From fd8ef5f521162821624de363eeebb7cf4309fbdf Mon Sep 17 00:00:00 2001
From: Yves Gouriou <yves.gouriou@ird.fr>
Date: Tue, 11 Mar 2008 15:54:08 +0000
Subject: [PATCH] =?UTF-8?q?Suppresion=20du=20module=20CSIRO=20D=C3=A9velop?=
=?UTF-8?q?pement=20du=20module=20d'interpolation=20des=20positions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
M_Csiro/Contents.m | 63 ----
M_Csiro/README | 7 -
M_Csiro/bm_bvfrq.m | 95 -----
M_Csiro/ctd.txt | 31 --
M_Csiro/sw_adtg.m | 119 ------
M_Csiro/sw_alpha.m | 105 ------
M_Csiro/sw_aonb.m | 130 -------
M_Csiro/sw_beta.m | 126 -------
M_Csiro/sw_bfrq.m | 164 --------
M_Csiro/sw_bfrq_mean.m | 173 ---------
M_Csiro/sw_bfrq_old.m | 164 --------
M_Csiro/sw_c3515.m | 39 --
M_Csiro/sw_cndr.m | 145 --------
M_Csiro/sw_copy.m | 165 --------
M_Csiro/sw_cp.m | 176 ---------
M_Csiro/sw_data.mat | Bin 8077 -> 0 bytes
M_Csiro/sw_dens.m | 103 -----
M_Csiro/sw_dens0.m | 91 -----
M_Csiro/sw_dist.m | 112 ------
M_Csiro/sw_dpth.m | 87 -----
M_Csiro/sw_f.m | 57 ---
M_Csiro/sw_fp.m | 90 -----
M_Csiro/sw_g.m | 70 ----
M_Csiro/sw_gpan.m | 126 -------
M_Csiro/sw_gvel.m | 62 ---
M_Csiro/sw_info.m | 30 --
M_Csiro/sw_new.m | 64 ----
M_Csiro/sw_pden.m | 57 ---
M_Csiro/sw_pres.m | 81 ----
M_Csiro/sw_ptmp.m | 137 -------
M_Csiro/sw_salds.m | 74 ----
M_Csiro/sw_salrp.m | 69 ----
M_Csiro/sw_salrt.m | 49 ---
M_Csiro/sw_sals.m | 79 ----
M_Csiro/sw_salt.m | 60 ---
M_Csiro/sw_satAr.m | 95 -----
M_Csiro/sw_satN2.m | 95 -----
M_Csiro/sw_satO2.m | 95 -----
M_Csiro/sw_seck.m | 167 ---------
M_Csiro/sw_smow.m | 69 ----
M_Csiro/sw_svan.m | 104 ------
M_Csiro/sw_svel.m | 181 ---------
M_Csiro/sw_temp.m | 59 ---
M_Csiro/sw_test.m | 600 ------------------------------
tsg_icon/interp.mat | Bin 0 -> 370 bytes
tsg_io/readTsgDataLabview.m | 17 +-
tsg_util/InterpPosLinear.m | 47 +++
tsg_util/automaticQC.m | 54 ++-
tsg_util/plot_Interpolation.m | 51 +++
tsg_util/tsg_preferences.m | 4 +-
tsg_util/updateAdjustedVariable.m | 9 +-
tsg_util/updateTsgStruct.m | 8 +-
tsgqc_GUI.m | 257 ++++++++++---
53 files changed, 361 insertions(+), 4751 deletions(-)
delete mode 100644 M_Csiro/Contents.m
delete mode 100644 M_Csiro/README
delete mode 100644 M_Csiro/bm_bvfrq.m
delete mode 100644 M_Csiro/ctd.txt
delete mode 100644 M_Csiro/sw_adtg.m
delete mode 100644 M_Csiro/sw_alpha.m
delete mode 100644 M_Csiro/sw_aonb.m
delete mode 100644 M_Csiro/sw_beta.m
delete mode 100644 M_Csiro/sw_bfrq.m
delete mode 100644 M_Csiro/sw_bfrq_mean.m
delete mode 100644 M_Csiro/sw_bfrq_old.m
delete mode 100644 M_Csiro/sw_c3515.m
delete mode 100644 M_Csiro/sw_cndr.m
delete mode 100644 M_Csiro/sw_copy.m
delete mode 100644 M_Csiro/sw_cp.m
delete mode 100644 M_Csiro/sw_data.mat
delete mode 100644 M_Csiro/sw_dens.m
delete mode 100644 M_Csiro/sw_dens0.m
delete mode 100644 M_Csiro/sw_dist.m
delete mode 100644 M_Csiro/sw_dpth.m
delete mode 100644 M_Csiro/sw_f.m
delete mode 100644 M_Csiro/sw_fp.m
delete mode 100644 M_Csiro/sw_g.m
delete mode 100644 M_Csiro/sw_gpan.m
delete mode 100644 M_Csiro/sw_gvel.m
delete mode 100644 M_Csiro/sw_info.m
delete mode 100644 M_Csiro/sw_new.m
delete mode 100644 M_Csiro/sw_pden.m
delete mode 100644 M_Csiro/sw_pres.m
delete mode 100644 M_Csiro/sw_ptmp.m
delete mode 100644 M_Csiro/sw_salds.m
delete mode 100644 M_Csiro/sw_salrp.m
delete mode 100644 M_Csiro/sw_salrt.m
delete mode 100644 M_Csiro/sw_sals.m
delete mode 100644 M_Csiro/sw_salt.m
delete mode 100644 M_Csiro/sw_satAr.m
delete mode 100644 M_Csiro/sw_satN2.m
delete mode 100644 M_Csiro/sw_satO2.m
delete mode 100644 M_Csiro/sw_seck.m
delete mode 100644 M_Csiro/sw_smow.m
delete mode 100644 M_Csiro/sw_svan.m
delete mode 100644 M_Csiro/sw_svel.m
delete mode 100644 M_Csiro/sw_temp.m
delete mode 100644 M_Csiro/sw_test.m
create mode 100644 tsg_icon/interp.mat
create mode 100644 tsg_util/InterpPosLinear.m
create mode 100644 tsg_util/plot_Interpolation.m
diff --git a/M_Csiro/Contents.m b/M_Csiro/Contents.m
deleted file mode 100644
index 8aa83ae..0000000
--- a/M_Csiro/Contents.m
+++ /dev/null
@@ -1,63 +0,0 @@
-% SEAWATER Library
-% Version 2.0.1 22-Apr-1998
-%
-% *******************************
-% * SEAWATER Library *
-% * *
-% * Version 2.0.1 *
-% * (for Matlab 5.x) *
-% * *
-% * *
-% * Phillip P. Morgan *
-% * CSIRO *
-% * *
-% * Phil.Morgan@marine.csiro.au *
-% *******************************
-%
-% LIST OF ROUTINES:
-%
-% SW_NEW What's new in this version of seawater.
-%
-% SW_ADTG Adiabatic temperature gradient
-% SW_ALPHA Thermal expansion coefficient (alpha)
-% SW_AONB Calculate alpha/beta (a on b)
-% SW_BETA Saline contraction coefficient (beta)
-% SW_BFRQ Brunt-Vaisala Frequency Squared (N^2)
-% SW_COPY Copyright and Licence file
-% SW_CP Heat Capacity (Cp) of Sea Water
-% SW_DENS Density of sea water
-% SW_DENS0 Denisty of sea water at atmospheric pressure
-% SW_DIST Distance between two lat, lon coordinates
-% SW_DPTH Depth from pressure
-% SW_F Coriolis factor "f"
-% SW_FP Freezing Point of sea water
-% SW_G Gravitational acceleration
-% SW_GPAN Geopotential anomaly
-% SW_GVEL Geostrophic velocity
-% SW_INFO Information on the SEAWATER library.
-% SW_PDEN Potential Density
-% SW_PRES Pressure from depth
-% SW_PTMP Potential temperature
-% SW_SALS Salinity of sea water
-% SW_SALT Salinity from cndr, T, P
-% SW_SATAr Solubility (saturation) of Ar in seawater
-% SW_SATN2 Solubility (saturation) of N2 in seawater
-% SW_SATO2 Solubility (saturation) of O2 in seawater
-% SW_SVAN Specific volume anomaly
-% SW_SVEL Sound velocity of sea water
-% SW_SMOW Denisty of standard mean ocean water (pure water)
-% SW_TEMP Temperature from potential temperature
-% SW_TEST Run test suite on library
-% SW_VER Version number of SEAWATER library
-%
-% LOW LEVEL ROUTINES CALLED BY ABOVE: (also available for you to use)
-%
-% SW_C3515 Conductivity at (35,15,0)
-% SW_CNDR Conductivity ratio R = C(S,T,P)/C(35,15,0)
-% SW_SALDS Differiential dS/d(sqrt(Rt)) at constant T.
-% SW_SALRP Conductivity ratio Rp(S,T,P) = C(S,T,P)/C(S,T,0)
-% SW_SALRT Conductivity ratio rt(T) = C(35,T,0)/C(35,15,0)
-% SW_SECK Secant bulk modulus (K) of sea water
-%=======================================================================
-
-% Contents.m $Revision: 1.6 $ $Date: 1998/04/22 02:12:17 $
diff --git a/M_Csiro/README b/M_Csiro/README
deleted file mode 100644
index a2881aa..0000000
--- a/M_Csiro/README
+++ /dev/null
@@ -1,7 +0,0 @@
-% README file $Revision: 1.1 $ $Date: 1994/10/11 02:54:21 $
-%
-% SEAWATER is a toolkit of MATLAB routines for calculating the
-% properties of sea water. They are a self contained library and
-% are extremely easy to use.
-%
-% See the file sw_info.m for info on installation and usage
diff --git a/M_Csiro/bm_bvfrq.m b/M_Csiro/bm_bvfrq.m
deleted file mode 100644
index 2de700e..0000000
--- a/M_Csiro/bm_bvfrq.m
+++ /dev/null
@@ -1,95 +0,0 @@
-function [n2, e] = bm_bvfrq( S, T, P, LAT, DP)
-%*************************************************************
-% ***** brunt-vaisala freq *****
-%
-% uses 1980 equation of state
-%
-% in :
-% P pressure decibars
-% T temperature deg celsius (ipts-68)
-% S salinity psu (pss-78)
-% LAT latitude
-% DP intervalle de pression (db) sur lequel est calcule n2
-%
-% out :
-% n2 bouyancy freq cph
-% e stability 1/m
-%
-% r. millard feb. 1991
-%
-%*************************************************************
-%------
-% BEGIN
-%------
-
-% change call list xlat to glat & pass gravity m/s^2
-% after formulation of n. p. fofonoff & breck owen's
-%
-
-% Calcul de la gravité
-% note that sw_g expects height as argument
-Z = sw_dpth(P,LAT);
-gp = sw_g(LAT,-Z);
-g2 = gp .* gp;
-g2 = g2 * 1.e-4;
-
-% compute least squares estimate of specific volume anamoly gradient
-
-[m,n] = size(P);
-n2 = zeros(size(P));
-
-% Calcul du nombre d'observation sur lequel est calcule n2
-
-dp = P(2)-P(1);
-nobs = DP / dp;
-
-% Debut du profil
-
-for i = 1:(nobs/2)
- j = 1:i+nobs/2;
- [n2(i), e(i)] = cal_bvfrq( S, T, P, g2(i), gp(i), nobs, j);
-end
-
-% Fin du profil
-
-for i = m-(nobs/2):m
- j = i-nobs/2:m;
- [n2(i), e(i)] = cal_bvfrq( S, T, P, g2(i), gp(i), nobs, j);
-end
-
-% Profil
-
-for i = (nobs/2+1):m-(nobs/2+1)
- j = i-nobs/2:i+nobs/2;
- [n2(i), e(i)] = cal_bvfrq( S, T, P, g2(i), gp(i), nobs, j);
-end
-
-% Corps du calcul
-
-function [n2, e] = cal_bvfrq( S, T, P, g2, gp, nobs, j)
-
-% default gravity & rad/sec to cph conversion
-%
-radsec = 572.9578;
-
- pav = mean(P(j));
- data = sw_svan( S(j), sw_ptmp( S(j), T(j), P(j), pav), pav);
- cxy = sum( data .* (P(j)-pav) );
- cy = sum( data );
- cxx = sum( (P(j)-pav).*(P(j)-pav) );
-
- sigma = sw_pden(S(j), sw_ptmp( S(j), T(j), P(j), pav), P(j), pav);
-
- a0 = cxy/cxx;
-
- v350p = 1./sigma - data;
- vbar = v350p(end) + cy/(nobs+1);
- dvdp = a0;
-
- e = -g2*dvdp/(vbar)^2;
- n2 = radsec*sqrt(abs(e))*sign(e);
-
- % define stability parameter units (1/m)
- e = e/gp;
-
- return
\ No newline at end of file
diff --git a/M_Csiro/ctd.txt b/M_Csiro/ctd.txt
deleted file mode 100644
index 3167e6f..0000000
--- a/M_Csiro/ctd.txt
+++ /dev/null
@@ -1,31 +0,0 @@
- 0 25.698 35.221
- 10 26.673 36.106
- 20 26.678 36.106
- 30 26.676 36.107
- 50 24.528 36.561
- 75 22.753 36.614
- 100 21.427 36.637
- 125 20.633 36.627
- 150 19.522 36.558
- 200 18.798 36.555
- 250 18.431 36.537
- 300 18.189 36.526
- 400 17.726 36.477
- 500 17.165 36.381
- 600 15.592 36.105
- 700 13.458 35.766
- 800 11.109 35.437
- 900 8.798 35.178
-1000 6.292 35.044
-1100 5.249 35.004
-1200 4.813 34.995
-1300 4.554 34.986
-1400 4.357 34.977
-1500 4.245 34.975
-1750 4.028 34.973
-2000 3.852 34.975
-2500 3.424 34.968
-3000 2.963 34.946
-3500 2.462 34.920
-4000 2.259 34.904
-4327 2.221 34.896
\ No newline at end of file
diff --git a/M_Csiro/sw_adtg.m b/M_Csiro/sw_adtg.m
deleted file mode 100644
index 9badeac..0000000
--- a/M_Csiro/sw_adtg.m
+++ /dev/null
@@ -1,119 +0,0 @@
-
-function ADTG = sw_adtg(S,T,P)
-
-% SW_ADTG Adiabatic temperature gradient
-%===========================================================================
-% SW_ADTG $Revision: 1.4 $ $Date: 1994/10/10 04:16:37 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% adtg = sw_adtg(S,T,P)
-%
-% DESCRIPTION:
-% Calculates adiabatic temperature gradient as per UNESCO 1983 routines.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% ADTG = adiabatic temperature gradient [degree_C/db]
-%
-% AUTHOR: Phil Morgan 92-04-03 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater. Unesco Tech. Pap. in Mar. Sci., No. 44, 53 pp. Eqn.(31) p.39
-%
-% Bryden, H. 1973.
-% "New Polynomials for thermal expansion, adiabatic temperature gradient
-% and potential temperature of sea water."
-% DEEP-SEA RES., 1973, Vol20,401-408.
-%=========================================================================
-
-%-------------
-% CHECK INPUTS
-%-------------
-if nargin ~= 3
- error('sw_adtg.m: Must pass 3 parameters ')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-%-------------
-% BEGIN
-%-------------
-a0 = 3.5803E-5;
-a1 = +8.5258E-6;
-a2 = -6.836E-8;
-a3 = 6.6228E-10;
-
-b0 = +1.8932E-6;
-b1 = -4.2393E-8;
-
-c0 = +1.8741E-8;
-c1 = -6.7795E-10;
-c2 = +8.733E-12;
-c3 = -5.4481E-14;
-
-d0 = -1.1351E-10;
-d1 = 2.7759E-12;
-
-e0 = -4.6206E-13;
-e1 = +1.8676E-14;
-e2 = -2.1687E-16;
-
-ADTG = a0 + (a1 + (a2 + a3.*T).*T).*T ...
- + (b0 + b1.*T).*(S-35) ...
- + ( (c0 + (c1 + (c2 + c3.*T).*T).*T) + (d0 + d1.*T).*(S-35) ).*P ...
- + ( e0 + (e1 + e2.*T).*T ).*P.*P;
-
-if Transpose
- ADTG = ADTG';
-end %if
-
-return
-%==========================================================================
-
diff --git a/M_Csiro/sw_alpha.m b/M_Csiro/sw_alpha.m
deleted file mode 100644
index 828bf3b..0000000
--- a/M_Csiro/sw_alpha.m
+++ /dev/null
@@ -1,105 +0,0 @@
-
-function [ALPHA] = sw_alpha(S, T, P, keyword)
-
-% SW_ALPHA Thermal expansion coefficient (alpha)
-%================================================================
-% SW_ALPHA $Revision: 1.6 $ $Date: 1998/04/21 05:42:10 $
-% Copyright (C) CSIRO, Nathan Bindoff 1993.
-%
-% USAGE: [ALPHA] = alpha(S, T, P, keyword)
-%
-% [ALPHA] = alpha(S, T, P, 'temp') %default
-% [ALPHA] = alpha(S, PTMP, P, 'ptmp')
-%
-% DESCRIPTION:
-% A function to calculate the thermal expansion coefficient.
-%
-% INPUT:
-% S = salinity [psu (PSS-78) ]
-% * PTMP = potential temperature [degree C (IPTS-68)]
-% * T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% keyword = optional string to identify if temp or ptmp passed.
-% = No argument defaults to 'temp'
-% = 'temp' assumes (S,T,P) passed. Will execute slower
-% as ptmp will be calculated internally.
-% = 'ptmp' assumes (S,PTMP,P) passed. Will execute faster.
-%
-% OUTPUT:
-% ALPHA = Thermal expansion coeff (alpha) [degree_C.^-1]
-%
-% AUTHOR: N.L. Bindoff 1993
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCE:
-% McDougall, T.J. 1987. "Neutral Surfaces"
-% Journal of Physical Oceanography vol 17 pages 1950-1964,
-%
-% CHECK VALUE:
-% See sw_beta.m amd sw_aonb.m
-%================================================================
-
-% Modifications
-% 93-04-22. Phil Morgan, Help display modified to suit library
-% 93-04-23. Phil Morgan, Input argument checking
-% 94-10-15. Phil Morgan, Pass S,T,P and keyword for 'ptmp'
-
-
-% CHECK INPUT ARGUMENTS
-if ~(nargin==3 | nargin==4)
- error('sw_alpha.m: requires 3 or 4 input arguments')
-end %if
-if nargin == 3
- keyword = 'temp';
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-% BEGIN
-
-ALPHA = sw_aonb(S,T,P,keyword).*sw_beta(S,T,P,keyword);
-
-return
-%------------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_aonb.m b/M_Csiro/sw_aonb.m
deleted file mode 100644
index e1f3370..0000000
--- a/M_Csiro/sw_aonb.m
+++ /dev/null
@@ -1,130 +0,0 @@
-
-function [AONB]= aonb(S, T, P, keyword)
-
-% SW_AONB Calculate alpha/beta (a on b)
-%================================================================
-% SW_AONB $Revision: 1.5 $ $Date: 1994/11/15 04:10:45 $
-% Copyright (C) CSIRO, Nathan Bindoff 1993
-%
-% USAGE: [AONB] = aonb(S, T, P, {keyword} )
-%
-% [AONB] = aonb(S, T, P, 'temp' ) %default
-% [AONB] = aonb(S, PTMP, P, 'ptmp' )
-%
-% DESCRIPTION
-% Calculate alpha/beta. See sw_alpha.m and sw_beta.m
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% * PTMP = potential temperature [degree C (IPTS-68)]
-% * T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% keyword = optional string to identify if temp or ptmp passed.
-% = No argument defaults to 'temp'
-% = 'temp' assumes (S,T,P) passed. Will execute slower
-% as ptmp will be calculated internally.
-% = 'ptmp' assumes (S,PTMP,P) passed. Will execute faster.
-%
-% OUTPUT
-% AONB = alpha/beta [psu/degree_C]
-%
-% AUTHOR: N.L. Bindoff 1993
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCE:
-% McDougall, T.J. 1987. "Neutral Surfaces"
-% Journal of Physical Oceanography vol 17 pages 1950-1964,
-%
-% CHECK VALUE:
-% aonb=0.34763 psu C^-1 at S=40.0 psu, ptmp=10.0 C, p=4000 db
-%================================================================
-
-% Modifications
-% 93-04-22. Phil Morgan, Help display modified to suit library
-% 93-04-23. Phil Morgan, Input argument checking
-% 94-10-15. Phil Morgan, Pass S,T,P and keyword for 'ptmp'
-
-% CHECK INPUT ARGUMENTS
-if ~(nargin==3 | nargin==4)
- error('sw_aonb.m: requires 3 input arguments')
-end %if
-if nargin == 3
- keyword = 'temp';
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-% ENSURE WE USE PTMP IN CALCULATIONS
-if strcmp(lower(keyword),'ptmp')
- % already have ptmp
-else
- T = sw_ptmp(S,T,P,0); % now have ptmp
-end %if
-
-% BEGIN
- c1=fliplr([ 0.665157e-1, 0.170907e-1, ...
- -0.203814e-3, 0.298357e-5, ...
- -0.255019e-7]);
- c2=fliplr([ 0.378110e-2, ...
- -0.846960e-4]);
- c2a=fliplr([0.0 -0.164759e-6, ...
- -0.251520e-11]);
- c3=[-0.678662e-5];
- c4=fliplr([+0.380374e-4, -0.933746e-6, ...
- +0.791325e-8]);
- c5=[0.512857e-12];
- c6=[-0.302285e-13];
-%
-% Now calaculate the thermal expansion saline contraction ratio adb
-%
- [m,n] = size(S);
- sm35 = S-35.0*ones(m,n);
- AONB = polyval(c1,T) + sm35.*(polyval(c2,T)...
- + polyval(c2a,P)) ...
- + sm35.^2*c3 + P.*polyval(c4,T) ...
- + c5*(P.^2).*(T.^2) + c6*P.^3;
-
-return
-%----------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_beta.m b/M_Csiro/sw_beta.m
deleted file mode 100644
index 3be9894..0000000
--- a/M_Csiro/sw_beta.m
+++ /dev/null
@@ -1,126 +0,0 @@
-
-function [BETA] = sw_beta(S, T, P, keyword)
-
-% SW_BETA Saline contraction coefficient (beta)
-%========================================================================
-% SW_BETA $Revision: 1.4 $ $Date: 1994/11/15 04:10:05 $
-% % Copyright (C) CSIRO, Nathan Bindoff 1993.
-%
-% USAGE: [BETA] = sw_beta(S, T, P, {keyword} )
-%
-% [BETA] = sw_beta(S, T, P, 'temp') %default
-% [BETA] = sw_beta(S, PTMP, P, 'ptmp')
-%
-% DESCRIPTION
-% The saline contraction coefficient as defined by T.J. McDougall.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% * PTMP = potential temperature [degree C (IPTS-68)]
-% * T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% keyword = optional string to identify if temp or ptmp passed.
-% = No argument defaults to 'temp'
-% = 'temp' assumes (S,T,P) passed. Will execute slower
-% as ptmp will be calculated internally.
-% = 'ptmp' assumes (S,PTMP,P) passed. Will execute faster.
-%
-% OUTPUT
-% BETA = Saline Contraction Coefficient [psu.^-1]
-%
-% AUTHOR: N.L. Bindoff 1993
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCE:
-% McDougall, T.J. 1987. "Neutral Surfaces"
-% Journal of Physical Oceanography vol 17 pages 1950-1964,
-%
-% CHECK VALUE:
-% beta=0.72088e-3 psu.^-1 at S=40.0 psu, ptmp = 10.0 C, p=4000 db
-%========================================================================
-
-% Modifications
-% 93-04-22. Phil Morgan, Help display modified to suit library
-% 93-04-23. Phil Morgan, Input argument checking
-% 94-10-15. Phil Morgan, Pass S,T,P and keyword for 'ptmp'
-
-% CHECK INPUT ARGUMENTS
-if ~(nargin==3 | nargin==4)
- error('sw_beta.m: requires 3 or 4 input arguments')
-end %if
-if nargin == 3
- keyword = 'temp';
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-% ENSURE WE USE PTMP IN CALCULATIONS
-if strcmp(lower(keyword),'ptmp')
- % already have ptmp
-else
- T = sw_ptmp(S,T,P,0); % now have ptmp
-end %if
-
-% BEGIN
-
- c1=fliplr([ 0.785567e-3, -0.301985e-5 ...
- 0.555579e-7, -0.415613e-9]);
- c2=fliplr([ -0.356603e-6, 0.788212e-8]);
- c3=fliplr([0.0 0.408195e-10, -0.602281e-15]);
- c4=[0.515032e-8];
- c5=fliplr([-0.121555e-7, 0.192867e-9, -0.213127e-11]);
- c6=fliplr([0.176621e-12 -0.175379e-14]);
- c7=[0.121551e-17];
-%
-% Now calaculate the thermal expansion saline contraction ratio adb
-%
- [m,n] = size(S);
- sm35 = S-35*ones(m,n);
- BETA = polyval(c1,T) + sm35.*(polyval(c2,T) + ...
- polyval(c3,P)) + c4*(sm35.^2) + ...
- P.*polyval(c5,T) + (P.^2).*polyval(c6,T) ...
- +c7*( P.^3);
-
-return
-%------------------------------------------------------------------------
diff --git a/M_Csiro/sw_bfrq.m b/M_Csiro/sw_bfrq.m
deleted file mode 100644
index 1c3d262..0000000
--- a/M_Csiro/sw_bfrq.m
+++ /dev/null
@@ -1,164 +0,0 @@
-
-function [n2,q,p_ave] = sw_bfrq(S,T,P,LAT)
-
-% SW_BFRQ Brunt-Vaisala Frequency Squared (N^2)
-%===========================================================================
-% SW_BFRQ $Revision: 1.12 $ $Date: 1994/11/15 04:13:34 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: [bfrq,vort,p_ave] = sw_bfrq(S,T,P,{LAT})
-%
-% DESCRIPTION:
-% Calculates Brunt-Vaisala Frequency squared (N^2) at the mid depths
-% from the equation,
-%
-% -g d(pdens)
-% N2 = ----- x --------
-% pdens d(z)
-%
-% Also returns Potential Vorticity from q = f*N2/g.
-%
-% INPUT: (all must have same dimensions MxN)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-%
-% OPTIONAL:
-% LAT = Latitude in decimal degrees north [-90..+90]
-% May have dimensions 1x1 or 1xn where S(mxn).
-% (Will use sw_g instead of the default g=9.8 m^2/s)
-% (Will also calc d(z) instead of d(p) in numerator)
-% OUTPUT:
-% bfrq = Brunt-Vaisala Frequency squared (M-1xN) [s^-2]
-% vort = Planetary Potential Vorticity (M-1xN) [(ms)^-1]
-% (if isempty(LAT) vort=NaN )
-% p_ave = Mid pressure between P grid (M-1xN) [db]
-%
-% AUTHOR: Phil Morgan 93-06-24 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% A.E. Gill 1982. p.54 eqn 3.7.15
-% "Atmosphere-Ocean Dynamics"
-% Academic Press: New York. ISBN: 0-12-283522-0
-%
-% Jackett, D.R. and McDougall, T.J. 1994.
-% Minimal adjustment of hydrographic properties to achieve static
-% stability. submitted J.Atmos.Ocean.Tech.
-%
-% Greg Johnson (gjohnson@pmel.noaa.gov)
-% added potential vorticity calcuation
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_dens.m sw_pden.m
-
-%$Id: sw_bfrq.M,v 1.12 1994/11/15 04:13:34 morgan Exp $
-
-%-------------
-% CHECK INPUTS
-%-------------
-if ~(nargin==3 | nargin==4)
- error('sw_bfrq.m: Must pass 3 or 4 parameters ')
-end %if
-
-if nargin == 3
- LAT = [];
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-% IF LAT PASSED THEN VERIFY DIMENSIONS
-if ~isempty(LAT)
- [mL,nL] = size(LAT);
- if mL==1 & nL==1
- LAT = LAT*ones(size(S));
- %end % Je commente le end et remplace le if suivant par elseif
-
- elseif (ms~=mL) | (ns~=nL) % S & LAT are not the same shape
- if (ns==nL) & (mL==1) % copy LATS down each column
- LAT = LAT( ones(1,ms), : ); % s.t. dim(S)==dim(LAT)
- else
- error('sw_bfrq.m: Inputs arguments have wrong dimensions')
- end %if
- end %if
-end %if
-
-
-
-%------
-% BEGIN
-%------
-if ~isempty(LAT)
- % note that sw_g expects height as argument
- Z = sw_dpth(P,LAT);
- g = sw_g(LAT,-Z);
- f = sw_f(LAT);
-else
- Z = P;
- g = 9.8*ones(size(P));
- f = NaN*ones(size(P));
-end %if
-
-[m,n] = size(P);
-iup = 1:m-1;
-ilo = 2:m;
-p_ave = (P(iup,:)+P(ilo,:) )/2;
-pden_up = sw_pden(S(iup,:),T(iup,:),P(iup,:),p_ave);
-pden_lo = sw_pden(S(ilo,:),T(ilo,:),P(ilo,:),p_ave);
-
-mid_pden = (pden_up + pden_lo )/2;
-dif_pden = pden_up - pden_lo;
-mid_g = (g(iup,:)+g(ilo,:))/2;
-dif_z = diff(Z);
-n2 = -mid_g .* dif_pden ./ (dif_z .* mid_pden);
-
-mid_f = f(iup,:);
-q = mid_f .* dif_pden ./ (dif_z .* mid_pden);
-
-if Transpose
- n2 = n2';
- q = q';
- p_ave = p_ave';
-end %if
-return
-%-------------------------------------------------------------------
diff --git a/M_Csiro/sw_bfrq_mean.m b/M_Csiro/sw_bfrq_mean.m
deleted file mode 100644
index 816a387..0000000
--- a/M_Csiro/sw_bfrq_mean.m
+++ /dev/null
@@ -1,173 +0,0 @@
-
-function [n2,q,p_ave] = sw_bfrq_mean(S,T,P,LAT)
-
-% SW_BFRQ Brunt-Vaisala Frequency Squared (N^2)
-%===========================================================================
-% SW_BFRQ $Revision: 1.12 $ $Date: 1994/11/15 04:13:34 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: [bfrq,vort,p_ave] = sw_bfrq(S,T,P,{LAT})
-%
-% DESCRIPTION:
-% Calculates Brunt-Vaisala Frequency squared (N^2) at the mid depths
-% from the equation,
-%
-% -g d(pdens)
-% N2 = ----- x --------
-% pdens d(z)
-%
-% Also returns Potential Vorticity from q = f*N2/g.
-%
-% INPUT: (all must have same dimensions MxN)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-%
-% OPTIONAL:
-% LAT = Latitude in decimal degrees north [-90..+90]
-% May have dimensions 1x1 or 1xn where S(mxn).
-% (Will use sw_g instead of the default g=9.8 m^2/s)
-% (Will also calc d(z) instead of d(p) in numerator)
-% OUTPUT:
-% bfrq = Brunt-Vaisala Frequency squared (M-1xN) [s^-2]
-% vort = Planetary Potential Vorticity (M-1xN) [(ms)^-1]
-% (if isempty(LAT) vort=NaN )
-% p_ave = Mid pressure between P grid (M-1xN) [db]
-%
-% AUTHOR: Phil Morgan 93-06-24 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% A.E. Gill 1982. p.54 eqn 3.7.15
-% "Atmosphere-Ocean Dynamics"
-% Academic Press: New York. ISBN: 0-12-283522-0
-%
-% Jackett, D.R. and McDougall, T.J. 1994.
-% Minimal adjustment of hydrographic properties to achieve static
-% stability. submitted J.Atmos.Ocean.Tech.
-%
-% Greg Johnson (gjohnson@pmel.noaa.gov)
-% added potential vorticity calcuation
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_dens.m sw_pden.m
-
-%$Id: sw_bfrq.M,v 1.12 1994/11/15 04:13:34 morgan Exp $
-
-%-------------
-% CHECK INPUTS
-%-------------
-if ~(nargin==3 | nargin==4)
- error('sw_bfrq.m: Must pass 3 or 4 parameters ')
-end %if
-
-if nargin == 3
- LAT = [];
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-% IF LAT PASSED THEN VERIFY DIMENSIONS
-if ~isempty(LAT)
- [mL,nL] = size(LAT);
- if mL==1 & nL==1
- LAT = LAT*ones(size(S));
- %end % Je commente le end et remplace le if suivant par elseif
-
- elseif (ms~=mL) | (ns~=nL) % S & LAT are not the same shape
- if (ns==nL) & (mL==1) % copy LATS down each column
- LAT = LAT( ones(1,ms), : ); % s.t. dim(S)==dim(LAT)
- else
- error('sw_bfrq.m: Inputs arguments have wrong dimensions')
- end %if
- end %if
-end %if
-
-
-
-%------
-% BEGIN
-%------
-if ~isempty(LAT)
- % note that sw_g expects height as argument
- Z = sw_dpth(P,LAT);
- g = sw_g(LAT,-Z);
- f = sw_f(LAT);
-else
- Z = P;
- g = 9.8*ones(size(P));
- f = NaN*ones(size(P));
-end %if
-
-[m,n] = size(P);
-iup = 1:m-1;
-ilo = 2:m;
-p_ave = (P(iup,:)+P(ilo,:) )/2;
-pden_up = sw_pden(S(iup,:),T(iup,:),P(iup,:),p_ave);
-pden_lo = sw_pden(S(ilo,:),T(ilo,:),P(ilo,:),p_ave);
-
-mid_pden = (pden_up + pden_lo )/2;
-dif_pden = pden_up - pden_lo;
-mid_g = (g(iup,:)+g(ilo,:))/2;
-dif_z = diff(Z);
-
-% Calcul des moyennes
-% -------------------
-Mmid_pden = mean(mid_pden,2);
-Mdif_pden = mean(dif_pden,2);
-Mmid_g = mid_g(:,1);
-Mdif_z = dif_z(:,1);
-
-n2 = -Mmid_g .* Mdif_pden ./ (Mdif_z .* Mmid_pden);
-
-mid_f = f(iup,:);
-Mmid_f = mid_f(:,1);
-q = Mmid_f .* Mdif_pden ./ (Mdif_z .* Mmid_pden);
-
-if Transpose
- n2 = n2';
- q = q';
- p_ave = p_ave';
-end %if
-return
-%-------------------------------------------------------------------
diff --git a/M_Csiro/sw_bfrq_old.m b/M_Csiro/sw_bfrq_old.m
deleted file mode 100644
index 72714c5..0000000
--- a/M_Csiro/sw_bfrq_old.m
+++ /dev/null
@@ -1,164 +0,0 @@
-
-function [n2,q,p_ave] = sw_bfrq(S,T,P,LAT)
-
-% SW_BFRQ Brunt-Vaisala Frequency Squared (N^2)
-%===========================================================================
-% SW_BFRQ $Revision: 1.12 $ $Date: 1994/11/15 04:13:34 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: [bfrq,vort,p_ave] = sw_bfrq(S,T,P,{LAT})
-%
-% DESCRIPTION:
-% Calculates Brunt-Vaisala Frequency squared (N^2) at the mid depths
-% from the equation,
-%
-% -g d(pdens)
-% N2 = ----- x --------
-% pdens d(z)
-%
-% Also returns Potential Vorticity from q = f*N2/g.
-%
-% INPUT: (all must have same dimensions MxN)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-%
-% OPTIONAL:
-% LAT = Latitude in decimal degrees north [-90..+90]
-% May have dimensions 1x1 or 1xn where S(mxn).
-% (Will use sw_g instead of the default g=9.8 m^2/s)
-% (Will also calc d(z) instead of d(p) in numerator)
-% OUTPUT:
-% bfrq = Brunt-Vaisala Frequency squared (M-1xN) [s^-2]
-% vort = Planetary Potential Vorticity (M-1xN) [(ms)^-1]
-% (if isempty(LAT) vort=NaN )
-% p_ave = Mid pressure between P grid (M-1xN) [db]
-%
-% AUTHOR: Phil Morgan 93-06-24 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% A.E. Gill 1982. p.54 eqn 3.7.15
-% "Atmosphere-Ocean Dynamics"
-% Academic Press: New York. ISBN: 0-12-283522-0
-%
-% Jackett, D.R. and McDougall, T.J. 1994.
-% Minimal adjustment of hydrographic properties to achieve static
-% stability. submitted J.Atmos.Ocean.Tech.
-%
-% Greg Johnson (gjohnson@pmel.noaa.gov)
-% added potential vorticity calcuation
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_dens.m sw_pden.m
-
-%$Id: sw_bfrq.M,v 1.12 1994/11/15 04:13:34 morgan Exp $
-
-%-------------
-% CHECK INPUTS
-%-------------
-if ~(nargin==3 | nargin==4)
- error('sw_bfrq.m: Must pass 3 or 4 parameters ')
-end %if
-
-if nargin == 3
- LAT = [];
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-% IF LAT PASSED THEN VERIFY DIMENSIONS
-if ~isempty(LAT)
- [mL,nL] = size(LAT);
- if mL==1 & nL==1
- LAT = LAT*ones(size(S));
- end %if
-
- if (ms~=mL) | (ns~=nL) % S & LAT are not the same shape
- if (ns==nL) & (mL==1) % copy LATS down each column
- LAT = LAT( ones(1,ms), : ); % s.t. dim(S)==dim(LAT)
- else
- error('sw_bfrq.m: Inputs arguments have wrong dimensions')
- end %if
- end %if
-end %if
-
-
-
-%------
-% BEGIN
-%------
-if ~isempty(LAT)
- % note that sw_g expects height as argument
- Z = sw_dpth(P,LAT);
- g = sw_g(LAT,-Z);
- f = sw_f(LAT);
-else
- Z = P;
- g = 9.8*ones(size(P));
- f = NaN*ones(size(P));
-end %if
-
-[m,n] = size(P);
-iup = 1:m-1;
-ilo = 2:m;
-p_ave = (P(iup,:)+P(ilo,:) )/2;
-pden_up = sw_pden(S(iup,:),T(iup,:),P(iup,:),p_ave);
-pden_lo = sw_pden(S(ilo,:),T(ilo,:),P(ilo,:),p_ave);
-
-mid_pden = (pden_up + pden_lo )/2;
-dif_pden = pden_up - pden_lo;
-mid_g = (g(iup,:)+g(ilo,:))/2;
-dif_z = diff(Z);
-n2 = -mid_g .* dif_pden ./ (dif_z .* mid_pden);
-
-mid_f = f(iup,:);
-q = mid_f .* dif_pden ./ (dif_z .* mid_pden);
-
-if Transpose
- n2 = n2';
- q = q';
- p_ave = p_ave';
-end %if
-return
-%-------------------------------------------------------------------
diff --git a/M_Csiro/sw_c3515.m b/M_Csiro/sw_c3515.m
deleted file mode 100644
index 0dd8a57..0000000
--- a/M_Csiro/sw_c3515.m
+++ /dev/null
@@ -1,39 +0,0 @@
-
-function c3515 = sw_c3515()
-
-% SW_C3515 Conductivity at (35,15,0)
-%=========================================================================
-% SW_c3515 $Revision: 1.4 $ $Date: 1994/10/10 04:35:22 $
-% % Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: c3515 = sw_c3515
-%
-% DESCRIPTION:
-% Returns conductivity at S=35 psu , T=15 C [ITPS 68] and P=0 db).
-%
-% INPUT: (none)
-%
-% OUTPUT:
-% c3515 = Conductivity [mmho/cm == mS/cm]
-%
-% AUTHOR: Phil Morgan 93-04-17 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% R.C. Millard and K. Yang 1992.
-% "CTD Calibration and Processing Methods used by Woods Hole
-% Oceanographic Institution" Draft April 14, 1992
-% (Personal communication)
-%=========================================================================
-
-% CALLER: none
-% CALLEE: none
-%
-
-c3515 = 42.914;
-
-return
-%-------------------------------------------------------------------------
diff --git a/M_Csiro/sw_cndr.m b/M_Csiro/sw_cndr.m
deleted file mode 100644
index 0060af8..0000000
--- a/M_Csiro/sw_cndr.m
+++ /dev/null
@@ -1,145 +0,0 @@
-
-function R = sw_cndr(S,T,P)
-
-% SW_CNDR Conductivity ratio R = C(S,T,P)/C(35,15,0)
-%=========================================================================
-% SW_CNDR $Revision: 1.3 $ $Date: 1994/10/10 04:36:58 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: cndr = sw_cndr(S,T,P)
-%
-% DESCRIPTION:
-% Calculates conductivity ratio from S,T,P.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% cndr = Conductivity ratio R = C(S,T,P)/C(35,15,0) [no units]
-%
-% AUTHOR: Phil Morgan 93-04-21 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_salds.m sw_sals.m sw_salrt.m
-
-%--------------
-% check inputs
-%-------------
-if nargin~=3
- error('sw_cndr.m: must have 3 input arguments')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-%-------
-% BEGIN
-%-------
-del_T = T - 15;
-
-for i = 1:ms
- for j = 1:ns
- %---------------------------------------------------------------------
- % DO A NEWTON-RAPHSON ITERATION FOR INVERSE INTERPOLATION OF Rt FROM S.
- %---------------------------------------------------------------------
- S_loop = S(i,j); % S in the loop
- T_loop = T(i,j); % T in the loop
- Rx_loop = sqrt(S_loop/35.0); % first guess at Rx = sqrt(Rt)
- SInc = sw_sals(Rx_loop.*Rx_loop,T_loop); % S INCrement (guess) from Rx
- iloop = 0;
- end_loop = 0;
- while ~end_loop
- Rx_loop = Rx_loop + (S_loop - SInc)./sw_salds(Rx_loop,del_T(i,j));
- SInc = sw_sals(Rx_loop.*Rx_loop,T_loop);
- iloop = iloop + 1;
- dels = abs(SInc-S_loop);
- if (dels>1.0e-4 & iloop<10)
- end_loop = 0;
- else
- end_loop = 1;
- end %if
- end %while
-
- Rx(i,j) = Rx_loop;
-
- end %for j
-end %for i
-
-%------------------------------------------------------
-% ONCE Rt FOUND, CORRESPONDING TO EACH (S,T) EVALUATE R
-%------------------------------------------------------
-% eqn(4) p.8 Unesco 1983
-
-d1 = 3.426e-2;
-d2 = 4.464e-4;
-d3 = 4.215e-1;
-d4 = -3.107e-3;
-
-e1 = 2.070e-5;
-e2 = -6.370e-10;
-e3 = 3.989e-15;
-
-A = (d3 + d4.*T);
-B = 1 + d1.*T + d2.*T.^2;
-C = P.*(e1 + e2.*P + e3.*P.^2);
-
-% eqn(6) p.9 UNESCO 1983.
-Rt = Rx.*Rx;
-rt = sw_salrt(T);
-Rtrt = rt.*Rt;
-D = B - A.*rt.*Rt;
-E = rt.*Rt.*A.*(B+C);
-R = sqrt(abs(D.^2+4*E)) - D;
-R = 0.5*R./A;
-
-return
-%-----------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_copy.m b/M_Csiro/sw_copy.m
deleted file mode 100644
index 69a0229..0000000
--- a/M_Csiro/sw_copy.m
+++ /dev/null
@@ -1,165 +0,0 @@
-% SW_COPY Copyright and licence information on SEAWATER library.
-% =================================================================
-% SW_COPY $Revision: 1.6 $ $Date: 1994/12/06 03:05:54 $
-% Copyright (C) Phil Morgan 1993
-%
-% SOFTWARE LICENCE AGREEMENT
-%
-% 1.0 Grant of Licence
-%
-% 1.1 The CSIRO Division of Oceanography (herein referred to as
-% "CSIRO") hereby grants you (hereinafter referred to as
-% the "Licencee"), subject to the Licencee agreeing to
-% comply with the terms and conditions of this Agreement, a
-% non-transferable, non-exclusive licence to use the
-% computer programs described in this document (hereinafter
-% referred to as the "Software") for the purpose of
-% the Licencee's computing activity.
-%
-% 1.2 CSIRO hereby grants the Licencee the right to make copies
-% of the Software for the purpose of the Licencee's
-% computing activity only.
-%
-% 1.3 The benefit of the rights granted to the Licencee by the
-% Licence and this Agreement generally shall be personal to
-% the Licencee and the Licencee shall not mortgage, charge,
-% assign, rent, lease, sell or otherwise dispose of or
-% transfer the same or any part to any third party.
-%
-% 1.4 Unless otherwise agreed in writing or provided for in
-% this Agreement, CSIRO shall be under no obligation or
-% responsibility to provide the Licencee with any training,
-% maintenance services, enhancements or updates of the
-% Software or any services whatsoever.
-%
-% 2.0 Acknowledgment by the Licencee
-%
-% 2.1 The Licencee acknowledges and agrees that it shall not:
-%
-% (i) sell, let for hire or by way of trade, offer or
-% exhibit or expose for sale or hire or otherwise
-% distribute the Software for the purposes of trade or
-% any other purpose;
-%
-% (ii) authorise or assist any third person to do any
-% of the acts set out in (i) above;
-%
-% (iii) modify the Software source code without advising
-% CSIRO.
-%
-% 2.2 The Licencee agrees that:
-%
-% (a) CSIRO is the owner of all copyright and other
-% Intellectual Property Rights subsisting in the
-% Software;
-%
-% (b) this document must be properly cited in any
-% publication reporting results derived from this
-% document or obtained from application and use of this
-% software. Any of the Licencee's documentation
-% describing results generated by the Licencee's
-% use of the Software will contain an acknowledgement
-% of CSIRO's ownership of the Software;
-%
-% (c) CSIRO reserves all rights in the Software other than
-% the rights granted to the Licencee by this
-% Agreement;
-%
-% (d) each item of the Software will display a banner
-% summarising the terms of this Agreement and
-% acknowledging the source of the Software, and the
-% contents of a banner will not be modified and its
-% display will not be inactivated by the Licencee
-% without the approval of CSIRO.
-%
-% 3.0 Indemnity
-%
-% 3.1 To the full extent permitted by law, CSIRO excludes any
-% and all liability in respect of any loss or damage,
-% whether personal (includes death or illness) or of
-% property and whether direct, consequential or special
-% (including consequential financial loss or damage) of
-% the Licencee, its officers, agents and employees or any
-% third party howsoever caused, which may be suffered or
-% incurred or which may arise directly or indirectly in
-% respect of or arising out of the Licencee's use or
-% inability to use the Software or the failure or omission
-% on the part of CSIRO to comply with the conditions and
-% warranties under this Licence Agreement. Insofar as
-% liability for loss or damages under or pursuant to such
-% legislation cannot be excluded, CSIRO's liability for
-% loss or damages shall be limited to the amount of One
-% Dollar ($1.00).
-%
-% 3.2 CSIRO make no warranties, expressed or implied, and
-% excludes all other warranties representations, terms or
-% conditions, whether express or implied, oral or written,
-% statutory or otherwise, relating in any way to the
-% Software, or to this Agreement, including any implied
-% warranty of merchantability or of fitness for particular
-% purpose. To the full extent permitted by the law of the
-% Commonwealth of Australia or the laws of any State or
-% Territory of Australia, any conditions or warranties
-% imposed by such legislation are hereby excluded. In so
-% far as liability under or pursuant to such legislation
-% may not be excluded, CSIRO's liability to the Licencee
-% pursuant to this Agreement shall be limited as set out in
-% clause 3.1 hereof.
-%
-% 3.3 The Licencee acknowledges and agrees that the Software
-% was developed for CSIRO research purposes and may have
-% inherent defects, errors or deficiencies, and that it is
-% the responsibility of the Licencee to make its own
-% assessment of the suitability of the Software for the
-% purpose of the Licencee's computing activity. The
-% Licencee will use the Software, and advice, opinions or
-% information supplied by CSIRO, its officers, employees or
-% agents concerning the Software at the Licencee's own
-% risk.
-%
-% 3.4 The Licencee hereby releases and indemnifies and shall
-% continue to release and indemnify CSIRO, its officers,
-% employees and agents from and against all actions,
-% claims, proceedings or demands (including those brought
-% by third parties) which may be bought against it or them,
-% whether on their own or jointly with the Licencee and
-% whether at common law, in equity or pursuant to statute or
-% otherwise, in respect of any loss, death, injury, illness
-% or damage (whether personal or property, and whether
-% direct or consequential, including consequential
-% financial loss) and any infringement of copyright,
-% patents, trade marks, designs or other Intellectual
-% Property Rights, howsoever arising out of the Licencee's
-% exercise of its rights under this Agreement and from and
-% against all damages, costs and expenses incurred in
-% defending or settling any such claim, proceeding or
-% demand.
-%
-% 3.5 The Licencee's obligation to indemnify CSIRO and its
-% officers, employees and agents set out in clause 3.4
-% hereof is a continuing obligation separate from
-% and independent of the Licencee's other obligations under
-% this Agreement, and shall survive all expiration or
-% termination of this Agreement.
-%
-% 4.0 Termination
-%
-% 4.1 The Licence shall terminate immediately upon the Licencee
-% breaching any term or condition of this Agreement whether
-% or not CSIRO is aware of the occurrence of the breach at
-% the time that it happens.
-%
-% 4.2 CSIRO may terminate the Licence on reasonable grounds by
-% notice in writing to the Licencee, and such notice of
-% termination shall be effective immediately upon receipt
-% by the Licencee.
-%
-%=========================================================================
-
-%$Id: sw_copy.M,v 1.6 1994/12/06 03:05:54 morgan Exp $
-
-more on
-help sw_copy
-more off
-return
-%--------------------------------------------------------------------
diff --git a/M_Csiro/sw_cp.m b/M_Csiro/sw_cp.m
deleted file mode 100644
index 8094e06..0000000
--- a/M_Csiro/sw_cp.m
+++ /dev/null
@@ -1,176 +0,0 @@
-
-function cp = sw_cp(S,T,P)
-
-% SW_CP Heat Capacity (Cp) of sea water
-%=========================================================================
-% SW_CP $Revision: 1.3 $ $Date: 1994/10/10 04:38:05 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: cp = sw_cp(S,T,P)
-%
-% DESCRIPTION:
-% Heat Capacity of Sea Water using UNESCO 1983 polynomial.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% cp = Specific Heat Capacity [J kg^-1 C^-1]
-%
-% AUTHOR: Phil Morgan 93-04-20 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: none
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=3
- error('sw_cp.m: Must pass 3 parameters')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-%------
-% BEGIN
-%------
-P = P/10; % to convert db to Bar as used in Unesco routines
-
-%------------
-% eqn 26 p.32
-%------------
-c0 = 4217.4;
-c1 = -3.720283;
-c2 = 0.1412855;
-c3 = -2.654387e-3;
-c4 = 2.093236e-5;
-
-a0 = -7.64357;
-a1 = 0.1072763;
-a2 = -1.38385e-3;
-
-b0 = 0.1770383;
-b1 = -4.07718e-3;
-b2 = 5.148e-5;
-
-Cpst0 = c0 + c1.*T + c2.*T.^2 + c3.*T.^3 + c4.*T.^4 + ...
- (a0 + a1.*T + a2.*T.^2).*S + ...
- (b0 + b1.*T + b2.*T.^2).*S.*sqrt(S);
-
-%------------
-% eqn 28 p.33
-%------------
-a0 = -4.9592e-1;
-a1 = 1.45747e-2;
-a2 = -3.13885e-4;
-a3 = 2.0357e-6;
-a4 = 1.7168e-8;
-
-b0 = 2.4931e-4;
-b1 = -1.08645e-5;
-b2 = 2.87533e-7;
-b3 = -4.0027e-9;
-b4 = 2.2956e-11;
-
-c0 = -5.422e-8;
-c1 = 2.6380e-9;
-c2 = -6.5637e-11;
-c3 = 6.136e-13;
-
-del_Cp0t0 = (a0 + a1.*T + a2.*T.^2 + a3.*T.^3 + a4.*T.^4).*P + ...
- (b0 + b1.*T + b2.*T.^2 + b3.*T.^3 + b4.*T.^4).*P.^2 + ...
- (c0 + c1.*T + c2.*T.^2 + c3.*T.^3).*P.^3;
-
-%------------
-% eqn 29 p.34
-%------------
-d0 = 4.9247e-3;
-d1 = -1.28315e-4;
-d2 = 9.802e-7;
-d3 = 2.5941e-8;
-d4 = -2.9179e-10;
-
-e0 = -1.2331e-4;
-e1 = -1.517e-6;
-e2 = 3.122e-8;
-
-f0 = -2.9558e-6;
-f1 = 1.17054e-7;
-f2 = -2.3905e-9;
-f3 = 1.8448e-11;
-
-g0 = 9.971e-8;
-
-h0 = 5.540e-10;
-h1 = -1.7682e-11;
-h2 = 3.513e-13;
-
-j1 = -1.4300e-12;
-S3_2 = S.*sqrt(S);
-
-del_Cpstp = [(d0 + d1.*T + d2.*T.^2 + d3.*T.^3 + d4.*T.^4).*S + ...
- (e0 + e1.*T + e2.*T.^2).*S3_2].*P + ...
- [(f0 + f1.*T + f2.*T.^2 + f3.*T.^3).*S + ...
- g0.*S3_2].*P.^2 + ...
- [(h0 + h1.*T + h2.*T.^2).*S + ...
- j1.*T.*S3_2].*P.^3;
-
-
-cp = Cpst0 + del_Cp0t0 + del_Cpstp;
-
-if Transpose
- cp = cp';
-end %if
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_data.mat b/M_Csiro/sw_data.mat
deleted file mode 100644
index c12ce2d917c580ea3790aed4f2ae55421b45fc31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 8077
zcmcgxYj9Q76+ZV8f>47*W1zhAAjUyOtP~OGS{o1$dC0>MAtV8zgRMXcsAy}|aq44Q
z>sS?AAE>DK7_}JjF}8Z4VnnSLe9!`;CL#n-2nh)g$fJ9&_3d*p@iyU4?+o*C9`~HR
z*80}BzI_t}9rgr45V8Nd+JEkobj{r5!TKpI2kR#TCjln{F9S{hUJ4u!90wc=yaYG~
zI2t%gG5Dc%ELj}z9KHVkLad{I5YI=)<qH;-1hI<zZu2I6QWGoBt^3D41!u>~zZlf>
zvA3^}eR<ucb;I(z#me@s_^k2JYxGIs5c<vjd+8f{a^9p*Y2O=Dzx`d`H>m2!$J^5H
z7)UjzUizlJg=$8YJo)dGE+gq6zOZleu3~f7P}=nu_j!o$0{V3H1Ggq;e?euJJn_N$
z+fJv~<vG!qoE_9F_ST`-?3E3%vO5Mw?XzPaJodI*Qf$ld%4>c<dSz^D{f<og=-3W@
z&iefIHn<=-StPuVHrzGzva)9m(mQ&BHvat=zpdYqMgQ6O@Y6e|AEkZO&$%~Kt*(QP
z>ig-KCW?;jzjxu%wHZ{ubGl7QcRHf$r#hP@n<}btk2&%$s+vEm_Y0>Crpf}zI8{g(
zqiFl$2k)Np)o|K8ILD^EiT>uoeBjnti7ij{a}6<<U0Z<ICRdJ2R>!uu^iTaRwiSii
z?ru9?8QbAr^YOO!=7Dyjz#jKXIhIhRTh07gw8zn4-efv>-*TIgV{`=98%}Wx{hS(I
z^%nn`nru)xdvBnodn7Pwl&|-p<6ZNTdfay{9hI=pqB{4O`W;m5sz0a~eTVbAe=Z*?
zcULpF(C3adm%T@2_AbjvTCMqsz48<J#NO5K$2LpZgP5e{i4SAj!4nX=tvpa2c-Rta
zQLkE8t(?77r~IU2!ux5|=-6lOq9)}hHESL?u#2@Np=PZgHTi}(jzZUK092=iq8e$O
zo9F-nt$Zo%#)@$-QH3k_!exX4(|ghfh4h?lx9F)8V$UPc4VHHOH$D>k(6ve7kk~et
z*Pf5J6}Z1n%^+$E<UrrgfqVSJYdE5b;D{2RBhuFsIiiH*$TL-smY&;{BmRDEYz}mN
z)C3|mD50rdm4^-^!8H(y10ZB25?JB-s{gyRRi97qOD7zlb*>L=!F_|gYV|9(?wuI!
z^YOKXoTP%nN&382*wM9N@&FdTf7ZmEHP75h1&xz|9i5O?KhGUh5xIjBfg?64c}YL!
z0FBcOf`oZMqtxj-s7BvM`$ccYP$lj!cdSVJHEp%+WP6C-lXU0NTFqx$aVEOXsjpkz
zt6IgWs_1dlJaa1Wj4>jFoK`N4$!Dx`U+BlDD=+yp#Qh_u2M^xOr-<(L<0O1P>UpDi
z-~jb+^o=ERqvR<%0^%P+!m330^J$L~jw<wli2^#=^L*xqHvUITIc<U{8K-Gy$FZL*
zfYYuLW#{fIr2#oz6VGWci(>QX2)L^@I;V7Td6@DQchu3q9scP)A8}Nrnj_k&)C>kR
zh{7+Vqk13J>G!GH*8Rqc@${`L)T5>J4MtPBGVWvpZh1fVR7vBW`usTRtmmE{oe*F5
zKKDX``ko__&%Ha#=;R(M?VRTF(OAo;=_usRI!d@BI<13Dszn^tQNa;MsIq6N8H{hh
zNIfbRWFFO`@YPNbm#(G#Ajn=_5AD)X&@!&}9&?7PYx*6WF+)ac9P_l$8Nkf9g~FUQ
zUq%vVUF4*1EN9*<O3nS7^m?B;ZeiDRx{fgJcDpFDC4`zJPS(P+cJj>}1u-HTAO~pi
z2F#$NPJy4^NwpwGwH?e>HR(H@eY6|W_%#w%p-gOd0<y$xtmKxMU8Ky<o+%aNER|%=
znrR)L^?C9CWTK=QFNzD|etJVn7w)cl#i=@HZ4!jU=W?<dAx_fjbJW?5-Y;-OjRpr!
zHhbJhjR>}0b(HG#KB|$N%%J^_d{wKc62@Yu>N9->+1TOis9kJZ+28@AWPtF1(XQ_<
z4>9Kq_vB-oGgSr=4>%@5%maqFiF25<A6G%la>ixzF3#AhwCVeh?UqgJxI2W6Q^!i3
zYzi<El0lFpG+<OmAV=Vxo7Lk{14d#!6!EZ{b*cd`4#14>0YAP`VW4sxf2qRKW(IOG
zvUA5OVdJO^&ux$f<g;M~atDeB<(zw5P5N;5MDa45p`MxhU__*&F;ZoQer^+>o`93l
zc}c2(991H7L<vmInjmU`DGWUWHVucMhzHek(6`{gZY1VwojFvFnfj$ZKT#rh&>AtJ
zt?_<UhC%6C+H>y|Gs6Q*)f=6yn+DG5EtTQS%SE!d?=<Jh7jb&6NH%v{qso}l1rJJA
za&r<!LR4KY2k7J`Nd0jP`+AjDIt+=dRYjp{orzSX(oFjh_-^3WaG{AJ_ve3LqnNa8
z?ll3MPO=?g0|_(fnkkd188GLo`!OR`0L*yRMl;p<;w5bIaXeeLL2TxTd$TCYVNv&u
zYzm}SY-Wp2u$iS(+01fHaljrs@}0%zO6R*CvM8yvFVK>he8+`H?6K@mEV^c>@#q6R
zS!5&raJ5YYw9ll7KCwAdWgyJN1u7$El-Ax%b{pg<n>?v$Jg`EXFLJgykB!Gdl@X&N
zU^AoB#1v?Anb{(oHW4Z>=1TD!HW4n;Pi>&Gleg%E^k$1bA)+$&*e6ELw>J@NBB-Rt
z4r+%?Cvhiiy1A~O!KN?b8Z1+t4e1au6I3?M4Dqk=^%u$pkxj8oGmD~^zdGSRVP<gW
z9Av&g{fC+DSU<`>QCWThH;|H$BOqaz5}z93PFty9ZW1AFg(lDmV3K8U+f?`vGTfx^
z#pZk&R&3CQY%WF7rpvD!cIj?-Y++L<jcsFB6K&?|%rSHEAfKc{HQ#0q+O0r-t+3>3
zNe<_^#@LKFfw(CVN!p6sUuQn9ir)$w(6s?b&>8Pb2kEnA_rhi{NJMHS%><Bmx=iV(
zY$DL!VIq7g=c>y##dt%Q3DB*rO!x<f?IJ&H*>-4G?c*8HA2yg1VY8Y+(;3`5Q`{+=
z46OegH<UkOa}nCm%fv*Tt!9RE+mqYV9-v5@-J$!}kYbtuAJEC76+rZRTbK&!W{9n4
zlZ)m%57fO7lo$pfXT+ns9X3;uFqlu{Cx>T7k(v$@qRdj;LS7}rRM>$cGx=oWOmu%-
z=eo-8G;C7D&Bal~>Du^xXUPVa&3S0;3v^d#hRF8F5&;8hBvcJX*-XN7XQ=lGJHt=R
zBIs%{w8bB{k_JCeoqJ!ID6aONw?u{%$!o3NhX@DI-y_zQ15xyGje-6f@Z(~y+C%+h
zy%-~ZjJhTRb7Za%TWDJYlf+L-FP6o4v(H2kL?&c}7fbm`ue}ksypPQYh;1uGrbhs$
zB2xuu?P7I>p~%maoeP_BV8~E$d2B9_eE^$bkf>2Oo(So<LiPc1C*kAt@rU`qL@n~2
zq2sHSqfpD$GR{QDY~a>g;gwi#%MSI7^*9r8P7^c9W-J)uJHb1sFn&jX1~!w>(RsQ(
z2`!>`QrJ$N;2=C9V6h72H}(@uC#;pXScTHki30cMt)zeeEpZ_%R|#g+GEDapNZZwz
z3Esd=gLxjO`)hMChTnx~`4PIEFuoC{ppc$8Ds5Ksta-3IPZK7<&qzN!{jl^*3B9Fv
z-#|@}4>S?7xxsC^4<<(aqX(NmVmM1f3}AC3Y|a9=(uo`nyK!K|aM`@G`Kj)c%+H{i
z<Drq^ZUTueKu36nhaG@U^Bw0q!p{nyFs}?DVmAHnJh0gS8`BD9c(Hj4yPH?^mnDOJ
zrFj6Iy8^?1w%RE(0g5*q$3vkAgc;|rPnSO)SR02<3wKRLLIukJFy065eWS;?x%N{7
zb|qwnR4h^D{rMC2iSCcA?vq@ybiuM^0cYzW^DXipo`mBo*6VR0E6y)g{3VW;0$1o?
zboiD{dj0kuihmFY_}+8$`2OXJ4}PZj@OZ^l8x^0(QCxjM@u@cz*W9W2Y`)_2c-{+9
zJ$`Y!;$KS@*On>1yiT$7NyS(Gq`2-j#aEXJ{=lDnJI!0NeEE_^0l&CS%eS^n@#S^j
zKlbPSec{p~N^^hS-{-&Yv2^urw<~8HpRkk^tSzO>{Hsceu3kKU!HR%~=}8`*0R8o$
SxbE>H9Q*73`y+6^1^yQ)T@e`o
diff --git a/M_Csiro/sw_dens.m b/M_Csiro/sw_dens.m
deleted file mode 100644
index a1613d5..0000000
--- a/M_Csiro/sw_dens.m
+++ /dev/null
@@ -1,103 +0,0 @@
-
-function dens = sw_dens(S,T,P)
-
-% SW_DENS Density of sea water
-%=========================================================================
-% SW_DENS $Revision: 1.3 $ $Date: 1994/10/10 04:39:16 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: dens = sw_dens(S,T,P)
-%
-% DESCRIPTION:
-% Density of Sea Water using UNESCO 1983 (EOS 80) polynomial.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% dens = density [kg/m^3]
-%
-% AUTHOR: Phil Morgan 92-11-05 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%
-% Millero, F.J., Chen, C.T., Bradshaw, A., and Schleicher, K.
-% " A new high pressure equation of state for seawater"
-% Deap-Sea Research., 1980, Vol27A, pp255-264.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_dens0.m sw_seck.m
-
-% UNESCO 1983. eqn.7 p.15
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=3
- error('sw_dens.m: Must pass 3 parameters')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-%------
-% BEGIN
-%------
-densP0 = sw_dens0(S,T);
-K = sw_seck(S,T,P);
-P = P/10; % convert from db to atm pressure units
-dens = densP0./(1-P./K);
-
-if Transpose
- dens = dens';
-end %if
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_dens0.m b/M_Csiro/sw_dens0.m
deleted file mode 100644
index 0d63ca8..0000000
--- a/M_Csiro/sw_dens0.m
+++ /dev/null
@@ -1,91 +0,0 @@
-
-function dens = sw_dens0(S,T)
-
-% SW_DENS0 Denisty of sea water at atmospheric pressure
-%=========================================================================
-% SW_DENS0 $Revision: 1.3 $ $Date: 1994/10/10 04:54:09 $
-% Copyright (C) CSIRO, Phil Morgan 1992
-%
-% USAGE: dens0 = sw_dens0(S,T)
-%
-% DESCRIPTION:
-% Density of Sea Water at atmospheric pressure using
-% UNESCO 1983 (EOS 1980) polynomial.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% T = temperature [degree C (IPTS-68)]
-%
-% OUTPUT:
-% dens0 = density [kg/m^3] of salt water with properties S,T,
-% P=0 (0 db gauge pressure)
-%
-% AUTHOR: Phil Morgan 92-11-05 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%
-% Millero, F.J. and Poisson, A.
-% International one-atmosphere equation of state of seawater.
-% Deep-Sea Res. 1981. Vol28A(6) pp625-629.
-%=========================================================================
-
-% CALLER: general purpose, sw_dens.m
-% CALLEE: sw_smow.m
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=2
- error('sw_dens0.m: Must pass 2 parameters')
-end %if
-
-[mS,nS] = size(S);
-[mT,nT] = size(T);
-
-if (mS~=mT) | (nS~=nT)
- error('sw_dens0.m: S,T inputs must have the same dimensions')
-end %if
-
-Transpose = 0;
-if mS == 1 % a row vector
- S = S(:);
- T = T(:);
- Transpose = 1;
-end %if
-
-%----------------------
-% DEFINE CONSTANTS
-%----------------------
-% UNESCO 1983 eqn(13) p17.
-
-b0 = 8.24493e-1;
-b1 = -4.0899e-3;
-b2 = 7.6438e-5;
-b3 = -8.2467e-7;
-b4 = 5.3875e-9;
-
-c0 = -5.72466e-3;
-c1 = +1.0227e-4;
-c2 = -1.6546e-6;
-
-d0 = 4.8314e-4;
-
-%$$$ dens = sw_smow(T) + (b0 + b1*T + b2*T.^2 + b3*T.^3 + b4*T.^4).*S ...
-%$$$ + (c0 + c1*T + c2*T.^2).*S.*sqrt(S) + d0*S.^2;
-
-dens = sw_smow(T) + (b0 + (b1 + (b2 + (b3 + b4*T).*T).*T).*T).*S ...
- + (c0 + (c1 + c2*T).*T).*S.*sqrt(S) + d0*S.^2;
-
-if Transpose
- dens = dens';
-end %if
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_dist.m b/M_Csiro/sw_dist.m
deleted file mode 100644
index 329ca19..0000000
--- a/M_Csiro/sw_dist.m
+++ /dev/null
@@ -1,112 +0,0 @@
-
-function [dist,phaseangle] = distance(lat,lon,units)
-
-% SW_DIST Distance between two lat,lon coordinates
-%===================================================================
-% SW_DIST $Revision: 1.4 $ $Date: 1994/10/10 04:55:23 $
-% Copyright (C) CSIRO, Phil Morgan & Steve Rintoul 1992.
-%
-% USAGE: [dist,phaseangle] = distance(lat,lon {,units} )
-%
-% DESCRIPTION:
-% Calculate distance between two positions on glode using the "Plane
-% Sailing" method. Also uses simple geometry to calculate the bearing of
-% the path between position pairs.
-%
-% INPUT:
-% lat = decimal degrees (+ve N, -ve S) [- 90.. +90]
-% lon = decimal degrees (+ve E, -ve W) [-180..+180]
-% units = optional string specifing units of distance
-% 'nm' = nautical miles (default)
-% 'km' = kilometres
-%
-% OUTPUT:
-% dist = distance between positions in units
-% phaseangle = angle of line between stations with x axis (East).
-% Range of values are -180..+180. (E=0, N=90, S=-90)
-%
-% AUTHOR: Phil Morgan and Steve Rintoul 92-02-10
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCE:
-% The PLANE SAILING method as descriibed in "CELESTIAL NAVIGATION" 1989 by
-% Dr. P. Gormley. The Australian Antartic Division.
-%==================================================================
-
-% CALLER: general purpose
-% CALLEE: none
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin > 3
- error('sw_dist.m: No more than 3 arguments allowed')
-elseif nargin==3
- if ~isstr(units)
- error('sw_dist.m: units argument must be string')
- end %if
-elseif nargin==2
- units = 'nm'; % default units
-else
- error('sw_dist.m: wrong number of arguments')
-end%if
-
-[mlat,nlat] = size(lat);
-if mlat~=1 & nlat~=1
- error('sw_dist.m: lat, lon must be vectors. No matrices allowed')
-else
- if mlat == 1
- Transpose = 1; % row vector passed in
- else
- Transpose = 0; % accept column vector
- end%if
-end%if
-lat = lat(:); %force to column vectors
-lon = lon(:);
-if length(lat)~=length(lon)
- error('sw_dist.m: lat and lon must have same number of elements')
-end%if
-
-%-----------------
-% DEFINE CONSTANTS
-%-----------------
-DEG2RAD = (2*pi/360);
-RAD2DEG = 1/DEG2RAD;
-DEG2MIN = 60;
-DEG2NM = 60;
-NM2KM = 1.8520; % Defined in Pond & Pickard p303.
-
-% BEGIN
-npositions = length(lat);
-ind=1:npositions-1; % index to first of position pairs
-
-dlon = diff(lon);
-if any(abs(dlon)>180)
- flag = find(abs(dlon)>180);
- for ii=1:length(flag)
- dlon(flag(ii))= -sign(dlon(flag(ii))) * (360 - abs(dlon(flag(ii))) );
- end %for
-end %if
-latrad = abs(lat*DEG2RAD);
-dep = cos( (latrad(ind+1)+latrad(ind))./2 ) .* dlon;
-dlat = diff(lat);
-dist = DEG2NM*sqrt(dlat.^2 + dep.^2); % in n.miles
-
-if strcmp(units,'km') % defaults to n.miles
- dist = dist * NM2KM;
-end %if
-
-% CALCUALTE ANGLE TO X AXIS
-phaseangle = angle(dep+dlat*sqrt(-1))*RAD2DEG;
-
-if Transpose
- dist = dist';
- phaseangle = phaseangle';
-end %if
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_dpth.m b/M_Csiro/sw_dpth.m
deleted file mode 100644
index 91f3ab2..0000000
--- a/M_Csiro/sw_dpth.m
+++ /dev/null
@@ -1,87 +0,0 @@
-
-function DEPTHM = sw_dpth(P,LAT)
-
-% SW_DPTH Depth from pressure
-%===========================================================================
-% SW_DPTH $Revision: 1.3 $ $Date: 1994/10/10 04:56:32 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: dpth = sw_dpth(P,LAT)
-%
-% DESCRIPTION:
-% Calculates depth in metres from pressure in dbars.
-%
-% INPUT: (all must have same dimensions)
-% P = Pressure [db]
-% LAT = Latitude in decimal degress north [-90..+90]
-% (lat may have dimensions 1x1 or 1xn where P(mxn).
-%
-% OUTPUT:
-% dpth = depth [metres]
-%
-% AUTHOR: Phil Morgan 92-04-06 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: none
-
-%-------------
-% CHECK INPUTS
-%-------------
-[mP,nP] = size(P);
-[mL,nL] = size(LAT);
-if mL==1 & nL==1
- LAT = LAT*ones(size(P));
- [mL,nL] = size(LAT);
-end %if
-
-if (mP~=mL) | (nP~=nL) % P & LAT are not the same shape
- if (nP==nL) & (mL==1) % LAT for each column of P
- LAT = LAT( ones(1,mP), : ); % copy LATS down each column
- % s.t. dim(P)==dim(LAT)
- else
- error('sw_depth.m: Inputs arguments have wrong dimensions')
- end %if
-end %if
-
-Transpose = 0;
-if mP == 1 % row vector
- P = P(:);
- LAT = LAT(:);
- Transpose = 1;
-end %if
-
-%-------------
-% BEGIN
-%-------------
-% Eqn 25, p26. Unesco 1983.
-
-DEG2RAD = pi/180;
-c1 = +9.72659;
-c2 = -2.2512E-5;
-c3 = +2.279E-10;
-c4 = -1.82E-15;
-gam_dash = 2.184e-6;
-
-LAT = abs(LAT);
-X = sin(LAT*DEG2RAD); % convert to radians
-X = X.*X;
-bot_line = 9.780318*(1.0+(5.2788E-3+2.36E-5*X).*X) + gam_dash*0.5*P;
-top_line = (((c4*P+c3).*P+c2).*P+c1).*P;
-DEPTHM = top_line./bot_line;
-
-if Transpose
- DEPTHM = DEPTHM';
-end %if
-
-return
-%===========================================================================
-%
diff --git a/M_Csiro/sw_f.m b/M_Csiro/sw_f.m
deleted file mode 100644
index caa36eb..0000000
--- a/M_Csiro/sw_f.m
+++ /dev/null
@@ -1,57 +0,0 @@
-
-function f = sw_f(lat)
-
-% SW_F Coriolis factor "f"
-%===========================================================================
-% SW_F $Revision: 1.3 $ $Date: 1994/10/10 04:57:08 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: f = sw_f(lat)
-%
-% DESCRIPTION:
-% Calculates the Coriolis factor "f" defined by
-% f = 2*Omega*Sin(lat) where Omega = 7.292e-5 radians/sec
-%
-% INPUT:
-% lat = Latitude in decimal degress north [-90..+90]
-%
-% OUTPUT:
-% f = Coriolis Factor "f" [s-1]
-%
-% AUTHOR: Phil Morgan 93-04-20 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCE:
-% S. Pond & G.Pickard 2nd Edition 1986
-% Introductory Dynamical Oceanogrpahy
-% Pergamon Press Sydney. ISBN 0-08-028728-X
-%
-% A.E. Gill 1982. p.597
-% "Atmosphere-Ocean Dynamics"
-% Academic Press: New York. ISBN: 0-12-283522-0
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: none
-
-%-------------
-% CHECK INPUTS
-%-------------
-if nargin ~= 1
- error('sw_f.m: Requires one input argument')
-end %if
-
-%-------------
-% BEGIN
-%-------------
-% Eqn p27. Unesco 1983.
-DEG2RAD = pi/180;
-OMEGA = 7.292e-5; %s-1 A.E.Gill p.597
-f = 2*OMEGA*sin(lat*DEG2RAD);
-
-return
-%===========================================================================
-
diff --git a/M_Csiro/sw_fp.m b/M_Csiro/sw_fp.m
deleted file mode 100644
index acd959c..0000000
--- a/M_Csiro/sw_fp.m
+++ /dev/null
@@ -1,90 +0,0 @@
-
-function fp = sw_fp(S,P)
-
-% SW_FP Freezing point of sea water
-%=========================================================================
-% SW_FP % $Revision: 1.3 $ $Date: 1994/10/10 04:57:50 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: fp = sw_fp(S,P)
-%
-% DESCRIPTION:
-% Heat Capacity of Sea Water using UNESCO 1983 polynomial.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% fp = Freezing Point temperature [degree C (IPTS-68)]
-%
-% AUTHOR: Phil Morgan 93-04-20 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: none
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=2
- error('sw_fp.m: Must pass 3 parameters')
-end %if
-
-[ms,ns] = size(S);
-[mp,np] = size(P);
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('sw_fp.m: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- S = S(:);
- Transpose = 1;
-end %if
-
-%------
-% BEGIN
-%------
-%P = P/10; % to convert db to Bar as used in Unesco routines
-
-%------------
-% eqn p.29
-%------------
-a0 = -0.0575;
-a1 = 1.710523e-3;
-a2 = -2.154996e-4;
-b = -7.53e-4;
-
-fp = a0.*S + a1.*S.*sqrt(S) + a2.*S.^2 + b.*P;
-
-if Transpose
- fp = fp';
-end %if
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_g.m b/M_Csiro/sw_g.m
deleted file mode 100644
index c2a3c90..0000000
--- a/M_Csiro/sw_g.m
+++ /dev/null
@@ -1,70 +0,0 @@
-
-function g = sw_g(LAT,z)
-
-% SW_G Gravitational acceleration
-%===========================================================================
-% SW_G $Revision: 1.4 $ $Date: 1994/10/11 00:00:54 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: g = sw_g(lat,z)
-%
-% DESCRIPTION:
-% Calculates acceleration due to gravity as function of latitude.
-%
-% INPUT: (all must have same dimensions)
-% lat = Latitude in decimal degress north [-90..+90]
-% z = height in metres (+ve above sea surface, -ve below)
-%
-% OUTPUT:
-% g = gravity [m/s^2]
-%
-% AUTHOR: Phil Morgan 93-04-20 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%
-% A.E. Gill 1982. p.597
-% "Atmosphere-Ocean Dynamics"
-% Academic Press: New York. ISBN: 0-12-283522-0
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: none
-
-%-------------
-% CHECK INPUTS
-%-------------
-if ~(nargin==1 | nargin==2)
- error('sw_g.m: Requires one or two input arguments')
-end %if
-if nargin == 1
- z = zeros(size(LAT));
-end %if
-
-[mL,nL] = size(LAT);
-[mz,nz] = size(z);
-if ~(mL==mz | nL==nz)
- error('sw_g.m: Input arguments should have same dimensions')
-end %if
-
-%-------------
-% BEGIN
-%-------------
-% Eqn p27. Unesco 1983.
-a = 6371000; % mean radius of earth A.E.Gill
-DEG2RAD = pi/180;
-LAT = abs(LAT);
-X = sin(LAT*DEG2RAD); % convert to radians
-sin2 = X.*X;
-g = 9.780318*(1.0+(5.2788E-3+2.36E-5*sin2).*sin2);
-if any(any(z))
- g = g./((1+z/a).^2); % from A.E.Gill p.597
-end %if
-return
-%===========================================================================
-
diff --git a/M_Csiro/sw_gpan.m b/M_Csiro/sw_gpan.m
deleted file mode 100644
index 2f5c1ad..0000000
--- a/M_Csiro/sw_gpan.m
+++ /dev/null
@@ -1,126 +0,0 @@
-
-function [ga, pe] = sw_gpan(S,T,P,LAT)
-
-% SW_GPAN Geopotential anomaly
-%=========================================================================
-% SW_GPAN $Revision: 1.3 $ $Date: 1994/10/10 05:01:00 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: [gpan, pe]= sw_gpan(S,T,P,LAT)
-%
-% DESCRIPTION:
-% Geopotential Anomaly calculated as the integral of svan from the
-% the sea surface to the bottom. Thus RELATIVE TO SEA SURFACE.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% T = temperature [degree C (ITP-68)]
-% P = Pressure [db]
-% LAT = latitude
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% gpan = Geopotential Anomaly [m^3 kg^-1 Pa == m^2 s^-2 == J kg^-1]
-% pe = anomalie d'energie potentielle en kg/s^2 * 10
-%
-% AUTHOR: Phil Morgan 92-11-05 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCE: S. Pond & G.Pickard 2nd Edition 1986
-% Introductory Dynamical Oceanogrpahy
-% Pergamon Press Sydney. ISBN 0-08-028728-X
-%
-% Note that older literature may use units of "dynamic decimeter' for above.
-%
-% Adapted method from Pond and Pickard (p76) to calc gpan rel to sea
-% surface whereas P&P calculated relative to the deepest common depth.
-%=========================================================================
-
-%
-% CALLER: general purpose
-% CALLEE: sw_svan.m
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~= 4
- error('sw_gpan.m: Must pass 4 parameters')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-%------
-% BEGIN
-%------
-db2Pascal = 1e4;
-[m,n] = size(P);
-svan = sw_svan(S,T,P);
-mean_svan = 0.5*(svan(2:m,:) + svan(1:m-1,:) );
-
-if n==1
- top = svan(1,1).*P(1,1)*db2Pascal;
-else
- top = svan(1,:).*P(1,:)*db2Pascal;
-end %if
-
-%press_diff = diff(P);
-
-delta_ga = (mean_svan.*diff(P))*db2Pascal;
-ga = cumsum([ top; delta_ga]);
-
-% Rajoute par Y. Gouriou en se basant sur la routine de Millard
-% pe[ref] = hdy[ref] * (ctd[ref].pres + ctd[ind].pres)*0.5F /
-% (float)grav( (double)ctd[ref].pres,lat ); */
-% pe[ref] = (float) ( fabs( (double)( pres[ref] - pres[ind]) )
-% * (anvs[ref]*pres[ref] + anvs[ind]*pres[ind])
-% * 0.5e-5 / (float)grav( (double)pres[ref],lat ));
-mean_P = 0.5*( P(2:m,:) + P(1:m-1,:) );
-delta_pe = delta_ga .* mean_P ./ sw_g( LAT, -sw_dpth(P(2:end),LAT));
-pe = cumsum([ top/sw_g( LAT, 0); delta_pe]);
-
-if Transpose
- ga = ga';
- pe = pe';
-end %if
-
-return
-%--------------------------------------------------------------------
diff --git a/M_Csiro/sw_gvel.m b/M_Csiro/sw_gvel.m
deleted file mode 100644
index 31ae07d..0000000
--- a/M_Csiro/sw_gvel.m
+++ /dev/null
@@ -1,62 +0,0 @@
-
-function vel = sw_gvel(ga,lat,lon)
-
-% SW_GVEL Geostrophic velocity
-%===================================================================
-% GEOVEL $Revision: 1.5 $ $Date: 1994/11/15 04:00:36 $
-% Copyright (C) CSIRO, Phil Morgan 1992
-%
-% USAGE: vel = sw_gvel(ga,lat,lon)
-%
-% DESCRIPTION:
-% Calculates geostrophic velocity given the geopotential anomaly
-% and position of each station.
-%
-% INPUT:
-% ga = geopotential anomoly relative to the sea surface.
-% dim(mxnstations)
-% lat = latitude of each station (+ve = N, -ve = S) [ -90.. +90]
-% lon = longitude of each station (+ve = E, -ve = W) [-180..+180]
-%
-% OUTPUT:
-% vel = geostrophic velocity RELATIVE to the sea surface.
-% dim(m,nstations-1)
-%
-% AUTHOR: Phil Morgan 1992/03/26 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCE: S. Pond & G.Pickard 2nd Edition 1986
-% Introductory Dynamical Oceanogrpahy
-% Pergamon Press Sydney. ISBN 0-08-028728-X
-% Equation 8.9A p73 Pond & Pickard
-%
-% NOTE: This calls sw_dist.m. You can replace the call to this
-% routine if you have a more appropraite distance routine.
-%==================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_dist.m
-%
-
-
-DEG2RAD = pi/180;
-RAD2DEG = 180/pi;
-OMEGA = 7.292e-5; % Angular velocity of Earth [radians/sec]
-
-% You may replace the call to sw_dist if you have
-% a more appropriate distance routine.
-distm = 1000*sw_dist(lat,lon,'km');
-[m,n] = size(ga);
-f = 2*OMEGA*sin( (lat(1:n-1)+lat(2:n))*DEG2RAD/2 );
-lf = f.*distm;
-
-LF = lf(ones(m,1),:);
-
-vel = -( ga(:,2:n)-ga(:,1:n-1) ) ./ LF;
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_info.m b/M_Csiro/sw_info.m
deleted file mode 100644
index 21e57fc..0000000
--- a/M_Csiro/sw_info.m
+++ /dev/null
@@ -1,30 +0,0 @@
-
-% SW_INFO Computational routines for the properties of sea water
-%
-% SEAWATER - devloped by Phil Morgan, CSIRO
-%
-% DESCRIPTION:
-% SEAWATER is a toolkit of MATLAB routines for calculating the
-% properties of sea water. They are a self contained library and
-% are extremely easy to use and will run on all computers that
-% support MATLAB.
-%
-% MATLAB:
-% For information on MATLAB contact info@mathworks.com
-%
-% DISCLAIMER
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% MORE INFORMATION:
-% http://www.marine.csiro.au/~morgan/seawater
-%
-% $Revision: 1.10 $ $Date: 1998/04/21 05:50:33 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%=========================================================================
-
-more on
-help sw_info
-more off
-return
-%--------------------------------------------------------------------
diff --git a/M_Csiro/sw_new.m b/M_Csiro/sw_new.m
deleted file mode 100644
index 0034026..0000000
--- a/M_Csiro/sw_new.m
+++ /dev/null
@@ -1,64 +0,0 @@
-
-% SW_NEW What's new in this version of seawater.
-%
-% 22 April 1998 release 2.0.1 (For version 5.x of Matlab)
-% ********************************************************
-% This version is not optimised but will run under Matlab 5.x
-% sw_satAr New routine. Solubility of Ar in seawater
-% sw_satN2 New routine. Solubility of Ar in seawater
-% sw_satO2 New routine. Solubility of Ar in seawater
-% sw_test Updated to include tests for above
-%
-% April 1998 release 1.2e (For version 4.x of Matlab)
-% ************************
-% sw_alpha Fixed bug where temp used in calculations regardless of
-% whether 'temp' or 'pmpt' was passed as keyword.
-%
-% sw_info Shorter version. Refer users to web pages
-% http://www.marine.csiro.au
-%
-% sw_ver New routine. Returns version number of SEAWATER
-%
-% sw_test New Routine. Run a test on the SEAWATER routines
-% and compare results with literature values
-%
-% 94/11/15 release 1.2d
-% **********************
-% sw_bfrq.m Now also returns potential vorticity.
-% Thanks to Greg Johnson (gjohnson@pmel.noaa.gov)
-%
-% sw_gvel.m OMEGA=7.29e-5 changed to OMEGA=7.292e-5 to be
-% consistent with sw_f.m
-%
-% IMPORTANT CHANGE: The usage of the following
-% routines has changed!
-%
-% sw_alpha.m | All these routines expect (S,T,P) to
-% sw_beta.m |-- be passed instead of (S,PTMP,P) as in
-% sw_aonb.m | previous releases of seawater.
-% Fast execution can still be obtained by passing
-% ptmp with a string flag 'ptmp' see help.
-%
-% 94/10/19 release 1.2c
-% **********************
-% Added routine sw_new.m to inform of updates and new features.
-% sw_bfrq.m Fixed bug where LAT = [] was needed as argument when
-% no latitude values are being passed.
-% Now pass PRESSURE instead of DEPTH -> more consistent
-% though only a negligible change is answers.
-%
-% sw_info.m Updated to include a registration section.
-% Noted that software is FREE.
-% Noted best email address is seawater@ml.csiro.au
-% Requests for Report also via email to library@ml.csiro.au
-%
-% 94/10/12 release 1.2b
-% ********************
-% First official release and announcement on the networks.
-%
-
-more on
-help sw_new
-more off
-
-%-------------
diff --git a/M_Csiro/sw_pden.m b/M_Csiro/sw_pden.m
deleted file mode 100644
index 9f47a8b..0000000
--- a/M_Csiro/sw_pden.m
+++ /dev/null
@@ -1,57 +0,0 @@
-
-function pden = sw_pden(S,T,P,PR)
-
-% SW_PDEN Potential density
-%===========================================================================
-% SW_PDEN $Revision: 1.3 $ $Date: 1994/10/10 05:05:21 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: pden = sw_pden(S,T,P,PR)
-%
-% DESCRIPTION:
-% Calculates potential density of water mass relative to the specified
-% reference pressure by pden = sw_dens(S,ptmp,PR).
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% PR = Reference pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% pden = Potential denisty relative to the ref. pressure [kg/m^3]
-%
-% AUTHOR: Phil Morgan 1992/04/06 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% A.E. Gill 1982. p.54
-% "Atmosphere-Ocean Dynamics"
-% Academic Press: New York. ISBN: 0-12-283522-0
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_ptmp.m sw_dens.m
-
-%-------------
-% CHECK INPUTS
-%-------------
-if nargin ~= 4
- error('sw_pden.m: Must pass 4 parameters ')
-end %if
-
-% LET sw_ptmp.m DO DIMENSION CHECKING
-
-%------
-% BEGIN
-%------
-ptmp = sw_ptmp(S,T,P,PR);
-pden = sw_dens(S,ptmp,PR);
-
-return
-%=========================================================================
-
diff --git a/M_Csiro/sw_pres.m b/M_Csiro/sw_pres.m
deleted file mode 100644
index 1d2d7ac..0000000
--- a/M_Csiro/sw_pres.m
+++ /dev/null
@@ -1,81 +0,0 @@
-
-function pres = sw_pres(DEPTH,LAT)
-
-% SW_PRES Pressure from depth
-%===========================================================================
-% SW_PRES $Revision: 1.5 $ $Date: 1994/10/11 01:23:32 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: pres = sw_pres(depth,lat)
-%
-% DESCRIPTION:
-% Calculates pressure in dbars from depth in meters.
-%
-% INPUT: (all must have same dimensions)
-% depth = depth [metres]
-% lat = Latitude in decimal degress north [-90..+90]
-% (LAT may have dimensions 1x1 or 1xn where depth(mxn) )
-%
-% OUTPUT:
-% pres = Pressure [db]
-%
-% AUTHOR: Phil Morgan 93-06-25 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Saunders, P.M. 1981
-% "Practical conversion of Pressure to Depth"
-% Journal of Physical Oceanography, 11, 573-574
-%
-% CHECK VALUE:
-% P=7500.00 db for LAT=30 deg, depth=7321.45 meters
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: none
-
-%-------------
-% CHECK INPUTS
-%-------------
-
-[mD,nD] = size(DEPTH);
-[mL,nL] = size(LAT);
-if mL==1 & nL==1
- LAT = LAT*ones(size(DEPTH));
- [mL,nL] = size(LAT);
-end %if
-
-if (mD~=mL) | (nD~=nL) % DEPTH & LAT are not the same shape
- if (nD==nL) & (mL==1) % LAT for each column of DEPTH
- LAT = LAT( ones(1,mD), : ); % copy LATS down each column
- % s.t. dim(DEPTH)==dim(LAT)
- else
- error('sw_pres.m: Inputs arguments have wrong dimensions')
- end %if
-end %if
-
-Transpose = 0;
-if mD == 1 % row vector
- DEPTH = DEPTH(:);
- LAT = LAT(:);
- Transpose = 1;
-end %if
-
-%-------------
-% BEGIN
-%-------------
-
-DEG2RAD = pi/180;
-X = sin(abs(LAT)*DEG2RAD); % convert to radians
-C1 = 5.92E-3+X.^2*5.25E-3;
-pres = ((1-C1)-sqrt(((1-C1).^2)-(8.84E-6*DEPTH)))/4.42E-6;
-
-if Transpose
- pres = pres';
-end %if
-
-return
-%===========================================================================
diff --git a/M_Csiro/sw_ptmp.m b/M_Csiro/sw_ptmp.m
deleted file mode 100644
index b0c37eb..0000000
--- a/M_Csiro/sw_ptmp.m
+++ /dev/null
@@ -1,137 +0,0 @@
-
-function PT = sw_ptmp(S,T,P,PR)
-
-% SW_PTMP Potential temperature
-%===========================================================================
-% SW_PTMP $Revision: 1.3 $ $Date: 1994/10/10 05:45:13 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: ptmp = sw_ptmp(S,T,P,PR)
-%
-% DESCRIPTION:
-% Calculates potential temperature as per UNESCO 1983 report.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% PR = Reference pressure [db]
-% (P & PR may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% ptmp = Potential temperature relative to PR [degree C (IPTS-68)]
-%
-% AUTHOR: Phil Morgan 92-04-06 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-% Eqn.(31) p.39
-%
-% Bryden, H. 1973.
-% "New Polynomials for thermal expansion, adiabatic temperature gradient
-% and potential temperature of sea water."
-% DEEP-SEA RES., 1973, Vol20,401-408.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_adtg.m
-
-%-------------
-% CHECK INPUTS
-%-------------
-if nargin ~= 4
- error('sw_ptmp.m: Must pass 4 parameters ')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-[mpr,npr] = size(PR);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-% CHECK OPTIONAL SHAPES FOR PR
-if mpr==1 & npr==1 % PR is a scalar. Fill to size of S
- PR = PR(1)*ones(ms,ns);
-elseif npr==ns & mpr==1 % PR is row vector with same cols as S
- PR = PR( ones(1,ms), : ); % Copy down each column.
-elseif mpr==ms & npr==1 % P is column vector
- PR = PR( :, ones(1,ns) ); % Copy across each row
-elseif mpr==ms & npr==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: PR has wrong dimensions')
-end %if
-[mpr,npr] = size(PR);
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- PR = PR(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-%------
-% BEGIN
-%------
-
-% theta1
-del_P = PR - P;
-del_th = del_P.*sw_adtg(S,T,P);
-th = T + 0.5*del_th;
-q = del_th;
-
-% theta2
-del_th = del_P.*sw_adtg(S,th,P+0.5*del_P);
-th = th + (1 - 1/sqrt(2))*(del_th - q);
-q = (2-sqrt(2))*del_th + (-2+3/sqrt(2))*q;
-
-% theta3
-del_th = del_P.*sw_adtg(S,th,P+0.5*del_P);
-th = th + (1 + 1/sqrt(2))*(del_th - q);
-q = (2 + sqrt(2))*del_th + (-2-3/sqrt(2))*q;
-
-% theta4
-del_th = del_P.*sw_adtg(S,th,P+del_P);
-PT = th + (del_th - 2*q)/6;
-
-if Transpose
- PT = PT';
-end %if
-
-return
-%=========================================================================
diff --git a/M_Csiro/sw_salds.m b/M_Csiro/sw_salds.m
deleted file mode 100644
index 134e970..0000000
--- a/M_Csiro/sw_salds.m
+++ /dev/null
@@ -1,74 +0,0 @@
-
-function dS = sw_salds(Rtx,delT)
-
-% SW_SALDS Differiential dS/d(sqrt(Rt)) at constant T.
-%=========================================================================
-% SW_SALDS $Revision: 1.3 $ $Date: 1994/10/10 05:46:08 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: dS = sw_salds(Rtx,delT)
-%
-% DESCRIPTION:
-% Calculates Salinity differential dS/d(sqrt(Rt)) at constant T.
-% UNESCO 1983 polynomial.
-%
-% INPUT: (all must have same dimensions)
-% Rtx = sqrt(Rt) where Rt defined in sw_salt.m
-% delT = T-15 [degree C (IPTS-68)]
-%
-% OUTPUT:
-% dS = S differential dS/d(sqrt(Rt)) at constant T.
-%
-% AUTHOR: Phil Morgan 93-04-21 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: sw_cndr.m
-% CALLEE: none
-
-%-------------
-% CHECK INPUTS
-%-------------
-if nargin~=2
- error('sw_salds.m: must have 2 input arguments')
-end %if
-
-[m1,n1] = size(Rtx);
-[m2,n2] = size(delT);
-if ~(m1==m2 | n1==n2)
- error('sw_salds.m: Rtx and delT must have the same shape')
-end %if
-
-%-------
-% BEGIN
-%-------
-a0 = 0.0080;
-a1 = -0.1692;
-a2 = 25.3851;
-a3 = 14.0941;
-a4 = -7.0261;
-a5 = 2.7081;
-
-b0 = 0.0005;
-b1 = -0.0056;
-b2 = -0.0066;
-b3 = -0.0375;
-b4 = 0.0636;
-b5 = -0.0144;
-
-k = 0.0162;
-
-dS = a1 + (2*a2 + (3*a3 + (4*a4 + 5*a5.*Rtx).*Rtx).*Rtx).*Rtx + ...
- (delT./(1+k*delT))* ...
- (b1 + (2*b2 + (3*b3 + (4*b4 + 5*b5.*Rtx).*Rtx).*Rtx).*Rtx);
-
-return
-%-----------------------------------------------------------------------
diff --git a/M_Csiro/sw_salrp.m b/M_Csiro/sw_salrp.m
deleted file mode 100644
index c795f22..0000000
--- a/M_Csiro/sw_salrp.m
+++ /dev/null
@@ -1,69 +0,0 @@
-
-function Rp = sw_salrp(R,T,P)
-
-% SW_SALRP Conductivity ratio Rp(S,T,P) = C(S,T,P)/C(S,T,0)
-%=========================================================================
-% SW_SALRP $Revision: 1.3 $ $Date: 1994/10/10 05:47:27 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: Rp = sw_salrp(R,T,P)
-%
-% DESCRIPTION:
-% Equation Rp(S,T,P) = C(S,T,P)/C(S,T,0) used in calculating salinity.
-% UNESCO 1983 polynomial.
-%
-% INPUT: (All must have same shape)
-% R = Conductivity ratio R = C(S,T,P)/C(35,15,0) [no units]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-%
-% OUTPUT:
-% Rp = conductivity ratio Rp(S,T,P) = C(S,T,P)/C(S,T,0) [no units]
-%
-% AUTHOR: Phil Morgan 93-04-17 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: sw_salt
-% CALLEE: none
-
-%-------------------
-% CHECK INPUTS
-%-------------------
-if nargin~=3
- error('sw_salrp.m: requires 3 input arguments')
-end %if
-
-[mr,nr] = size(R);
-[mp,np] = size(P);
-[mt,nt] = size(T);
-if ~(mr==mp | mr==mt | nr==np | nr==nt)
- error('sw_salrp.m: R,T,P must all have the same shape')
-end %if
-
-%-------------------
-% eqn (4) p.8 unesco.
-%-------------------
-d1 = 3.426e-2;
-d2 = 4.464e-4;
-d3 = 4.215e-1;
-d4 = -3.107e-3;
-
-e1 = 2.070e-5;
-e2 = -6.370e-10;
-e3 = 3.989e-15;
-
-Rp = 1 + ( P.*(e1 + e2.*P + e3.*P.^2) ) ...
- ./ (1 + d1.*T + d2.*T.^2 +(d3 + d4.*T).*R);
-
-return
-%-----------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_salrt.m b/M_Csiro/sw_salrt.m
deleted file mode 100644
index db985e5..0000000
--- a/M_Csiro/sw_salrt.m
+++ /dev/null
@@ -1,49 +0,0 @@
-
-function rt = sw_salrt(T)
-
-% SW_SALRT Conductivity ratio rt(T) = C(35,T,0)/C(35,15,0)
-%=========================================================================
-% SW_SALRT $Revision: 1.3 $ $Date: 1994/10/10 05:48:34 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: rt = sw_salrt(T)
-%
-% DESCRIPTION:
-% Equation rt(T) = C(35,T,0)/C(35,15,0) used in calculating salinity.
-% UNESCO 1983 polynomial.
-%
-% INPUT:
-% T = temperature [degree C (IPTS-68)]
-%
-% OUTPUT:
-% rt = conductivity ratio [no units]
-%
-% AUTHOR: Phil Morgan 93-04-17 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: sw_salt
-% CALLEE: none
-
-% rt = rt(T) = C(35,T,0)/C(35,15,0)
-% Eqn (3) p.7 Unesco.
-
-c0 = 0.6766097;
-c1 = 2.00564e-2;
-c2 = 1.104259e-4;
-c3 = -6.9698e-7;
-% c4 = 1.0031e-9;
-c4 = 1.e-9;
-
-rt = c0 + (c1 + (c2 + (c3 + c4.*T).*T).*T).*T;
-
-return
-%--------------------------------------------------------------------
diff --git a/M_Csiro/sw_sals.m b/M_Csiro/sw_sals.m
deleted file mode 100644
index fb7bdbd..0000000
--- a/M_Csiro/sw_sals.m
+++ /dev/null
@@ -1,79 +0,0 @@
-
-function S = sw_sals(Rt,T)
-
-% SW_SALS Salinity of sea water
-%=========================================================================
-% SW_SALS $Revision: 1.3 $ $Date: 1994/10/10 05:49:13 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: S = sw_sals(Rt,T)
-%
-% DESCRIPTION:
-% Salinity of sea water as a function of Rt and T.
-% UNESCO 1983 polynomial.
-%
-% INPUT:
-% Rt = Rt(S,T) = C(S,T,0)/C(35,T,0)
-% T = temperature [degree C (IPTS-68)]
-%
-% OUTPUT:
-% S = salinity [psu (PSS-78)]
-%
-% AUTHOR: Phil Morgan 93-04-17 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: sw_salt
-% CALLEE: none
-
-%--------------------------
-% CHECK INPUTS
-%--------------------------
-if nargin~=2
- error('sw_sals.m: requires 2 input arguments')
-end %if
-
-[mrt,nrt] = size(Rt);
-[mT,nT] = size(T);
-if ~(mrt==mT | nrt==nT)
- error('sw_sals.m: Rt and T must have the same shape')
-end %if
-
-%--------------------------
-% eqn (1) & (2) p6,7 unesco
-%--------------------------
-a0 = 0.0080;
-a1 = -0.1692;
-a2 = 25.3851;
-a3 = 14.0941;
-a4 = -7.0261;
-a5 = 2.7081;
-
-b0 = 0.0005;
-b1 = -0.0056;
-b2 = -0.0066;
-b3 = -0.0375;
-b4 = 0.0636;
-b5 = -0.0144;
-
-k = 0.0162;
-
-Rtx = sqrt(Rt);
-del_T = T - 15;
-del_S = (del_T ./ (1+k*del_T) ) .* ...
- ( b0 + (b1 + (b2+ (b3 + (b4 + b5.*Rtx).*Rtx).*Rtx).*Rtx).*Rtx);
-
-S = a0 + (a1 + (a2 + (a3 + (a4 + a5.*Rtx).*Rtx).*Rtx).*Rtx).*Rtx;
-
-S = S + del_S;
-
-return
-%----------------------------------------------------------------------
diff --git a/M_Csiro/sw_salt.m b/M_Csiro/sw_salt.m
deleted file mode 100644
index d0102b8..0000000
--- a/M_Csiro/sw_salt.m
+++ /dev/null
@@ -1,60 +0,0 @@
-
-function S = sw_salt(cndr,T,P)
-
-% SW_SALT Salinity from cndr, T, P
-%=========================================================================
-% SW_SALT $Revision: 1.3 $ $Date: 1994/10/10 05:49:53 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: S = sw_salt(cndr,T,P)
-%
-% DESCRIPTION:
-% Calculates Salinity from conductivity ratio. UNESCO 1983 polynomial.
-%
-% INPUT:
-% cndr = Conductivity ratio R = C(S,T,P)/C(35,15,0) [no units]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-%
-% OUTPUT:
-% S = salinity [psu (PSS-78)]
-%
-% AUTHOR: Phil Morgan 93-04-17 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_sals.m sw_salrt.m sw_salrp.m
-
-
-%----------------------------------
-% CHECK INPUTS ARE SAME DIMENSIONS
-%----------------------------------
-[mc,nc] = size(cndr);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-if ~(mc==mt | mc==mp | nc==nt | nc==np)
- error('sw_salt.m: cndr,T,P must all have the same dimensions')
-end %if
-
-%-------
-% BEGIN
-%-------
-R = cndr;
-rt = sw_salrt(T);
-Rp = sw_salrp(R,T,P);
-Rt = R./(Rp.*rt);
-S = sw_sals(Rt,T);
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_satAr.m b/M_Csiro/sw_satAr.m
deleted file mode 100644
index 481271b..0000000
--- a/M_Csiro/sw_satAr.m
+++ /dev/null
@@ -1,95 +0,0 @@
-%$$$
-%$$$ #undef __PR
-%$$$ #include "VARIANT.h"
-
-function c = sw_satAr(S,T)
-
-% SW_SATAr Satuaration of Ar in sea water
-%=========================================================================
-% sw_satAr $Revision: 1.1 $ $Date: 1998/04/22 02:15:56 $
-% Copyright (C) CSIRO, Phil Morgan 1998.
-%
-% USAGE: satAr = sw_satAr(S,T,P)
-%
-% DESCRIPTION:
-% Solubility (satuaration) of Argon (Ar) in sea water
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% T = temperature [degree C (IPTS-68)]
-%
-% OUTPUT:
-% satAr = solubility of Ar [ml/l]
-%
-% AUTHOR: Phil Morgan 97-11-05 (morgan@ml.csiro.au)
-%
-%$$$ #include "disclaimer_in_code.inc"
-%
-% REFERENCES:
-% Weiss, R. F. 1970
-% "The solubility of nitrogen, oxygen and argon in water and seawater."
-% Deap-Sea Research., 1970, Vol 17, pp721-735.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE:
-
-%$$$ #ifdef VARIANT_PRIVATE
-%$$$ %***********************************************************
-%$$$ %$Id: sw_satAr.M,v 1.1 1998/04/22 02:15:56 morgan Exp $
-%$$$ %
-%$$$ %$Log: sw_satAr.M,v $
-
-%$$$ %
-%$$$ %***********************************************************
-%$$$ #endif
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=2
- error('sw_satAr.m: Must pass 2 parameters')
-end %if
-
-% CHECK S,T dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('sw_satAr: S & T must have same dimensions')
-end %if
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if ms == 1 % row vector
- T = T(:);
- S = S(:);
- Transpose = 1;
-end %if
-
-%------
-% BEGIN
-%------
-
-% convert T to Kelvin
-T = 273.15 + T;
-
-% constants for Eqn (4) of Weiss 1970
-a1 = -173.5146;
-a2 = 245.4510;
-a3 = 141.8222;
-a4 = -21.8020;
-b1 = -0.034474;
-b2 = 0.014934;
-b3 = -0.0017729;
-
-% Eqn (4) of Weiss 1970
-lnC = a1 + a2.*(100./T) + a3.*log(T./100) + a4.*(T./100) + ...
- S.*( b1 + b2.*(T./100) + b3.*((T./100).^2) );
-
-c = exp(lnC);
-
-return
-
diff --git a/M_Csiro/sw_satN2.m b/M_Csiro/sw_satN2.m
deleted file mode 100644
index f1a0ca8..0000000
--- a/M_Csiro/sw_satN2.m
+++ /dev/null
@@ -1,95 +0,0 @@
-%$$$
-%$$$ #undef __PR
-%$$$ #include "VARIANT.h"
-
-function c = sw_satN2(S,T)
-
-% SW_SATN2 Satuaration of N2 in sea water
-%=========================================================================
-% sw_satN2 $Revision: 1.1 $ $Date: 1998/04/22 02:15:56 $
-% Copyright (C) CSIRO, Phil Morgan 1998.
-%
-% USAGE: satN2 = sw_satN2(S,T,P)
-%
-% DESCRIPTION:
-% Solubility (satuaration) of Nitrogen (N2) in sea water
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% T = temperature [degree C (IPTS-68)]
-%
-% OUTPUT:
-% satN2 = solubility of N2 [ml/l]
-%
-% AUTHOR: Phil Morgan 97-11-05 (morgan@ml.csiro.au)
-%
-%$$$ #include "disclaimer_in_code.inc"
-%
-% REFERENCES:
-% Weiss, R. F. 1970
-% "The solubility of nitrogen, oxygen and argon in water and seawater."
-% Deap-Sea Research., 1970, Vol 17, pp721-735.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE:
-
-%$$$ #ifdef VARIANT_PRIVATE
-%$$$ %***********************************************************
-%$$$ %$Id: sw_satN2.M,v 1.1 1998/04/22 02:15:56 morgan Exp $
-%$$$ %
-%$$$ %$Log: sw_satN2.M,v $
-
-%$$$ %
-%$$$ %***********************************************************
-%$$$ #endif
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=2
- error('sw_satN2.m: Must pass 2 parameters')
-end %if
-
-% CHECK S,T dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('sw_satN2: S & T must have same dimensions')
-end %if
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if ms == 1 % row vector
- T = T(:);
- S = S(:);
- Transpose = 1;
-end %if
-
-%------
-% BEGIN
-%------
-
-% convert T to Kelvin
-T = 273.15 + T;
-
-% constants for Eqn (4) of Weiss 1970
-a1 = -172.4965;
-a2 = 248.4262;
-a3 = 143.0738;
-a4 = -21.7120;
-b1 = -0.049781;
-b2 = 0.025018;
-b3 = -0.0034861;
-
-% Eqn (4) of Weiss 1970
-lnC = a1 + a2.*(100./T) + a3.*log(T./100) + a4.*(T./100) + ...
- S.*( b1 + b2.*(T./100) + b3.*((T./100).^2) );
-
-c = exp(lnC);
-
-return
-
diff --git a/M_Csiro/sw_satO2.m b/M_Csiro/sw_satO2.m
deleted file mode 100644
index ea1b5c7..0000000
--- a/M_Csiro/sw_satO2.m
+++ /dev/null
@@ -1,95 +0,0 @@
-%$$$
-%$$$ #undef __PR
-%$$$ #include "VARIANT.h"
-
-function c = sw_satO2(S,T)
-
-% SW_SATO2 Satuaration of O2 in sea water
-%=========================================================================
-% sw_satO2 $Revision: 1.1 $ $Date: 1998/04/22 02:15:56 $
-% Copyright (C) CSIRO, Phil Morgan 1998.
-%
-% USAGE: satO2 = sw_satO2(S,T,P)
-%
-% DESCRIPTION:
-% Solubility (satuaration) of Oxygen (O2) in sea water
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% T = temperature [degree C (IPTS-68)]
-%
-% OUTPUT:
-% satO2 = solubility of O2 [ml/l]
-%
-% AUTHOR: Phil Morgan 97-11-05 (morgan@ml.csiro.au)
-%
-%$$$ #include "disclaimer_in_code.inc"
-%
-% REFERENCES:
-% Weiss, R. F. 1970
-% "The solubility of nitrogen, oxygen and argon in water and seawater."
-% Deap-Sea Research., 1970, Vol 17, pp721-735.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE:
-
-%$$$ #ifdef VARIANT_PRIVATE
-%$$$ %***********************************************************
-%$$$ %$Id: sw_satO2.M,v 1.1 1998/04/22 02:15:56 morgan Exp $
-%$$$ %
-%$$$ %$Log: sw_satO2.M,v $
-
-%$$$ %
-%$$$ %***********************************************************
-%$$$ #endif
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=2
- error('sw_satO2.m: Must pass 2 parameters')
-end %if
-
-% CHECK S,T dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('sw_satO2: S & T must have same dimensions')
-end %if
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if ms == 1 % row vector
- T = T(:);
- S = S(:);
- Transpose = 1;
-end %if
-
-%------
-% BEGIN
-%------
-
-% convert T to Kelvin
-T = 273.15 + T;
-
-% constants for Eqn (4) of Weiss 1970
-a1 = -173.4292;
-a2 = 249.6339;
-a3 = 143.3483;
-a4 = -21.8492;
-b1 = -0.033096;
-b2 = 0.014259;
-b3 = -0.0017000;
-
-% Eqn (4) of Weiss 1970
-lnC = a1 + a2.*(100./T) + a3.*log(T./100) + a4.*(T./100) + ...
- S.*( b1 + b2.*(T./100) + b3.*((T./100).^2) );
-
-c = exp(lnC);
-
-return
-
diff --git a/M_Csiro/sw_seck.m b/M_Csiro/sw_seck.m
deleted file mode 100644
index ae1dc17..0000000
--- a/M_Csiro/sw_seck.m
+++ /dev/null
@@ -1,167 +0,0 @@
-
-function K = sw_seck(S,T,P)
-
-% SW_SECK Secant bulk modulus (K) of sea water
-%=========================================================================
-% SW_SECK $Revision: 1.3 $ $Date: 1994/10/10 05:50:45 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: dens = sw_seck(S,T,P)
-%
-% DESCRIPTION:
-% Secant Bulk Modulus (K) of Sea Water using Equation of state 1980.
-% UNESCO polynomial implementation.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (alternatively, may have dimensions 1*1 or 1*n where n is columns in S)
-%
-% OUTPUT:
-% K = Secant Bulk Modulus [bars]
-%
-% AUTHOR: Phil Morgan 92-11-05 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-% Eqn.(15) p.18
-%
-% Millero, F.J. and Poisson, A.
-% International one-atmosphere equation of state of seawater.
-% Deep-Sea Res. 1981. Vol28A(6) pp625-629.
-%=========================================================================
-
-% CALLER: sw_dens.m
-% CALLEE: none
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=3
- error('sw_seck.m: Must pass 3 parameters')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-%--------------------------------------------------------------------
-% COMPUTE COMPRESSION TERMS
-%--------------------------------------------------------------------
-P = P/10; %convert from db to atmospheric pressure units
-
-% Pure water terms of the secant bulk modulus at atmos pressure.
-% UNESCO eqn 19 p 18
-
-h3 = -5.77905E-7;
-h2 = +1.16092E-4;
-h1 = +1.43713E-3;
-h0 = +3.239908; %[-0.1194975];
-
-%AW = h0 + h1*T + h2*T.^2 + h3*T.^3;
-AW = h0 + (h1 + (h2 + h3.*T).*T).*T;
-
-k2 = 5.2787E-8;
-k1 = -6.12293E-6;
-k0 = +8.50935E-5; %[+3.47718E-5];
-
-BW = k0 + (k1 + k2*T).*T;
-%BW = k0 + k1*T + k2*T.^2;
-
-e4 = -5.155288E-5;
-e3 = +1.360477E-2;
-e2 = -2.327105;
-e1 = +148.4206;
-e0 = 19652.21; %[-1930.06];
-
-KW = e0 + (e1 + (e2 + (e3 + e4*T).*T).*T).*T; % eqn 19
-%KW = e0 + e1*T + e2*T.^2 + e3*T.^3 + e4*T.^4;
-
-%--------------------------------------------------------------------
-% SEA WATER TERMS OF SECANT BULK MODULUS AT ATMOS PRESSURE.
-%--------------------------------------------------------------------
-j0 = 1.91075E-4;
-
-i2 = -1.6078E-6;
-i1 = -1.0981E-5;
-i0 = 2.2838E-3;
-
-SR = sqrt(S);
-
-A = AW + (i0 + (i1 + i2*T).*T + j0*SR).*S;
-%A = AW + (i0 + i1*T + i2*T.^2 + j0*SR).*S; % eqn 17
-
-
-m2 = 9.1697E-10;
-m1 = +2.0816E-8;
-m0 = -9.9348E-7;
-
-B = BW + (m0 + (m1 + m2*T).*T).*S; % eqn 18
-%B = BW + (m0 + m1*T + m2*T.^2).*S; % eqn 18
-
-
-f3 = -6.1670E-5;
-f2 = +1.09987E-2;
-f1 = -0.603459;
-f0 = +54.6746;
-
-g2 = -5.3009E-4;
-g1 = +1.6483E-2;
-g0 = +7.944E-2;
-
-K0 = KW + ( f0 + (f1 + (f2 + f3*T).*T).*T ...
- + (g0 + (g1 + g2*T).*T).*SR ).*S; % eqn 16
-
-%K0 = KW + (f0 + f1*T + f2*T.^2 + f3*T.^3).*S ...
-% + (g0 + g1*T + g2*T.^2).*SR.*S; % eqn 16
-
-K = K0 + (A + B.*P).*P; % eqn 15
-
-if Transpose
- K = K';
-end %if
-
-return
-%----------------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_smow.m b/M_Csiro/sw_smow.m
deleted file mode 100644
index 725e5e2..0000000
--- a/M_Csiro/sw_smow.m
+++ /dev/null
@@ -1,69 +0,0 @@
-
-function dens = sw_smow(T)
-
-% SW_SMOW Denisty of standard mean ocean water (pure water)
-%=========================================================================
-% SW_SMOW $Revision: 1.3 $ $Date: 1994/10/10 05:51:46 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: dens = sw_smow(T)
-%
-% DESCRIPTION:
-% Denisty of Standard Mean Ocean Water (Pure Water) using EOS 1980.
-%
-% INPUT:
-% T = temperature [degree C (IPTS-68)]
-%
-% OUTPUT:
-% dens = density [kg/m^3]
-%
-% AUTHOR: Phil Morgan 92-11-05 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-% UNESCO 1983 p17 Eqn(14)
-%
-% Millero, F.J & Poisson, A.
-% INternational one-atmosphere equation of state for seawater.
-% Deep-Sea Research Vol28A No.6. 1981 625-629. Eqn (6)
-%=========================================================================
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-% TEST INPUTS
-if nargin ~= 1
- error('sw_smow.m: Only one input argument allowed')
-end %if
-
-Transpose = 0;
-[mT,nT] = size(T);
-if mT == 1 % a row vector
- T = T(:);
- Tranpose = 1;
-end %if
-
-%----------------------
-% DEFINE CONSTANTS
-%----------------------
-a0 = 999.842594;
-a1 = 6.793952e-2;
-a2 = -9.095290e-3;
-a3 = 1.001685e-4;
-a4 = -1.120083e-6;
-a5 = 6.536332e-9;
-
-dens = a0 + (a1 + (a2 + (a3 + (a4 + a5*T).*T).*T).*T).*T;
-
-if Transpose
- dens = dens';
-end %if
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_svan.m b/M_Csiro/sw_svan.m
deleted file mode 100644
index c714431..0000000
--- a/M_Csiro/sw_svan.m
+++ /dev/null
@@ -1,104 +0,0 @@
-
-function svan = sw_svan(S,T,P)
-
-% SW_SVAN Specific volume anomaly
-%=========================================================================
-% SW_SVAN $Revision: 1.3 $ $Date: 1994/10/10 05:52:20 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: svan = sw_svan(S,T,P)
-%
-% DESCRIPTION:
-% Specific Volume Anomaly calculated as
-% svan = 1/sw_dens(s,t,p) - 1/sw_dens(35,0,p)
-% Note that it is often quoted in literature as 1e8*units
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% T = temperature [degree C (IPTS-68)]
-% P = Pressure [db]
-% (alternatively, may have dimensions 1*1 or 1*n where n is columns in S)
-%
-% OUTPUT:
-% svan = Specific Volume Anomaly [m^3 kg^-1]
-%
-% AUTHOR: Phil Morgan 92-11-05 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCE:
-% Fofonoff, N.P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-% Eqn (9) p.15.
-%
-% S. Pond & G.Pickard 2nd Edition 1986
-% Introductory Dynamical Oceanogrpahy
-% Pergamon Press Sydney. ISBN 0-08-028728-X
-%=========================================================================
-
-%
-% CALLER: general purpose
-% CALLEE: sw_dens.m
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=3
- error('sw_svan.m: Must pass 3 parameters')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-
-% -----
-% BEGIN
-% -----
-svan = ( ones(size(S)) ./ sw_dens(S,T,P)) - ...
- (ones(size(S)) ./ sw_dens(35*ones(size(S)),zeros(size(S)),P) );
-
-if Transpose
- svan = svan';
-end %if
-
-return
-%--------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_svel.m b/M_Csiro/sw_svel.m
deleted file mode 100644
index f3dff2f..0000000
--- a/M_Csiro/sw_svel.m
+++ /dev/null
@@ -1,181 +0,0 @@
-
-function svel = sw_svel(S,T,P)
-
-% SW_SVEL Sound velocity of sea water
-%=========================================================================
-% SW_SVEL $Revision: 1.3 $ $Date: 1994/10/10 05:53:00 $
-% Copyright (C) CSIRO, Phil Morgan 1993.
-%
-% USAGE: svel = sw_svel(S,T,P)
-%
-% DESCRIPTION:
-% Sound Velocity in sea water using UNESCO 1983 polynomial.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78)]
-% T = temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% svel = sound velocity [m/s]
-%
-% AUTHOR: Phil Morgan 93-04-20 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: none
-
-% UNESCO 1983. eqn.33 p.46
-
-%----------------------
-% CHECK INPUT ARGUMENTS
-%----------------------
-if nargin ~=3
- error('sw_svel.m: Must pass 3 parameters')
-end %if
-
-% CHECK S,T,P dimensions and verify consistent
-[ms,ns] = size(S);
-[mt,nt] = size(T);
-[mp,np] = size(P);
-
-
-% CHECK THAT S & T HAVE SAME SHAPE
-if (ms~=mt) | (ns~=nt)
- error('check_stp: S & T must have same dimensions')
-end %if
-
-% CHECK OPTIONAL SHAPES FOR P
-if mp==1 & np==1 % P is a scalar. Fill to size of S
- P = P(1)*ones(ms,ns);
-elseif np==ns & mp==1 % P is row vector with same cols as S
- P = P( ones(1,ms), : ); % Copy down each column.
-elseif mp==ms & np==1 % P is column vector
- P = P( :, ones(1,ns) ); % Copy across each row
-elseif mp==ms & np==ns % PR is a matrix size(S)
- % shape ok
-else
- error('check_stp: P has wrong dimensions')
-end %if
-[mp,np] = size(P);
-
-
-
-% IF ALL ROW VECTORS ARE PASSED THEN LET US PRESERVE SHAPE ON RETURN.
-Transpose = 0;
-if mp == 1 % row vector
- P = P(:);
- T = T(:);
- S = S(:);
-
- Transpose = 1;
-end %if
-%***check_stp
-
-%---------
-% BEGIN
-%--------
-
-P = P/10; % convert db to bars as used in UNESCO routines
-
-%------------
-% eqn 34 p.46
-%------------
-c00 = 1402.388;
-c01 = 5.03711;
-c02 = -5.80852e-2;
-c03 = 3.3420e-4;
-c04 = -1.47800e-6;
-c05 = 3.1464e-9;
-
-c10 = 0.153563;
-c11 = 6.8982e-4;
-c12 = -8.1788e-6;
-c13 = 1.3621e-7;
-c14 = -6.1185e-10;
-
-c20 = 3.1260e-5;
-c21 = -1.7107e-6;
-c22 = 2.5974e-8;
-c23 = -2.5335e-10;
-c24 = 1.0405e-12;
-
-c30 = -9.7729e-9;
-c31 = 3.8504e-10;
-c32 = -2.3643e-12;
-
-Cw = c00 + c01.*T + c02.*T.^2 + c03.*T.^3 + c04.*T.^4 + c05.*T.^5 ...
- + (c10 + c11.*T + c12.*T.^2 + c13.*T.^3 + c14.*T.^4).*P ...
- + (c20 + c21.*T + c22.*T.^2 + c23.*T.^3 + c24.*T.^4).*P.^2 ...
- + (c30 + c31.*T + c32.*T.^2).*P.^3;
-
-%-------------
-% eqn 35. p.47
-%-------------
-a00 = 1.389;
-a01 = -1.262e-2;
-a02 = 7.164e-5;
-a03 = 2.006e-6;
-a04 = -3.21e-8;
-
-a10 = 9.4742e-5;
-a11 = -1.2580e-5;
-a12 = -6.4885e-8;
-a13 = 1.0507e-8;
-a14 = -2.0122e-10;
-
-a20 = -3.9064e-7;
-a21 = 9.1041e-9;
-a22 = -1.6002e-10;
-a23 = 7.988e-12;
-
-a30 = 1.100e-10;
-a31 = 6.649e-12;
-a32 = -3.389e-13;
-
-A = a00 + a01.*T + a02.*T.^2 + a03.*T.^3 + a04.*T.^4 ...
- + (a10 + a11.*T + a12.*T.^2 + a13.*T.^3 + a14.*T.^4).*P ...
- + (a20 + a21.*T + a22.*T.^2 + a23.*T.^3).*P.^2 ...
- + (a30 + a31.*T + a32.*T.^2).*P.^3;
-
-
-%------------
-% eqn 36 p.47
-%------------
-b00 = -1.922e-2;
-b01 = -4.42e-5;
-b10 = 7.3637e-5;
-b11 = 1.7945e-7;
-
-B = b00 + b01.*T + (b10 + b11.*T).*P;
-
-%------------
-% eqn 37 p.47
-%------------
-d00 = 1.727e-3;
-d10 = -7.9836e-6;
-
-D = d00 + d10.*P;
-
-%------------
-% eqn 33 p.46
-%------------
-svel = Cw + A.*S + B.*S.*sqrt(S) + D.*S.^2;
-
-if Transpose
- svel = svel';
-end %if
-
-return
-%--------------------------------------------------------------------------
-
diff --git a/M_Csiro/sw_temp.m b/M_Csiro/sw_temp.m
deleted file mode 100644
index c62e569..0000000
--- a/M_Csiro/sw_temp.m
+++ /dev/null
@@ -1,59 +0,0 @@
-
-function PT = sw_temp(S,T,P,PR)
-
-% SW_TEMP Temperature from potential temperature
-%===========================================================================
-% TEMP $Revision: 1.3 $ $Date: 1994/10/10 05:53:39 $
-% Copyright (C) CSIRO, Phil Morgan 1992.
-%
-% USAGE: temp = sw_temp(S,PTMP,P,PR)
-%
-% DESCRIPTION:
-% Calculates temperature from potential temperature at the reference
-% pressure PR and in-situ pressure P.
-%
-% INPUT: (all must have same dimensions)
-% S = salinity [psu (PSS-78) ]
-% PTMP = potential temperature [degree C (IPTS-68)]
-% P = pressure [db]
-% PR = Reference pressure [db]
-% (P may have dims 1x1, mx1, 1xn or mxn for S(mxn) )
-%
-% OUTPUT:
-% temp = temperature [degree C (IPTS-68)]
-%
-% AUTHOR: Phil Morgan 92-04-06 (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-% REFERENCES:
-% Fofonoff, P. and Millard, R.C. Jr
-% Unesco 1983. Algorithms for computation of fundamental properties of
-% seawater, 1983. _Unesco Tech. Pap. in Mar. Sci._, No. 44, 53 pp.
-% Eqn.(31) p.39
-%
-% Bryden, H. 1973.
-% "New Polynomials for thermal expansion, adiabatic temperature gradient
-% and potential temperature of sea water."
-% DEEP-SEA RES., 1973, Vol20,401-408.
-%=========================================================================
-
-% CALLER: general purpose
-% CALLEE: sw_ptmp.m
-
-%-------------
-% CHECK INPUTS
-%-------------
-if nargin ~= 4
- error('sw_temp.m: Must pass 4 parameters ')
-end %if
-% LET sw_ptmp.m DO DIMENSION CHECKING
-
-% CARRY OUT INVERSE CALCULATION BY SWAPPING P0 & PR.
-PT = sw_ptmp(S,T,PR,P);
-
-return
-%=========================================================================
-
diff --git a/M_Csiro/sw_test.m b/M_Csiro/sw_test.m
deleted file mode 100644
index 26f2350..0000000
--- a/M_Csiro/sw_test.m
+++ /dev/null
@@ -1,600 +0,0 @@
-
-function [] = sw_test()
-
-% SW_TEST Test SEAWATER Library Routines
-%=========================================================================
-% SW_TEST $Revision: 1.4 $ $Date: 1998/04/22 02:08:04 $
-% Copyright (C) CSIRO, Phil Morgan 1994
-%
-% sw_test
-%
-% DESCRIPTION:
-% Execute test routines to test and verify SEAWATER Library routines
-% for your platform. Prints output to screen and to file sw_test.txt
-%
-% Use the "more" command to scroll results to screen
-%
-% OUTPUT:
-% file sw_test.txt
-%
-% AUTHOR: Phil Morgan (morgan@ml.csiro.au)
-%
-% DISCLAIMER:
-% This software is provided "as is" without warranty of any kind.
-% See the file sw_copy.m for conditions of use and licence.
-%
-%=========================================================================
-
-delete sw_test.txt
-disp('OUTPUT FROM THIS TEST WILL ALSO BE SAVED IN FILE sw_test.txt')
-disp(' <enter> to continue...')
-pause
-reply = input('Full listing of help for each routine (y/n) ? ','s');
-display_help = strcmp(reply,'y') | strcmp(reply,'Y');
-
-format compact
-echo off
-diary sw_test.txt
-
-disp( '***********************')
-disp( ' TEST REPORT ')
-disp( ' ')
-disp( ' SEA WATER LIBRARY ')
-disp( ' ')
-sw_ver
-disp( ' ')
-disp(['Matlab Version ' version ])
-disp( ' ')
-disp([' ' date ''])
-disp( '***********************')
-
-disp(' ')
-
-%--------------------------------
-% TEST MAIN MODULE sw_ptmp.m
-% SUB-MODULES sw_atg.m
-%--------------------------------
-module = 'sw_ptmp';
-submodules = 'sw_adtg.m';
-disp('*************************************')
-disp(['** TESTING MODULE: ' module])
-disp(['** and SUB-MODULE: ' submodules])
-disp('*************************************')
-if display_help
- eval(['help ' module])
- eval(['help ' submodules])
-end %if
-
-% TEST 1 - data from Unesco 1983 p45
-
-T = [ 0 0 0 0 0 0;
- 10 10 10 10 10 10;
- 20 20 20 20 20 20;
- 30 30 30 30 30 30;
- 40 40 40 40 40 40 ];
-
-S = [25 25 25 35 35 35;
- 25 25 25 35 35 35;
- 25 25 25 35 35 35 ;
- 25 25 25 35 35 35;
- 25 25 25 35 35 35 ];
-
-P = [0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000 ;
- 0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000 ];
-
-Pr = [0 0 0 0 0 0];
-
-UN_ptmp = [ 0 -0.3061 -0.9667 0 -0.3856 -1.0974;
- 10 9.3531 8.4684 10 9.2906 8.3643;
- 20 19.0438 17.9426 20 18.9985 17.8654;
- 30 28.7512 27.4353 30 28.7231 27.3851;
- 40 38.4607 36.9254 40 38.4498 36.9023];
-
-ptmp = sw_ptmp(S,T,P,Pr);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from UNESCO 1983 ')
-disp (' (Unesco Tech. Paper in Marine Sci. No. 44, p45)')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-
-for icol = 1:length(S(1,:))
-disp(' ')
-disp (' Sal Temp Press PTMP sw_ptmp')
-disp (' (psu) (C) (db) (C) (C)')
- fprintf(1,' %4.0f %4.0f %5.0f %8.4f %11.5f\n', ...
- [S(:,icol) T(:,icol) P(:,icol) UN_ptmp(:,icol) ptmp(:,icol)]');
-end %for
-
-%-------------------------------------------------------------------------------
-% TEST MAIN MODULE sw_svan.m
-% SUB-MODULES sw_dens.m sw_dens0.m sw_smow.m sw_seck.m sw_pden.m sw_ptmp.m
-%------------------------------------------------------------------------------
-module = 'sw_svan.m';
-submodules = 'sw_dens.m sw_dens0.m sw_smow.m sw_seck.m sw_pden.m sw_ptmp.m';
-disp(' ')
-disp('************************************************************************')
-disp(['** TESTING MODULE: ' module])
-disp(['** and SUB-MODULE: ' submodules])
-disp('************************************************************************')
-if display_help
- eval(['help ' module])
- eval(['help ' submodules])
-end %if
-
-% TEST DATA FROM
-% Unesco Tech. Paper in Marine Sci. No. 44, p22
-
-s = [0 0 0 0 35 35 35 35]';
-p = [0 10000 0 10000 0 10000 0 10000]';
-t = [0 0 30 30 0 0 30 30]';
-
-UN_svan = [2749.54 2288.61 3170.58 3147.85 ...
- 0.0 0.00 607.14 916.34]';
-
-svan = sw_svan(s,t,p);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from UNESCO 1983')
-disp (' (Unesco Tech. Paper in Marine Sci. No. 44, p22)')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-disp(' ')
-disp (' Sal Temp Press SVAN sw_svan')
-disp (' (psu) (C) (db) (1e-8*m3/kg) (1e-8*m3/kg)')
-fprintf(1,' %4.0f %4.0f %5.0f %11.2f %11.3f\n',[s t p UN_svan 1e+8*svan]');
-
-%-------------------------------------------------------------------------------
-% TEST MAIN MODULE
-% SUB-MODULES
-%------------------------------------------------------------------------------
-module = 'sw_salt.m';
-submodules = 'sw_salrt.m sw_salrp.m sw_sals.m';
-disp(' ')
-disp('************************************************************************')
-disp(['** TESTING MODULE: ' module])
-disp(['** and SUB-MODULE: ' submodules])
-disp('************************************************************************')
-if display_help
- eval(['help ' module])
- eval(['help ' submodules])
-end %if
-
-% TEST 1 - data from Unesco 1983 p9
-%***************************************************************************
-
-R = [1 1.2 0.65]'; % cndr = R
-T = [15 20 5]';
-P = [0 2000 1500]';
-
-Rt = [1 1.0568875 0.81705885]';
-UN_S = [35 37.245628 27.995347]';
-S = sw_salt(R,T,P);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from UNESCO 1983 ')
-disp (' (Unesco Tech. Paper in Marine Sci. No. 44, p9)')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-disp(' ')
-disp (' Temp Press R S sw_salt')
-disp (' (C) (db) (no units) (psu) (psu) ')
-table = [T P R UN_S S]';
-fprintf(1,' %4.0f %4.0f %8.2f %11.6f %14.7f\n', table);
-
-%-------------------------------------------------------------------------------
-% TEST MAIN MODULE
-% SUB-MODULES
-%------------------------------------------------------------------------------
-module = 'sw_cndr.m';
-submodules = 'sw_salds.m';
-disp(' ')
-disp('************************************************************************')
-disp(['** TESTING MODULE: ' module])
-disp(['** and SUB-MODULE: ' submodules])
-disp('************************************************************************')
-if display_help
- eval(['help ' module])
- eval(['help ' submodules])
-end %if
-
-% TEST 1 - data from Unesco 1983 p9
-
-T = [0 10 0 10 10 30]';
-P = [0 0 1000 1000 0 0]';
-S = [25 25 25 25 40 40]';
-UN_R = [ 0.498088 0.654990 0.506244 0.662975 1.000073 1.529967]';
-R = sw_cndr(S,T,P);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from UNESCO 1983 ')
-disp (' (Unesco Tech. Paper in Marine Sci. No. 44, p14)')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-disp(' ')
-disp (' Temp Press S cndr sw_cndr')
-disp (' (C) (db) (psu) (no units) (no units) ')
-table = [T P S UN_R R]';
-fprintf(1,' %4.0f %4.0f %8.6f %11.6f %14.8f\n', table);
-
-%-------------------------------------------------------------------------------
-% TEST MAIN MODULE
-% SUB-MODULES
-%------------------------------------------------------------------------------
-module = 'sw_dpth.m';
-disp(' ')
-disp('************************************************************************')
-disp(['** TESTING MODULE: ' module])
-disp('************************************************************************')
-if display_help
- eval(['help ' module])
-end %if
-
-% TEST DATA - matrix "pressure", vector "lat" Unesco 1983 data p30.
-
-lat = [0 30 45 90];
-P = [ 500 500 500 500;
- 5000 5000 5000 5000;
- 10000 10000 10000 10000];
-
-UN_dpth = [ 496.65 496.00 495.34 494.03;
- 4915.04 4908.56 4902.08 4889.13;
- 9725.47 9712.65 9699.84 9674.23];
-
-dpth = sw_dpth(P,lat);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from Unesco 1983 ')
-disp (' (Unesco Tech. Paper in Marine Sci. No. 44, p28)')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-
-for irow = 1:3
- disp(' ')
- disp (' Lat Press DPTH sw_dpth')
- disp (' (degree) (db) (meter) (meter)')
- table = [lat' P(irow,:)' UN_dpth(irow,:)' dpth(irow,:)'];
- fprintf(1,' %6.3f %6.0f %8.2f %8.3f\n', table')
-end %for
-
-%-------------------------------------------------------------------------------
-% TEST MAIN MODULE
-% SUB-MODULES
-%------------------------------------------------------------------------------
-module = 'sw_fp.m';
-disp(' ')
-disp('************************************************************************')
-disp(['** TESTING MODULE: ' module])
-disp('************************************************************************')
-if display_help
- eval(['help ' module])
-end %if
-
-% TEST 1 -
-% UNESCO DATA p.30
-%***************************************************************************
-S = [ 5 10 15 20 25 30 35 40;
- 5 10 15 20 25 30 35 40];
-
-P = [ 0 0 0 0 0 0 0 0;
- 500 500 500 500 500 500 500 500];
-
-
-UN_fp = [-0.274 -0.542 -0.812 -1.083 -1.358 -1.638 -1.922 -2.212;
- -0.650 -0.919 -1.188 -1.460 -1.735 -2.014 -2.299 -2.589];
-
-fp = sw_fp(S,P);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from UNESCO 1983 ')
-disp (' (Unesco Tech. Paper in Marine Sci. No. 44, p30)')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-
-for irow = 1:2
- disp(' ')
- disp (' Sal Press fp sw_fp')
- disp (' (psu) (db) (C) (C)')
- table = [S(irow,:); P(irow,:); UN_fp(irow,:); fp(irow,:)];
- fprintf(1,' %4.0f %5.0f %8.3f %11.4f\n', table)
-end %for
-
-%-------------------------------------------------------------------------------
-% TEST MAIN MODULE
-% SUB-MODULES
-%------------------------------------------------------------------------------
-module = 'sw_cp.m';
-disp(' ')
-disp('************************************************************************')
-disp(['** TESTING MODULE: ' module])
-disp('************************************************************************')
-if display_help
- eval(['help ' module])
-end %if
-
-% TEST 1 -
-% DATA FROM POND AND PICKARD INTRO. DYNAMICAL OCEANOGRAPHY 2ND ED. 1986
-%***************************************************************************
-
-T = [ 0 0 0 0 0 0;
- 10 10 10 10 10 10;
- 20 20 20 20 20 20;
- 30 30 30 30 30 30;
- 40 40 40 40 40 40 ];
-
-S = [25 25 25 35 35 35;
- 25 25 25 35 35 35;
- 25 25 25 35 35 35 ;
- 25 25 25 35 35 35;
- 25 25 25 35 35 35 ];
-
-P = [0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000 ;
- 0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000 ];
-
-UN_cp = [ 4048.4 3896.3 3807.7 3986.5 3849.3 3769.1;
- 4041.8 3919.6 3842.3 3986.3 3874.7 3804.4;
- 4044.8 3938.6 3866.7 3993.9 3895.0 3828.3;
- 4049.1 3952.0 3883.0 4000.7 3909.2 3844.3;
- 4051.2 3966.1 3905.9 4003.5 3923.9 3868.3 ];
-
-cp = sw_cp(S,T,P);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from UNESCO 1983 ')
-disp (' (Unesco Tech. Paper in Marine Sci. No. 44, p37)')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-
-for icol = 1:length(S(1,:))
- disp(' ')
- disp (' Sal Temp Press Cp sw_cp')
- disp (' (psu) (C) (db) (J/kg.C) (J/kg.C)')
- fprintf(1,' %4.0f %4.0f %5.0f %8.1f %11.2f\n', ...
- [S(:,icol) T(:,icol) P(:,icol) UN_cp(:,icol) cp(:,icol)]');
-end %for
-
-%-------------------------------------------------------------------------------
-% TEST MAIN MODULE
-% SUB-MODULES
-%------------------------------------------------------------------------------
-module = 'sw_svel.m';
-disp(' ')
-disp('************************************************************************')
-disp(['** TESTING MODULE: ' module])
-disp('************************************************************************')
-if display_help
- eval(['help ' module])
-end %if
-
-% TEST 1 -
-% DATA FROM POND AND PICKARD INTRO. DYNAMICAL OCEANOGRAPHY 2ND ED. 1986
-%***************************************************************************
-
-T = [ 0 0 0 0 0 0;
- 10 10 10 10 10 10;
- 20 20 20 20 20 20;
- 30 30 30 30 30 30;
- 40 40 40 40 40 40 ];
-
-S = [25 25 25 35 35 35;
- 25 25 25 35 35 35;
- 25 25 25 35 35 35 ;
- 25 25 25 35 35 35;
- 25 25 25 35 35 35 ];
-
-P = [0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000 ;
- 0 5000 10000 0 5000 10000;
- 0 5000 10000 0 5000 10000 ];
-
-UN_svel = [1435.8 1520.4 1610.4 1449.1 1534.0 1623.2;
- 1477.7 1561.3 1647.4 1489.8 1573.4 1659.0;
- 1510.3 1593.6 1676.8 1521.5 1604.5 1687.2;
- 1535.2 1619.0 1700.6 1545.6 1629.0 1710.1;
- 1553.4 1638.0 1719.2 1563.2 1647.3 1727.8 ];
-
-svel = sw_svel(S,T,P);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from UNESCO 1983 ')
-disp (' (Unesco Tech. Paper in Marine Sci. No. 44, p50)')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-
-for icol = 1:length(S(1,:))
- disp(' ')
- disp (' Sal Temp Press SVEL sw_svel')
- disp (' (psu) (C) (db) (m/s) (m/s)')
- fprintf(1,' %4.0f %4.0f %5.0f %8.1f %11.3f\n', ...
- [S(:,icol) T(:,icol) P(:,icol) UN_svel(:,icol) svel(:,icol)]');
-end %for
-
-%----------------------------------------------------------------------------
-% TEST MAIN MODULE
-% SUB-MODULES
-%---------------------------------------------------------------------------
-submodules = 'sw_alpha.m sw_beta.m sw_aonb.m';
-disp(' ')
-disp('**********************************************************************')
-disp(['** TESTING MODULE: ' submodules])
-disp('**********************************************************************')
-if display_help
- eval(['help ' submodules])
-end %if
-
-% DATA FROM MCDOUOGALL 1987
-s = 40;
-ptmp = 10;
-p = 4000;
-beta_lit = 0.72088e-03;
-aonb_lit = 0.34763;
-alpha_lit = aonb_lit*beta_lit;
-
-%$$$ % TEST ARGUMENT PASSING
-%$$$ beta = sw_beta(s,ptmp,p,'ptmp')
-%$$$ beta = sw_beta(s,ptmp,p,'temp')
-%$$$ beta = sw_beta(s,ptmp,p)
-%$$$
-%$$$ alpha = sw_alpha(s,ptmp,p,'ptmp')
-%$$$ alpha = sw_alpha(s,ptmp,p,'temp')
-%$$$ alpha = sw_alpha(s,ptmp,p)
-%$$$
-%$$$ aonb = sw_aonb( s,ptmp,p,'ptmp')
-%$$$ aonb = sw_aonb( s,ptmp,p,'temp')
-%$$$ aonb = sw_aonb( s,ptmp,p)
-%$$$
-beta = sw_beta( s,ptmp,p,'ptmp');
-alpha = sw_alpha(s,ptmp,p,'ptmp');
-aonb = sw_aonb( s,ptmp,p,'ptmp');
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from MCDOUGALL 1987 ')
-disp (['with computed results on ' computer ' computer'])
-disp ('********************************************************')
-
- disp(' ')
- disp (' Sal Temp Press BETA sw_beta')
- disp (' (psu) (C) (db) (psu^-1) (psu^-1)')
- fprintf(1,' %4.0f %4.0f %5.0f %11.4e %11.5e\n', ...
- [s ptmp p beta_lit beta]');
-
- disp(' ')
- disp (' Sal Temp Press AONB sw_aonb')
- disp (' (psu) (C) (db) (psu C^-1) (psu C^-1)')
- fprintf(1,' %4.0f %4.0f %5.0f %8.5f %11.6f\n', ...
- [s ptmp p aonb_lit aonb]');
-
- disp(' ')
- disp (' Sal Temp Press ALPHA sw_alpha')
- disp (' (psu) (C) (db) (psu^-1) (psu^-1)')
- fprintf(1,' %4.0f %4.0f %5.0f %11.4e %11.4e\n', ...
- [s ptmp p alpha_lit alpha]');
-
-%--------------------------------
-% TEST MAIN MODULE sw_satO2.m
-% SUB-MODULES
-%--------------------------------
-module = 'sw_satO2 sw_satN2 sw_satAr';
-disp(' ')
-disp('*************************************')
-disp(['** TESTING MODULE: ' module])
-disp(['** and SUB-MODULE: ' submodules])
-disp('*************************************')
-if display_help
- eval(['help ' module])
-end %if
-
-% Data from Weiss 1970
-
-T = [-1 -1;
- 10 10;
- 20 20 ;
- 40 40 ];
-
-S = [20 40;
- 20 40;
- 20 40 ;
- 20 40];
-
-lit_O2= [ 9.162 7.984;
- 6.950 6.121;
- 5.644 5.015;
- 4.050 3.656];
-
-lit_N2= [16.28 14.01;
- 12.64 11.01;
- 10.47 9.21;
- 7.78 6.95];
-
-lit_Ar= [ 0.4456 0.3877;
- 0.3397 0.2989;
- 0.2766 0.2457;
- 0.1986 0.1794];
-
-
-satO2 = sw_satO2(S,T);
-satN2 = sw_satN2(S,T);
-satAr = sw_satAr(S,T);
-
-%----------------
-% DISPLAY RESULTS
-%----------------
-disp(' ')
-disp ('********************************************************')
-disp ('Comparison of accepted values from Weiss, R.F. 1979 ')
-disp ('"The solubility of nitrogen, oxygen and argon in water and seawater."')
-disp (' Deap-Sea Research., 1970, Vol 17, pp721-735.')
-disp (['with computed results from ' module ' on ' computer ' computer'])
-disp ('********************************************************')
-
-for icol = 1:length(S(1,:))
-disp(' ')
-disp (' Sal Temp O2 sw_satO2')
-disp (' (psu) (C) (ml/l) (ml/l)')
- fprintf(1,' %4.0f %4.0f %8.2f %9.3f\n', ...
- [S(:,icol) T(:,icol) lit_O2(:,icol) satO2(:,icol)]');
-end %for
-
-for icol = 1:length(S(1,:))
-disp(' ')
-disp (' Sal Temp N2 sw_satN2')
-disp (' (psu) (C) (ml/l) (ml/l)')
- fprintf(1,' %4.0f %4.0f %8.2f %9.3f\n', ...
- [S(:,icol) T(:,icol) lit_N2(:,icol) satN2(:,icol)]');
-end %for
-
-for icol = 1:length(S(1,:))
-disp(' ')
-disp (' Sal Temp Ar sw_satAr')
-disp (' (psu) (C) (ml/l) (ml/l)')
- fprintf(1,' %4.0f %4.0f %8.4f %9.4f\n', ...
- [S(:,icol) T(:,icol) lit_Ar(:,icol) satAr(:,icol)]');
-end %for
-
-diary off
-return
-
-%--------------------------------------------------------------------
diff --git a/tsg_icon/interp.mat b/tsg_icon/interp.mat
new file mode 100644
index 0000000000000000000000000000000000000000..5c831d8a9189564757a1aeeec5196ff6babf7a26
GIT binary patch
literal 370
zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w>_Ia4t$sEJ;mK$j`G<
z2q{ff@J%dIFf;@rD<exQLkk5X0|N^Mk^uvwr!PMP1H&sIu9)*UIU%87LPA0U^CcM`
z0V$S<#u@A#tP5sHYMtYl>h0&L<H>Sqj)LQYf04$H50?J@dX#lr%ys?SmuK@A-tGTy
zQ26SD;J-z^KWEgii8w^qF8!D8z|8zQ{?gm!Wq&41{oC?Xn2-O~vj2_z{7&EcpVepm
zs{inN`mTS=x7S}}eEMwiv-(%J`5*UR`+w!(WGVZ_U;k(P_5c0r|6zuo^Edq6^7TLa
z?}N|cZ~dxY@Q0fjENegG)&Ga{{|CO6&iFqm&p!9n|HjqtJ$&mylK<p?eYOAjvfJqY
Y<=gw^FJx3*|9@q>{4sWhs)>_@0E7;q=Kufz
literal 0
HcmV?d00001
diff --git a/tsg_io/readTsgDataLabview.m b/tsg_io/readTsgDataLabview.m
index 1b2443b..019c72d 100644
--- a/tsg_io/readTsgDataLabview.m
+++ b/tsg_io/readTsgDataLabview.m
@@ -153,10 +153,18 @@ if fid ~= -1
tsg.LONX = lon(noNaN);
tsg.SSJT = sst(noNaN);
tsg.SSPS = sss(noNaN);
- tsg.CNDC = cond(noNaN);
- tsg.SPDC = sog(noNaN);
- tsg.SSJT_FREQ = tsg.SSJT_FREQ(noNaN);
- tsg.CNDC_FREQ = tsg.CNDC_FREQ(noNaN);
+ if ~isempty(cond) && ~isempty( find(isnan(cond) == 0))
+ tsg.CNDC = cond(noNaN);
+ end
+ if ~isempty(sog) && ~isempty( find( isnan(sog) == 0))
+ tsg.SPDC = sog(noNaN);
+ end
+ if ~isempty( tsg.SSJT_FREQ )
+ tsg.SSJT_FREQ = tsg.SSJT_FREQ(noNaN);
+ end
+ if ~isempty( tsg.CNDC_FREQ )
+ tsg.CNDC_FREQ = tsg.CNDC_FREQ(noNaN);
+ end
% Set active code to NOCONTROL
% ----------------------------
@@ -164,7 +172,6 @@ if fid ~= -1
% Set salinity QC (SSPS_QC) par NOCONTROL code
% --------------------------------------------
- %tsg.SSPS_QC = tsg.qc.active.Code * ones(length(noNaN),1);
tsg.SSPS_QC = castByteQC( tsg.qc.active.Code, noNaN );
tsg.SSJT_QC = castByteQC( tsg.qc.active.Code, noNaN );
diff --git a/tsg_util/InterpPosLinear.m b/tsg_util/InterpPosLinear.m
new file mode 100644
index 0000000..c0d0e72
--- /dev/null
+++ b/tsg_util/InterpPosLinear.m
@@ -0,0 +1,47 @@
+function interpPosLinear( hMainFig, dateMin, dateMax )
+%
+% Function that interpolate linearly Latitude and position when they are
+% set to NaN
+%
+% Input
+% hMainFig ..... Handle to the main GUI
+% dateMin ...... the correction is applied between dateMin and date Max
+% dateMax ...... the correction is applied between dateMin and date Max
+%
+% Output
+% Error ........ 1 everything OK
+% ........ -1 dateMax <= date Min
+%
+
+% Get application data
+% --------------------
+tsg = getappdata( hMainFig, 'tsg_data');
+
+error = 1;
+if dateMax > dateMin
+
+ % find the closest point
+ % ----------------------
+ ind = find( tsg.DAYD >= dateMin && tsg.DAYD <= dateMax );
+
+ if ~isempty( ind )
+
+ interp1( tsg.DAYD(ind), tsg.LATX(ind)
+ end
+
+ % Create time series
+ % ------------------
+ time = dateMin:deltaT:dateMax;
+
+
+ % Update tsg application data
+ % ---------------------------
+ setappdata( hMainFig, 'tsg_data', tsg);
+
+else
+
+ error = -1;
+
+end
+
+end
\ No newline at end of file
diff --git a/tsg_util/automaticQC.m b/tsg_util/automaticQC.m
index 0f989b4..aba6307 100644
--- a/tsg_util/automaticQC.m
+++ b/tsg_util/automaticQC.m
@@ -1,22 +1,58 @@
-function [] = automaticQC( hTsgGUI )
+function [] = automaticQC( hMainFig )
%
% function [] = automaticQC( hTsgGUI )
%
% Automatic controlon TSG time series
%
% Test for :
-% No date or time
-% SSS < 0 and SSS > 40
+% 1 -
+% 2 - Increasing date
+% 3 - SSS < 0 and SSS > 40
+%
+% TODO : Create a log file with the results of these tests
%
% Get application data : TSG structure
% --------------------------------------
-tsg = getappdata( hTsgGUI, 'tsg_data');
+tsg = getappdata( hMainFig, 'tsg_data');
+
+% ************************** TEST 1 ***********************************
+%
+% Detect records with date and time at NaN.
+% This is done in the reading function
-% Detect records with date and time at NaN
-% ----------------------------------------
-indNaN = find( isnan(tsg.DAYD) == 1 );
+% ************************** TEST 2 ***********************************
+%
+% Test if the records are correctly sorted : increasing date
+% Delete the records with inversion
+%
+% Find negative differences between successive dates
+difDate = diff( tsg.DAYD );
+ind = find( difDate < 0 ) + 1;
+while ~isempty( ind )
+ if ~isempty( tsg.DAYD ); tsg.DAYD(ind) = []; end;
+ if ~isempty( tsg.DATE ); tsg.DATE(ind) = []; end;
+ if ~isempty( tsg.LATX ); tsg.LATX(ind) = []; end;
+ if ~isempty( tsg.LONX ); tsg.LONX(ind) = []; end;
+ if ~isempty( tsg.SSPS ); tsg.SSPS(ind) = []; end;
+ if ~isempty( tsg.SSPS_QC ); tsg.SSPS_QC(ind) = []; end;
+ if ~isempty( tsg.SSJT ); tsg.SSJT(ind) = []; end;
+ if ~isempty( tsg.SSJT_QC ); tsg.SSJT_QC(ind) = []; end;
+ if ~isempty( tsg.SSTP ); tsg.SSTP(ind) = []; end;
+ if ~isempty( tsg.SSTP_QC ); tsg.SSTP_QC(ind) = []; end;
+ if ~isempty( tsg.CNDC ); tsg.CNDC(ind) = []; end;
+ if ~isempty( tsg.SPDC ); tsg.SPDC(ind) = []; end;
+ if ~isempty( tsg.CNDC_FREQ ); tsg.CNDC_FREQ(ind) = []; end;
+ if ~isempty( tsg.SSJT_FREQ ); tsg.SSJT_FREQ(ind) = []; end;
+
+ difDate = diff( tsg.DAYD );
+ ind = find( difDate < 0 ) + 1;
+
+end
+
+% ************************** TEST 3 ***********************************
+%
% Get BAD code value
% ------------------
badCode = get(tsg.qc.hash, 'BAD', 'code');
@@ -24,7 +60,6 @@ badCode = get(tsg.qc.hash, 'BAD', 'code');
% Set salinity QC to BAD for SSS > 40
% -----------------------------------
ind = find(tsg.SSPS > 40);
-%tsg.SSPS_QC(ind) = badCode * ones(size(ind),1);
if ~isempty( ind )
tsg.SSPS_QC(ind) = castByteQC( badCode, ind );
end
@@ -32,13 +67,12 @@ end
% Set salinity QC to BAD for SSS < 0
% -----------------------------------
ind = find(tsg.SSPS < 0);
-%tsg.SSPS_QC(ind) = badCode*ones(size(ind),1);
if ~isempty( ind )
tsg.SSPS_QC(ind) = castByteQC( badCode, ind );
end
% Save the data in the application GUI
% ------------------------------------
-setappdata( hTsgGUI, 'tsg_data', tsg );
+setappdata( hMainFig, 'tsg_data', tsg );
end
\ No newline at end of file
diff --git a/tsg_util/plot_Interpolation.m b/tsg_util/plot_Interpolation.m
new file mode 100644
index 0000000..078fe5c
--- /dev/null
+++ b/tsg_util/plot_Interpolation.m
@@ -0,0 +1,51 @@
+function plot_Interpolation( hMainFig, hPlotAxes, nPlot )
+
+% Get tsg application data
+% ------------------------
+tsg = getappdata( hMainFig, 'tsg_data');
+
+switch nPlot
+
+ % ---------------------------------------------------------------------
+ case 1
+
+ erase_Line( hPlotAxes, 1 );
+
+ % Find records with no position
+ % -----------------------------
+ if ~isempty( tsg.LATX ) && ~isempty( tsg.SSPS)
+
+ ind = find( isnan(tsg.LATX) == 1 | isnan(tsg.LONX) == 1);
+ if ~isempty( tsg.ssps_smooth )
+ plot_Tsg( hMainFig, hPlotAxes, 1, tsg.DAYD(ind), tsg.SSPS(ind), [],...
+ 'SSPS_NOPOS','r','none','*',2);
+ end
+
+ ind = find( isnan(tsg.LATX) == 0 | isnan(tsg.LONX) == 0);
+ if ~isempty( tsg.SSPS )
+ plot_Tsg( hMainFig, hPlotAxes, 1, tsg.DAYD(ind), tsg.SSPS(ind), [],...
+ 'SSPS','k','none','*',2);
+ end
+ end
+
+ % ---------------------------------------------------------------------
+ case 2
+
+ erase_Line( hPlotAxes, 2 );
+ if ~isempty( tsg.LATX )
+ plot_Tsg( hMainFig, hPlotAxes, 2, tsg.DAYD, tsg.LATX,[],...
+ 'LATX','k','none','*',2);
+ end
+
+ % ---------------------------------------------------------------------
+ case 3
+ erase_Line( hPlotAxes, 3 );
+ if ~isempty( tsg.LONX )
+ plot_Tsg( hMainFig, hPlotAxes, 3, tsg.DAYD, tsg.LONX,[],...
+ 'LONX','k','none','*',2);
+ end
+end
+
+axesCommonProp( hPlotAxes );
+
+end
diff --git a/tsg_util/tsg_preferences.m b/tsg_util/tsg_preferences.m
index 513a795..1820ace 100644
--- a/tsg_util/tsg_preferences.m
+++ b/tsg_util/tsg_preferences.m
@@ -28,8 +28,8 @@ config_file = [prefdir, filesep, app_name, '.mat'];
% Open config file
% ----------------
-config = fopen( config_file, 'r' );
-
+% config = fopen( config_file, 'r' );
+config = -1;
% test fopen return value
% -----------------------
if config == -1
diff --git a/tsg_util/updateAdjustedVariable.m b/tsg_util/updateAdjustedVariable.m
index 63c1a7b..ab91950 100644
--- a/tsg_util/updateAdjustedVariable.m
+++ b/tsg_util/updateAdjustedVariable.m
@@ -4,8 +4,8 @@ function updateAdjustedVariable( hMainFig )
% applied to these variable.
%
% The TRICK :
-% Test ADJUSTED_ERROR - Only records corrected compared to water sample
-% get error values
+% The programe test the variable ADJUSTED_ERROR as only records corrected
+% compared to water sample get error values
%
% Get tsg application data
@@ -27,11 +27,12 @@ if ~isempty(tsg.SSPS_CAL)
tsg.SSPS_ADJUSTED_QC(ind) = VALUE_CHANGED;
else
- % If the calibration has been canceled the ADJUSTED value is equal to
+ % If the calibration has been canceled the ADJUSTED value is set to
% the raw value
- % -------------------------------------------------------------------
+ % -----------------------------------------------------------------
tsg.SSPS_ADJUSTED(ind) = tsg.SSPS(ind);
tsg.SSPS_ADJUSTED_QC(ind) = tsg.SSPS_QC(ind);
+
end
% SSJT
diff --git a/tsg_util/updateTsgStruct.m b/tsg_util/updateTsgStruct.m
index 5a67ab5..b60c05d 100644
--- a/tsg_util/updateTsgStruct.m
+++ b/tsg_util/updateTsgStruct.m
@@ -66,10 +66,10 @@ elseif isempty( tsg.SSJT )
'warn', 'modal');
end
-if isempty( tsg.SSPS_ADJUSTED ) && ~isempty( tsg.SSPS )
- tsg.SSPT_ADJUSTED = tsg.SSPT;
- tsg.SSPT_ADJUSTED_QC = tsg.SSPT_QC;
- tsg.SSPT_ADJUSTED_ERROR = NaN * ones( size( tsg.SSPS ));
+if isempty( tsg.SSTP_ADJUSTED ) && ~isempty( tsg.SSTP )
+ tsg.SSTP_ADJUSTED = tsg.SSTP;
+ tsg.SSTP_ADJUSTED_QC = tsg.SSTP_QC;
+ tsg.SSTP_ADJUSTED_ERROR = NaN * ones( size( tsg.SSTP ));
end
% Save tsg structure
diff --git a/tsgqc_GUI.m b/tsgqc_GUI.m
index ed4e03a..d383bc0 100644
--- a/tsgqc_GUI.m
+++ b/tsgqc_GUI.m
@@ -103,7 +103,7 @@ hMainFig = figure(...
% Initialize tsg structure
% ------------------------
-%tsg_initialisation(hMainFig)
+% tsg_initialisation(hMainFig)
%% Initialize tsg structure with tsg_preference function
% -----------------------------------------------------
@@ -279,21 +279,10 @@ hPanToggletool = uitoggletool(... % Open Pan toolbar button
'Enable', 'off',...
'OffCallback', @Pan_OffMenuCallback,...
'OnCallback', @Pan_OnMenuCallback);
-hCalToggletool = uitoggletool(... % Open QC toolbar button
- 'Parent',hToolbar,...
- 'TooltipString','Calibration sensors',...
- 'Separator', 'on', ...
- 'CData',iconRead(...
- [DEFAULT_PATH_FILE 'tsg_icon' filesep 'outils.mat']),...
- 'HandleVisibility','on', ...
- 'Tag','PUSHTOOL_CAL',...
- 'UserData', 'off',...
- 'Enable', 'off',...
- 'OffCallback', @Cal_OffMenuCallback,...
- 'OnCallback', @Cal_OnMenuCallback);
hQCToggletool = uitoggletool(... % Open QC toolbar button
'Parent',hToolbar,...
'TooltipString','Validation codes',...
+ 'Separator', 'on', ...
'CData',iconRead(...
[DEFAULT_PATH_FILE 'tsg_icon' filesep 'qcicon.mat']),...
'HandleVisibility','on', ...
@@ -302,6 +291,17 @@ hQCToggletool = uitoggletool(... % Open QC toolbar button
'Enable', 'off',...
'OffCallback', @QC_OffMenuCallback,...
'OnCallback', @QC_OnMenuCallback);
+hTimelimitToggletool = uitoggletool(...
+ 'Parent',hToolbar,...
+ 'TooltipString','Select time limit',...
+ 'CData',iconRead(...
+ [DEFAULT_PATH_FILE 'tsg_icon' filesep 'selecttime.mat']),...
+ 'HandleVisibility','on', ...
+ 'Tag', 'CORRECT_STARTTIME', ...
+ 'UserData', 'off',...
+ 'Enable', 'off',...
+ 'OffCallback', @SelectTime_OffMenuCallback,...
+ 'OnCallback', @SelectTime_OnMenuCallback);
hMapToggletool = uitoggletool(... % Open Map toolbar button
'Parent',hToolbar,...
'TooltipString','Map and ship track',...
@@ -317,7 +317,6 @@ hMapToggletool = uitoggletool(... % Open Map toolbar button
hClimToggletool = uitoggletool(... % Open Climatology toolbar button
'Parent',hToolbar,...
'TooltipString','Climatology',...
- 'Separator', 'on', ...
'CData',iconRead(...
[DEFAULT_PATH_FILE 'tsg_icon' filesep 'climicon.mat']),...
'HandleVisibility','on', ...
@@ -326,29 +325,40 @@ hClimToggletool = uitoggletool(... % Open Climatology toolbar button
'Enable', 'off',...
'OffCallback', @Clim_OffMenuCallback,...
'OnCallback', @Clim_OnMenuCallback);
-hBottleToggletool = uitoggletool(... % Correction module toolbar button
+hCalToggletool = uitoggletool(... %
'Parent',hToolbar,...
- 'TooltipString','Correct the SSS TSG data',...
+ 'TooltipString','Calibration sensors',...
'Separator', 'on', ...
'CData',iconRead(...
- [DEFAULT_PATH_FILE 'tsg_icon' filesep 'bottleicon.mat']),...
+ [DEFAULT_PATH_FILE 'tsg_icon' filesep 'outils.mat']),...
'HandleVisibility','on', ...
- 'Tag','PUSHTOOL_BOTTLE',...
+ 'Tag','PUSHTOOL_CAL',...
'UserData', 'off',...
'Enable', 'off',...
- 'OffCallback', @Bottle_OffMenuCallback,...
- 'OnCallback', @Bottle_OnMenuCallback);
-hTimelimitToggletool = uitoggletool(... % Select beginning of time series toolbar button
+ 'OffCallback', @Cal_OffMenuCallback,...
+ 'OnCallback', @Cal_OnMenuCallback);
+hInterpToggletool = uitoggletool(... %
'Parent',hToolbar,...
- 'TooltipString','Select time limit',...
+ 'TooltipString','Interpolate missing position',...
'CData',iconRead(...
- [DEFAULT_PATH_FILE 'tsg_icon' filesep 'selecttime.mat']),...
+ [DEFAULT_PATH_FILE 'tsg_icon' filesep 'interp.mat']),...
'HandleVisibility','on', ...
- 'Tag', 'CORRECT_STARTTIME', ...
+ 'Tag','PUSHTOOL_INTERP',...
'UserData', 'off',...
'Enable', 'off',...
- 'OffCallback', @SelectTime_OffMenuCallback,...
- 'OnCallback', @SelectTime_OnMenuCallback);
+ 'OffCallback', @Inter_OffMenuCallback,...
+ 'OnCallback', @Inter_OnMenuCallback);
+hBottleToggletool = uitoggletool(... % Correction module toolbar button
+ 'Parent',hToolbar,...
+ 'TooltipString','Correct the SSS TSG data',...
+ 'CData',iconRead(...
+ [DEFAULT_PATH_FILE 'tsg_icon' filesep 'bottleicon.mat']),...
+ 'HandleVisibility','on', ...
+ 'Tag','PUSHTOOL_BOTTLE',...
+ 'UserData', 'off',...
+ 'Enable', 'off',...
+ 'OffCallback', @Bottle_OffMenuCallback,...
+ 'OnCallback', @Bottle_OnMenuCallback);
hHeaderPushtool = uipushtool(... % Open headerForm button
'Parent',hToolbar,...
@@ -836,6 +846,32 @@ hpCalCoef = uipanel( ...
'Callback', @CancelCalibrationCallback);
+%% uiPanel for Interpolation of position
+
+% Create the uipanel
+hpInterpPos = uipanel( ...
+ 'Parent', hMainFig, ...
+ 'Title', 'Lat-Lon interpolation', ...
+ 'FontSize', tsg.fontSize-1, 'Fontweight', 'bold', ...
+ 'Visible', 'off', ...
+ 'Units', 'normalized','Position', [.0, .85, .15, .11]);
+hrbInterpLinear = uicontrol( ...
+ 'Style','pushbutton', 'Parent',hpInterpPos, ...
+ 'String','Linear interpolation',...
+ 'FontSize',tsg.fontSize-1,...
+ 'Tag', 'TAG_PUSH_INTERP_LINEAR', ...
+ 'Units', 'normalized','pos',[.05 .6 .9 .3], ...
+ 'HandleVisibility','callback', ...
+ 'Callback', @InterpPosLinearCallback);
+hrbInterpOther = uicontrol( ...
+ 'Style','pushbutton', 'Parent',hpInterpPos, ...
+ 'String','Other method',...
+ 'FontSize',tsg.fontSize-1,...
+ 'Tag', 'TAG_PUSH_INTERP_OTHER', ...
+ 'Units', 'normalized','pos',[.05 .1 .9 .3], ...
+ 'HandleVisibility','callback', ...
+ 'Callback', @InterpPosOtherCallback);
+
%% test if user preference autoload field is checked (on)
% -------------------------------------------------------
@@ -1048,6 +1084,111 @@ end
end
+%% Inter_OnMenuCallback ................................... Interpolation
+ %----------------------------------------------------------------------
+ % Callback function run when
+ %
+ function Inter_OnMenuCallback( hObject, eventdata)
+
+
+ % Activate or desactivate uipanels
+ % --------------------------------
+ set( hpCalCoef, 'Visible', 'off' );
+ set( hbgQc, 'Visible', 'off' );
+ set( hpDateLimit, 'Visible', 'on' );
+ set( hpInterpPos, 'Visible', 'on' );
+
+ % Pushbutton
+ % ----------
+ set( hTimelimitToggletool, 'enable', 'on' );
+ set( hQCToggletool, 'enable', 'off' );
+ set( hClimToggletool, 'enable', 'off' );
+ set( hBottleToggletool, 'enable', 'off' );
+ set( hCalToggletool, 'enable', 'off' );
+ set( hHeaderPushtool, 'enable', 'off' );
+
+ % Draw the 3 plots of the interpolation figure
+ % --------------------------------------------
+ plot_Interpolation( hMainFig, hPlotAxes, 1 );
+ plot_Interpolation( hMainFig, hPlotAxes, 2 );
+ plot_Interpolation( hMainFig, hPlotAxes, 3 );
+
+ end
+
+%% Inter_OffMenuCallback .................................. Interpolation
+ %----------------------------------------------------------------------
+ % Callback function run when
+ %
+ function Inter_OffMenuCallback( hObject, eventdata)
+
+ % Activate or desactivate uipanels
+ % --------------------------------
+ set( hpCalCoef, 'Visible', 'off' );
+ set( hbgQc, 'Visible', 'on');
+ set( hpDateLimit, 'Visible', 'off' );
+ set( hpInterpPos, 'Visible', 'off' );
+
+ % Enable Pushbuttons
+ % ------------------
+ set( hQCToggletool, 'enable', 'on' );
+ set( hTimelimitToggletool, 'enable', 'off' );
+ set( hClimToggletool, 'enable', 'on' );
+ set( hBottleToggletool, 'enable', 'on' );
+ set( hCalToggletool, 'enable', 'on' );
+ set( hHeaderPushtool, 'enable', 'on' );
+
+ % Draw the 3 plots of the validation figure
+ % -----------------------------------------
+ plot_Validation( hMainFig, hPlotAxes, 1 );
+ plot_Validation( hMainFig, hPlotAxes, 2 );
+ plot_Validation( hMainFig, hPlotAxes, 3 );
+
+ end
+
+%% InterpLinearCallback ...............................Interpolation Linear
+ %------------------------------------------------------------------------
+ % Callback function run when
+ %----------------------------------------------------------------------
+ function InterpPosLinearCallback( hObject, eventdata)
+
+ msgbox( 'Method not yet implemented', ...
+ 'Function InterpLinearCallback', ...
+ 'warn',...
+ 'modal' );
+
+
+ % Get the time limits for the correction A TESTER
+ % --------------------------------------
+ dateMin = datenum(get( hetDateMin, 'String'), 'yyyy-mm-dd HH:MM:SS');
+ dateMax = datenum(get( hetDateMax, 'String'), 'yyyy-mm-dd HH:MM:SS');
+
+ switch error
+
+ case 1
+
+ % Plot in the 3 axes
+ % ------------------
+ plot_Correction( hMainFig, hPlotAxes );
+
+ case -1
+ msgbox( 'Date limits are not correct',...
+ 'Correction module', 'warn', 'modal');
+ end
+
+
+ end
+
+%% InterpOtherCallback ...............................Interpolation Linear
+ %------------------------------------------------------------------------
+ % Callback function run when
+ %----------------------------------------------------------------------
+ function InterpPosOtherCallback( hObject, eventdata)
+
+ msgbox( 'Method not yet implemented', ...
+ 'Function InterpOtherCallback', ...
+ 'warn',...
+ 'modal' );
+ end
%% Cal_OnMenuCallback ..................................... Calibration
%----------------------------------------------------------------------
@@ -1055,19 +1196,18 @@ end
%----------------------------------------------------------------------
function Cal_OnMenuCallback( hObject, eventdata)
+ % Activate or desactivate uipanels
+ % --------------------------------
set( hpCalCoef, 'Visible', 'on' );
set( hbgQc, 'Visible', 'off');
% Pushbutton
+ % ----------
set( hQCToggletool, 'enable', 'off' );
set( hClimToggletool, 'enable', 'off' );
set( hBottleToggletool, 'enable', 'off' );
+ set( hInterpToggletool, 'enable', 'off' );
set( hHeaderPushtool, 'enable', 'off' );
-
- % Activate Time selection uipanels
- % --------------------------------
- set( hpDateLimit, 'Visible', 'on' );
- set( hTimelimitToggletool, 'enable', 'on' );
% Draw the 3 plots of the validation figure
% -----------------------------------------
@@ -1106,6 +1246,8 @@ end
%----------------------------------------------------------------------
function Cal_OffMenuCallback( hObject, eventdata)
+ % Activate or desactivate uipanels
+ % --------------------------------
set( hpCalCoef, 'Visible', 'off' );
set( hbgQc, 'Visible', 'on');
@@ -1114,12 +1256,8 @@ end
set( hQCToggletool, 'enable', 'on' );
set( hClimToggletool, 'enable', 'on' );
set( hBottleToggletool, 'enable', 'on' );
+ set( hInterpToggletool, 'enable', 'on' );
set( hHeaderPushtool, 'enable', 'on' );
-
- % Desactivate Time selection uipanels
- % --------------------------------
- set( hpDateLimit, 'Visible', 'off' );
- set( hTimelimitToggletool, 'enable', 'off' );
% Get tsg application data
% ------------------------
@@ -1152,8 +1290,9 @@ end
% ------------------------
tsg = getappdata( hMainFig, 'tsg_data' );
- % Get the calibration coefficients
- % --------------------------------
+ % Get the calibration coefficients.
+ % They will be used in the function calibration
+ % ---------------------------------------------
tsg.CNDC_LINCOEF(1) = str2num(get( hetCalCNDCSlope, 'String'));
tsg.CNDC_LINCOEF(2) = str2num(get( hetCalCNDCOffset, 'String'));
tsg.SSJT_LINCOEF(1) = str2num(get( hetCalSSJTSlope, 'String'));
@@ -1335,13 +1474,13 @@ end
%----------------------------------------------------------------------
function QC_OnMenuCallback(gcbo, eventdata)
- % Desactivate Zoom and Pan functions.
- % ----------------------------------
+ % Desactivate toggletools.
+ % ------------------------
set( hZoomToggletool, 'state', 'off' );
set( hPanToggletool, 'state', 'off' );
set( hTimelimitToggletool, 'state', 'off' );
-
set( hCalToggletool, 'state', 'off' );
+ set( hInterpToggletool, 'state', 'off' );
% Activate right clic context menu on first axes (salinity)
% ---------------------------------------------------------
@@ -1772,17 +1911,15 @@ end
% ---------------------
tsg = getappdata(hMainFig, 'tsg_data');
- % Desactivate the Climatology button
- % ----------------------------------
- set( hClimToggletool, 'Enable', 'off');
-
% Switch somme buttons
% --------------------
- set( hZoomToggletool, 'state', 'off' );
- set( hQCToggletool, 'state', 'off' );
- set( hPanToggletool, 'state', 'off' );
- set( hMapToggletool, 'state', 'off' );
- set( hCalToggletool, 'enable', 'off' );
+ set( hZoomToggletool, 'state', 'off' );
+ set( hQCToggletool, 'state', 'off' );
+ set( hPanToggletool, 'state', 'off' );
+ set( hMapToggletool, 'state', 'off' );
+ set( hClimToggletool, 'Enable', 'off');
+ set( hCalToggletool, 'enable', 'off' );
+ set( hInterpToggletool, 'enable', 'off' );
set( hTimelimitToggletool, 'enable', 'on' );
% Activate uipanels
@@ -1826,18 +1963,16 @@ end
%---------------------------------------------------------------------
function Bottle_OffMenuCallback(hObject, eventdata)
- % Activate the Climatology button
- % -------------------------------
- set( hClimToggletool, 'Enable', 'on');
-
% If necessary toggle off some buttons
% ------------------------------------
- set( hZoomToggletool, 'state', 'off' );
- set( hQCToggletool, 'state', 'off' );
- set( hPanToggletool, 'state', 'off' );
- set( hMapToggletool, 'state', 'off' );
- set( hCalToggletool, 'enable', 'on' );
- set( hTimelimitToggletool, 'enable', 'off' );
+ set( hZoomToggletool, 'state', 'off' );
+ set( hQCToggletool, 'state', 'off' );
+ set( hPanToggletool, 'state', 'off' );
+ set( hMapToggletool, 'state', 'off' );
+ set( hClimToggletool, 'enable', 'on');
+ set( hCalToggletool, 'enable', 'on' );
+ set( hInterpToggletool, 'enable', 'on' );
+ set( hTimelimitToggletool, 'enable', 'off' );
% Desactivate some toolbar buttons
% --------------------------------
@@ -1959,7 +2094,7 @@ end
case -1
msgbox( 'Date limits are not correct',...
- 'Correction module', 'warn', 'modal');
+ 'Correction module', 'warn', 'modal');
end
end
--
GitLab