Due to a shift in policy, from 0900 GMT on Wednesday 14th July 2021, we will be disabling ssh access to the server for external users. External users who wish to continue to access code repositories on the server will need to switch to using https. This can be accomplished in the following way: 1) On the repo on gitlab, use the clone dialogue and select ‘Clone with HTTPS’ to get the address of the repo; 2) From within the checkout of your repo run: $ git remote set-url origin HTTPS_ADDRESS. Here, replace HTTPS_ADDRESS with the address you have just copied from GitLab. Pulls and pushes will now require you to enter a username and password rather than using a ssh key. If you would prefer not to enter a password each time, you might consider caching your login credentials.

Commit 732bbe0f authored by Pierre Cazenave's avatar Pierre Cazenave

Update the files with my latest changes from the -dev branch. This is mainly...

Update the files with my latest changes from the -dev branch. This is mainly permissions changes rather than code changes
parent 6d25387e
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -22,7 +22,7 @@
clear
close all
clc
base = checkos;
cd([base, 'FVCOM/fvcom_co2/fvcom-toolbox/fvcom_postproc/surface_plots/'])
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -37,7 +37,7 @@ function rho = SW_Density(T,S)
% UPDATED 09-23-2010 modified to now handle matrices and commented out
% range checking.
%=========================================================================
%----------------------
% CHECK INPUT ARGUMENTS
%----------------------
......
File mode changed from 100755 to 100644
......@@ -35,7 +35,7 @@ function mu = SW_Viscosity(T,S)
% [4] F. J. Millero, The Sea, Vol. 5, 3 � 80, John Wiley, New York, 1974
% [5] IAPWS release on the viscosity of ordinary water substance 2008
%=========================================================================
%----------------------
% CHECK INPUT ARGUMENTS
%----------------------
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -113,3 +113,559 @@ function [X,Y,BUTTON,SCALEMAT] = ginput2(varargin)
% MATLAB: 7.7.0.471 (R2008b)
% AUTHOR: Carlos Adrian Vargas Aguilera (MEXICO)
% CONTACT: nubeobscura@hotmail.com
% REVISIONS:
% 1.0 Released. (Jul 09, 2008)
% 2.0 Changed default YESERROR value and fixed a bug there. Changed
% behavior when N==1. Fixed bug with zoom out. Changed default
% selection keys. Changed default selection click mouse: from
% left one to the right one. (Jun 08, 2009)
% 2.1 Fixed bugs related with points deletion. Added new 'KeepZoom'
% feature. (Aug 20, 2009)
% 3.0 Now it PANs when dragging. Updated help. (Nov 05, 2009)
% 3.1 Now returns when N==1 and pressed not predefined KEYS or one
% of DELECTION or RETURN buttons. (Nov 12, 2009)
% DISCLAIMER:
% ginput2.m is provided "as is" without warranty of any kind, under the
% revised BSD license.
% Copyright (c) 2008-2009 Carlos Adrian Vargas Aguilera
% INPUTS CHECK-IN
% -------------------------------------------------------------------------
% PARAMETERS
% Defaults:
X = [];
Y = [];
BUTTON = [];
SCALEMAT = [];
N = Inf;
DoScale = false;
PlotOpt = {'none'};
UnZoom = 'UnZoom';
% Constants KEYs (on my personal keyboard):
DOUBLECLICK = 0;
LEFTCLICK = 1;
MIDDLECLICK = 2;
RIGHTCLICK = 3;
BACKSPACE = 8;
ESCAPE = 27;
LEFTARROW = 28;
RIGHTARROW = 29;
UPARROW = 30;
DOWNARROW = 31;
SPACEBAR = 32;
DELETE = 127;
ASCII = [ ...
33:64 ... UP-KEYS
65:90 ... UP-LETTERS
91:96 ... LOW-KEYS
97:122 ... LOW-LETTERS
123:126 ... LOW-KEY
161:255 ... FOREING
];
% Functionality:
% NOTE: I left all this KEYs because the user may use this special case for
% other special purposes outside this function.
% % First version default:
% % SELECTS = [LEFTCLICK ASCII ESCAPE LEFTARROW RIGHTARROW ...
% % UPARROW DOWNARROW SPACEBAR DELETE];
% % ZOOMIN = RIGHTCLICK;
SELECTS = [RIGHTCLICK SPACEBAR]; % Selection buttons
DELETES = BACKSPACE; % Deletion buttons
FINISHES = []; % Finishes buttons
ZOOMIN = LEFTCLICK; % ZOOM(2) buttons
ZOOMRESET = MIDDLECLICK; % ZOOM RESET buttons
ZOOMOUT = DOUBLECLICK; % ZOOM OUT buttons
% Other parameters
secpause = 0.3; % Seconds to wait for double-click response.
YESERROR = false; % If there is an error with GINPUT, it tells to display
% an ERROR or a WARNING message.
% Checks number of inputs:
if nargout>4
error('CVARGAS:ginput2:tooManyOutputs',...
'At most 4 outputs are allowed.')
end
% Checks N:
if ~isempty(varargin) && ~isempty(varargin{1}) && ...
isfloat(varargin{1})
N = round(abs(varargin{1}(1))); % Forced unique, positive
varargin(1) = []; % integer.
end
% Checks DoScale:
if ~isempty(varargin) && ~isempty(varargin{1}) && ...
((islogical(varargin{1})) || (ndims(varargin{1})==2 && ...
all(size(varargin{1})==[2 4])))
DoScale = varargin{1};
varargin(1) = [];
end
% Checks UnZoom:
if ~isempty(varargin)
if ~isempty(varargin{1}) && ischar(varargin{1})
if strncmpi(varargin(1),'UnZoom' ,max(length(varargin{1}),2))
UnZoom = 'UnZoom';
varargin(1) = [];
elseif strncmpi(varargin(1),'KeepZoom',max(length(varargin{1}),2))
UnZoom = 'KeepZoom';
varargin(1) = [];
end
elseif (length(varargin)>1) && ~isempty(varargin{end}) && ...
ischar(varargin{end})
if strncmpi(varargin(end),'UnZoom' ,max(length(varargin{1}),2))
UnZoom = 'UnZoom';
varargin(end) = [];
elseif strncmpi(varargin(end),'KeepZoom',max(length(varargin{1}),2))
UnZoom = 'KeepZoom';
varargin(end) = [];
end
end
end
% Checks PlotOpt:
if ~isempty(varargin) && ~isempty(varargin{1})
PlotOpt = varargin;
end
clear varargin
% Checks DoScale:
if ~islogical(DoScale)
SCALEMAT = DoScale;
DoScale = true;
end
% SCALES/GEOREFERENCE?:
if DoScale
method = 'linear';
extrap = 'extrap';
ha = gca;
hi = findobj(get(ha,'Children'),'Type','image');
axes(ha)
if ~isempty(hi)
hi = hi(1);
xlim = get(ha,'XLim');
ylim = get(ha,'YLim');
zlim = get(ha,'ZLim');
z = repmat(max(zlim),1,5);
xdata = get(hi,'XData');
ydata = get(hi,'YData');
if isempty(SCALEMAT) % interactively
I1x = round(min(xdata)); I2x = round(max(xdata));
I1y = round(min(ydata)); I2y = round(max(ydata));
% Default (equal):
U1x = I1x; U2x = I2x;
U1y = I1y; U2y = I2y;
hgeo = [];
dlgTitle = 'Georeference image';
lineNo = 1;
while true
% Selects first corner:
theans = ...
questdlg('Select the first corner (1 of 2):',dlgTitle,'OK','OK');
if ~strcmp(theans,'OK'), return, end
pause(secpause)
[I1x,I1y] = ginput2(1,false,'none','UnZoom');
I1x = round(I1x);
I1y = round(I1y);
if ~ishandle(ha), return, end
if (ha==gca) && ~isempty(I1x) && ~isnan(I1x)
axis(ha,[xlim ylim])
hgeo(1) = line([xlim NaN I1x I1x],[I1y I1y NaN ylim],z,'color','m');
prompt = {'X-coordinate at 1st corner:',...
'Y-coordinate at 1st corner:'};
def = {int2str(I1x),int2str(I1y)};
answer = inputdlg(prompt,dlgTitle,lineNo,def);
answer = str2num(char(answer{:}));
break
end
end
axes(ha)
% Checks inputs:
if ~isempty(answer) && isfloat(answer) && (length(answer)==2) && ...
all(isfinite(answer))
U1x = answer(1); U1y = answer(2);
secondcorner = true;
else
secondcorner = false;
warning('CVARGAS:ginput2:incorrectGeoreference',...
'Ignored incorrect georeference corners.')
end
while secondcorner
% Selects second corner:
theans = ...
questdlg('Select the second corner (2 of 2):',dlgTitle,'OK','OK');
if ~strcmp(theans,'OK'), return, end
pause(secpause)
[I2x,I2y] = ginput2(1,false,'none','UnZoom');
I2x = round(I2x);
I2y = round(I2y);
if ~ishandle(ha), return, end
if (ha==gca) && ~isempty(I2x) && ~isnan(I2x) && ...
(I2x~=I1x) && (I2y~=I1y)
axis(ha,[xlim ylim])
hgeo(2) = line([xlim NaN I2x I2x],[I2y I2y NaN ylim],z,'color','c');
prompt = {'X-coordinate at 2nd corner:',...
'Y-coordinate at 2nd corner:'};
def = {int2str(I2x),int2str(I2y)};
answer = inputdlg(prompt,dlgTitle,lineNo,def);
answer = str2num(char(answer{:}));
break
end
end
axes(ha)
% Checks inputs:
if secondcorner && ~isempty(answer) && isfloat(answer) && ...
(length(answer)==2) && all(isfinite(answer))
U2x = answer(1); U2y = answer(2);
else
warning('CVARGAS:ginput2:incorrectGeoreference',...
'Ignored incorrect georeference corners.')
end
% Deletes corner's lines:
if any(ishandle(hgeo))
delete(hgeo(ishandle(hgeo)))
end
% Scale matrix:
SCALEMAT = [I1x I1y I2x I2y; U1x U1y U2x U2y];
else
% Continue
end
else
warning('CVARGAS:ginput2:noImageFound',...
'No image found in the current axes to georeference.')
end
% OK, set the scaling then:
if ~isempty(SCALEMAT)
xdata = interp1(SCALEMAT(1,[1 3]),SCALEMAT(2,[1 3]),xdata,method,extrap);
ydata = interp1(SCALEMAT(1,[2 4]),SCALEMAT(2,[2 4]),ydata,method,extrap);
xlim2 = interp1(SCALEMAT(1,[1 3]),SCALEMAT(2,[1 3]),xlim ,method,extrap);
ylim2 = interp1(SCALEMAT(1,[2 4]),SCALEMAT(2,[2 4]),ylim ,method,extrap);
set(hi,'XData',xdata);
set(hi,'YData',ydata);
set(ha,'XLim' ,sort(xlim2,'ascend'));
set(ha,'YLim' ,sort(ylim2,'ascend'));
% Reverses axis directions:
if diff(xlim)*diff(xlim2)<1
if strcmp(get(ha,'XDir'),'normal')
set(ha,'XDir','reverse')
else
set(ha,'XDir','normal')
end
end
if diff(ylim)*diff(ylim2)<1
if strcmp(get(ha,'YDir'),'normal')
set(ha,'YDir','reverse')
else
set(ha,'YDir','normal')
end
end
end
axis(ha,'normal')
end
% DRAWS?:
if strcmpi(PlotOpt{1},'none')
yesdraw = false;
else
yesdraw = true;
end
% Optional parameters:
if yesdraw
hpoints = [];
% Check for linestyle color:
yescolor = true;
Nplotopt = length(PlotOpt);
yeslinestyle = rem(Nplotopt,2);
if yeslinestyle % Given LineStyle
for k = 1:length(PlotOpt{1})
switch lower(PlotOpt{1}(k))
case 'y', yescolor = false; break
case 'm', yescolor = false; break
case 'c', yescolor = false; break
case 'r', yescolor = false; break
case 'g', yescolor = false; break
case 'b', yescolor = false; break
case 'w', yescolor = false; break
case 'k', yescolor = false; break
otherwise, % no color specified
end
end
end
if ~yescolor && (Nplotopt*yeslinestyle~=1)
for k = yeslinestyle+1:2:Nplotopt % Given 'Color'
if strncmpi(PlotOpt{k},'co',2), yescolor = false; break, end
end
end
if yescolor
contnan = 1;
colors = get(gca,'ColorOrder');
ncolors = size(colors,1);
color = colors(1,:);
end
end
% -------------------------------------------------------------------------
% MAIN
% -------------------------------------------------------------------------