diff --git a/Toolbox/gsw_Abs_Pressure_from_p.m b/Toolbox/gsw_Abs_Pressure_from_p.m index 3dd7250..45d84ef 100644 --- a/Toolbox/gsw_Abs_Pressure_from_p.m +++ b/Toolbox/gsw_Abs_Pressure_from_p.m @@ -17,9 +17,9 @@ % Absolute_Pressure = Absolute Pressure [ Pa ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_C3515.m b/Toolbox/gsw_C3515.m index 627c762..1c95bf5 100644 --- a/Toolbox/gsw_C3515.m +++ b/Toolbox/gsw_C3515.m @@ -15,9 +15,9 @@ % C3515 = Conductivity at (SP=35, t_68=15, p=0) [ mS/cm ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % Culkin and Smith, 1980: Determination of the Concentration of Potassium diff --git a/Toolbox/gsw_CT_first_derivatives.m b/Toolbox/gsw_CT_first_derivatives.m index 6d19da3..f0a2a4e 100644 --- a/Toolbox/gsw_CT_first_derivatives.m +++ b/Toolbox/gsw_CT_first_derivatives.m @@ -32,9 +32,9 @@ % at constant SA. CT_pt is dimensionless. [ unitless ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (11th April 2011) +% VERSION NUMBER: 3.01 (11th April 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_CT_freezing.m b/Toolbox/gsw_CT_freezing.m index ecdda10..b657afd 100644 --- a/Toolbox/gsw_CT_freezing.m +++ b/Toolbox/gsw_CT_freezing.m @@ -31,7 +31,7 @@ % AUTHOR: % Trevor McDougall, Paul Barker and Rainer Feistal [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (4th November, 2011) +% VERSION NUMBER: 3.01 (4th November, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_CT_from_entropy.m b/Toolbox/gsw_CT_from_entropy.m index c8c7959..2b8be6a 100644 --- a/Toolbox/gsw_CT_from_entropy.m +++ b/Toolbox/gsw_CT_from_entropy.m @@ -20,9 +20,9 @@ % CT = Conservative Temperature (ITS-90) [ deg C ] % % AUTHOR: -% Trevor McDougall and Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd March, 2011) +% VERSION NUMBER: 3.01 (3rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_CT_from_pt.m b/Toolbox/gsw_CT_from_pt.m index bdd1632..2d316aa 100644 --- a/Toolbox/gsw_CT_from_pt.m +++ b/Toolbox/gsw_CT_from_pt.m @@ -20,9 +20,9 @@ % CT = Conservative Temperature (ITS-90) [ deg C ] % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_CT_from_rho.m b/Toolbox/gsw_CT_from_rho.m index a9c8383..7d1ea2f 100644 --- a/Toolbox/gsw_CT_from_rho.m +++ b/Toolbox/gsw_CT_from_rho.m @@ -41,9 +41,9 @@ % called with two outputs the second variable will be set to NaN. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (21th April, 2011) +% VERSION NUMBER: 3.01 (21th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_CT_from_rho_exact.m b/Toolbox/gsw_CT_from_rho_exact.m index 112294f..c5a5ab9 100644 --- a/Toolbox/gsw_CT_from_rho_exact.m +++ b/Toolbox/gsw_CT_from_rho_exact.m @@ -32,9 +32,9 @@ % outputs the second variable will be set to NaN. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (21th April, 2011) +% VERSION NUMBER: 3.01 (21th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_CT_from_t.m b/Toolbox/gsw_CT_from_t.m index a2ae047..5e60c22 100644 --- a/Toolbox/gsw_CT_from_t.m +++ b/Toolbox/gsw_CT_from_t.m @@ -23,9 +23,9 @@ % CT = Conservative Temperature (ITS-90) [ deg C ] % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (27th March, 2011) +% VERSION NUMBER: 3.01 (27th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_CT_maxdensity.m b/Toolbox/gsw_CT_maxdensity.m index 74d93f5..8ac38df 100644 --- a/Toolbox/gsw_CT_maxdensity.m +++ b/Toolbox/gsw_CT_maxdensity.m @@ -34,9 +34,9 @@ % given Absolute Salinity and pressure. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_CT_maxdensity_exact.m b/Toolbox/gsw_CT_maxdensity_exact.m index 256f29d..71fb8c0 100644 --- a/Toolbox/gsw_CT_maxdensity_exact.m +++ b/Toolbox/gsw_CT_maxdensity_exact.m @@ -26,9 +26,9 @@ % given Absolute Salinity and pressure. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_CT_second_derivatives.m b/Toolbox/gsw_CT_second_derivatives.m index 04d2365..8280d79 100644 --- a/Toolbox/gsw_CT_second_derivatives.m +++ b/Toolbox/gsw_CT_second_derivatives.m @@ -42,9 +42,9 @@ % CT_pt_pt has units of: [ 1/K ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_C_from_SP.m b/Toolbox/gsw_C_from_SP.m index fe658e8..499d738 100644 --- a/Toolbox/gsw_C_from_SP.m +++ b/Toolbox/gsw_C_from_SP.m @@ -41,9 +41,9 @@ % C = conductivity [ mS/cm ] % % AUTHOR: -% Trevor McDougall, Paul Barker and Rich Pawlowicz [ help_gsw@csiro.au ] +% Trevor McDougall, Paul Barker and Rich Pawlowicz [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (1st April, 2011) +% VERSION NUMBER: 3.01 (1st April, 2011) % % REFERENCES: % Hill, K.D., T.M. Dauphinee and D.J. Woods, 1986: The extension of the @@ -57,7 +57,7 @@ % See appendix E of this TEOS-10 Manual. % % Unesco, 1983: Algorithms for computation of fundamental properties of -% seawater. Unesco Technical Papers in Marine Science, 44, 53 pp. +% seawater. Unesco Technical Papers in Marine Science, 44, 53 pp. % % The software is available from http://www.TEOS-10.org % diff --git a/Toolbox/gsw_Helmholtz_energy_t_exact.m b/Toolbox/gsw_Helmholtz_energy_t_exact.m index 3be464e..26bd53a 100644 --- a/Toolbox/gsw_Helmholtz_energy_t_exact.m +++ b/Toolbox/gsw_Helmholtz_energy_t_exact.m @@ -22,9 +22,9 @@ % Helmholtz_energy_t_exact = Helmholtz energy [ J/kg ] % % AUTHOR: -% Trevor McDougall [ help_gsw@csiro.au ] +% Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_IPV_vs_fNsquared_ratio.m b/Toolbox/gsw_IPV_vs_fNsquared_ratio.m index 06bd224..fc435f7 100644 --- a/Toolbox/gsw_IPV_vs_fNsquared_ratio.m +++ b/Toolbox/gsw_IPV_vs_fNsquared_ratio.m @@ -51,9 +51,9 @@ % That is, p_mid is on a (M-1)xN grid. [ dbar ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_Nsquared.m b/Toolbox/gsw_Nsquared.m index fb5c24e..588ef21 100644 --- a/Toolbox/gsw_Nsquared.m +++ b/Toolbox/gsw_Nsquared.m @@ -46,9 +46,9 @@ % p_mid = Mid pressure between p grid (M-1xN) [ dbar ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (22nd March, 2011) +% VERSION NUMBER: 3.01 (22nd March, 2011) % % REFERENCES: % Griffies, S. M., 2004: Fundamentals of Ocean Climate Models. Princeton, diff --git a/Toolbox/gsw_P0.m b/Toolbox/gsw_P0.m index 7149e59..d26dcc7 100644 --- a/Toolbox/gsw_P0.m +++ b/Toolbox/gsw_P0.m @@ -13,9 +13,9 @@ % P0 = Absolute Pressure of one standard atmosphere. [ Pa ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_R_from_SP.m b/Toolbox/gsw_R_from_SP.m index 665e12a..8235732 100644 --- a/Toolbox/gsw_R_from_SP.m +++ b/Toolbox/gsw_R_from_SP.m @@ -41,9 +41,9 @@ % R = conductivity ratio [ unitless ] % % AUTHOR: -% Trevor McDougall, Paul Barker and Rich Pawlowicz [ help_gsw@csiro.au ] +% Trevor McDougall, Paul Barker and Rich Pawlowicz [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (6th April, 2011) +% VERSION NUMBER: 3.01 (6th April, 2011) % % REFERENCES: % Culkin and Smith, 1980: Determination of the Concentration of Potassium diff --git a/Toolbox/gsw_SA_CT_plot.m b/Toolbox/gsw_SA_CT_plot.m index 853e61d..75d1731 100644 --- a/Toolbox/gsw_SA_CT_plot.m +++ b/Toolbox/gsw_SA_CT_plot.m @@ -40,14 +40,14 @@ function gsw_SA_CT_plot(SA,CT,p_ref,isopycs,title_string) % isopycs can be either 1x1 or 1xN or Mx1 % % AUTHOR: -% Rich Pawlowicz [ help_gsw@csiro.au ] +% Rich Pawlowicz [ help@teos-10.org ] % Note. This function was extracted and adapted from Rich Pawlowicz's % ocean toolbox. % % MODIFIED: % Paul Barker & Trevor McDougall % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (6th March, 2012) % % REFERENCES: % McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2011: A @@ -68,12 +68,27 @@ function gsw_SA_CT_plot(SA,CT,p_ref,isopycs,title_string) isopycs = 5; end +if ischar(p_ref) == 1 + title_string = p_ref; + p_ref = 0; + isopycs = 5; +end + if ~isscalar(unique(p_ref)) error('gsw_SA_CT_plot: Multiple reference pressures'); else p_ref = unique(p_ref); end +if ~exist('isopycs','var'), + isopycs = 5; +end + +if ischar(isopycs) == 1 + title_string = isopycs; + isopycs = 5; +end + isopycs = isopycs(:); min_SA_data = min(min(SA(:))); max_SA_data = max(max(SA(:))); @@ -103,7 +118,7 @@ function gsw_SA_CT_plot(SA,CT,p_ref,isopycs,title_string) [c1,h] = contour(SA_gridded,CT_gridded,isopycs_gridded,isopycs,':','Color',[.5 .5 .5]); end hold on; -[c2] = plot(SA(:,1),CT(:,1),'k.','linewidth',2); +[c2] = plot(SA,CT,'.','linewidth',2); if exist('c1','var') clabel(c1,h,'labelspacing',360,'fontsize',8,'color',[.5 .5 .5]); diff --git a/Toolbox/gsw_SA_Sstar_from_SP.m b/Toolbox/gsw_SA_Sstar_from_SP.m index 7fdabda..2e1e964 100644 --- a/Toolbox/gsw_SA_Sstar_from_SP.m +++ b/Toolbox/gsw_SA_Sstar_from_SP.m @@ -36,7 +36,7 @@ % AUTHOR: % Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (11th November, 2011) +% VERSION NUMBER: 3.01 (11th November, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SA_from_SP.m b/Toolbox/gsw_SA_from_SP.m index a8aee59..79149ca 100644 --- a/Toolbox/gsw_SA_from_SP.m +++ b/Toolbox/gsw_SA_from_SP.m @@ -33,7 +33,7 @@ % AUTHOR: % David Jackett, Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (31st May, 2011) +% VERSION NUMBER: 3.01 (31st May, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SA_from_Sstar.m b/Toolbox/gsw_SA_from_Sstar.m index 33e8b11..34bd9d8 100644 --- a/Toolbox/gsw_SA_from_Sstar.m +++ b/Toolbox/gsw_SA_from_Sstar.m @@ -29,9 +29,9 @@ % hundred kilometres inland from the coast. % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (27th March, 2011) +% VERSION NUMBER: 3.01 (27th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SA_from_rho.m b/Toolbox/gsw_SA_from_rho.m index a143461..d016545 100644 --- a/Toolbox/gsw_SA_from_rho.m +++ b/Toolbox/gsw_SA_from_rho.m @@ -35,9 +35,9 @@ % Scale of Millero et al. (2008). % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (4th April, 2011) +% VERSION NUMBER: 3.01 (4th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SA_from_rho_CT.m b/Toolbox/gsw_SA_from_rho_CT.m index 2a0a09d..9a15121 100644 --- a/Toolbox/gsw_SA_from_rho_CT.m +++ b/Toolbox/gsw_SA_from_rho_CT.m @@ -41,9 +41,9 @@ % Scale of Millero et al. (2008). % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (4th April, 2011) +% VERSION NUMBER: 3.01 (4th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SA_from_rho_t_exact.m b/Toolbox/gsw_SA_from_rho_t_exact.m index ed1085f..95fbecf 100644 --- a/Toolbox/gsw_SA_from_rho_t_exact.m +++ b/Toolbox/gsw_SA_from_rho_t_exact.m @@ -27,9 +27,9 @@ % Scale of Millero et al. (2008). % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (28th March, 2011) +% VERSION NUMBER: 3.01 (28th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SK_from_SP.m b/Toolbox/gsw_SK_from_SP.m new file mode 100644 index 0000000..3289693 --- /dev/null +++ b/Toolbox/gsw_SK_from_SP.m @@ -0,0 +1,54 @@ +function SK = gsw_SK_from_SP(SP) + +% gsw_SK_from_SP Knudsen Salinity from Practical Salinity +%========================================================================== +% +% USAGE: +% SK = gsw_SK_from_SP(SP) +% +% DESCRIPTION: +% Calculates Knudsen Salinity from Practical Salinity. +% +% INPUT: +% SP = Practical Salinity (PSS-78) [ unitless ] +% +% OUTPUT: +% SK = Knudsen Salinity [parts per thousand, ppt] +% +% AUTHOR: +% Trevor McDougall and Paul Barker [ help@teos-10.org ] +% +% VERSION NUMBER: 3.01 (16th November, 2011) +% +% REFERENCES: +% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of +% seawater - 2010: Calculation and use of thermodynamic properties. +% Intergovernmental Oceanographic Commission, Manuals and Guides No. 56, +% UNESCO (English), 196 pp. Available from http://www.TEOS-10.org +% See Appendix A.3 of this TEOS-10 Manual. +% +% The software is available from http://www.TEOS-10.org +% +%========================================================================== + +%-------------------------------------------------------------------------- +% Check variables +%-------------------------------------------------------------------------- + +if ~(nargin == 1) + error('gsw_SK_from_SP: Requires only one input') +end %if + +%-------------------------------------------------------------------------- +% Start of the calculation +%-------------------------------------------------------------------------- + +% These few lines ensure that SP is non-negative. +[I_neg_SP] = find(SP < 0); +if ~isempty(I_neg_SP) + SP(I_neg_SP) = 0; +end + +SK = 0.03 + SP.*(1.805/1.80655); + +end diff --git a/Toolbox/gsw_SP_from_C.m b/Toolbox/gsw_SP_from_C.m index 04541e7..961b042 100644 --- a/Toolbox/gsw_SP_from_C.m +++ b/Toolbox/gsw_SP_from_C.m @@ -29,9 +29,9 @@ % SP = Practical Salinity on the PSS-78 scale [ unitless ] % % AUTHOR: -% Paul Barker, Trevor McDougall and Rich Pawlowicz [ help_gsw@csiro.au ] +% Paul Barker, Trevor McDougall and Rich Pawlowicz [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (1st April, 2010) +% VERSION NUMBER: 3.01 (1st April, 2010) % % REFERENCES: % Culkin and Smith, 1980: Determination of the Concentration of Potassium diff --git a/Toolbox/gsw_SP_from_R.m b/Toolbox/gsw_SP_from_R.m index f264823..104c0c1 100644 --- a/Toolbox/gsw_SP_from_R.m +++ b/Toolbox/gsw_SP_from_R.m @@ -28,9 +28,9 @@ % SP = Practical Salinity on the PSS-78 scale [ unitless ] % % AUTHOR: -% Paul Barker, Trevor McDougall and Rich Pawlowicz [ help_gsw@csiro.au ] +% Paul Barker, Trevor McDougall and Rich Pawlowicz [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (1st April, 2011) +% VERSION NUMBER: 3.01 (1st April, 2011) % % REFERENCES: % Hill, K.D., T.M. Dauphinee & D.J. Woods, 1986: The extension of the diff --git a/Toolbox/gsw_SP_from_SK.m b/Toolbox/gsw_SP_from_SK.m new file mode 100644 index 0000000..e348aa3 --- /dev/null +++ b/Toolbox/gsw_SP_from_SK.m @@ -0,0 +1,54 @@ +function SP = gsw_SP_from_SK(SK) + +% gsw_SP_from_SK Practical Salinity from Knudsen Salinity +%========================================================================== +% +% USAGE: +% SP = gsw_SP_from_SK(SK) +% +% DESCRIPTION: +% Calculates Practical Salinity from Knudsen Salinity. +% +% INPUT: +% SK = Knudsen Salinity [parts per thousand, ppt] +% +% OUTPUT: +% SP = Practical Salinity (PSS-78) [ unitless ] +% +% AUTHOR: +% Trevor McDougall and Paul Barker [ help@teos-10.org ] +% +% VERSION NUMBER: 3.01 (16th November, 2011) +% +% REFERENCES: +% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of +% seawater - 2010: Calculation and use of thermodynamic properties. +% Intergovernmental Oceanographic Commission, Manuals and Guides No. 56, +% UNESCO (English), 196 pp. Available from http://www.TEOS-10.org +% See Appendix A.3 of this TEOS-10 Manual. +% +% The software is available from http://www.TEOS-10.org +% +%========================================================================== + +%-------------------------------------------------------------------------- +% Check variables +%-------------------------------------------------------------------------- + +if ~(nargin == 1) + error('gsw_SP_from_SK: Requires only one input') +end %if + +%-------------------------------------------------------------------------- +% Start of the calculation +%-------------------------------------------------------------------------- + +SP = (SK - 0.03).*(1.80655/1.805); + +% These few lines ensure that SP is non-negative. +[I_neg_SP] = find(SP < 0); +if ~isempty(I_neg_SP) + SP(I_neg_SP) = 0; +end + +end diff --git a/Toolbox/gsw_SP_from_SR.m b/Toolbox/gsw_SP_from_SR.m index 2eb755b..4b4e078 100644 --- a/Toolbox/gsw_SP_from_SR.m +++ b/Toolbox/gsw_SP_from_SR.m @@ -16,9 +16,9 @@ % SP = Practical Salinity (PSS-78) [ unitless ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (27th March, 2011) +% VERSION NUMBER: 3.01 (27th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SP_from_Sstar.m b/Toolbox/gsw_SP_from_Sstar.m index 1387829..4725632 100644 --- a/Toolbox/gsw_SP_from_Sstar.m +++ b/Toolbox/gsw_SP_from_Sstar.m @@ -29,9 +29,9 @@ % hundred kilometres inland from the coast. % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (27th March, 2011) +% VERSION NUMBER: 3.01 (27th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SP_salinometer.m b/Toolbox/gsw_SP_salinometer.m index e6c0b48..26a1684 100644 --- a/Toolbox/gsw_SP_salinometer.m +++ b/Toolbox/gsw_SP_salinometer.m @@ -30,9 +30,9 @@ % t may have dimensions 1x1 or Mx1 or 1xN or MxN, where Rt is MxN. % % AUTHOR: -% Paul Barker, Trevor McDougall and Rich Pawlowicz [ help_gsw@csiro.au ] +% Paul Barker, Trevor McDougall and Rich Pawlowicz [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (30th March, 2011) +% VERSION NUMBER: 3.01 (30th March, 2011) % % REFERENCES: % Fofonoff, P. and R.C. Millard Jr. 1983: Algorithms for computation of diff --git a/Toolbox/gsw_SR_from_SP.m b/Toolbox/gsw_SR_from_SP.m index 79d958f..bd307a9 100644 --- a/Toolbox/gsw_SR_from_SP.m +++ b/Toolbox/gsw_SR_from_SP.m @@ -16,9 +16,9 @@ % SR = Reference Salinity [ g/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (27th March, 2011) +% VERSION NUMBER: 3.01 (27th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SSO.m b/Toolbox/gsw_SSO.m index 5cd56e5..15e6df7 100644 --- a/Toolbox/gsw_SSO.m +++ b/Toolbox/gsw_SSO.m @@ -18,9 +18,9 @@ % SSO = Standard Ocean Reference Salinity. [ g/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_SonCl.m b/Toolbox/gsw_SonCl.m index d48ee2a..f28e0c7 100644 --- a/Toolbox/gsw_SonCl.m +++ b/Toolbox/gsw_SonCl.m @@ -18,9 +18,9 @@ % SonCl = SP to Chlorinity ratio [ (g/kg)^-1 ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % Millero, F. J., R. Feistel, D. G. Wright, and T. J. McDougall, 2008: diff --git a/Toolbox/gsw_Sstar_from_SA.m b/Toolbox/gsw_Sstar_from_SA.m index 86b3b67..41f5c9b 100644 --- a/Toolbox/gsw_Sstar_from_SA.m +++ b/Toolbox/gsw_Sstar_from_SA.m @@ -29,9 +29,9 @@ % hundred kilometres inland from the coast. % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (27th March, 2011) +% VERSION NUMBER: 3.01 (27th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_Sstar_from_SP.m b/Toolbox/gsw_Sstar_from_SP.m index e8db1ca..b69232e 100644 --- a/Toolbox/gsw_Sstar_from_SP.m +++ b/Toolbox/gsw_Sstar_from_SP.m @@ -33,7 +33,7 @@ % AUTHOR: % David Jackett, Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (27th March, 2011) +% VERSION NUMBER: 3.01 (27th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_T0.m b/Toolbox/gsw_T0.m index 9e90c52..4ce7814 100644 --- a/Toolbox/gsw_T0.m +++ b/Toolbox/gsw_T0.m @@ -14,9 +14,9 @@ % T0 = the Celcius zero point. [ K ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_Turner_Rsubrho.m b/Toolbox/gsw_Turner_Rsubrho.m index 89487ef..6887147 100644 --- a/Toolbox/gsw_Turner_Rsubrho.m +++ b/Toolbox/gsw_Turner_Rsubrho.m @@ -45,9 +45,9 @@ % p_mid has units of: [ dbar ] % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011) +% VERSION NUMBER: 3.01 (26th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_adiabatic_lapse_rate_t_exact.m b/Toolbox/gsw_adiabatic_lapse_rate_t_exact.m index b4434da..1b8ce26 100644 --- a/Toolbox/gsw_adiabatic_lapse_rate_t_exact.m +++ b/Toolbox/gsw_adiabatic_lapse_rate_t_exact.m @@ -24,9 +24,9 @@ % (or equivilently K/Pa) not in units of K/dbar. % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_alpha.m b/Toolbox/gsw_alpha.m index 94ef948..2188e6a 100644 --- a/Toolbox/gsw_alpha.m +++ b/Toolbox/gsw_alpha.m @@ -32,9 +32,9 @@ % with respect to Conservative Temperature % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_alpha_CT.m b/Toolbox/gsw_alpha_CT.m index f81e52b..a3bf7ad 100644 --- a/Toolbox/gsw_alpha_CT.m +++ b/Toolbox/gsw_alpha_CT.m @@ -38,9 +38,9 @@ % with respect to Conservative Temperature % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_alpha_CT_exact.m b/Toolbox/gsw_alpha_CT_exact.m index 7359f58..82e3621 100644 --- a/Toolbox/gsw_alpha_CT_exact.m +++ b/Toolbox/gsw_alpha_CT_exact.m @@ -31,9 +31,9 @@ % with respect to Conservative Temperature % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_alpha_wrt_CT_t_exact.m b/Toolbox/gsw_alpha_wrt_CT_t_exact.m index ad83cc9..b14bc44 100644 --- a/Toolbox/gsw_alpha_wrt_CT_t_exact.m +++ b/Toolbox/gsw_alpha_wrt_CT_t_exact.m @@ -25,9 +25,9 @@ % with respect to Conservative Temperature % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_alpha_wrt_pt_t_exact.m b/Toolbox/gsw_alpha_wrt_pt_t_exact.m index f434141..29296ad 100644 --- a/Toolbox/gsw_alpha_wrt_pt_t_exact.m +++ b/Toolbox/gsw_alpha_wrt_pt_t_exact.m @@ -26,9 +26,9 @@ % with a reference pressure of zero dbar. % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_alpha_wrt_t_exact.m b/Toolbox/gsw_alpha_wrt_t_exact.m index 0ca59a5..c2104e4 100644 --- a/Toolbox/gsw_alpha_wrt_t_exact.m +++ b/Toolbox/gsw_alpha_wrt_t_exact.m @@ -25,9 +25,9 @@ % with respect to in-situ temperature % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_atomic_weight.m b/Toolbox/gsw_atomic_weight.m index ba10e59..6c01510 100644 --- a/Toolbox/gsw_atomic_weight.m +++ b/Toolbox/gsw_atomic_weight.m @@ -17,9 +17,9 @@ % Composition [ g/mol ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_beta.m b/Toolbox/gsw_beta.m index 4fe118c..381a1f4 100644 --- a/Toolbox/gsw_beta.m +++ b/Toolbox/gsw_beta.m @@ -33,9 +33,9 @@ % at constant Conservative Temperature % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2010) +% VERSION NUMBER: 3.01 (23rd March, 2010) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_beta_CT.m b/Toolbox/gsw_beta_CT.m index 514979f..25e1229 100644 --- a/Toolbox/gsw_beta_CT.m +++ b/Toolbox/gsw_beta_CT.m @@ -39,9 +39,9 @@ % at constant Conservative Temperature % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2010) +% VERSION NUMBER: 3.01 (23rd March, 2010) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_beta_CT_exact.m b/Toolbox/gsw_beta_CT_exact.m index d194ae0..c65f1f2 100644 --- a/Toolbox/gsw_beta_CT_exact.m +++ b/Toolbox/gsw_beta_CT_exact.m @@ -30,9 +30,9 @@ % at constant Conservative Temperature % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2010) +% VERSION NUMBER: 3.01 (23rd March, 2010) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_beta_const_CT_t_exact.m b/Toolbox/gsw_beta_const_CT_t_exact.m index f2264c9..ed700c9 100644 --- a/Toolbox/gsw_beta_const_CT_t_exact.m +++ b/Toolbox/gsw_beta_const_CT_t_exact.m @@ -25,9 +25,9 @@ % at constant Conservative Temperature % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (10th April 2011) +% VERSION NUMBER: 3.01 (10th April 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_beta_const_pt_t_exact.m b/Toolbox/gsw_beta_const_pt_t_exact.m index df8b7ba..7855564 100644 --- a/Toolbox/gsw_beta_const_pt_t_exact.m +++ b/Toolbox/gsw_beta_const_pt_t_exact.m @@ -26,9 +26,9 @@ % and with a reference pressure of 0 dbar. % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (10th April 2011) +% VERSION NUMBER: 3.01 (10th April 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_beta_const_t_exact.m b/Toolbox/gsw_beta_const_t_exact.m index fd8484b..ef7e80a 100644 --- a/Toolbox/gsw_beta_const_t_exact.m +++ b/Toolbox/gsw_beta_const_t_exact.m @@ -25,9 +25,9 @@ % at constant in-situ temperature % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_brineSA_CT.m b/Toolbox/gsw_brineSA_CT.m index 1153153..60994fb 100644 --- a/Toolbox/gsw_brineSA_CT.m +++ b/Toolbox/gsw_brineSA_CT.m @@ -34,9 +34,9 @@ % pressure and air saturation fraction. [ g/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (28th March, 2011) +% VERSION NUMBER: 3.01 (28th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_brineSA_t.m b/Toolbox/gsw_brineSA_t.m index 0c9b402..366ca10 100644 --- a/Toolbox/gsw_brineSA_t.m +++ b/Toolbox/gsw_brineSA_t.m @@ -34,9 +34,9 @@ % air saturation fraction. [ g/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (28th March, 2011) +% VERSION NUMBER: 3.01 (28th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_cabbeling.m b/Toolbox/gsw_cabbeling.m index ba92d51..5556c2f 100644 --- a/Toolbox/gsw_cabbeling.m +++ b/Toolbox/gsw_cabbeling.m @@ -33,9 +33,9 @@ % Conservative Temperature. % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_check_functions.m b/Toolbox/gsw_check_functions.m index cc5582c..10c8e5d 100644 --- a/Toolbox/gsw_check_functions.m +++ b/Toolbox/gsw_check_functions.m @@ -1,24 +1,15 @@ if isempty(which('gsw_gibbs.html')) - try - cprintf('err','You need to add the GSW "html" subdirectory to your path.\n') - catch - fprintf(2,'You need to add the GSW "html" subdirectory to your path. \n'); - end + fprintf(2,'You need to add the GSW "html" subdirectory to your path. \n'); end + if isempty(which('gsw_gibbs.m')) - try - cprintf('err','You need to add the GSW "library" subdirectory to your path.\n') - catch - fprintf(2,'You need to add the GSW "library" subdirectory to your path. \n'); - end + fprintf(2,'You need to add the GSW "library" subdirectory to your path. \n'); end + if isempty(which('gibbs.pdf')) - try - cprintf('err','You need to add the GSW "pdf" subdirectory to your path.\n') - catch - fprintf(2,'You need to add the GSW "pdf" subdirectory to your path. \n'); - end + fprintf(2,'You need to add the GSW "pdf" subdirectory to your path. \n'); end + if isempty(which('gsw_gibbs.html')) | isempty(which('gsw_gibbs.m'))| isempty(which('gibbs.pdf')) error('You have not added the GSW subdirectories to you MATLAB Path') end @@ -35,26 +26,15 @@ gsw_ver -try - cprintf('text',' \n'); - cprintf('strings','This function is running three stored vertical profiles through\n'); - cprintf('strings','all the functions in the GSW Oceanographic Toolbox, and then checks\n'); - cprintf('strings','that the outputs are all within pre-defined limits of the correct\n'); - cprintf('strings','answers. These pre-defined limits are a factor of approximately\n'); - cprintf('strings','a hundred larger than the errors expected from numerical round-off.\n'); - cprintf('text',' \n'); - cprintf('text',' checking '); -catch - fprintf(1,' \n'); - fprintf(1,'This function is running three stored vertical profiles through\n'); - fprintf(1,'all the functions in the GSW Oceanographic Toolbox, and then checks\n'); - fprintf(1,'that the outputs are all within pre-defined limits of the correct\n'); - fprintf(1,'answers. These pre-defined limits are a factor of approximately\n'); - fprintf(1,'a hundred larger than the errors expected from numerical round-off.\n'); - fprintf(1,' \n'); - fprintf(1,' checking '); -end - +fprintf(1,' \n'); +fprintf(1,'This function is running three stored vertical profiles through\n'); +fprintf(1,'all the functions in the GSW Oceanographic Toolbox, and then checks\n'); +fprintf(1,'that the outputs are all within pre-defined limits of the correct\n'); +fprintf(1,'answers. These pre-defined limits are a factor of approximately\n'); +fprintf(1,'a hundred larger than the errors expected from numerical round-off.\n'); +fprintf(1,' \n'); +fprintf(1,' checking '); + gsw_cf.gsw_chks = 1; %% Practical Salinity (SP):- PSS-78 @@ -62,55 +42,35 @@ gsw_cf.C = gsw_C_from_SP(gsw_cv.SP_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.IC_from_SP] = find(abs(gsw_cv.C_from_SP - gsw_cf.C) >= gsw_cv.C_from_SP_ca); if ~isempty(gsw_cf.IC_from_SP) - try - cprintf('err','gsw_C_from_SP: Failed\n'); - catch - fprintf(2,'gsw_C_from_SP: Failed\n'); - end + fprintf(2,'gsw_C_from_SP: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SP_from_C = gsw_SP_from_C(gsw_cf.C,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ISP_from_C] = find(abs(gsw_cv.SP_from_C - gsw_cf.SP_from_C) >= gsw_cv.SP_from_C_ca); if ~isempty(gsw_cf.ISP_from_C) - try - cprintf('err','gsw_SP_from_C: Failed\n'); - catch - fprintf(2,'gsw_SP_from_C: Failed\n'); - end + fprintf(2,'gsw_SP_from_C: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.R = gsw_R_from_SP(gsw_cv.SP_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.IR_from_SP] = find(abs(gsw_cv.R_from_SP - gsw_cf.R) >= gsw_cv.R_from_SP_ca); if ~isempty(gsw_cf.IR_from_SP) - try - cprintf('err','gsw_R_from_SP: Failed\n'); - catch - fprintf(2,'gsw_R_from_SP: Failed\n'); - end + fprintf(2,'gsw_R_from_SP: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SP_from_R = gsw_SP_from_R(gsw_cf.R,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ISP_from_R] = find(abs(gsw_cv.SP_from_R - gsw_cf.SP_from_R) >= gsw_cv.SP_from_R_ca); if ~isempty(gsw_cf.ISP_from_R) - try - cprintf('err','gsw_SP_from_R: Failed\n'); - catch fprintf(2,'gsw_SP_from_R: Failed\n'); - end gsw_chks = 0; end gsw_cf.SP_salinometer = gsw_SP_salinometer(gsw_cv.Rt_chck_cast,gsw_cv.t_chck_cast); [gsw_cf.ISP_salinometer] = find(abs(gsw_cv.SP_salinometer - gsw_cf.SP_salinometer) >= gsw_cv.SP_salinometer_ca); if ~isempty(gsw_cf.ISP_salinometer) - try - cprintf('err','gsw_SP_salinometer: Failed\n'); - catch - fprintf(2,'gsw_SP_salinometer: Failed\n'); - end + fprintf(2,'gsw_SP_salinometer: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -119,33 +79,21 @@ gsw_cf.SA_from_SP = gsw_SA_from_SP(gsw_cv.SP_chck_cast,gsw_cv.p_chck_cast,gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.ISA_from_SP] = find(abs(gsw_cv.SA_from_SP - gsw_cf.SA_from_SP) >= gsw_cv.SA_from_SP_ca); if ~isempty(gsw_cf.ISA_from_SP) - try - cprintf('err','gsw_SA_from_SP: Failed. Note that this will cause many other programmes in the GSW toolbox to fail.\n'); - catch - fprintf(2,'gsw_SA_from_SP: Failed. Note that this will cause many other programmes in the GSW toolbox to fail.\n'); - end + fprintf(2,'gsw_SA_from_SP: Failed. Note that this will cause many other programmes in the GSW toolbox to fail.\n'); gsw_cf.gsw_chks = 0; end gsw_cf.Sstar_from_SP = gsw_Sstar_from_SP(gsw_cv.SP_chck_cast,gsw_cv.p_chck_cast,gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.ISstar_from_SP] = find(abs(gsw_cv.Sstar_from_SP - gsw_cf.Sstar_from_SP) >= gsw_cv.Sstar_from_SP_ca); if ~isempty(gsw_cf.ISstar_from_SP) - try - cprintf('err','gsw_Sstar_from_SP: Failed\n'); - catch - fprintf(2,'gsw_Sstar_from_SP: Failed\n'); - end + fprintf(2,'gsw_Sstar_from_SP: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.CT_chck_cast = gsw_CT_from_t(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ICT_from_t] = find(abs(gsw_cv.CT_from_t - gsw_cf.CT_chck_cast) >= gsw_cv.CT_from_t_ca); if ~isempty(gsw_cf.ICT_from_t) - try - cprintf('err','gsw_CT_from_t: Failed. Note that this will cause many other programmes in the GSW toolbox to fail.\n'); - catch - fprintf(2,'gsw_CT_from_t: Failed. Note that this will cause many other programmes in the GSW toolbox to fail.\n'); - end + fprintf(2,'gsw_CT_from_t: Failed. Note that this will cause many other programmes in the GSW toolbox to fail.\n'); gsw_cf.gsw_chks = 0; end @@ -154,11 +102,7 @@ gsw_cf.deltaSA_from_SP = gsw_deltaSA_from_SP(gsw_cv.SP_chck_cast,gsw_cv.p_chck_cast,gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.IdeltaSA_from_SP] = find(abs(gsw_cv.deltaSA_from_SP - gsw_cf.deltaSA_from_SP) >= gsw_cv.deltaSA_from_SP_ca); if ~isempty(gsw_cf.IdeltaSA_from_SP) - try - cprintf('err','gsw_deltaSA_from_SP: Failed\n'); - catch - fprintf(2,'gsw_deltaSA_from_SP: Failed\n'); - end + fprintf(2,'gsw_deltaSA_from_SP: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -166,347 +110,219 @@ [gsw_cf.ISA_Sstar_from_SP] = find(abs(gsw_cv.SA_SA_Sstar_from_SP - gsw_cf.SA_SA_Sstar_from_SP) >= gsw_cv.SA_SA_Sstar_from_SP_ca | ... abs(gsw_cv.Sstar_SA_Sstar_from_SP - gsw_cf.Sstar_SA_Sstar_from_SP) >= gsw_cv.Sstar_SA_Sstar_from_SP_ca); if ~isempty(gsw_cf.ISA_Sstar_from_SP) - try - cprintf('err','gsw_SA_Sstar_from_SP: Failed\n'); - catch - fprintf(2,'gsw_SA_Sstar_from_SP: Failed\n'); - end + fprintf(2,'gsw_SA_Sstar_from_SP: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SR_from_SP = gsw_SR_from_SP(gsw_cv.SP_chck_cast); [gsw_cf.ISR_from_SP] = find(abs(gsw_cv.SR_from_SP - gsw_cf.SR_from_SP) >= gsw_cv.SR_from_SP_ca); if ~isempty(gsw_cf.ISR_from_SP) - try - cprintf('err','gsw_SR_from_SP: Failed\n'); - catch - fprintf(2,'gsw_SR_from_SP: Failed\n'); - end + fprintf(2,'gsw_SR_from_SP: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SP_from_SR = gsw_SP_from_SR(gsw_cf.SR_from_SP); [gsw_cf.ISP_from_SR] = find(abs(gsw_cv.SP_from_SR - gsw_cf.SP_from_SR) >= gsw_cv.SP_from_SR_ca); if ~isempty(gsw_cf.ISP_from_SR) - try - cprintf('err','gsw_SP_from_SR: Failed\n'); - catch - fprintf(2,'gsw_SP_from_SR: Failed\n'); - end + fprintf(2,'gsw_SP_from_SR: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SP_from_SA = gsw_SP_from_SA(gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast,gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.ISP_from_SA] = find(abs(gsw_cv.SP_chck_cast - gsw_cf.SP_from_SA) >= gsw_cv.SP_from_SA_ca); if ~isempty(gsw_cf.ISP_from_SA) - try - cprintf('err','gsw_SP_from_SA: Failed\n'); - catch - fprintf(2,'gsw_SP_from_SA: Failed\n'); - end + fprintf(2,'gsw_SP_from_SA: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.Sstar_from_SA = gsw_Sstar_from_SA(gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast,gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.ISstar_from_SA] = find(abs(gsw_cv.Sstar_from_SA - gsw_cf.Sstar_from_SA) >= gsw_cv.Sstar_from_SA_ca); if ~isempty(gsw_cf.ISstar_from_SA) - try - cprintf('err','gsw_Sstar_from_SA: Failed\n'); - catch - fprintf(2,'gsw_Sstar_from_SA: Failed\n'); - end + fprintf(2,'gsw_Sstar_from_SA: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SA_from_Sstar = gsw_SA_from_Sstar(gsw_cf.Sstar_from_SA,gsw_cv.p_chck_cast,gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.ISA_from_Sstar] = find(abs(gsw_cv.SA_from_Sstar - gsw_cf.SA_from_Sstar) >= gsw_cv.SA_from_Sstar_ca); if ~isempty(gsw_cf.ISA_from_Sstar) - try - cprintf('err','gsw_SA_from_Sstar: Failed\n'); - catch - fprintf(2,'gsw_SA_from_Sstar: Failed\n'); - end + fprintf(2,'gsw_SA_from_Sstar: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SP_from_Sstar = gsw_SP_from_Sstar(gsw_cf.Sstar_from_SA,gsw_cv.p_chck_cast,gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.ISP_from_Sstar] = find(abs(gsw_cv.SP_from_Sstar - gsw_cf.SP_from_Sstar) >= gsw_cv.SP_from_Sstar_ca); if ~isempty(gsw_cf.ISP_from_Sstar) - try - cprintf('err','gsw_SP_from_Sstar: Failed\n'); - catch - fprintf(2,'gsw_SP_from_Sstar: Failed\n'); - end + fprintf(2,'gsw_SP_from_Sstar: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.t_from_CT = gsw_t_from_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.It_from_CT] = find(abs(gsw_cv.t_chck_cast - gsw_cf.t_from_CT) >= gsw_cv.t_from_CT_ca); if ~isempty(gsw_cf.It_from_CT) - try - cprintf('err','gsw_t_from_CT: Failed.\n'); - catch - fprintf(2,'gsw_t_from_CT: Failed.\n'); - end + fprintf(2,'gsw_t_from_CT: Failed.\n'); gsw_cf.gsw_chks = 0; end gsw_cf.pt = gsw_pt_from_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Ipt_from_CT] = find(abs(gsw_cv.pt_from_CT - gsw_cf.pt) >= gsw_cv.pt_from_CT_ca); if ~isempty(gsw_cf.Ipt_from_CT) - try - cprintf('err','gsw_pt_from_CT: Failed\n'); - catch - fprintf(2,'gsw_pt_from_CT: Failed\n'); - end + fprintf(2,'gsw_pt_from_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.CT_from_pt = gsw_CT_from_pt(gsw_cv.SA_chck_cast,gsw_cf.pt); [gsw_cf.ICT_from_pt] = find(abs(gsw_cv.CT_from_pt - gsw_cf.CT_from_pt) >= gsw_cv.CT_from_pt_ca); if ~isempty(gsw_cf.ICT_from_pt) - try - cprintf('err','gsw_CT_from_pt: Failed\n'); - catch - fprintf(2,'gsw_CT_from_pt: Failed\n'); - end + fprintf(2,'gsw_CT_from_pt: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.pot_enthalpy_from_pt = gsw_pot_enthalpy_from_pt(gsw_cv.SA_chck_cast,gsw_cf.pt); [gsw_cf.Ipot_enthalpy] = find(abs(gsw_cv.pot_enthalpy_from_pt - gsw_cf.pot_enthalpy_from_pt) >= gsw_cv.pot_enthalpy_from_pt_ca); if ~isempty(gsw_cf.Ipot_enthalpy) - try - cprintf('err','gsw_pot_enthalpy_from_pt: Failed\n'); - catch - fprintf(2,'gsw_pot_enthalpy_from_pt: Failed\n'); - end + fprintf(2,'gsw_pot_enthalpy_from_pt: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.pt0_from_t = gsw_pt0_from_t(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ipt0] = find(abs(gsw_cv.pt0_from_t - gsw_cf.pt0_from_t) >= gsw_cv.pt0_from_t_ca); if ~isempty(gsw_cf.Ipt0) - try - cprintf('err','gsw_pt0_from_t: Failed\n'); - catch - fprintf(2,'gsw_pt0_from_t: Failed\n'); - end + fprintf(2,'gsw_pt0_from_t: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.pt_from_t = gsw_pt_from_t(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast,gsw_cv.pr); [gsw_cf.Ipt_from_t] = find(abs(gsw_cv.pt_from_t - gsw_cf.pt_from_t) >= gsw_cv.pt_from_t_ca); if ~isempty(gsw_cf.Ipt_from_t) - try - cprintf('err','gsw_pt_from_t: Failed\n'); - catch - fprintf(2,'gsw_pt_from_t: Failed\n'); - end + fprintf(2,'gsw_pt_from_t: Failed\n'); gsw_cf.gsw_chks = 0; end if gsw_cf.gsw_chks == 1 ; - try - cprintf('text','.'); - catch - fprintf(1,'.'); - end + fprintf(1,'.'); end gsw_cf.t90_from_t48 = gsw_t90_from_t48(gsw_cv.t_chck_cast); [gsw_cf.It90_from_t48] = find(abs(gsw_cv.t90_from_t48 - gsw_cf.t90_from_t48) >= gsw_cv.t90_from_t48_ca); if ~isempty(gsw_cf.It90_from_t48) - try - cprintf('err','gsw_t90_from_t48: Failed\n'); - catch - fprintf(2,'gsw_t90_from_t48: Failed\n'); - end + fprintf(2,'gsw_t90_from_t48: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.t90_from_t68 = gsw_t90_from_t68(gsw_cv.t_chck_cast); [gsw_cf.It90_from_t68] = find(abs(gsw_cv.t90_from_t68 - gsw_cf.t90_from_t68) >= gsw_cv.t90_from_t68_ca); if ~isempty(gsw_cf.It90_from_t68) - try - cprintf('err','gsw_t90_from_t68: Failed\n'); - catch - fprintf(2,'gsw_t90_from_t68: Failed\n'); - end + fprintf(2,'gsw_t90_from_t68: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.z_from_p = gsw_z_from_p(gsw_cv.p_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.Iz_from_p] = find(abs(gsw_cv.z_from_p - gsw_cf.z_from_p) >= gsw_cv.z_from_p_ca); if ~isempty(gsw_cf.Iz_from_p) - try - cprintf('err','gsw_z_from_p: Failed\n'); - catch - fprintf(2,'gsw_z_from_p: Failed\n'); - end + fprintf(2,'gsw_z_from_p: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.p_from_z = gsw_p_from_z(gsw_cf.z_from_p,gsw_cv.lat_chck_cast); [gsw_cf.Ip_from_z] = find(abs(gsw_cv.p_from_z - gsw_cf.p_from_z) >= gsw_cv.p_from_z_ca); if ~isempty(gsw_cf.Ip_from_z) - try - cprintf('err','gsw_p_from_z: Failed\n'); - catch - fprintf(2,'gsw_p_from_z: Failed\n'); - end + fprintf(2,'gsw_p_from_z: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.depth_from_z = gsw_depth_from_z(gsw_cf.z_from_p); [gsw_cf.Idepth_from_z] = find(abs(gsw_cv.depth_from_z - gsw_cf.depth_from_z) >= gsw_cv.depth_from_z_ca); if ~isempty(gsw_cf.Idepth_from_z) - try - cprintf('err','gsw_depth_from_z: Failed\n'); - catch - fprintf(2,'gsw_depth_from_z: Failed\n'); - end + fprintf(2,'gsw_depth_from_z: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.z_from_depth = gsw_z_from_depth(gsw_cf.depth_from_z); [gsw_cf.Iz_from_depth] = find(abs(gsw_cv.z_from_depth - gsw_cf.z_from_depth) >= gsw_cv.z_from_depth_ca); if ~isempty(gsw_cf.Iz_from_depth) - try - cprintf('err','gsw_z_from_depth: Failed\n'); - catch - fprintf(2,'gsw_z_from_depth: Failed\n'); - end + fprintf(2,'gsw_z_from_depth: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.Abs_Pressure_from_p = gsw_Abs_Pressure_from_p(gsw_cv.p_chck_cast); [gsw_cf.IAbs_Pressure_from_p] = find(abs(gsw_cv.Abs_Pressure_from_p - gsw_cf.Abs_Pressure_from_p) >= gsw_cv.Abs_Pressure_from_p_ca); if ~isempty(gsw_cf.IAbs_Pressure_from_p) - try - cprintf('err','gsw_Abs_Pressure_from_p: Failed\n'); - catch - fprintf(2,'gsw_Abs_Pressure_from_p: Failed\n'); - end + fprintf(2,'gsw_Abs_Pressure_from_p: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.p_from_Abs_Pressure = gsw_p_from_Abs_Pressure(gsw_cf.Abs_Pressure_from_p); [gsw_cf.Ip_from_Abs_Pressure] = find(abs(gsw_cv.p_from_Abs_Pressure - gsw_cf.p_from_Abs_Pressure) >= gsw_cv.p_from_Abs_Pressure_ca); if ~isempty(gsw_cf.Ip_from_Abs_Pressure) - try - cprintf('err','gsw_p_from_Abs_Pressure: Failed\n'); - catch - fprintf(2,'gsw_p_from_Abs_Pressure: Failed\n'); - end + fprintf(2,'gsw_p_from_Abs_Pressure: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.entropy_from_CT = gsw_entropy_from_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Ientropy_from_CT] = find(abs(gsw_cv.entropy_from_CT - gsw_cf.entropy_from_CT) >= gsw_cv.entropy_from_CT_ca); if ~isempty(gsw_cf.Ientropy_from_CT) - try - cprintf('err','gsw_entropy_from_CT: Failed\n'); - catch - fprintf(2,'gsw_entropy_from_CT: Failed\n'); - end + fprintf(2,'gsw_entropy_from_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.CT_from_entropy = gsw_CT_from_entropy(gsw_cv.SA_chck_cast,gsw_cf.entropy_from_CT); [gsw_cf.ICT_from_entropy] = find(abs(gsw_cv.CT_from_entropy - gsw_cf.CT_from_entropy) >= gsw_cv.CT_from_entropy_ca); if ~isempty(gsw_cf.ICT_from_entropy) - try - cprintf('err','gsw_CT_from_entropy: Failed\n'); - catch - fprintf(2,'gsw_CT_from_entropy: Failed\n'); - end + fprintf(2,'gsw_CT_from_entropy: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.entropy_from_pt = gsw_entropy_from_pt(gsw_cv.SA_chck_cast,gsw_cf.pt_from_t); [gsw_cf.Ientropy_from_pt] = find(abs(gsw_cv.entropy_from_pt - gsw_cf.entropy_from_pt) >= gsw_cv.entropy_from_pt_ca); if ~isempty(gsw_cf.Ientropy_from_pt) - try - cprintf('err','gsw_entropy_from_pt: Failed\n'); - catch - fprintf(2,'gsw_entropy_from_pt: Failed\n'); - end + fprintf(2,'gsw_entropy_from_pt: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.pt_from_entropy = gsw_pt_from_entropy(gsw_cv.SA_chck_cast,gsw_cf.entropy_from_pt); [gsw_cf.Ipt_from_entropy] = find(abs(gsw_cv.pt_from_entropy - gsw_cf.pt_from_entropy) >= gsw_cv.pt_from_entropy_ca); if ~isempty(gsw_cf.Ipt_from_entropy) - try - cprintf('err','gsw_pt_from_entropy: Failed\n'); - catch - fprintf(2,'gsw_pt_from_entropy: Failed\n'); - end + fprintf(2,'gsw_pt_from_entropy: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.molality_from_SA = gsw_molality_from_SA(gsw_cv.SA_chck_cast); [gsw_cf.Imolality_from_SA] = find(abs(gsw_cv.molality_from_SA - gsw_cf.molality_from_SA) >= gsw_cv.molality_from_SA_ca); if ~isempty(gsw_cf.Imolality_from_SA) - try - cprintf('err','gsw_molality_from_SA: Failed\n'); - catch - fprintf(2,'gsw_molality_from_SA: Failed\n'); - end + fprintf(2,'gsw_molality_from_SA: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.ionic_strength_from_SA = gsw_ionic_strength_from_SA(gsw_cv.SA_chck_cast); [gsw_cf.Iionic_strength_from_SA] = find(abs(gsw_cv.ionic_strength_from_SA - gsw_cf.ionic_strength_from_SA) >= gsw_cv.ionic_strength_from_SA_ca); if ~isempty(gsw_cf.Iionic_strength_from_SA) - try - cprintf('err','gsw_ionic_strength_from_SA: Failed\n'); - catch - fprintf(2,'gsw_ionic_strength_from_SA: Failed\n'); - end + fprintf(2,'gsw_ionic_strength_from_SA: Failed\n'); gsw_cf.gsw_chks = 0; end %% density and enthalpy, based on the 48-term expression for density -if gsw_cf.gsw_chks == 1 ; - try - cprintf('text','.'); - catch - fprintf(1,'.'); - end +if gsw_cf.gsw_chks == 1; + fprintf(1,'.'); end gsw_cf.rho = gsw_rho_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Irho] = find(abs(gsw_cv.rho - gsw_cf.rho) >= gsw_cv.rho_ca); if ~isempty(gsw_cf.Irho) - try - cprintf('err','gsw_rho_CT: Failed\n'); - catch - fprintf(2,'gsw_rho_CT: Failed\n'); - end + fprintf(2,'gsw_rho_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.alpha = gsw_alpha_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ialpha] = find(abs(gsw_cv.alpha - gsw_cf.alpha) >= gsw_cv.alpha_ca); if ~isempty(gsw_cf.Ialpha) - try - cprintf('err','gsw_alpha_CT: Failed\n'); - catch - fprintf(2,'gsw_alpha_CT: Failed\n'); - end + fprintf(2,'gsw_alpha_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.beta = gsw_beta_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ibeta] = find(abs(gsw_cv.beta - gsw_cf.beta) >= gsw_cv.beta_ca); if ~isempty(gsw_cf.Ibeta) - try - cprintf('err','gsw_beta_CT: Failed\n'); - catch - fprintf(2,'gsw_beta_CT: Failed\n'); - end + fprintf(2,'gsw_beta_CT: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -515,176 +331,112 @@ abs(gsw_cv.alpha_rab - gsw_cf.alpha_rab) >= gsw_cv.alpha_rab_ca | ... abs(gsw_cv.beta_rab - gsw_cf.beta_rab) >= gsw_cv.beta_rab_ca); if ~isempty(gsw_cf.Irho_rab) - try - cprintf('err','gsw_rho_alpha_beta_CT: Failed\n'); - catch - fprintf(2,'gsw_rho_alpha_beta_CT: Failed\n'); - end + fprintf(2,'gsw_rho_alpha_beta_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.specvol = gsw_specvol_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ispecvol] = find(abs(gsw_cv.specvol - gsw_cf.specvol) >= gsw_cv.specvol_ca); if ~isempty(gsw_cf.Ispecvol) - try - cprintf('err','gsw_specvol_CT: Failed\n'); - catch - fprintf(2,'gsw_specvol_CT: Failed\n'); - end + fprintf(2,'gsw_specvol_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.specvol_anom = gsw_specvol_anom_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ispecvol_anom] = find(abs(gsw_cv.specvol_anom - gsw_cf.specvol_anom) >= gsw_cv.specvol_anom_ca); if ~isempty(gsw_cf.Ispecvol_anom) - try - cprintf('err','gsw_specvol_anom_CT: Failed\n'); - catch - fprintf(2,'gsw_specvol_anom_CT: Failed\n'); - end + fprintf(2,'gsw_specvol_anom_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sigma0 = gsw_sigma0_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma0] = find(abs(gsw_cv.sigma0 - gsw_cf.sigma0) >= gsw_cv.sigma0_ca); if ~isempty(gsw_cf.Isigma0) - try - cprintf('err','gsw_sigma0_CT: Failed\n'); - catch - fprintf(2,'gsw_sigma0_CT: Failed\n'); - end + fprintf(2,'gsw_sigma0_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sigma1 = gsw_sigma1_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma1_CT] = find(abs(gsw_cv.sigma1 - gsw_cf.sigma1) >= gsw_cv.sigma1_ca); if ~isempty(gsw_cf.Isigma1_CT) - try - cprintf('err','gsw_sigma1_CT: Failed\n'); - catch - fprintf(2,'gsw_sigma1_CT: Failed\n'); - end + fprintf(2,'gsw_sigma1_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sigma2 = gsw_sigma2_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma2] = find(abs(gsw_cv.sigma2 - gsw_cf.sigma2) >= gsw_cv.sigma2_ca); if ~isempty(gsw_cf.Isigma2) - try - cprintf('err','gsw_sigma2_CT: Failed\n'); - catch - fprintf(2,'gsw_sigma2_CT: Failed\n'); - end + fprintf(2,'gsw_sigma2_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sigma3 = gsw_sigma3_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma3] = find(abs(gsw_cv.sigma3 - gsw_cf.sigma3) >= gsw_cv.sigma3_ca); if ~isempty(gsw_cf.Isigma3) - try - cprintf('err','gsw_sigma3_CT: Failed\n'); - catch - fprintf(2,'gsw_sigma3_CT: Failed\n'); - end + fprintf(2,'gsw_sigma3_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sigma4 = gsw_sigma4_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma4] = find(abs(gsw_cv.sigma4 - gsw_cf.sigma4) >= gsw_cv.sigma4_ca); if ~isempty(gsw_cf.Isigma4) - try - cprintf('err','gsw_sigma4_CT: Failed\n'); - catch - fprintf(2,'gsw_sigma4_CT: Failed\n'); - end + fprintf(2,'gsw_sigma4_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sound_speed = gsw_sound_speed_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Isound_speed] = find(abs(gsw_cv.sound_speed - gsw_cf.sound_speed) >= gsw_cv.sound_speed_ca); if ~isempty(gsw_cf.Isound_speed) - try - cprintf('err','gsw_sound_speed_CT: Failed\n'); - catch - fprintf(2,'gsw_sound_speed_CT: Failed\n'); - end + fprintf(2,'gsw_sound_speed_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.internal_energy = gsw_internal_energy_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Iinternal_energy] = find(abs(gsw_cv.internal_energy - gsw_cf.internal_energy) >= gsw_cv.internal_energy_ca); if ~isempty(gsw_cf.Iinternal_energy) - try - cprintf('err','gsw_internal_energy_CT: Failed\n'); - catch - fprintf(2,'gsw_internal_energy_CT: Failed\n'); - end + fprintf(2,'gsw_internal_energy_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.enthalpy = gsw_enthalpy_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ienthalpy] = find(abs(gsw_cv.enthalpy - gsw_cf.enthalpy) >= gsw_cv.enthalpy_ca); if ~isempty(gsw_cf.Ienthalpy) - try - cprintf('err','gsw_enthalpy_CT: Failed\n'); - catch - fprintf(2,'gsw_enthalpy_CT: Failed\n'); - end + fprintf(2,'gsw_enthalpy_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.enthalpy_diff = gsw_enthalpy_diff_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast_shallow,gsw_cv.p_chck_cast_deep); [gsw_cf.Ienthalpy_diff] = find(abs(gsw_cv.enthalpy_diff - gsw_cf.enthalpy_diff) >= gsw_cv.enthalpy_diff_ca); if ~isempty(gsw_cf.Ienthalpy_diff) - try - cprintf('err','gsw_enthalpy_diff_CT: Failed\n'); - catch - fprintf(2,'gsw_enthalpy_diff_CT: Failed\n'); - end + fprintf(2,'gsw_enthalpy_diff_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.dynamic_enthalpy = gsw_dynamic_enthalpy_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Idynamic_enthalpy] = find(abs(gsw_cv.dynamic_enthalpy - gsw_cf.dynamic_enthalpy) >= gsw_cv.dynamic_enthalpy_ca); if ~isempty(gsw_cf.Idynamic_enthalpy) - try - cprintf('err','gsw_dynamic_enthalpy: Failed\n'); - catch - fprintf(2,'gsw_dynamic_enthalpy: Failed\n'); - end + fprintf(2,'gsw_dynamic_enthalpy: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SA_from_rho = gsw_SA_from_rho_CT(gsw_cf.rho,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ISA_from_rho] = find(abs(gsw_cv.SA_from_rho - gsw_cf.SA_from_rho) >= gsw_cv.SA_from_rho_ca); if ~isempty(gsw_cf.ISA_from_rho) - try - cprintf('err','gsw_SA_from_rho_CT: Failed\n'); - catch - fprintf(2,'gsw_SA_from_rho_CT: Failed\n'); - end + fprintf(2,'gsw_SA_from_rho_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.CT_maxdensity = gsw_CT_maxdensity(gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ICT_maxdensity] = find(abs(gsw_cv.CT_maxdensity - gsw_cf.CT_maxdensity) >= gsw_cv.CT_maxdensity_ca); if ~isempty(gsw_cf.ICT_maxdensity) - try - cprintf('err','gsw_CT_maxdensity: Failed\n'); - catch - fprintf(2,'gsw_CT_maxdensity: Failed\n'); - end + fprintf(2,'gsw_CT_maxdensity: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.CT_from_rho = gsw_CT_from_rho(gsw_cf.rho,gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ICT_from_rho] = find(abs(gsw_cv.CT_from_rho - gsw_cf.CT_from_rho) >= gsw_cv.CT_from_rho_ca); if ~isempty(gsw_cf.ICT_from_rho) - try - cprintf('err','gsw_CT_from_rho: Failed\n'); - catch - fprintf(2,'gsw_CT_from_rho: Failed\n'); - end + fprintf(2,'gsw_CT_from_rho: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -693,11 +445,7 @@ [gsw_cf.n2, gsw_cf.p_mid_n2] = gsw_Nsquared(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.INsquared] = find(abs(gsw_cv.n2 - gsw_cf.n2) >= gsw_cv.n2_ca | abs(gsw_cv.p_mid_n2 - gsw_cf.p_mid_n2) >= gsw_cv.p_mid_n2_ca); if ~isempty(gsw_cf.INsquared) - try - cprintf('err','gsw_Nsquared: Failed\n'); - catch - fprintf(2,'gsw_Nsquared: Failed\n'); - end + fprintf(2,'gsw_Nsquared: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -705,11 +453,7 @@ [gsw_cf.ITurner] = find(abs(gsw_cv.Tu - gsw_cf.Tu) >= gsw_cv.Tu_ca | abs(gsw_cv.Rsubrho - gsw_cf.Rsubrho) >= gsw_cv.Rsubrho_ca | ... abs(gsw_cv.p_mid_TuRsr - gsw_cf.p_mid_TuRsr) >= gsw_cv.p_mid_TuRsr_ca); if ~isempty(gsw_cf.ITurner) - try - cprintf('err','gsw_Turner_Rsubrho: Failed\n'); - catch - fprintf(2,'gsw_Turner_Rsubrho: Failed\n'); - end + fprintf(2,'gsw_Turner_Rsubrho: Failed\n'); gsw_chks = 0; end @@ -717,20 +461,12 @@ [gsw_cf.IIPVfN2] = find(abs(gsw_cv.IPVfN2 - gsw_cf.IPVfN2) >= gsw_cv.IPVfN2_ca | ... abs(gsw_cv.p_mid_IPVfN2 - gsw_cf.p_mid_IPVfN2) >= gsw_cv.p_mid_IPVfN2_ca); if ~isempty(gsw_cf.IIPVfN2) - try - cprintf('err','gsw_IPV_vs_fNsquared_ratio: Failed\n'); - catch - fprintf(2,'gsw_IPV_vs_fNsquared_ratio: Failed\n'); - end + fprintf(2,'gsw_IPV_vs_fNsquared_ratio: Failed\n'); gsw_cf.gsw_chks = 0; end if gsw_cf.gsw_chks == 1 ; - try - cprintf('text','.'); - catch - fprintf(1,'.'); - end + fprintf(1,'.'); end %% neutral and non-linear properties, based on the 48-term expression for density @@ -738,41 +474,25 @@ gsw_cf.cabbeling = gsw_cabbeling(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Icabbeling] = find(abs(gsw_cv.cabbeling - gsw_cf.cabbeling) >= gsw_cv.cabbeling_ca); if ~isempty(gsw_cf.Icabbeling) - try - cprintf('err','gsw_cabbeling: Failed\n'); - catch - fprintf(2,'gsw_cabbeling: Failed\n'); - end + fprintf(2,'gsw_cabbeling: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.thermobaric = gsw_thermobaric(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ithermobaric] = find(abs(gsw_cv.thermobaric - gsw_cf.thermobaric) >= gsw_cv.thermobaric_ca); if ~isempty(gsw_cf.Ithermobaric) - try - cprintf('err','gsw_thermobaric: Failed\n'); - catch - fprintf(2,'gsw_thermobaric: Failed\n'); - end + fprintf(2,'gsw_thermobaric: Failed\n'); gsw_cf.gsw_chks = 0; end if gsw_cf.gsw_chks == 1 ; - try - cprintf('text','.'); - catch - fprintf(1,'.'); - end + fprintf(1,'.'); end gsw_cf.isopycnal_slope_ratio = gsw_isopycnal_slope_ratio(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast,gsw_cv.pr); [gsw_cf.Iisopycnal_slope_ratio] = find(abs(gsw_cv.isopycnal_slope_ratio - gsw_cf.isopycnal_slope_ratio) >= gsw_cv.isopycnal_slope_ratio_ca); if ~isempty(gsw_cf.Iisopycnal_slope_ratio) - try - cprintf('err','gsw_isopycnal_slope_ratio: Failed\n'); - catch - fprintf(2,'gsw_isopycnal_slope_ratio: Failed\n'); - end + fprintf(2,'gsw_isopycnal_slope_ratio: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -780,22 +500,14 @@ [gsw_cf.IG_CT] = find(abs(gsw_cv.G_CT - gsw_cf.G_CT) >= gsw_cv.G_CT_ca | ... (gsw_cv.p_mid_G_CT - gsw_cf.p_mid_G_CT) >= gsw_cv.p_mid_G_CT_ca); if ~isempty(gsw_cf.IG_CT) - try - cprintf('err','gsw_isopycnal_vs_ntp_CT_ratio: Failed\n'); - catch - fprintf(2,'gsw_isopycnal_vs_ntp_CT_ratio: Failed\n'); - end + fprintf(2,'gsw_isopycnal_vs_ntp_CT_ratio: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.ntpptCT = gsw_ntp_pt_vs_CT_ratio(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.IntpptCT] = find(abs(gsw_cv.ntpptCT - gsw_cf.ntpptCT) >= gsw_cv.ntpptCT_ca); if ~isempty(gsw_cf.IntpptCT) - try - cprintf('err','gsw_ntp_pt_vs_CT_ratio: Failed\n'); - catch - fprintf(2,'gsw_ntp_pt_vs_CT_ratio: Failed\n'); - end + fprintf(2,'gsw_ntp_pt_vs_CT_ratio: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -804,11 +516,7 @@ gsw_cf.geo_strf_dyn_height = gsw_geo_strf_dyn_height(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast,gsw_cv.pr); [gsw_cf.Igeo_strf_dyn_height] = find(abs(gsw_cv.geo_strf_dyn_height - gsw_cf.geo_strf_dyn_height) >= gsw_cv.geo_strf_dyn_height_ca); if ~isempty(gsw_cf.Igeo_strf_dyn_height) - try - cprintf('err','gsw_geo_strf_dyn_height: Failed\n'); - catch - fprintf(2,'gsw_geo_strf_dyn_height: Failed\n'); - end + fprintf(2,'gsw_geo_strf_dyn_height: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -816,22 +524,14 @@ [gsw_cf.Igeo_strf_dyn_height_pc] = find(abs(gsw_cv.geo_strf_dyn_height_pc - gsw_cf.geo_strf_dyn_height_pc) >= gsw_cv.geo_strf_dyn_height_pc_ca | ... abs(gsw_cv.geo_strf_dyn_height_pc_p_mid - gsw_cf.geo_strf_dyn_height_pc_p_mid) >= gsw_cv.geo_strf_dyn_height_pc_p_mid_ca); if ~isempty(gsw_cf.Igeo_strf_dyn_height_pc) - try - cprintf('err','gsw_geo_strf_dyn_height_pc: Failed\n'); - catch - fprintf(2,'gsw_geo_strf_dyn_height_pc: Failed\n'); - end + fprintf(2,'gsw_geo_strf_dyn_height_pc: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.geo_strf_isopycnal = gsw_geo_strf_isopycnal(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast,gsw_cv.pr,gsw_cv.Neutral_Density,gsw_cv.p_Neutral_Density); [gsw_cf.Igeo_strf_isopycnal] = find(abs(gsw_cv.geo_strf_isopycnal - gsw_cf.geo_strf_isopycnal) >= gsw_cv.geo_strf_isopycnal_ca); if ~isempty(gsw_cf.Igeo_strf_isopycnal) - try - cprintf('err','gsw_geo_strf_isopycnal: Failed\n'); - catch - fprintf(2,'gsw_geo_strf_isopycnal: Failed\n'); - end + fprintf(2,'gsw_geo_strf_isopycnal: Failed\n'); gsw_chks = 0; end @@ -839,33 +539,21 @@ [gsw_cf.Igeo_strf_isopycnal_pc] = find(abs(gsw_cv.geo_strf_isopycnal_pc - gsw_cf.geo_strf_isopycnal_pc) >= gsw_cv.geo_strf_isopycnal_pc_ca |... abs(gsw_cv.geo_strf_isopycnal_pc_p_mid - gsw_cf.geo_strf_isopycnal_pc_p_mid) >= gsw_cv.geo_strf_isopycnal_pc_p_mid_ca); if ~isempty(gsw_cf.Igeo_strf_isopycnal_pc) - try - cprintf('err','gsw_geo_strf_isopycnal_pc: Failed\n'); - catch - fprintf(2,'gsw_geo_strf_isopycnal_pc: Failed\n'); - end + fprintf(2,'gsw_geo_strf_isopycnal_pc: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.geo_strf_Montgomery = gsw_geo_strf_Montgomery(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast,gsw_cv.pr); [gsw_cf.Igeo_strf_Montgomery] = find(abs(gsw_cv.geo_strf_Montgomery - gsw_cf.geo_strf_Montgomery) >= gsw_cv.geo_strf_Montgomery_ca); if ~isempty(gsw_cf.Igeo_strf_Montgomery) - try - cprintf('err','gsw_geo_strf_Montgomery: Failed\n'); - catch - fprintf(2,'gsw_geo_strf_Montgomery: Failed\n'); - end + fprintf(2,'gsw_geo_strf_Montgomery: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.geo_strf_Cunningham = gsw_geo_strf_Cunningham(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast,gsw_cv.pr); [gsw_cf.Igeo_strf_Cunningham] = find(abs(gsw_cv.geo_strf_Cunningham - gsw_cf.geo_strf_Cunningham) >= gsw_cv.geo_strf_Cunningham_ca); if ~isempty(gsw_cf.Igeo_strf_Cunningham) - try - cprintf('err','gsw_geo_strf_Cunningham: Failed\n'); - catch - fprintf(2,'gsw_geo_strf_Cunningham: Failed\n'); - end + fprintf(2,'gsw_geo_strf_Cunningham: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -876,11 +564,7 @@ abs(gsw_cv.geo_strf_velocity_mid_lat - gsw_cf.geo_strf_velocity_mid_lat) >= gsw_cv.geo_strf_velocity_mid_lat_ca | ... abs(gsw_cv.geo_strf_velocity_mid_long - gsw_cf.geo_strf_velocity_mid_long) >= gsw_cv.geo_strf_velocity_mid_long_ca); if ~isempty(gsw_cf.Igeostrophic_velo) - try - cprintf('err','gsw_geostrophic_velocity: Failed\n'); - catch - fprintf(2,'gsw_geostrophic_velocity: Failed\n'); - end + fprintf(2,'gsw_geostrophic_velocity: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -890,11 +574,7 @@ [gsw_cf.ICT_first_deriv] = find(abs(gsw_cv.CT_SA - gsw_cf.CT_SA) >= gsw_cv.CT_SA_ca | ... (gsw_cv.CT_pt - gsw_cf.CT_pt) >= gsw_cv.CT_pt_ca); if ~isempty(gsw_cf.ICT_first_deriv) - try - cprintf('err','gsw_CT_first_derivatives: Failed\n'); - catch - fprintf(2,'gsw_CT_first_derivatives: Failed\n'); - end + fprintf(2,'gsw_CT_first_derivatives: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -903,11 +583,7 @@ abs(gsw_cv.CT_SA_pt - gsw_cf.CT_SA_pt) >= gsw_cv.CT_SA_pt_ca | ... abs(gsw_cv.CT_pt_pt - gsw_cf.CT_pt_pt) >= gsw_cv.CT_pt_pt_ca); if ~isempty(gsw_cf.ICT_second_deriv) - try - cprintf('err','gsw_CT_second_derivatives: Failed\n'); - catch - fprintf(2,'gsw_CT_second_derivatives: Failed\n'); - end + fprintf(2,'gsw_CT_second_derivatives: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -916,11 +592,7 @@ abs(gsw_cv.h_CT - gsw_cf.h_CT) >= gsw_cv.h_CT_ca | ... abs(gsw_cv.h_P - gsw_cf.h_P) >= gsw_cv.h_P_ca); if ~isempty(gsw_cf.Ienthalpy_first_deriv) - try - cprintf('err','gsw_enthalpy_first_derivatives: Failed\n'); - catch - fprintf(2,'gsw_enthalpy_first_derivatives: Failed\n'); - end + fprintf(2,'gsw_enthalpy_first_derivatives: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -929,11 +601,7 @@ abs(gsw_cv.h_SA_CT - gsw_cf.h_SA_CT) >= gsw_cv.h_SA_CT_ca | ... abs(gsw_cv.h_CT_CT - gsw_cf.h_CT_CT) >= gsw_cv.h_CT_CT_ca); if ~isempty(gsw_cf.Ienthalpy_second_deriv) - try - cprintf('err','gsw_enthalpy_second_derivatives: Failed\n'); - catch - fprintf(2,'gsw_enthalpy_second_derivatives: Failed\n'); - end + fprintf(2,'gsw_enthalpy_second_derivatives: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -941,20 +609,12 @@ [gsw_cf.Ientropy_first_deriv] = find(abs(gsw_cv.eta_SA - gsw_cf.eta_SA) >= gsw_cv.eta_SA_ca | ... abs(gsw_cv.eta_CT - gsw_cf.eta_CT) >= gsw_cv.eta_CT_ca); if ~isempty(gsw_cf.Ientropy_first_deriv) - try - cprintf('err','gsw_enthalpy_first_derivatives: Failed\n'); - catch - fprintf(2,'gsw_enthalpy_first_derivatives: Failed\n'); - end + fprintf(2,'gsw_enthalpy_first_derivatives: Failed\n'); gsw_cf.gsw_chks = 0; end if gsw_cf.gsw_chks == 1 ; - try - cprintf('text','.'); - catch - fprintf(1,'.'); - end + fprintf(1,'.'); end [gsw_cf.eta_SA_SA, gsw_cf.eta_SA_CT, gsw_cf.eta_CT_CT] = gsw_entropy_second_derivatives(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); @@ -962,11 +622,7 @@ abs(gsw_cv.eta_SA_CT - gsw_cf.eta_SA_CT) >= gsw_cv.eta_SA_CT_ca |... abs(gsw_cv.eta_CT_CT - gsw_cf.eta_CT_CT) >= gsw_cv.eta_CT_CT_ca); if ~isempty(gsw_cf.Ientropy_second_deriv) - try - cprintf('err','gsw_entropy_second_derivatives: Failed\n'); - catch - fprintf(2,'gsw_entropy_second_derivatives: Failed\n'); - end + fprintf(2,'gsw_entropy_second_derivatives: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -974,11 +630,7 @@ [gsw_cf.Ipt_first_deriv] = find(abs(gsw_cv.pt_SA - gsw_cf.pt_SA) >= gsw_cv.pt_SA_ca |... abs(gsw_cv.pt_CT - gsw_cf.pt_CT) >= gsw_cv.pt_CT_ca); if ~isempty(gsw_cf.Ipt_first_deriv) - try - cprintf('err','gsw_pt_first_derivatives: Failed\n'); - catch - fprintf(2,'gsw_pt_first_derivatives: Failed\n'); - end + fprintf(2,'gsw_pt_first_derivatives: Failed\n'); gsw_chks = 0; end @@ -987,11 +639,7 @@ abs(gsw_cv.pt_SA_CT - gsw_cf.pt_SA_CT) >= gsw_cv.pt_SA_CT_ca | ... abs(gsw_cv.pt_CT_CT - gsw_cf.pt_CT_CT) >= gsw_cv.pt_CT_CT_ca); if ~isempty(gsw_cf.Ipt_second_deriv) - try - cprintf('err','gsw_pt_second_derivatives: Failed\n'); - catch - fprintf(2,'gsw_pt_second_derivatives: Failed\n'); - end + fprintf(2,'gsw_pt_second_derivatives: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -1000,44 +648,28 @@ gsw_cf.CT_freezing = gsw_CT_freezing(gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast,0); [gsw_cf.ICT_freezing] = find(abs(gsw_cv.CT_freezing - gsw_cf.CT_freezing) >= gsw_cv.CT_freezing_ca); if ~isempty(gsw_cf.ICT_freezing) - try - cprintf('err','gsw_CT_freezing: Failed\n'); - catch - fprintf(2,'gsw_CT_freezing: Failed\n'); - end + fprintf(2,'gsw_CT_freezing: Failed\n'); gsw_chks = 0; end gsw_cf.t_freezing = gsw_t_freezing(gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast,0); [gsw_cf.It_freezing] = find(abs(gsw_cv.t_freezing - gsw_cf.t_freezing) >= gsw_cv.t_freezing_ca); if ~isempty(gsw_cf.It_freezing) - try - cprintf('err','gsw_t_freezing: Failed\n'); - catch - fprintf(2,'gsw_t_freezing: Failed\n'); - end + fprintf(2,'gsw_t_freezing: Failed\n'); gsw_chks = 0; end gsw_cf.brineSA_CT = gsw_brineSA_CT(gsw_cf.CT_freezing,gsw_cv.p_chck_cast,0.5); [gsw_cf.IbrineSA_CT] = find(abs(gsw_cv.brineSA_CT - gsw_cf.brineSA_CT) >= gsw_cv.brineSA_CT_ca); if ~isempty(gsw_cf.IbrineSA_CT) - try - cprintf('err','gsw_brineSA_CT: Failed\n'); - catch - fprintf(2,'gsw_brineSA_CT: Failed\n'); - end + fprintf(2,'gsw_brineSA_CT: Failed\n'); gsw_chks = 0; end gsw_cf.brineSA_t = gsw_brineSA_t(gsw_cf.t_freezing,gsw_cv.p_chck_cast,0.5); [gsw_cf.IbrineSA_t] = find(abs(gsw_cv.brineSA_t - gsw_cf.brineSA_t) >= gsw_cv.brineSA_t_ca); if ~isempty(gsw_cf.IbrineSA_t) - try - cprintf('err','gsw_brineSA_t: Failed\n'); - catch - fprintf(2,'gsw_brineSA_t: Failed\n'); - end + fprintf(2,'gsw_brineSA_t: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -1047,33 +679,21 @@ gsw_cf.latentheat_melting = gsw_latentheat_melting(gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ilatentheat_melting] = find(abs(gsw_cv.latentheat_melting - gsw_cf.latentheat_melting) >= gsw_cv.latentheat_melting_ca); if ~isempty(gsw_cf.Ilatentheat_melting) - try - cprintf('err','gsw_latentheat_melting: Failed\n'); - catch - fprintf(2,'gsw_latentheat_melting: Failed\n'); - end + fprintf(2,'gsw_latentheat_melting: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.latentheat_evap_CT = gsw_latentheat_evap_CT(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Ilatentheat_evap_CT] = find(abs(gsw_cv.latentheat_evap_CT - gsw_cf.latentheat_evap_CT) >= gsw_cv.latentheat_evap_CT_ca); if ~isempty(gsw_cf.Ilatentheat_evap_CT) - try - cprintf('err','gsw_latentheat_evap_CT: Failed\n'); - catch - fprintf(2,'gsw_latentheat_evap_CT: Failed\n'); - end + fprintf(2,'gsw_latentheat_evap_CT: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.latentheat_evap_t = gsw_latentheat_evap_t(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast); [gsw_cf.Ilatentheat_evap_t] = find(abs(gsw_cv.latentheat_evap_t - gsw_cf.latentheat_evap_t) >= gsw_cv.latentheat_evap_t_ca); if ~isempty(gsw_cf.Ilatentheat_evap_t) - try - cprintf('err','gsw_latentheat_evap_t: Failed\n'); - catch - fprintf(2,'gsw_latentheat_evap_t: Failed\n'); - end + fprintf(2,'gsw_latentheat_evap_t: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -1082,33 +702,21 @@ gsw_cf.f = gsw_f(gsw_cv.lat_chck_cast); [gsw_cf.If] = find(abs(gsw_cv.f - gsw_cf.f) >= gsw_cv.f_ca); if ~isempty(gsw_cf.If) - try - cprintf('err','gsw_f: Failed\n'); - catch - fprintf(2,'gsw_f: Failed\n'); - end + fprintf(2,'gsw_f: Failed\n'); gsw_chks = 0; end gsw_cf.grav = gsw_grav(gsw_cv.lat_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Igrav] = find(abs(gsw_cv.grav - gsw_cf.grav) >= gsw_cv.grav_ca); if ~isempty(gsw_cf.Igrav) - try - cprintf('err','gsw_grav: Failed\n'); - catch - fprintf(2,'gsw_grav: Failed\n'); - end + fprintf(2,'gsw_grav: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.distance = gsw_distance(gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Idistance] = find(abs(gsw_cv.distance - gsw_cf.distance) >= gsw_cv.distance_ca); if ~isempty(gsw_cf.Idistance) - try - cprintf('err','gsw_distance: Failed\n'); - catch - fprintf(2,'gsw_distance: Failed\n'); - end + fprintf(2,'gsw_distance: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -1117,11 +725,7 @@ gsw_cf.steric_height = gsw_steric_height(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast,gsw_cv.pr); [gsw_cf.Isteric_height] = find(abs(gsw_cv.steric_height - gsw_cf.steric_height) >= gsw_cv.steric_height_ca); if ~isempty(gsw_cf.Isteric_height) - try - cprintf('err','gsw_steric_height: Failed\n'); - catch - fprintf(2,'gsw_steric_height: Failed\n'); - end + fprintf(2,'gsw_steric_height: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -1131,99 +735,63 @@ gsw_cf.T0 = gsw_T0; [gsw_cf.IT0] = find(abs(gsw_cv.T0 - gsw_cf.T0) > 1e-13); if ~isempty(gsw_cf.IT0) - try - cprintf('err','gsw_T0: Failed\n'); - catch - fprintf(2,'gsw_T0: Failed\n'); - end + fprintf(2,'gsw_T0: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.P0 = gsw_P0; [gsw_cf.IP0] = find(abs(gsw_cv.P0 - gsw_cf.P0) > 1e-13); if ~isempty(gsw_cf.IP0) - try - cprintf('err','gsw_P0: Failed\n'); - catch - fprintf(2,'gsw_P0: Failed\n'); - end + fprintf(2,'gsw_P0: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SSO = gsw_SSO; [gsw_cf.ISSO] = find(abs(gsw_cv.SSO - gsw_cf.SSO) > 1e-13); if ~isempty(gsw_cf.ISSO) - try - cprintf('err','gsw_SSO: Failed\n'); - catch - fprintf(2,'gsw_SSO: Failed\n'); - end + fprintf(2,'gsw_SSO: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.uPS = gsw_uPS; [gsw_cf.IuPS] = find(abs(gsw_cv.uPS - gsw_cf.uPS) > 1e-13); if ~isempty(gsw_cf.IuPS) - try - cprintf('err','gsw_uPS: Failed\n'); - catch - fprintf(2,'gsw_uPS: Failed\n'); - end + fprintf(2,'gsw_uPS: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.cp0 = gsw_cp0; [gsw_cf.Icp0] = find(abs(gsw_cv.cp0 - gsw_cf.cp0) > 1e-13); if ~isempty(gsw_cf.Icp0) - try - cprintf('err','gsw_cp0: Failed\n'); - catch - fprintf(2,'gsw_cp0: Failed\n'); - end + fprintf(2,'gsw_cp0: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.C3515 = gsw_C3515; [gsw_cf.IC3515] = find(abs(gsw_cv.C3515 - gsw_cf.C3515) > 1e-13); if ~isempty(gsw_cf.IC3515) - try - cprintf('err','gsw_C3515: Failed\n'); - catch - fprintf(2,'gsw_C3515: Failed\n'); - end + fprintf(2,'gsw_C3515: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SonCl = gsw_SonCl; [gsw_cf.ISonCl] = find(abs(gsw_cv.SonCl - gsw_cf.SonCl) > 1e-13); if ~isempty(gsw_cf.ISonCl) - try - cprintf('err','gsw_SonCl: Failed\n'); - catch - fprintf(2,'gsw_SonCl: Failed\n'); - end + fprintf(2,'gsw_SonCl: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.valence_factor = gsw_valence_factor; [gsw_cf.Ivalence_factor] = find(abs(gsw_cv.valence_factor - gsw_cf.valence_factor) > 1e-13); if ~isempty(gsw_cf.Ivalence_factor) - try - cprintf('err','gsw_valence_factor: Failed\n'); - catch - fprintf(2,'gsw_valence_factor: Failed\n'); - end + fprintf(2,'gsw_valence_factor: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.atomic_weight = gsw_atomic_weight; [gsw_cf.Iatomic_weight] = find(abs(gsw_cv.atomic_weight - gsw_cf.atomic_weight) > 1e-13); if ~isempty(gsw_cf.Iatomic_weight) - try - cprintf('err','gsw_atomic_weight: Failed\n'); - catch - fprintf(2,'gsw_atomic_weight: Failed\n'); - end + fprintf(2,'gsw_atomic_weight: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -1232,33 +800,21 @@ gsw_cf.rho_CT_exact = gsw_rho_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Irho_CT_exact] = find(abs(gsw_cv.rho_CT_exact - gsw_cf.rho_CT_exact) >= gsw_cv.rho_CT_exact_ca); if ~isempty(gsw_cf.Irho_CT_exact) - try - cprintf('err','gsw_rho_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_rho_CT_exact: Failed\n'); - end + fprintf(2,'gsw_rho_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.alpha_CT_exact = gsw_alpha_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ialpha_CT_exact] = find(abs(gsw_cv.alpha_CT_exact - gsw_cf.alpha_CT_exact) >= gsw_cv.alpha_CT_exact_ca); if ~isempty(gsw_cf.Ialpha_CT_exact) - try - cprintf('err','gsw_alpha_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_alpha_CT_exact: Failed\n'); - end + fprintf(2,'gsw_alpha_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.beta_CT_exact = gsw_beta_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ibeta_CT_exact] = find(abs(gsw_cv.beta_CT_exact - gsw_cf.beta_CT_exact) >= gsw_cv.beta_CT_exact_ca); if ~isempty(gsw_cf.Ibeta_CT_exact) - try - cprintf('err','gsw_beta_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_beta_CT_exact: Failed\n'); - end + fprintf(2,'gsw_beta_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -1267,176 +823,112 @@ abs(gsw_cv.alpha_CTrab_exact - gsw_cf.alpha_CTrab_exact) >= gsw_cv.alpha_CT_exact_rab_ca | ... abs(gsw_cv.beta_CTrab_exact - gsw_cf.beta_CTrab_exact) >= gsw_cv.beta_CT_exact_rab_ca); if ~isempty(gsw_cf.Irho_CTrab_exact) - try - cprintf('err','gsw_rho_alpha_beta_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_rho_alpha_beta_CT_exact: Failed\n'); - end + fprintf(2,'gsw_rho_alpha_beta_CT_exact: Failed\n'); gsw_chks = 0; end gsw_cf.specvol_CT_exact = gsw_specvol_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ispecvol_CT_exact] = find(abs(gsw_cv.specvol_CT_exact - gsw_cf.specvol_CT_exact) >= gsw_cv.specvol_CT_exact_ca); if ~isempty(gsw_cf.Ispecvol_CT_exact) - try - cprintf('err','gsw_specvol_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_specvol_CT_exact: Failed\n'); - end + fprintf(2,'gsw_specvol_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.specvol_anom_CT_exact = gsw_specvol_anom_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ispecvol_anom_CT_exact] = find(abs(gsw_cv.specvol_anom_CT_exact - gsw_cf.specvol_anom_CT_exact) >= gsw_cv.specvol_anom_CT_exact_ca); if ~isempty(gsw_cf.Ispecvol_anom_CT_exact) - try - cprintf('err','gsw_specvol_anom_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_specvol_anom_CT_exact: Failed\n'); - end + fprintf(2,'gsw_specvol_anom_CT_exact: Failed\n'); gsw_chks = 0; end gsw_cf.sigma0_CT_exact = gsw_sigma0_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma0_CT_exact] = find(abs(gsw_cv.sigma0_CT_exact - gsw_cf.sigma0_CT_exact) >= gsw_cv.sigma0_CT_exact_ca); if ~isempty(gsw_cf.Isigma0_CT_exact) - try - cprintf('err','gsw_sigma0_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_sigma0_CT_exact: Failed\n'); - end + fprintf(2,'gsw_sigma0_CT_exact: Failed\n'); gsw_chks = 0; end gsw_cf.sigma1_CT_exact = gsw_sigma1_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma1_CT_exact] = find(abs(gsw_cv.sigma1_CT_exact - gsw_cf.sigma1_CT_exact) >= gsw_cv.sigma1_CT_exact_ca); if ~isempty(gsw_cf.Isigma1_CT_exact) - try - cprintf('err','gsw_sigma1_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_sigma1_CT_exact: Failed\n'); - end + fprintf(2,'gsw_sigma1_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sigma2_CT_exact = gsw_sigma2_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma2_CT_exact] = find(abs(gsw_cv.sigma2_CT_exact - gsw_cf.sigma2_CT_exact) >= gsw_cv.sigma2_CT_exact_ca); if ~isempty(gsw_cf.Isigma2_CT_exact) - try - cprintf('err','gsw_sigma2_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_sigma2_CT_exact: Failed\n'); - end + fprintf(2,'gsw_sigma2_CT_exact: Failed\n'); gsw_chks = 0; end gsw_cf.sigma3_CT_exact = gsw_sigma3_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma3_CT_exact] = find(abs(gsw_cv.sigma3_CT_exact - gsw_cf.sigma3_CT_exact) >= gsw_cv.sigma3_CT_exact_ca); if ~isempty(gsw_cf.Isigma3_CT_exact) - try - cprintf('err','gsw_sigma3_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_sigma3_CT_exact: Failed\n'); - end + fprintf(2,'gsw_sigma3_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sigma4_CT_exact = gsw_sigma4_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast); [gsw_cf.Isigma4_CT_exact] = find(abs(gsw_cv.sigma4_CT_exact - gsw_cf.sigma4_CT_exact) >= gsw_cv.sigma4_CT_exact_ca); if ~isempty(gsw_cf.Isigma4_CT_exact) - try - cprintf('err','gsw_sigma4_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_sigma4_CT_exact: Failed\n'); - end + fprintf(2,'gsw_sigma4_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.sound_speed_CT_exact = gsw_sound_speed_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Isound_speed_CT_exact] = find(abs(gsw_cv.sound_speed_CT_exact - gsw_cf.sound_speed_CT_exact) >= gsw_cv.sound_speed_CT_exact_ca); if ~isempty(gsw_cf.Isound_speed_CT_exact) - try - cprintf('err','gsw_sound_speed_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_sound_speed_CT_exact: Failed\n'); - end + fprintf(2,'gsw_sound_speed_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.internal_energy_CT_exact = gsw_internal_energy_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Iinternal_energy_CT_exact] = find(abs(gsw_cv.internal_energy_CT_exact - gsw_cf.internal_energy_CT_exact) >= gsw_cv.internal_energy_CT_exact_ca); if ~isempty(gsw_cf.Iinternal_energy_CT_exact) - try - cprintf('err','gsw_internal_energy_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_internal_energy_CT_exact: Failed\n'); - end + fprintf(2,'gsw_internal_energy_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.enthalpy_CT_exact = gsw_enthalpy_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ienthalpy_CT_exact] = find(abs(gsw_cv.enthalpy_CT_exact - gsw_cf.enthalpy_CT_exact) >= gsw_cv.enthalpy_CT_exact_ca); if ~isempty(gsw_cf.Ienthalpy_CT_exact) - try - cprintf('err','gsw_enthalpy_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_enthalpy_CT_exact: Failed\n'); - end + fprintf(2,'gsw_enthalpy_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.enthalpy_diff_CT_exact = gsw_enthalpy_diff_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast_shallow,gsw_cv.p_chck_cast_deep); [gsw_cf.Ienthalpy_diff_CT_exact] = find(abs(gsw_cv.enthalpy_diff_CT_exact - gsw_cf.enthalpy_diff_CT_exact) >= gsw_cv.enthalpy_diff_CT_exact_ca); if ~isempty(gsw_cf.Ienthalpy_diff_CT_exact) - try - cprintf('err','gsw_enthalpy_diff_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_enthalpy_diff_CT_exact: Failed\n'); - end + fprintf(2,'gsw_enthalpy_diff_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.dynamic_enthalpy_CT_exact = gsw_dynamic_enthalpy_CT_exact(gsw_cv.SA_chck_cast,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Idynamic_enthalpy_CT_exact] = find(abs(gsw_cv.dynamic_enthalpy_CT_exact - gsw_cf.dynamic_enthalpy_CT_exact) >= gsw_cv.dynamic_enthalpy_CT_exact_ca); if ~isempty(gsw_cf.Idynamic_enthalpy_CT_exact) - try - cprintf('err','gsw_dynamic_enthalpy_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_dynamic_enthalpy_CT_exact: Failed\n'); - end + fprintf(2,'gsw_dynamic_enthalpy_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.SA_from_rho_CT_exact = gsw_SA_from_rho_CT_exact(gsw_cf.rho_CT_exact,gsw_cv.CT_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ISA_from_rho_CT_exact] = find(abs(gsw_cv.SA_from_rho_CT_exact - gsw_cf.SA_from_rho_CT_exact) >= gsw_cv.SA_from_rho_CT_exact_ca); if ~isempty(gsw_cf.ISA_from_rho_CT_exact) - try - cprintf('err','gsw_SA_from_rho_CT_exact: Failed\n'); - catch - fprintf(2,'gsw_SA_from_rho_CT_exact: Failed\n'); - end + fprintf(2,'gsw_SA_from_rho_CT_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.CT_from_rho_exact = gsw_CT_from_rho_exact(gsw_cf.rho_CT_exact,gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ICT_from_rho_exact] = find(abs(gsw_cv.CT_from_rho_exact - gsw_cf.CT_from_rho_exact) >= gsw_cv.CT_from_rho_exact_ca); if ~isempty(gsw_cf.ICT_from_rho_exact) - try - cprintf('err','gsw_CT_from_rho_exact: Failed\n'); - catch - fprintf(2,'gsw_CT_from_rho_exact: Failed\n'); - end + fprintf(2,'gsw_CT_from_rho_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.CT_maxdensity_exact = gsw_CT_maxdensity_exact(gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ICT_maxdensity_exact] = find(abs(gsw_cv.CT_maxdensity_exact - gsw_cf.CT_maxdensity_exact) >= gsw_cv.CT_maxdensity_exact_ca); if ~isempty(gsw_cf.ICT_maxdensity_exact) - try - cprintf('err','gsw_CT_maxdensity_exact: Failed\n'); - catch - fprintf(2,'gsw_CT_maxdensity_exact: Failed\n'); - end + fprintf(2,'gsw_CT_maxdensity_exact: Failed\n'); gsw_cf.gsw_chks = 0; end @@ -1445,367 +937,231 @@ gsw_cf.rho_t_exact = gsw_rho_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Irho_t_exact] = find(abs(gsw_cv.rho_t_exact - gsw_cf.rho_t_exact) >= gsw_cv.rho_t_exact_ca); if ~isempty(gsw_cf.Irho_t_exact) - try - cprintf('err','gsw_rho_t_exact: Failed\n'); - catch - fprintf(2,'gsw_rho_t_exact: Failed\n'); - end + fprintf(2,'gsw_rho_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.pot_rho_t_exact = gsw_pot_rho_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast,gsw_cv.pr); [gsw_cf.Ipot_rho_t_exact] = find(abs(gsw_cv.pot_rho_t_exact - gsw_cf.pot_rho_t_exact) >= gsw_cv.pot_rho_t_exact_ca); if ~isempty(gsw_cf.Ipot_rho_t_exact) - try - cprintf('err','gsw_pot_rho_t_exact: Failed\n'); - catch - fprintf(2,'gsw_pot_rho_t_exact: Failed\n'); - end + fprintf(2,'gsw_pot_rho_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.sigma0_pt0_exact = gsw_sigma0_pt0_exact(gsw_cv.SA_chck_cast,gsw_cf.pt0_from_t); [gsw_cf.Isigma0_pt0_exact] = find(abs(gsw_cv.sigma0_pt0_exact - gsw_cf.sigma0_pt0_exact) >= gsw_cv.sigma0_pt0_exact_ca); if ~isempty(gsw_cf.Isigma0_pt0_exact) - try - cprintf('err','gsw_sigma0_pt0_exact: Failed\n'); - catch - fprintf(2,'gsw_sigma0_pt0_exact: Failed\n'); - end + fprintf(2,'gsw_sigma0_pt0_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.alpha_wrt_CT_t_exact = gsw_alpha_wrt_CT_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ialpha_wrt_CT_t_exact] = find(abs(gsw_cv.alpha_wrt_CT_t_exact - gsw_cf.alpha_wrt_CT_t_exact) >= gsw_cv.alpha_wrt_CT_t_exact_ca); if ~isempty(gsw_cf.Ialpha_wrt_CT_t_exact) - try - cprintf('err','gsw_alpha_wrt_CT_t_exact: Failed\n'); - catch - fprintf(2,'gsw_alpha_wrt_CT_t_exact: Failed\n'); - end + fprintf(2,'gsw_alpha_wrt_CT_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.alpha_wrt_pt_t_exact = gsw_alpha_wrt_pt_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ialpha_wrt_pt_t_exact] = find(abs(gsw_cv.alpha_wrt_pt_t_exact - gsw_cf.alpha_wrt_pt_t_exact) >= gsw_cv.alpha_wrt_pt_t_exact_ca); if ~isempty(gsw_cf.Ialpha_wrt_pt_t_exact) - try - cprintf('err','gsw_alpha_wrt_pt_t_exact: Failed\n'); - catch - fprintf(2,'gsw_alpha_wrt_pt_t_exact: Failed\n'); - end + fprintf(2,'gsw_alpha_wrt_pt_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.alpha_wrt_t_exact = gsw_alpha_wrt_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ialpha_wrt_t_exact] = find(abs(gsw_cv.alpha_wrt_t_exact - gsw_cf.alpha_wrt_t_exact) >= gsw_cv.alpha_wrt_t_exact_ca); if ~isempty(gsw_cf.Ialpha_wrt_t_exact) - try - cprintf('err','gsw_alpha_wrt_t_exact: Failed\n'); - catch - fprintf(2,'gsw_alpha_wrt_t_exact: Failed\n'); - end + fprintf(2,'gsw_alpha_wrt_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.beta_const_CT_t_exact = gsw_beta_const_CT_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ibeta_const_CT_t_exact] = find(abs(gsw_cv.beta_const_CT_t_exact - gsw_cf.beta_const_CT_t_exact) >= gsw_cv.beta_const_CT_t_exact_ca); if ~isempty(gsw_cf.Ibeta_const_CT_t_exact) - try - cprintf('err','gsw_beta_const_CT_t_exact: Failed\n'); - catch - fprintf(2,'gsw_beta_const_CT_t_exact: Failed\n'); - end + fprintf(2,'gsw_beta_const_CT_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.beta_const_pt_t_exact = gsw_beta_const_pt_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ibeta_const_pt_t_exact] = find(abs(gsw_cv.beta_const_pt_t_exact - gsw_cf.beta_const_pt_t_exact) >= gsw_cv.beta_const_pt_t_exact_ca); if ~isempty(gsw_cf.Ibeta_const_pt_t_exact) - try - cprintf('err','gsw_beta_const_pt_t_exact: Failed\n'); - catch - fprintf(2,'gsw_beta_const_pt_t_exact: Failed\n'); - end + fprintf(2,'gsw_beta_const_pt_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.beta_const_t_exact = gsw_beta_const_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ibeta_const_t_exact] = find(abs(gsw_cv.beta_const_t_exact - gsw_cf.beta_const_t_exact) >= gsw_cv.beta_const_t_exact_ca); if ~isempty(gsw_cf.Ibeta_const_t_exact) - try - cprintf('err','gsw_beta_const_t_exact: Failed\n'); - catch - fprintf(2,'gsw_beta_const_t_exact: Failed\n'); - end + fprintf(2,'gsw_beta_const_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.specvol_t_exact = gsw_specvol_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ispecvol_t_exact] = find(abs(gsw_cv.specvol_t_exact - gsw_cf.specvol_t_exact) >= gsw_cv.specvol_t_exact_ca); if ~isempty(gsw_cf.Ispecvol_t_exact) - try - cprintf('err','gsw_specvol_t_exact: Failed\n'); - catch - fprintf(2,'gsw_specvol_t_exact: Failed\n'); - end + fprintf(2,'gsw_specvol_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.specvol_anom_t_exact = gsw_specvol_anom_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ispecvol_anom_t_exact] = find(abs(gsw_cv.specvol_anom_t_exact - gsw_cf.specvol_anom_t_exact) >= gsw_cv.specvol_anom_t_exact_ca); if ~isempty(gsw_cf.Ispecvol_anom_t_exact) - try - cprintf('err','gsw_specvol_anom_t_exact: Failed\n'); - catch - fprintf(2,'gsw_specvol_anom_t_exact: Failed\n'); - end + fprintf(2,'gsw_specvol_anom_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end if gsw_cf.gsw_chks == 1 ; - try - cprintf('text','.'); - catch - fprintf(1,'.'); - end + fprintf(1,'.'); end gsw_cf.sound_speed_t_exact = gsw_sound_speed_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Isound_speed_t_exact] = find(abs(gsw_cv.sound_speed_t_exact - gsw_cf.sound_speed_t_exact) >= gsw_cv.sound_speed_t_exact_ca); if ~isempty(gsw_cf.Isound_speed_t_exact) - try - cprintf('err','gsw_sound_speed_t_exact: Failed\n'); - catch - fprintf(2,'gsw_sound_speed_t_exact: Failed\n'); - end + fprintf(2,'gsw_sound_speed_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.kappa_t_exact = gsw_kappa_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ikappa_t_exact] = find(abs(gsw_cv.kappa_t_exact - gsw_cf.kappa_t_exact) >= gsw_cv.kappa_t_exact_ca); if ~isempty(gsw_cf.Ikappa_t_exact) - try - cprintf('err','gsw_kappa_t_exact: Failed\n'); - catch - fprintf(2,'gsw_kappa_t_exact: Failed\n'); - end + fprintf(2,'gsw_kappa_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.kappa_const_t_exact = gsw_kappa_const_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ikappa_const_t_exact] = find(abs(gsw_cv.kappa_const_t_exact - gsw_cf.kappa_const_t_exact) >= gsw_cv.kappa_const_t_exact_ca); if ~isempty(gsw_cf.Ikappa_const_t_exact) - try - cprintf('err','gsw_kappa_const_t_exact: Failed\n'); - catch - fprintf(2,'gsw_kappa_const_t_exact: Failed\n'); - end + fprintf(2,'gsw_kappa_const_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.internal_energy_t_exact = gsw_internal_energy_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Iinternal_energy_t_exact] = find(abs(gsw_cv.internal_energy_t_exact - gsw_cf.internal_energy_t_exact) >= gsw_cv.internal_energy_t_exact_ca); if ~isempty(gsw_cf.Iinternal_energy_t_exact) - try - cprintf('err','gsw_internal_energy_t_exact: Failed\n'); - catch - fprintf(2,'gsw_internal_energy_t_exact: Failed\n'); - end + fprintf(2,'gsw_internal_energy_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.enthalpy_t_exact = gsw_enthalpy_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ienthalpy_t_exact] = find(abs(gsw_cv.enthalpy_t_exact - gsw_cf.enthalpy_t_exact) >= gsw_cv.enthalpy_t_exact_ca); if ~isempty(gsw_cf.Ienthalpy_t_exact) - try - cprintf('err','gsw_enthalpy_t_exact: Failed\n'); - catch - fprintf(2,'gsw_enthalpy_t_exact: Failed\n'); - end + fprintf(2,'gsw_enthalpy_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.dynamic_enthalpy_t_exact = gsw_dynamic_enthalpy_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Idynamic_enthalpy_t_exact] = find(abs(gsw_cv.dynamic_enthalpy_t_exact - gsw_cf.dynamic_enthalpy_t_exact) >= gsw_cv.dynamic_enthalpy_t_exact_ca); if ~isempty(gsw_cf.Idynamic_enthalpy_t_exact) - try - cprintf('err','gsw_dynamic_enthalpy_t_exact: Failed\n'); - catch - fprintf(2,'gsw_dynamic_enthalpy_t_exact: Failed\n'); - end + fprintf(2,'gsw_dynamic_enthalpy_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.SA_from_rho_t_exact = gsw_SA_from_rho_t_exact(gsw_cf.rho_t_exact,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.ISA_from_rho_t_exact] = find(abs(gsw_cv.SA_from_rho_t_exact - gsw_cf.SA_from_rho_t_exact) >= gsw_cv.SA_from_rho_t_exact_ca); if ~isempty(gsw_cf.ISA_from_rho_t_exact) - try - cprintf('err','gsw_SA_from_rho_t_exact: Failed\n'); - catch - fprintf(2,'gsw_SA_from_rho_t_exact: Failed\n'); - end + fprintf(2,'gsw_SA_from_rho_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.t_from_rho_exact = gsw_t_from_rho_exact(gsw_cf.rho_t_exact,gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.It_from_rho_exact] = find(abs(gsw_cv.t_from_rho_exact - gsw_cf.t_from_rho_exact) >= gsw_cv.t_from_rho_exact_ca); if ~isempty(gsw_cf.It_from_rho_exact) - try - cprintf('err','gsw_t_from_rho_exact: Failed\n'); - catch - fprintf(2,'gsw_t_from_rho_exact: Failed\n'); - end + fprintf(2,'gsw_t_from_rho_exact: Failed\n'); gsw_chks = 0; end gsw_cf.t_maxdensity_exact = gsw_t_maxdensity_exact(gsw_cv.SA_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.It_maxdensity_exact] = find(abs(gsw_cv.t_maxdensity_exact - gsw_cf.t_maxdensity_exact) >= gsw_cv.t_maxdensity_exact_ca); if ~isempty(gsw_cf.It_maxdensity_exact) - try - cprintf('err','gsw_t_maxdensity_exact: Failed\n'); - catch - fprintf(2,'gsw_t_maxdensity_exact: Failed\n'); - end + fprintf(2,'gsw_t_maxdensity_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.entropy_t_exact = gsw_entropy_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ientropy_t_exact] = find(abs(gsw_cv.entropy_t_exact - gsw_cf.entropy_t_exact) >= gsw_cv.entropy_t_exact_ca); if ~isempty(gsw_cf.Ientropy_t_exact) - try - cprintf('err','gsw_entropy_t_exact: Failed\n'); - catch - fprintf(2,'gsw_entropy_t_exact: Failed\n'); - end + fprintf(2,'gsw_entropy_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.cp_t_exact = gsw_cp_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Icp_t_exact] = find(abs(gsw_cv.cp_t_exact - gsw_cf.cp_t_exact) >= gsw_cv.cp_t_exact_ca); if ~isempty(gsw_cf.Icp_t_exact) - try - cprintf('err','gsw_cp_t_exact: Failed\n'); - catch - fprintf(2,'gsw_cp_t_exact: Failed\n'); - end + fprintf(2,'gsw_cp_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.isochoric_heat_cap_t_exact = gsw_isochoric_heat_cap_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Iisochoric_heat_cap_t_exact] = find(abs(gsw_cv.isochoric_heat_cap_t_exact - gsw_cf.isochoric_heat_cap_t_exact) >= gsw_cv.isochoric_heat_cap_t_exact_ca); if ~isempty(gsw_cf.Iisochoric_heat_cap_t_exact) - try - cprintf('err','gsw_isochoric_heat_cap_t_exact: Failed\n'); - catch - fprintf(2,'gsw_isochoric_heat_cap_t_exact: Failed\n'); - end + fprintf(2,'gsw_isochoric_heat_cap_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.chem_potential_t_exact = gsw_chem_potential_relative_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ichem_potential_t_exact] = find(abs(gsw_cv.chem_potential_t_exact - gsw_cf.chem_potential_t_exact) >= gsw_cv.chem_potential_t_exact_ca); if ~isempty(gsw_cf.Ichem_potential_t_exact) - try - cprintf('err','gsw_chem_potential_relative_t_exact: Failed\n'); - catch - fprintf(2,'gsw_chem_potential_relative_t_exact: Failed\n'); - end + fprintf(2,'gsw_chem_potential_relative_t_exact: Failed\n'); gsw_chks = 0; end gsw_cf.chem_potential_water_t_exact = gsw_chem_potential_water_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ichem_potential_water_t_exact] = find(abs(gsw_cv.chem_potential_water_t_exact - gsw_cf.chem_potential_water_t_exact) >= gsw_cv.chem_potential_water_t_exact_ca); if ~isempty(gsw_cf.Ichem_potential_water_t_exact) - try - cprintf('err','gsw_chem_potential_water_t_exact: Failed\n'); - catch - fprintf(2,'gsw_chem_potential_water_t_exact: Failed\n'); - end + fprintf(2,'gsw_chem_potential_water_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end if gsw_cf.gsw_chks == 1 ; - try - cprintf('text','.'); - catch - fprintf(1,'.'); - end + fprintf(1,'.'); end gsw_cf.chem_potential_salt_t_exact = gsw_chem_potential_salt_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Ichem_potential_salt_t_exact] = find(abs(gsw_cv.chem_potential_salt_t_exact - gsw_cf.chem_potential_salt_t_exact) >= gsw_cv.chem_potential_salt_t_exact_ca); if ~isempty(gsw_cf.Ichem_potential_salt_t_exact) - try - cprintf('err','gsw_chem_potential_salt_t_exact: Failed\n'); - catch - fprintf(2,'gsw_chem_potential_salt_t_exact: Failed\n'); - end + fprintf(2,'gsw_chem_potential_salt_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.Helmholtz_energy_t_exact = gsw_Helmholtz_energy_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.IHelmholtz_energy_t_exact] = find(abs(gsw_cv.Helmholtz_energy_t_exact - gsw_cf.Helmholtz_energy_t_exact) >= gsw_cv.Helmholtz_energy_t_exact_ca); if ~isempty(gsw_cf.IHelmholtz_energy_t_exact) - try - cprintf('err','gsw_Helmholtz_energy_t_exact: Failed\n'); - catch - fprintf(2,'gsw_Helmholtz_energy_t_exact: Failed\n'); - end + fprintf(2,'gsw_Helmholtz_energy_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.adiabatic_lapse_rate_t_exact = gsw_adiabatic_lapse_rate_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Iadiabatic_lapse_rate_t_exact] = find(abs(gsw_cv.adiabatic_lapse_rate_t_exact - gsw_cf.adiabatic_lapse_rate_t_exact) >= gsw_cv.adiabatic_lapse_rate_t_exact_ca); if ~isempty(gsw_cf.Iadiabatic_lapse_rate_t_exact) - try - cprintf('err','gsw_adiabatic_lapse_rate_t_exact: Failed\n'); - catch - fprintf(2,'gsw_adiabatic_lapse_rate_t_exact: Failed\n'); - end + fprintf(2,'gsw_adiabatic_lapse_rate_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.osmotic_coefficient_t_exact = gsw_osmotic_coefficient_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Iosmotic_coefficient_t_exact] = find(abs(gsw_cv.osmotic_coefficient_t_exact - gsw_cf.osmotic_coefficient_t_exact) >= gsw_cv.osmotic_coefficient_t_exact_ca); if ~isempty(gsw_cf.Iosmotic_coefficient_t_exact) - try - cprintf('err','gsw_osmotic_coefficient_t_exact: Failed\n'); - catch - fprintf(2,'gsw_osmotic_coefficient_t_exact: Failed\n'); - end + fprintf(2,'gsw_osmotic_coefficient_t_exact: Failed\n'); gsw_cf.gsw_chks = 0; end gsw_cf.osmotic_pressure_t_exact = gsw_osmotic_pressure_t_exact(gsw_cv.SA_chck_cast,gsw_cv.t_chck_cast,gsw_cv.p_chck_cast); [gsw_cf.Iosmotic_pressure_t_exact] = find(abs(gsw_cv.osmotic_pressure_t_exact - gsw_cf.osmotic_pressure_t_exact) >= gsw_cv.osmotic_pressure_t_exact_ca); if ~isempty(gsw_cf.Iosmotic_pressure_t_exact) - try - cprintf('err','gsw_osmotic_pressure_t_exact: Failed\n'); - catch - fprintf(2,'gsw_osmotic_pressure_t_exact: Failed\n'); - end + fprintf(2,'gsw_osmotic_pressure_t_exact: Failed\n'); gsw_chks = 0; end if gsw_cf.gsw_chks == 1 ; - try - cprintf('text','.'); - catch - fprintf(1,'.'); - end + fprintf(1,'.'); end % library gsw_cf.fdelta = gsw_Fdelta(gsw_cv.p_chck_cast,gsw_cv.long_chck_cast,gsw_cv.lat_chck_cast); [gsw_cf.Ifdelta] = find(abs(gsw_cv.fdelta - gsw_cf.fdelta) >= gsw_cv.fdelta_ca); if ~isempty(gsw_cf.Ifdelta) - try - cprintf('err','gsw_Fdelta: Failed. \n'); - catch - fprintf(2,'gsw_Fdelta: Failed. \n'); - end + fprintf(2,'gsw_Fdelta: Failed. \n'); gsw_cf.gsw_chks = 0; end @@ -1818,11 +1174,7 @@ gsw_cf.delta_sa_ref(I) = gsw_delta_SA_ref(gsw_cv.p_chck_cast(I),gsw_cf.long_chck_cast_temp(I),gsw_cf.lat_chck_cast_temp(I)); [gsw_cf.Idelta_sa_ref] = find(abs(gsw_cv.delta_sa_ref - gsw_cf.delta_sa_ref) >= gsw_cv.delta_sa_ref_ca); if ~isempty(gsw_cf.Idelta_sa_ref) - try - cprintf('err','gsw_delta_SA_ref: Failed. \n'); - catch - fprintf(2,'gsw_delta_SA_ref: Failed. \n'); - end + fprintf(2,'gsw_delta_SA_ref: Failed. \n'); gsw_cf.gsw_chks = 0; end @@ -1831,48 +1183,26 @@ %% if gsw_cf.gsw_chks == 1 ; - try - cprintf('text',' Finished.\n'); - cprintf('text',' \n'); - catch - fprintf(1,' Finished.\n'); - fprintf(1,'\n'); - end + fprintf(1,' Finished.\n'); + fprintf(1,'\n'); end if gsw_cf.gsw_chks == 0 - try - cprintf('err','Your installation of the Gibbs SeaWater (GSW) Oceanographic Toolbox has errors !\n'); - catch - fprintf(2,'Your installation of the Gibbs SeaWater (GSW) Oceanographic Toolbox has errors !\n'); - end + fprintf(2,'Your installation of the Gibbs SeaWater (GSW) Oceanographic Toolbox has errors !\n'); demo = 0; else - try - cprintf('comment','Well done! The gsw_check_functions confirms that the \n'); - cprintf('comment','Gibbs SeaWater (GSW) Oceanographic Toolbox is installed correctly.\n'); - cprintf('text','\n'); - catch - fprintf(1,'Well done! The gsw_check_fuctions confirms that the \n'); - fprintf(1,'Gibbs SeaWater (GSW) Oceanographic Toolbox is installed correctly.\n'); - fprintf(1,'\n'); - end + fprintf(1,'Well done! The gsw_check_fuctions confirms that the \n'); + fprintf(1,'Gibbs SeaWater (GSW) Oceanographic Toolbox is installed correctly.\n'); + fprintf(1,'\n'); demo = gsw_cf.gsw_chks; - clear gsw_cf gsw_cv gsw_data gsw_data_file + clear gsw_cf gsw_cv gsw_data gsw_data_file end if demo == 1 - try - cprintf('strings','A demo will now follow. \n'); - cprintf('text','Press enter to continue. \n'); - pause - gsw_demo - catch - fprintf(1,'A demo will now follow. \n'); - fprintf(1,'Press enter to continue. \n'); - pause - gsw_demo - end + fprintf(1,'A demo will now follow. \n'); + fprintf(1,'Press enter to continue. \n'); + pause + gsw_demo end clear demo diff --git a/Toolbox/gsw_chem_potential_relative_t_exact.m b/Toolbox/gsw_chem_potential_relative_t_exact.m index 4c6639d..a8c5bd1 100644 --- a/Toolbox/gsw_chem_potential_relative_t_exact.m +++ b/Toolbox/gsw_chem_potential_relative_t_exact.m @@ -23,9 +23,9 @@ % [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_chem_potential_salt_t_exact.m b/Toolbox/gsw_chem_potential_salt_t_exact.m index cc7211b..b583da2 100644 --- a/Toolbox/gsw_chem_potential_salt_t_exact.m +++ b/Toolbox/gsw_chem_potential_salt_t_exact.m @@ -24,9 +24,9 @@ % [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_chem_potential_water_t_exact.m b/Toolbox/gsw_chem_potential_water_t_exact.m index d912068..e55b2ac 100644 --- a/Toolbox/gsw_chem_potential_water_t_exact.m +++ b/Toolbox/gsw_chem_potential_water_t_exact.m @@ -24,9 +24,9 @@ % [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_cp0.m b/Toolbox/gsw_cp0.m index 58e208f..78f3b47 100644 --- a/Toolbox/gsw_cp0.m +++ b/Toolbox/gsw_cp0.m @@ -15,9 +15,9 @@ % with Conservative Temperature % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_cp_t_exact.m b/Toolbox/gsw_cp_t_exact.m index e85b07e..f1fbf7e 100644 --- a/Toolbox/gsw_cp_t_exact.m +++ b/Toolbox/gsw_cp_t_exact.m @@ -22,9 +22,9 @@ % cp_t_exact = heat capacity of seawater [ J/(kg*K) ] % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_deltaSA_from_SP.m b/Toolbox/gsw_deltaSA_from_SP.m index 92782c5..90f41e7 100644 --- a/Toolbox/gsw_deltaSA_from_SP.m +++ b/Toolbox/gsw_deltaSA_from_SP.m @@ -27,9 +27,9 @@ % deltaSA = Absolute Salinity Anomaly [ g/kg ] % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (27th March, 2011) +% VERSION NUMBER: 3.01 (27th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_demo.m b/Toolbox/gsw_demo.m index 4f4f6c5..dcae42a 100644 --- a/Toolbox/gsw_demo.m +++ b/Toolbox/gsw_demo.m @@ -8,300 +8,167 @@ try JavaVirtMach = system_dependent('useJava','jvm'); catch -% assume no Java Virtual Machine + % assume no Java Virtual Machine JavaVirtMach = 0; end -try - cprintf('keywords','Welcome the Gibbs Seawater (GSW) Oceanographic Toolbox (version 3). \n'); - pause(3) - cprintf('comment','This is a short demonstration of some of the features of the \n'); - cprintf('comment','GSW Oceanographic Toolbox. \n'); - cprintf('text',' \n'); - cprintf('keywords','The most important functions are the first two functions. \n'); - cprintf('text',' \n'); - cprintf('comment','The following vertical profiles, from the North Pacific, are of \n'); - cprintf('comment','Practical Salinity, SP, and in-situ temperature, t, as a function \n'); - cprintf('comment','of pressure, p, \n'); - pause(6) - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'SP = [',gsw_demo_data.SP([1,22,29:4:45],1)',']'); - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'t = [',gsw_demo_data.t([1,22,29:4:45],1)',']'); - cprintf('text','%s %7.0f %7.0f %7.0f %7.0f %7.0f %7.0f %7.0f %s \n' ,'p = [',gsw_demo_data.p([1,22,29:4:45],1)',']'); - cprintf('comment','Note that, we have shown only seven bottles from the full vertical profile. \n'); - cprintf('text',' \n'); - pause(6) - cprintf('keywords','The first step under TEOS-10 is to convert Practical Salinity, SP, \n'); - cprintf('keywords','into Absolute Salinity, SA. This is done with the function "gsw_SA_from_SP" \n'); - pause(6) - cprintf('text','SA = gsw_SA_from_SP(SP,p,long,lat) \n'); - gsw_demo_data.SA = gsw_SA_from_SP(gsw_demo_data.SP,gsw_demo_data.p,gsw_demo_data.long,gsw_demo_data.lat); - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'SA = [',gsw_demo_data.SA([1,22,29:4:45],1)',']'); - cprintf('text',' \n'); - pause(6) - cprintf('keywords','The second step is to convert in-situ temperature, t, into \n'); - cprintf('keywords','Conservative Temperature, CT, using the function \n'); - cprintf('keywords','"gsw_CT_from_t", \n'); - pause(6) - cprintf('text','CT = gsw_CT_from_t(SA,t,p) \n'); - gsw_demo_data.CT = gsw_CT_from_t(gsw_demo_data.SA,gsw_demo_data.t,gsw_demo_data.p); - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'CT = [',gsw_demo_data.CT([1,22,29:4:45],1)',']'); - cprintf('text',' \n'); - cprintf('comment','At this point the data has been converted into SA and CT, which are \n'); - cprintf('comment','the TEOS-10 salinity and temperature variables. With these variables it \n'); - cprintf('comment','is possible to compute the complete range of water column properties. \n'); - cprintf('text',' \n'); - pause(6) - cprintf('comment','The first property to be demonstrated is density (rho) as a function \n'); - cprintf('comment','of SA and CT. This is computed by using the function "gsw_rho_CT". \n'); - cprintf('comment','The use of a single algorithm for seawater density (the 48-term computationally \n'); - cprintf('comment','efficient expression) ensures consistency between ocean modelling, observational \n'); - cprintf('comment','oceanography, and theoretical studies. Note that this is not been the case to \n'); - cprintf('comment','date under EOS-80. \n'); - cprintf('text','rho_CT = gsw_rho_CT(SA,CT,p) \n'); - gsw_demo_data.rho_CT = gsw_rho_CT(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p); - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'rho_CT = [',gsw_demo_data.rho_CT([1,22,29:4:45],1)',']'); - cprintf('text',' \n'); - pause(6) - cprintf('comment','Using this same programme, gsw_rho_CT, it is possible to compute potential \n'); - cprintf('comment','density by replacing the in-situ pressure, p with the reference pressure, \n'); - cprintf('comment','p_ref. \n'); - cprintf('text',' \n'); - pause(2) - cprintf('comment','An example. We have set p_ref to be 2000 dbar, thus we have the potential \n'); - cprintf('comment','density referenced to 2000 dbars. \n'); - cprintf('text','pot_rho_CT_2 = gsw_rho_CT(SA,CT,p_ref) \n'); - gsw_demo_data.pot_rho_CT_2 = gsw_rho_CT(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p_ref); - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'pot_rho_CT = [',gsw_demo_data.pot_rho_CT_2([1,22,29:4:45],1)',']'); - cprintf('text',' \n'); - pause(6) - cprintf('comment','The potential density anomaly can be obtained by using the function \n'); - cprintf('comment','"gsw_rho_CT" - 1000 kg/m^3. \n'); - cprintf('comment','Two examples of this are sigma_0 and sigma_2 which can be calculated \n'); - cprintf('comment','as follows \n'); - cprintf('text','sigma_0 = gsw_rho_CT(SA,CT,0) - 1000 \n'); - gsw_demo_data.sigma_0 = gsw_rho_CT(gsw_demo_data.SA,gsw_demo_data.CT,0) -1000; - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'sigma_0 = [',gsw_demo_data.sigma_0([1,22,29:4:45],1)',']'); - cprintf('text',' \n'); - pause(6) - cprintf('text','sigma_2 = gsw_rho_CT(SA,CT,2000) - 1000 \n'); - gsw_demo_data.sigma_2 = gsw_rho_CT(gsw_demo_data.SA,gsw_demo_data.CT,2000) - 1000; - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'sigma_2 = [',gsw_demo_data.sigma_2([1,22,29:4:45],1)',']'); - cprintf('text',' \n'); - pause(6) - cprintf('comment','However, there are alternatives to the last two calls, we have provided \n'); - cprintf('comment','some short-cuts for the standard oceaongraphic variables as functions of \n'); - cprintf('comment','SA and CT, the alternative short-cuts to the above two calls are: \n'); - cprintf('text','sigma_0 = gsw_sigma0_CT(SA,CT) \n'); - cprintf('comment',' and \n'); - cprintf('text','sigma_2 = gsw_sigma2_CT(SA,CT) \n'); - cprintf('text',' \n'); - pause(6) - cprintf('comment','Calculating the Conservative Temperature at which seawater freezes is \n'); - cprintf('comment','done with the function \n'); - cprintf('text','"gsw_CT_freezing" \n'); - cprintf('comment','This programme allows the user to choose the amount of air which the water \n'); - cprintf('comment','contains, at zero the water is unsaturated and at 1 it is completely \n'); - cprintf('comment','saturated, we have opted to set the default saturation level at maximum \n'); - cprintf('text','CT_freezing = gsw_CT_freezing(SA,p) \n'); - gsw_demo_data.CT_freezing = gsw_CT_freezing(gsw_demo_data.SA,gsw_demo_data.p); - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'CT_freezing = [',gsw_demo_data.CT_freezing([1,22,29:4:45],1)',']'); - cprintf('text',' \n'); - cprintf('comment','Press enter to continue. \n'); - pause - cprintf('keywords','We now plot the profile on the Absolute Salinity - Conservative Temperature diagram\n'); - cprintf('comment','This can be done by calling "gsw_SA_CT_plot". This function plots the \n'); - cprintf('comment','Absolute Salinity and Conservative Temperature profile data on a SA-CT diagram \n'); - cprintf('comment','with user definied potential density contours and the Conservative Temperature \n'); - cprintf('comment','freezing line at p of 0 dbar. The potential density anomaly contours are \n'); - cprintf('comment','referenced to user supplied depth are also included. In this example we have \n'); - cprintf('comment','set the reference pressure to be 2000 dbar. \n'); - cprintf('comment','note that this plotting function relies on the functions \n'); - cprintf('comment','"gsw_rho_CT" and "gsw_CT_freezing" \n'); - cprintf('text',' \n'); - cprintf('text','p_ref = 2000 \n'); - cprintf('text','gsw_SA_CT_plot(SA,CT,p_ref,''\\itS_A - \\Theta plot'') \n'); - pause(6) - if JavaVirtMach == 1 - try - gsw_SA_CT_plot(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p_ref,[33:0.2:38],'\itS\rm_A - \Theta plot') - pause(6) - close all - catch - fprintf(1,' \n'); - fprintf(1,'It appears that you are running MATLAB without the Java Virtual Machine, \n'); - fprintf(1,'so we can not show the resulting figure. \n'); - end - else +fprintf(1,'Welcome the Gibbs Seawater (GSW) Oceanographic Toolbox (version 3). \n'); +pause(3) +fprintf(1,'This is a short demonstration of some of the features of the \n'); +fprintf(1,'GSW Oceanographic toolbox. \n'); +fprintf(1,' \n'); +fprintf(1,'The most important functions are the first two functions. \n'); +fprintf(1,' \n'); +fprintf(1,'The following vertical profiles, from the North Pacific, are of \n'); +fprintf(1,'Practical Salinity, SP, and in-situ temperature, t, as a function \n'); +fprintf(1,'of pressure, p, \n'); +pause(6) +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'SP = [',gsw_demo_data.SP([1,22,29:4:45],1)',']'); +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'t = [',gsw_demo_data.t([1,22,29:4:45],1)',']'); +fprintf(1,'%s %7.0f %7.0f %7.0f %7.0f %7.0f %7.0f %7.0f %s \n' ,'p = [',gsw_demo_data.p([1,22,29:4:45],1)',']'); +fprintf(1,'Note that, we have shown only seven bottles from the full vertical profile. \n'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'The first step under TEOS-10 is to convert Practical Salinity, SP, \n'); +fprintf(1,'into Absolute Salinity, SA. This is done with the function "gsw_SA_from_SP" \n'); +pause(6) +fprintf(1,'SA = gsw_SA_from_SP(SP,p,long,lat) \n'); +gsw_demo_data.SA = gsw_SA_from_SP(gsw_demo_data.SP,gsw_demo_data.p,gsw_demo_data.long,gsw_demo_data.lat); +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'SA = [',gsw_demo_data.SA([1,22,29:4:45],1)',']'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'The second step is to convert in-situ temperature, t, into \n'); +fprintf(1,'Conservative Temperature, CT, using the function \n'); +fprintf(1,'"gsw_CT_from_t", \n'); +pause(6) +fprintf(1,'CT = gsw_CT_from_t(SA,t,p) \n'); +gsw_demo_data.CT = gsw_CT_from_t(gsw_demo_data.SA,gsw_demo_data.t,gsw_demo_data.p); +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'CT = [',gsw_demo_data.CT([1,22,29:4:45],1)',']'); +fprintf(1,' \n'); +fprintf(1,'At this point the data has been converted into SA and CT, which are \n'); +fprintf(1,'the TEOS-10 salinity and temperature variables. With these variables it \n'); +fprintf(1,'is possible to compute the complete range of water column properties. \n'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'The first property to be demonstrated is density (rho) as a function \n'); +fprintf(1,'of SA and CT. This is computed by using the function "gsw_rho_CT". \n'); +fprintf(1,'The use of a single algorithm for seawater density (the 48-term computationally \n'); +fprintf(1,'efficient expression) ensures consistency between ocean modelling, observational \n'); +fprintf(1,'oceanography, and theoretical studies. Note that this is not been the case to \n'); +fprintf(1,'date under EOS-80. \n'); +fprintf(1,'rho_CT = gsw_rho_CT(SA,CT,p) \n'); +gsw_demo_data.rho_CT = gsw_rho(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p); +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'rho_CT = [',gsw_demo_data.rho_CT([1,22,29:4:45],1)',']'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'Using this same programme, gsw_rho_CT, it is possible to compute potential \n'); +fprintf(1,'density by replacing the in-situ pressure, p with the reference pressure, \n'); +fprintf(1,'p_ref. \n'); +fprintf(1,' \n'); +pause(2) +fprintf(1,'An example. We have set p_ref to be 2000 dbar, thus we have the potential \n'); +fprintf(1,'density referenced to 2000 dbars. \n'); +fprintf(1,'pot_rho_CT_2 = gsw_rho_CT(SA,CT,p_ref) \n'); +gsw_demo_data.pot_rho_CT_2 = gsw_rho(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p_ref); +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'pot_rho_CT = [',gsw_demo_data.pot_rho_CT_2([1,22,29:4:45],1)',']'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'The potential density anomaly can be obtained by using the function \n'); +fprintf(1,'"gsw_rho_CT" - 1000 kg/m^3. \n'); +fprintf(1,'Two examples of this are sigma_Theta and sigma_2 which can be calculated \n'); +fprintf(1,'as follows \n'); +fprintf(1,'sigma_0 = gsw_rho_CT(SA,CT,0) - 1000 \n'); +gsw_demo_data.sigma_0 = gsw_rho(gsw_demo_data.SA,gsw_demo_data.CT,0) -1000; +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'sigma_0 = [',gsw_demo_data.sigma_0([1,22,29:4:45],1)',']'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'sigma_2 = gsw_rho_CT(SA,CT,2000) - 1000 \n'); +gsw_demo_data.sigma_2 = gsw_rho(gsw_demo_data.SA,gsw_demo_data.CT,2000) - 1000; +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'sigma_2 = [',gsw_demo_data.sigma_2([1,22,29:4:45],1)',']'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'However, there are alternatives to the last two calls, we have provided \n'); +fprintf(1,'some short-cuts for the standard oceaongraphic variables as functions of \n'); +fprintf(1,'SA and CT, the alternative short-cuts to the above two calls are: \n'); +fprintf(1,'sigma_0 = gsw_sigma0_CT(SA,CT) \n'); +fprintf(1,' and \n'); +fprintf(1,'sigma_2 = gsw_sigma2_CT(SA,CT) \n'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'Calculating the Conservative Temperature at which seawater freezes is \n'); +fprintf(1,'done with the function \n'); +fprintf(1,'"gsw_CT_freezing" \n'); +fprintf(1,'This programme allows the user to choose the amount of air which the water \n'); +fprintf(1,'contains, at zero the water is unsaturated and at 1 it is completely \n'); +fprintf(1,'saturated, we have opted to set the default saturation level at maximum \n'); +fprintf(1,'CT_freezing = gsw_CT_freezing(SA,p) \n'); +gsw_demo_data.CT_freezing = gsw_CT_freezing(gsw_demo_data.SA,gsw_demo_data.p); +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'CT_freezing = [',gsw_demo_data.CT_freezing([1,22,29:4:45],1)',']'); +fprintf(1,' \n'); +fprintf(1,'Press enter to continue. \n'); +pause +fprintf(1,'We now plot the profile on the Absolute Salinity - Conservative Temperature diagram \n'); +fprintf(1,'This can be done by calling "gsw_SA_CT_plot". This function plots the \n'); +fprintf(1,'Absolute Salinity and Conservative Temperature profile data on a SA-CT diagram \n'); +fprintf(1,'with user definied potential density contours and the Conservative Temperature \n'); +fprintf(1,'freezing line at p of 0 dbar. The potential density anomaly contours are \n'); +fprintf(1,'referenced to user supplied depth are also included. In this example we have \n'); +fprintf(1,'set the reference pressure to be 2000 dbar. \n'); +fprintf(1,'note that this plotting function relies on the functions \n'); +fprintf(1,'"gsw_rho_CT" and "gsw_CT_freezing" \n'); +fprintf(1,' \n'); +fprintf(1,'p_ref = 2000 \n'); +fprintf(1,'gsw_SA_CT_plot(SA,CT,p_ref,''\\itS\\rm_A - \\Theta plot'') \n'); +pause(6) +if JavaVirtMach == 1 + try + fig1 = figure; + set(fig1,'pos','default','menubar','none','numbertitle','off', ... + 'name','GSW demo') + hax1 = axes('pos',[0 0 1 1],'parent',fig1); + axis(hax1,'off'); + str1(1) = {'An \it{S}\rm_A - {\Theta} diagram will soon appear.'}; + str1(2) = {' '}; + str1(3) = {'When you have finished studying the plot,'}; + str1(4) = {'minimise or close the window '}; + str1(5) = {'and press enter to continue.'}; + text(.5,.6,str1,'parent',hax1,'horizontalalignment','center','fontsize',18) + pause(6) + clf(fig1) + set(fig1,'pos','default','menubar','none','numbertitle','off', ... + 'name','GSW demo - An example SA_CT diagram') + gsw_SA_CT_plot(gsw_demo_data.SA(:,1),gsw_demo_data.CT(:,1),gsw_demo_data.p_ref,[33:0.2:38],'\itS\rm_A - \Theta plot') + pause + catch fprintf(1,' \n'); fprintf(1,'It appears that you are running MATLAB without the Java Virtual Machine, \n'); fprintf(1,'so we can not show the resulting figure. \n'); end - cprintf('text',' \n'); - pause(2) - cprintf('comment','The bouyancy (Brunt Vasaila) frequency squared (N^2) at the mid point \n'); - cprintf('comment','pressure (p_mid) between the "bottles" can be obtained by using the \n'); - cprintf('comment','function "gsw_Nsquared" \n'); - cprintf('text','[N2, p_mid] = gsw_Nsquared(SA,CT,p) \n'); - [gsw_demo_data.N2, gsw_demo_data.p_mid] = gsw_Nsquared(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p); - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'N2 = [',1e5*gsw_demo_data.N2([1,22,29:4:44],1)','] (*1e-5)'); - cprintf('text',' \n'); - cprintf('text','%s %7.2f %7.2f %7.2f %7.2f %7.2f %7.2f %s \n' ,'p_mid = [',gsw_demo_data.p_mid([1,22,29:4:44],1)',']'); - cprintf('text',' \n'); - pause(6) - cprintf('comment','The dynamic height anomaly, commmonly shortened to "dynamic height", can be \n'); - cprintf('comment','calculated with the function "gsw_geo_strf_dyn_height". In this function \n'); - cprintf('comment','the user defines the the reference pressure that they want the dymanic height \n'); - cprintf('comment','relative to. In this example we set p_ref to be 2000 dbar. \n'); - gsw_demo_data.geo_strf_dyn_height = gsw_geo_strf_dyn_height(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p,gsw_demo_data.p_ref); - cprintf('text','geo_strf_dyn_height = gsw_geo_strf_dyn_height(SA,CT,p,p_ref) \n'); - cprintf('text','%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'geo_strf_dyn_height = [',gsw_demo_data.geo_strf_dyn_height([1,22,29:4:45],1)',']'); - pause(4) - cprintf('comment','The end. \n'); -catch - fprintf(1,'Welcome the Gibbs Seawater (GSW) Oceanographic Toolbox (version 3). \n'); - pause(3) - fprintf(1,'This is a short demonstration of some of the features of the \n'); - fprintf(1,'GSW Oceanographic toolbox. \n'); - fprintf(1,' \n'); - fprintf(1,'The most important functions are the first two functions. \n'); - fprintf(1,' \n'); - fprintf(1,'The following vertical profiles, from the North Pacific, are of \n'); - fprintf(1,'Practical Salinity, SP, and in-situ temperature, t, as a function \n'); - fprintf(1,'of pressure, p, \n'); - pause(6) - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'SP = [',gsw_demo_data.SP([1,22,29:4:45],1)',']'); - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'t = [',gsw_demo_data.t([1,22,29:4:45],1)',']'); - fprintf(1,'%s %7.0f %7.0f %7.0f %7.0f %7.0f %7.0f %7.0f %s \n' ,'p = [',gsw_demo_data.p([1,22,29:4:45],1)',']'); - fprintf(1,'Note that, we have shown only seven bottles from the full vertical profile. \n'); - fprintf(1,' \n'); - pause(6) - fprintf(1,'The first step under TEOS-10 is to convert Practical Salinity, SP, \n'); - fprintf(1,'into Absolute Salinity, SA. This is done with the function "gsw_SA_from_SP" \n'); - pause(6) - fprintf(1,'SA = gsw_SA_from_SP(SP,p,long,lat) \n'); - gsw_demo_data.SA = gsw_SA_from_SP(gsw_demo_data.SP,gsw_demo_data.p,gsw_demo_data.long,gsw_demo_data.lat); - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'SA = [',gsw_demo_data.SA([1,22,29:4:45],1)',']'); - fprintf(1,' \n'); - pause(6) - fprintf(1,'The second step is to convert in-situ temperature, t, into \n'); - fprintf(1,'Conservative Temperature, CT, using the function \n'); - fprintf(1,'"gsw_CT_from_t", \n'); - pause(6) - fprintf(1,'CT = gsw_CT_from_t(SA,t,p) '); - gsw_demo_data.CT = gsw_CT_from_t(gsw_demo_data.SA,gsw_demo_data.t,gsw_demo_data.p); - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'CT = [',gsw_demo_data.CT([1,22,29:4:45],1)',']'); - fprintf(1,' \n'); - fprintf(1,'At this point the data has been converted into SA and CT, which are \n'); - fprintf(1,'the TEOS-10 salinity and temperature variables. With these variables it \n'); - fprintf(1,'is possible to compute the complete range of water column properties. \n'); - fprintf(1,' \n'); - pause(6) - fprintf(1,'The first property to be demonstrated is density (rho) as a function \n'); - fprintf(1,'of SA and CT. This is computed by using the function "gsw_rho_CT". \n'); - fprintf(1,'The use of a single algorithm for seawater density (the 48-term computationally \n'); - fprintf(1,'efficient expression) ensures consistency between ocean modelling, observational \n'); - fprintf(1,'oceanography, and theoretical studies. Note that this is not been the case to \n'); - fprintf(1,'date under EOS-80. \n'); - fprintf(1,'rho_CT = gsw_rho_CT(SA,CT,p) \n'); - gsw_demo_data.rho_CT = gsw_rho_CT(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p); - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'rho_CT = [',gsw_demo_data.rho_CT([1,22,29:4:45],1)',']'); - fprintf(1,' \n'); - pause(6) - fprintf(1,'Using this same programme, gsw_rho_CT, it is possible to compute potential \n'); - fprintf(1,'density by replacing the in-situ pressure, p with the reference pressure, \n'); - fprintf(1,'p_ref. \n'); - fprintf(1,' \n'); - pause(2) - fprintf(1,'An example. We have set p_ref to be 2000 dbar, thus we have the potential \n'); - fprintf(1,'density referenced to 2000 dbars. \n'); - fprintf(1,'pot_rho_CT_2 = gsw_rho_CT(SA,CT,p_ref) \n'); - gsw_demo_data.pot_rho_CT_2 = gsw_rho_CT(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p_ref); - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'pot_rho_CT = [',gsw_demo_data.pot_rho_CT_2([1,22,29:4:45],1)',']'); - fprintf(1,' \n'); - pause(6) - fprintf(1,'The potential density anomaly can be obtained by using the function \n'); - fprintf(1,'"gsw_rho_CT" - 1000 kg/m^3. \n'); - fprintf(1,'Two examples of this are sigma_Theta and sigma_2 which can be calculated \n'); - fprintf(1,'as follows \n'); - fprintf(1,'sigma_0 = gsw_rho_CT(SA,CT,0) - 1000 \n'); - gsw_demo_data.sigma_0 = gsw_rho_CT(gsw_demo_data.SA,gsw_demo_data.CT,0) -1000; - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'sigma_0 = [',gsw_demo_data.sigma_0([1,22,29:4:45],1)',']'); - fprintf(1,' \n'); - pause(6) - fprintf(1,'sigma_2 = gsw_rho_CT(SA,CT,2000) - 1000 \n'); - gsw_demo_data.sigma_2 = gsw_rho_CT(gsw_demo_data.SA,gsw_demo_data.CT,2000) - 1000; - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'sigma_2 = [',gsw_demo_data.sigma_2([1,22,29:4:45],1)',']'); - fprintf(1,' \n'); - pause(6) - fprintf(1,'However, there are alternatives to the last two calls, we have provided \n'); - fprintf(1,'some short-cuts for the standard oceaongraphic variables as functions of \n'); - fprintf(1,'SA and CT, the alternative short-cuts to the above two calls are: \n'); - fprintf(1,'sigma_0 = gsw_sigma0_CT(SA,CT) \n'); - fprintf(1,' and \n'); - fprintf(1,'sigma_2 = gsw_sigma2_CT(SA,CT) \n'); - fprintf(1,' \n'); - pause(6) - fprintf(1,'Calculating the Conservative Temperature at which seawater freezes is \n'); - fprintf(1,'done with the function \n'); - fprintf(1,'"gsw_CT_freezing" \n'); - fprintf(1,'This programme allows the user to choose the amount of air which the water \n'); - fprintf(1,'contains, at zero the water is unsaturated and at 1 it is completely \n'); - fprintf(1,'saturated, we have opted to set the default saturation level at maximum \n'); - fprintf(1,'CT_freezing = gsw_CT_freezing(SA,p) \n'); - gsw_demo_data.CT_freezing = gsw_CT_freezing(gsw_demo_data.SA,gsw_demo_data.p); - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'CT_freezing = [',gsw_demo_data.CT_freezing([1,22,29:4:45],1)',']'); - fprintf(1,' \n'); - fprintf(1,'Press enter to continue. \n'); - pause - fprintf(1,'We now plot the profile on the Absolute Salinity - Conservative Temperature diagram \n'); - fprintf(1,'This can be done by calling "gsw_SA_CT_plot". This function plots the \n'); - fprintf(1,'Absolute Salinity and Conservative Temperature profile data on a SA-CT diagram \n'); - fprintf(1,'with user definied potential density contours and the Conservative Temperature \n'); - fprintf(1,'freezing line at p of 0 dbar. The potential density anomaly contours are \n'); - fprintf(1,'referenced to user supplied depth are also included. In this example we have \n'); - fprintf(1,'set the reference pressure to be 2000 dbar. \n'); - fprintf(1,'note that this plotting function relies on the functions \n'); - fprintf(1,'"gsw_rho_CT" and "gsw_CT_freezing" \n'); - fprintf(1,' \n'); - fprintf(1,'p_ref = 2000 \n'); - fprintf(1,'gsw_SA_CT_plot(SA,CT,p_ref,''\\itS_A - \\Theta plot'') \n'); - pause(6) - if JavaVirtMach == 1 - try - gsw_SA_CT_plot(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p_ref,[33:0.2:38],'\itS\rm_A - \Theta plot') - pause(6) - close all - catch - fprintf(1,' \n'); - fprintf(1,'It appears that you are running MATLAB without the Java Virtual Machine, \n'); - fprintf(1,'so we can not show the resulting figure. \n'); - end - else - fprintf(1,' \n'); - fprintf(1,'It appears that you are running MATLAB without the Java Virtual Machine, \n'); - fprintf(1,'so we can not show the resulting figure. \n'); - end - fprintf(1,' \n'); - pause(2) - fprintf(1,'The bouyancy (Brunt Vasaila) frequency squared (N^2) at the mid point \n'); - fprintf(1,'pressure (p_mid) between the "bottles" can be obtained by using the \n'); - fprintf(1,'function "gsw_Nsquared" \n'); - fprintf(1,'[N2, p_mid] = gsw_Nsquared(SA,CT,p) \n'); - [gsw_demo_data.N2, gsw_demo_data.p_mid] = gsw_Nsquared(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p); - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'N2 = [',1e5*gsw_demo_data.N2([1,22,29:4:44],1)','] (*1e-5)'); - fprintf(1,' \n'); - fprintf(1,'%s %7.2f %7.2f %7.2f %7.2f %7.2f %7.2f %s \n' ,'p_mid = [',gsw_demo_data.p_mid([1,22,29:4:44],1)',']'); +else fprintf(1,' \n'); - pause(6) - fprintf(1,'The dynamic height anomaly, commmonly shortened to "dynamic height", can be \n'); - fprintf(1,'calculated with the function "gsw_geo_strf_dyn_height". In this function \n'); - fprintf(1,'the user defines the the reference pressure that they want the dymanic height \n'); - fprintf(1,'relative to. In this example we set p_ref to be 2000 dbar. \n'); - gsw_demo_data.geo_strf_dyn_height = gsw_geo_strf_dyn_height(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p,gsw_demo_data.p_ref); - fprintf(1,'geo_strf_dyn_height = gsw_geo_strf_dyn_height(SA,CT,p,p_ref) \n'); - fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'geo_strf_dyn_height = [',gsw_demo_data.geo_strf_dyn_height([1,22,29:4:45],1)',']'); - pause(4) - fprintf(1,'The end. \n'); + fprintf(1,'It appears that you are running MATLAB without the Java Virtual Machine, \n'); + fprintf(1,'so we can not show the resulting figure. \n'); end +fprintf(1,' \n'); +pause(2) +fprintf(1,'The bouyancy (Brunt Vasaila) frequency squared (N^2) at the mid point \n'); +fprintf(1,'pressure (p_mid) between the "bottles" can be obtained by using the \n'); +fprintf(1,'function "gsw_Nsquared" \n'); +fprintf(1,'[N2, p_mid] = gsw_Nsquared(SA,CT,p) \n'); +[gsw_demo_data.N2, gsw_demo_data.p_mid] = gsw_Nsquared(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p); +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'N2 = [',1e5*gsw_demo_data.N2([1,22,29:4:44],1)','] (*1e-5)'); +fprintf(1,' \n'); +fprintf(1,'%s %7.2f %7.2f %7.2f %7.2f %7.2f %7.2f %s \n' ,'p_mid = [',gsw_demo_data.p_mid([1,22,29:4:44],1)',']'); +fprintf(1,' \n'); +pause(6) +fprintf(1,'The dynamic height anomaly, commmonly shortened to "dynamic height", can be \n'); +fprintf(1,'calculated with the function "gsw_geo_strf_dyn_height". In this function \n'); +fprintf(1,'the user defines the the reference pressure that they want the dymanic height \n'); +fprintf(1,'relative to. In this example we set p_ref to be 2000 dbar. \n'); +gsw_demo_data.geo_strf_dyn_height = gsw_geo_strf_dyn_height(gsw_demo_data.SA,gsw_demo_data.CT,gsw_demo_data.p,gsw_demo_data.p_ref); +fprintf(1,'geo_strf_dyn_height = gsw_geo_strf_dyn_height(SA,CT,p,p_ref) \n'); +fprintf(1,'%s %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %7.4f %s \n' ,'geo_strf_dyn_height = [',gsw_demo_data.geo_strf_dyn_height([1,22,29:4:45],1)',']'); +pause(4) +fprintf(1,'The end. \n'); clear gsw_demo_data JavaVirtMach diff --git a/Toolbox/gsw_depth_from_z.m b/Toolbox/gsw_depth_from_z.m index 2053197..baea44a 100644 --- a/Toolbox/gsw_depth_from_z.m +++ b/Toolbox/gsw_depth_from_z.m @@ -17,9 +17,9 @@ % depth = depth [ m ] % % AUTHOR: -% Winston [ help_gsw@csiro.au ] +% Winston [ god@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011) +% VERSION NUMBER: 3.01 (26th March, 2011) % % This software is available from http://www.TEOS-10.org % diff --git a/Toolbox/gsw_distance.m b/Toolbox/gsw_distance.m index 90a8c3b..c7c9c83 100644 --- a/Toolbox/gsw_distance.m +++ b/Toolbox/gsw_distance.m @@ -36,14 +36,14 @@ % Note. The output is in m not km. % % AUTHOR: -% 6th November, 2000 by Rich Pawlowicz [ help_gsw@csiro.au ] +% 6th November, 2000 by Rich Pawlowicz [ help@teos-10.org ] % Note. This function was extracted from Rich Pawlowicz's m_map package, % which is available from http://www.eos.ubc.ca/~rich/map.html % % MODIFIED: % 4th April, 2011 by Paul Barker and Trevor McDougall. % -% VERSION NUMBER: 3.0 (4th April, 2011) +% VERSION NUMBER: 3.01 (4th April, 2011) % % REFERENCE: % http://www.eos.ubc.ca/~rich/map.html diff --git a/Toolbox/gsw_dynamic_enthalpy.m b/Toolbox/gsw_dynamic_enthalpy.m index 2421caf..817a131 100644 --- a/Toolbox/gsw_dynamic_enthalpy.m +++ b/Toolbox/gsw_dynamic_enthalpy.m @@ -32,9 +32,9 @@ % dynamic_enthalpy = dynamic enthalpy [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (5th April, 2011) +% VERSION NUMBER: 3.01 (5th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_dynamic_enthalpy_CT.m b/Toolbox/gsw_dynamic_enthalpy_CT.m index 010da8e..5394b65 100644 --- a/Toolbox/gsw_dynamic_enthalpy_CT.m +++ b/Toolbox/gsw_dynamic_enthalpy_CT.m @@ -38,9 +38,9 @@ % dynamic_enthalpy_CT = dynamic enthalpy [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (5th April, 2011) +% VERSION NUMBER: 3.01 (5th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_dynamic_enthalpy_CT_exact.m b/Toolbox/gsw_dynamic_enthalpy_CT_exact.m index 67b57e9..0925a62 100644 --- a/Toolbox/gsw_dynamic_enthalpy_CT_exact.m +++ b/Toolbox/gsw_dynamic_enthalpy_CT_exact.m @@ -30,9 +30,9 @@ % dynamic_enthalpy_CT_exact = dynamic enthalpy [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (5th April, 2011) +% VERSION NUMBER: 3.01 (5th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_dynamic_enthalpy_t_exact.m b/Toolbox/gsw_dynamic_enthalpy_t_exact.m index bc2e588..3ee1162 100644 --- a/Toolbox/gsw_dynamic_enthalpy_t_exact.m +++ b/Toolbox/gsw_dynamic_enthalpy_t_exact.m @@ -27,9 +27,9 @@ % dynamic_enthalpy_t_exact = dynamic enthalpy [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (11th April, 2011) +% VERSION NUMBER: 3.01 (11th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_enthalpy.m b/Toolbox/gsw_enthalpy.m index f89c063..3ddfe45 100644 --- a/Toolbox/gsw_enthalpy.m +++ b/Toolbox/gsw_enthalpy.m @@ -32,9 +32,9 @@ % % AUTHOR: % Trevor McDougall, David Jackett, Claire Roberts-Thomson and Paul Barker. -% [ help_gsw@csiro.au ] +% [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (5th April, 2011) +% VERSION NUMBER: 3.01 (5th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_enthalpy_CT.m b/Toolbox/gsw_enthalpy_CT.m index dc4be22..43414eb 100644 --- a/Toolbox/gsw_enthalpy_CT.m +++ b/Toolbox/gsw_enthalpy_CT.m @@ -38,9 +38,9 @@ % % AUTHOR: % Trevor McDougall, David Jackett, Claire Roberts-Thomson and Paul Barker. -% [ help_gsw@csiro.au ] +% [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (5th April, 2011) +% VERSION NUMBER: 3.01 (5th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_enthalpy_CT_exact.m b/Toolbox/gsw_enthalpy_CT_exact.m index e57a8ee..60836c0 100644 --- a/Toolbox/gsw_enthalpy_CT_exact.m +++ b/Toolbox/gsw_enthalpy_CT_exact.m @@ -28,9 +28,9 @@ % enthalpy_CT_exact = specific enthalpy [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (6th April, 2011) +% VERSION NUMBER: 3.01 (6th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_enthalpy_diff.m b/Toolbox/gsw_enthalpy_diff.m index 31e3f85..2c40642 100644 --- a/Toolbox/gsw_enthalpy_diff.m +++ b/Toolbox/gsw_enthalpy_diff.m @@ -38,9 +38,9 @@ % (deep minus shallow) % % AUTHOR: -% Trevor McDougall & Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (21st March, 2011) +% VERSION NUMBER: 3.01 (21st March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_enthalpy_diff_CT.m b/Toolbox/gsw_enthalpy_diff_CT.m index 73218a2..5241ec8 100644 --- a/Toolbox/gsw_enthalpy_diff_CT.m +++ b/Toolbox/gsw_enthalpy_diff_CT.m @@ -44,9 +44,9 @@ % (deep minus shallow) % % AUTHOR: -% Trevor McDougall & Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (21st March, 2011) +% VERSION NUMBER: 3.01 (21st March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_enthalpy_diff_CT_exact.m b/Toolbox/gsw_enthalpy_diff_CT_exact.m index c70a068..8991f82 100644 --- a/Toolbox/gsw_enthalpy_diff_CT_exact.m +++ b/Toolbox/gsw_enthalpy_diff_CT_exact.m @@ -35,9 +35,9 @@ % (deep minus shallow) % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (6th April, 2011) +% VERSION NUMBER: 3.01 (6th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_enthalpy_first_derivatives.m b/Toolbox/gsw_enthalpy_first_derivatives.m index 5ca96e8..52a45bb 100644 --- a/Toolbox/gsw_enthalpy_first_derivatives.m +++ b/Toolbox/gsw_enthalpy_first_derivatives.m @@ -34,9 +34,9 @@ % h_P is specific volume (1/rho). % % AUTHOR: -% Trevor McDougall. [ help_gsw@csiro.au ] +% Trevor McDougall. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_enthalpy_second_derivatives.m b/Toolbox/gsw_enthalpy_second_derivatives.m index a26de77..1e32396 100644 --- a/Toolbox/gsw_enthalpy_second_derivatives.m +++ b/Toolbox/gsw_enthalpy_second_derivatives.m @@ -34,9 +34,9 @@ % CT at constant SA and p. [ J/(kg K^2) ] % % AUTHOR: -% Trevor McDougall and Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_enthalpy_t_exact.m b/Toolbox/gsw_enthalpy_t_exact.m index 13c4615..eaf9235 100644 --- a/Toolbox/gsw_enthalpy_t_exact.m +++ b/Toolbox/gsw_enthalpy_t_exact.m @@ -22,9 +22,9 @@ % enthalpy_t_exact = specific enthalpy [ J/kg ] % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_entropy_first_derivatives.m b/Toolbox/gsw_entropy_first_derivatives.m index 3bf200e..4359bea 100644 --- a/Toolbox/gsw_entropy_first_derivatives.m +++ b/Toolbox/gsw_entropy_first_derivatives.m @@ -30,9 +30,9 @@ % eta_CT has units of: [ J/(kg K^2) ] % % AUTHOR: -% Trevor McDougall. [ help_gsw@csiro.au ] +% Trevor McDougall. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_entropy_from_CT.m b/Toolbox/gsw_entropy_from_CT.m index d071207..b4cb7d0 100644 --- a/Toolbox/gsw_entropy_from_CT.m +++ b/Toolbox/gsw_entropy_from_CT.m @@ -20,9 +20,9 @@ % entropy = specific entropy [ J/(kg*K) ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (4th April, 2011) +% VERSION NUMBER: 3.01 (4th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_entropy_from_pt.m b/Toolbox/gsw_entropy_from_pt.m index b502b6d..cef55e8 100644 --- a/Toolbox/gsw_entropy_from_pt.m +++ b/Toolbox/gsw_entropy_from_pt.m @@ -20,9 +20,9 @@ % entropy = specific entropy [ J/(kg*K) ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_entropy_second_derivatives.m b/Toolbox/gsw_entropy_second_derivatives.m index 7136556..1a70ffc 100644 --- a/Toolbox/gsw_entropy_second_derivatives.m +++ b/Toolbox/gsw_entropy_second_derivatives.m @@ -35,9 +35,9 @@ % Salinity. eta_CT_CT has units of: [ J/(kg K^3) ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_entropy_t_exact.m b/Toolbox/gsw_entropy_t_exact.m index c3d88f1..ddb41bd 100644 --- a/Toolbox/gsw_entropy_t_exact.m +++ b/Toolbox/gsw_entropy_t_exact.m @@ -22,9 +22,9 @@ % entropy_t_exact = specific entropy [ J/(kg*K) ] % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_f.m b/Toolbox/gsw_f.m index 2b25be1..4f0f40c 100644 --- a/Toolbox/gsw_f.m +++ b/Toolbox/gsw_f.m @@ -19,12 +19,12 @@ % f = Coriolis parameter [ radians/s ] % % AUTHOR: -% 20th April 1993. Phil Morgan [ help_gsw@csiro.au ] +% 20th April 1993. Phil Morgan [ help@teos-10.org ] % % MODIFIED: % 28th July, 2010 by Paul Barker % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (28th July, 2010). % % REFERENCE: diff --git a/Toolbox/gsw_geo_strf_Cunningham.m b/Toolbox/gsw_geo_strf_Cunningham.m index 7733d9e..6ba6b02 100644 --- a/Toolbox/gsw_geo_strf_Cunningham.m +++ b/Toolbox/gsw_geo_strf_Cunningham.m @@ -46,9 +46,9 @@ % streamfunction % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (18th March, 2011) +% VERSION NUMBER: 3.01 (18th March, 2011) % % REFERENCES: % Cunningham, S.A., 2000: Circulation and volume flux of the North diff --git a/Toolbox/gsw_geo_strf_Montgomery.m b/Toolbox/gsw_geo_strf_Montgomery.m index f56160f..92d006c 100644 --- a/Toolbox/gsw_geo_strf_Montgomery.m +++ b/Toolbox/gsw_geo_strf_Montgomery.m @@ -49,9 +49,9 @@ % streamfunction % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011) +% VERSION NUMBER: 3.01 (26th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_geo_strf_dyn_height.m b/Toolbox/gsw_geo_strf_dyn_height.m index 38f305b..0566ac6 100644 --- a/Toolbox/gsw_geo_strf_dyn_height.m +++ b/Toolbox/gsw_geo_strf_dyn_height.m @@ -58,9 +58,9 @@ % on the whole vertical profile is returned as NaN. % % AUTHOR: -% Paul Barker, Jeff Dunn and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker, Jeff Dunn and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (7th April, 2011) +% VERSION NUMBER: 3.01 (7th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_geo_strf_dyn_height_pc.m b/Toolbox/gsw_geo_strf_dyn_height_pc.m index 47ba07f..b882fbb 100644 --- a/Toolbox/gsw_geo_strf_dyn_height_pc.m +++ b/Toolbox/gsw_geo_strf_dyn_height_pc.m @@ -49,9 +49,9 @@ % p_mid = mid-point pressure in each layer [ dbar ] % % AUTHOR: -% Trevor McDougall and Claire Roberts-Thomson [ help_gsw@csiro.au ] +% Trevor McDougall and Claire Roberts-Thomson [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (28th March, 2011) +% VERSION NUMBER: 3.01 (28th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_geo_strf_isopycnal.m b/Toolbox/gsw_geo_strf_isopycnal.m index e7df0f9..3083e15 100644 --- a/Toolbox/gsw_geo_strf_isopycnal.m +++ b/Toolbox/gsw_geo_strf_isopycnal.m @@ -72,9 +72,9 @@ % McDougall & Klocker (2010) % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (21st March, 2011) +% VERSION NUMBER: 3.01 (21st March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_geo_strf_isopycnal_pc.m b/Toolbox/gsw_geo_strf_isopycnal_pc.m index e7f096c..6e4f950 100644 --- a/Toolbox/gsw_geo_strf_isopycnal_pc.m +++ b/Toolbox/gsw_geo_strf_isopycnal_pc.m @@ -50,9 +50,9 @@ % p_mid = mid-point pressure in each layer [ dbar ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (17th March, 2011) +% VERSION NUMBER: 3.01 (17th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_geostrophic_velocity.m b/Toolbox/gsw_geostrophic_velocity.m index 6dff55a..5ea60e4 100644 --- a/Toolbox/gsw_geostrophic_velocity.m +++ b/Toolbox/gsw_geostrophic_velocity.m @@ -57,9 +57,9 @@ % % % AUTHOR: -% Paul Barker, Trevor McDougall and Phil Morgan [ help_gsw@csiro.au ] +% Paul Barker, Trevor McDougall and Phil Morgan [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % Cunningham, S. A., 2000: Circulation and volume flux of the North diff --git a/Toolbox/gsw_grav.m b/Toolbox/gsw_grav.m index d1c8900..1c42476 100644 --- a/Toolbox/gsw_grav.m +++ b/Toolbox/gsw_grav.m @@ -25,9 +25,9 @@ % grav = gravitational acceleration [ m s^-2 ] % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_internal_energy.m b/Toolbox/gsw_internal_energy.m index 7f2f1b6..8c4b89d 100644 --- a/Toolbox/gsw_internal_energy.m +++ b/Toolbox/gsw_internal_energy.m @@ -31,9 +31,9 @@ % internal_energy = specific internal energy [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (4th April, 2011) +% VERSION NUMBER: 3.01 (4th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_internal_energy_CT.m b/Toolbox/gsw_internal_energy_CT.m index 65d938d..814f5fa 100644 --- a/Toolbox/gsw_internal_energy_CT.m +++ b/Toolbox/gsw_internal_energy_CT.m @@ -37,9 +37,9 @@ % internal_energy_CT = specific internal energy [ J/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (4th April, 2011) +% VERSION NUMBER: 3.01 (4th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_internal_energy_CT_exact.m b/Toolbox/gsw_internal_energy_CT_exact.m index 083adb7..8d15cea 100644 --- a/Toolbox/gsw_internal_energy_CT_exact.m +++ b/Toolbox/gsw_internal_energy_CT_exact.m @@ -23,9 +23,9 @@ % internal_energy_CT_exact = specific internal energy (u) [ J/kg ] % % AUTHOR: -% Trevor McDougall [ help_gsw@csiro.au ] +% Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (5th April, 2011) +% VERSION NUMBER: 3.01 (5th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_internal_energy_t_exact.m b/Toolbox/gsw_internal_energy_t_exact.m index 18a7883..81ae666 100644 --- a/Toolbox/gsw_internal_energy_t_exact.m +++ b/Toolbox/gsw_internal_energy_t_exact.m @@ -22,9 +22,9 @@ % internal_energy_t_exact = specific internal energy (u) [ J/kg ] % % AUTHOR: -% Trevor McDougall [ help_gsw@csiro.au ] +% Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_ionic_strength_from_SA.m b/Toolbox/gsw_ionic_strength_from_SA.m index 9b29631..504a0d0 100644 --- a/Toolbox/gsw_ionic_strength_from_SA.m +++ b/Toolbox/gsw_ionic_strength_from_SA.m @@ -16,9 +16,9 @@ % ionic_strength = ionic strength of seawater [ mol/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_isochoric_heat_cap_t_exact.m b/Toolbox/gsw_isochoric_heat_cap_t_exact.m index 8d4dff6..cbfb319 100644 --- a/Toolbox/gsw_isochoric_heat_cap_t_exact.m +++ b/Toolbox/gsw_isochoric_heat_cap_t_exact.m @@ -22,9 +22,9 @@ % isochoric_heat_cap_t_exact = isochoric heat capacity [ J/(kg K) ] % % AUTHOR: -% Trevor McDougall [ help_gsw@csiro.au ] +% Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_isopycnal_slope_ratio.m b/Toolbox/gsw_isopycnal_slope_ratio.m index a6b8c08..b8105a2 100644 --- a/Toolbox/gsw_isopycnal_slope_ratio.m +++ b/Toolbox/gsw_isopycnal_slope_ratio.m @@ -37,9 +37,9 @@ % pressure, p, to that at reference pressure, p_ref. % % AUTHOR: -% Trevor McDougall, Paul Barker & David Jackett [ gsw_help@csiro.au ] +% Trevor McDougall, Paul Barker & David Jackett [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011). +% VERSION NUMBER: 3.01 (26th March, 2011). % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_isopycnal_vs_ntp_CT_ratio.m b/Toolbox/gsw_isopycnal_vs_ntp_CT_ratio.m index 3dae9df..2ca8983 100644 --- a/Toolbox/gsw_isopycnal_vs_ntp_CT_ratio.m +++ b/Toolbox/gsw_isopycnal_vs_ntp_CT_ratio.m @@ -49,9 +49,9 @@ % p_mid has units of: [ dbar ] % % AUTHOR: -% Trevor McDougall, Paul Barker & David Jackett [ help_gsw@csiro.au ] +% Trevor McDougall, Paul Barker & David Jackett [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_kappa_const_t_exact.m b/Toolbox/gsw_kappa_const_t_exact.m index 4650509..fc4d180 100644 --- a/Toolbox/gsw_kappa_const_t_exact.m +++ b/Toolbox/gsw_kappa_const_t_exact.m @@ -25,9 +25,9 @@ % Note. The output units are 1/Pa not 1/dbar. % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_kappa_t_exact.m b/Toolbox/gsw_kappa_t_exact.m index 5ba4df8..336139f 100644 --- a/Toolbox/gsw_kappa_t_exact.m +++ b/Toolbox/gsw_kappa_t_exact.m @@ -23,9 +23,9 @@ % Note. The output units are 1/Pa not 1/dbar. % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_latentheat_evap_CT.m b/Toolbox/gsw_latentheat_evap_CT.m index 98ea7fa..43814cd 100644 --- a/Toolbox/gsw_latentheat_evap_CT.m +++ b/Toolbox/gsw_latentheat_evap_CT.m @@ -23,9 +23,9 @@ % latentheat_evap_CT = latent heat of evaporation [ J/kg ] % % AUTHOR: -% Paul Barker, Trevor McDougall & Rainer Feistel [ help_gsw@csiro.au ] +% Paul Barker, Trevor McDougall & Rainer Feistel [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_latentheat_evap_t.m b/Toolbox/gsw_latentheat_evap_t.m index b892070..24b0fc9 100644 --- a/Toolbox/gsw_latentheat_evap_t.m +++ b/Toolbox/gsw_latentheat_evap_t.m @@ -22,9 +22,9 @@ % latentheat_evap_t = latent heat of evaporation [ J/kg ] % % AUTHOR: -% Paul Barker, Trevor McDougall & Rainer Feistel [ help_gsw@csiro.au ] +% Paul Barker, Trevor McDougall & Rainer Feistel [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_latentheat_melting.m b/Toolbox/gsw_latentheat_melting.m index a5cce30..c14e19a 100644 --- a/Toolbox/gsw_latentheat_melting.m +++ b/Toolbox/gsw_latentheat_melting.m @@ -23,9 +23,9 @@ % latentheat_melting = latent heat of melting [ J/kg ] % % AUTHOR: -% Paul Barker, Trevor McDougall & Rainer Feistel [ help_gsw@csiro.au ] +% Paul Barker, Trevor McDougall & Rainer Feistel [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_molality_from_SA.m b/Toolbox/gsw_molality_from_SA.m index 1be7576..e404976 100644 --- a/Toolbox/gsw_molality_from_SA.m +++ b/Toolbox/gsw_molality_from_SA.m @@ -16,9 +16,9 @@ % molality = molality of seawater [ mol/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_ntp_pt_vs_CT_ratio.m b/Toolbox/gsw_ntp_pt_vs_CT_ratio.m index 8d7422e..9ee8758 100644 --- a/Toolbox/gsw_ntp_pt_vs_CT_ratio.m +++ b/Toolbox/gsw_ntp_pt_vs_CT_ratio.m @@ -39,9 +39,9 @@ % neutral tangent plane (ntp). [ unitless ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ gsw_help@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_osmotic_coefficient_t_exact.m b/Toolbox/gsw_osmotic_coefficient_t_exact.m index a0d2092..0b1272c 100644 --- a/Toolbox/gsw_osmotic_coefficient_t_exact.m +++ b/Toolbox/gsw_osmotic_coefficient_t_exact.m @@ -23,9 +23,9 @@ % [ unitless ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (1st April, 2011) +% VERSION NUMBER: 3.01 (1st April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_osmotic_pressure_t_exact.m b/Toolbox/gsw_osmotic_pressure_t_exact.m index 8feabff..b12abc0 100644 --- a/Toolbox/gsw_osmotic_pressure_t_exact.m +++ b/Toolbox/gsw_osmotic_pressure_t_exact.m @@ -22,9 +22,9 @@ % osmotic_pressure_t_exact = osmotic pressure of seawater [ dbar ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th May, 2011) +% VERSION NUMBER: 3.01 (26th May, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_p_from_Abs_Pressure.m b/Toolbox/gsw_p_from_Abs_Pressure.m index fab5a2c..4ac5962 100644 --- a/Toolbox/gsw_p_from_Abs_Pressure.m +++ b/Toolbox/gsw_p_from_Abs_Pressure.m @@ -17,9 +17,9 @@ % p = sea pressure [ dbar ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_p_from_z.m b/Toolbox/gsw_p_from_z.m index 21044c4..8fdfbce 100644 --- a/Toolbox/gsw_p_from_z.m +++ b/Toolbox/gsw_p_from_z.m @@ -43,9 +43,9 @@ % % AUTHOR: % Trevor McDougall, Claire Roberts-Thomson and Paul Barker. -% [ help_gsw@csiro.au ] +% [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011) +% VERSION NUMBER: 3.01 (26th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_pot_enthalpy_from_pt.m b/Toolbox/gsw_pot_enthalpy_from_pt.m index 943bed7..cafc33e 100644 --- a/Toolbox/gsw_pot_enthalpy_from_pt.m +++ b/Toolbox/gsw_pot_enthalpy_from_pt.m @@ -20,9 +20,9 @@ % pot_enthalpy = potential enthalpy [ J/kg ] % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_pot_rho_t_exact.m b/Toolbox/gsw_pot_rho_t_exact.m index d1b2b21..28cb4a3 100644 --- a/Toolbox/gsw_pot_rho_t_exact.m +++ b/Toolbox/gsw_pot_rho_t_exact.m @@ -28,9 +28,9 @@ % [ kg/m^3 ] % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_pt0_from_t.m b/Toolbox/gsw_pt0_from_t.m index 251f8cf..dd89008 100644 --- a/Toolbox/gsw_pt0_from_t.m +++ b/Toolbox/gsw_pt0_from_t.m @@ -31,9 +31,9 @@ % % AUTHOR: % Trevor McDougall, David Jackett, Claire Roberts-Thomson and Paul Barker. -% [ help_gsw@csiro.au ] +% [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_pt_first_derivatives.m b/Toolbox/gsw_pt_first_derivatives.m index 71640e4..4c44acd 100644 --- a/Toolbox/gsw_pt_first_derivatives.m +++ b/Toolbox/gsw_pt_first_derivatives.m @@ -29,9 +29,9 @@ % pt_CT is dimensionless. [ unitless ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_pt_from_CT.m b/Toolbox/gsw_pt_from_CT.m index b1aa61b..d256f09 100644 --- a/Toolbox/gsw_pt_from_CT.m +++ b/Toolbox/gsw_pt_from_CT.m @@ -25,9 +25,9 @@ % % AUTHOR: % Trevor McDougall, David Jackett, Claire Roberts-Thomson and Paul Barker. -% [ help_gsw@csiro.au ] +% [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (21st September, 2012) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: @@ -104,7 +104,7 @@ dCT_dpt = (pt_den)./(CT_factor + a5CT - (b2 + b3CT + b3CT).*pt); -% start the 1.5 iterations through the modified Newton-Rapshon iterative method. +% start the 1.5 iterations through the modified Newton-Raphson iterative method. CT_diff = gsw_CT_from_pt(SA,pt) - CT; pt_old = pt; diff --git a/Toolbox/gsw_pt_from_entropy.m b/Toolbox/gsw_pt_from_entropy.m index 67b2be6..4ee8390 100644 --- a/Toolbox/gsw_pt_from_entropy.m +++ b/Toolbox/gsw_pt_from_entropy.m @@ -24,9 +24,9 @@ % Note. The reference sea pressure of the output, pt, is zero dbar. % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_pt_from_t.m b/Toolbox/gsw_pt_from_t.m index 60cb976..abeff74 100644 --- a/Toolbox/gsw_pt_from_t.m +++ b/Toolbox/gsw_pt_from_t.m @@ -34,9 +34,9 @@ % % AUTHOR: % Trevor McDougall, David Jackett, Claire Roberts-Thomson and Paul Barker. -% [ help_gsw@csiro.au ] +% [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_pt_second_derivatives.m b/Toolbox/gsw_pt_second_derivatives.m index 5fd9de2..4f91e67 100644 --- a/Toolbox/gsw_pt_second_derivatives.m +++ b/Toolbox/gsw_pt_second_derivatives.m @@ -38,9 +38,9 @@ % pt_CT_CT has units of: [ 1/K ] % % AUTHOR: -% Trevor McDougall and Paul Barker. [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker. [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_rho.m b/Toolbox/gsw_rho.m index aacd11b..9fda100 100644 --- a/Toolbox/gsw_rho.m +++ b/Toolbox/gsw_rho.m @@ -34,9 +34,9 @@ % rho = in-situ density [ kg/m ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (18th March, 2011) +% VERSION NUMBER: 3.01 (18th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_rho_CT.m b/Toolbox/gsw_rho_CT.m index 1a1d682..cb4a4db 100644 --- a/Toolbox/gsw_rho_CT.m +++ b/Toolbox/gsw_rho_CT.m @@ -40,9 +40,9 @@ % rho_CT = in-situ density [ kg/m^3 ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (18th March, 2011) +% VERSION NUMBER: 3.01 (18th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_rho_CT_exact.m b/Toolbox/gsw_rho_CT_exact.m index bae2281..f914b2a 100644 --- a/Toolbox/gsw_rho_CT_exact.m +++ b/Toolbox/gsw_rho_CT_exact.m @@ -32,9 +32,9 @@ % rho_CT_exact = in-situ density [ kg/m^3 ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_rho_alpha_beta.m b/Toolbox/gsw_rho_alpha_beta.m index 35a45bd..fbbb417 100644 --- a/Toolbox/gsw_rho_alpha_beta.m +++ b/Toolbox/gsw_rho_alpha_beta.m @@ -41,9 +41,9 @@ % coefficient at constant Conservative Temperature % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_rho_alpha_beta_CT.m b/Toolbox/gsw_rho_alpha_beta_CT.m index e878dd4..48190b2 100644 --- a/Toolbox/gsw_rho_alpha_beta_CT.m +++ b/Toolbox/gsw_rho_alpha_beta_CT.m @@ -48,9 +48,9 @@ % coefficient at constant Conservative Temperature % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_rho_alpha_beta_CT_exact.m b/Toolbox/gsw_rho_alpha_beta_CT_exact.m index fc82a30..2391f2c 100644 --- a/Toolbox/gsw_rho_alpha_beta_CT_exact.m +++ b/Toolbox/gsw_rho_alpha_beta_CT_exact.m @@ -35,9 +35,9 @@ % at constant Conservative Temperature % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_rho_t_exact.m b/Toolbox/gsw_rho_t_exact.m index 406abd3..5283853 100644 --- a/Toolbox/gsw_rho_t_exact.m +++ b/Toolbox/gsw_rho_t_exact.m @@ -24,9 +24,9 @@ % rho_t_exact = in-situ density (not density anomaly) [ kg/m^3 ] % % AUTHOR: -% Paul Barker, David Jackett & Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker, David Jackett & Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma0.m b/Toolbox/gsw_sigma0.m index 742ae6a..9f1c946 100644 --- a/Toolbox/gsw_sigma0.m +++ b/Toolbox/gsw_sigma0.m @@ -32,9 +32,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (30th July, 2011) +% VERSION NUMBER: 3.01 (30th July, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma0_CT.m b/Toolbox/gsw_sigma0_CT.m index 4c4e108..dfca930 100644 --- a/Toolbox/gsw_sigma0_CT.m +++ b/Toolbox/gsw_sigma0_CT.m @@ -38,9 +38,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011) +% VERSION NUMBER: 3.01 (26th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma0_CT_exact.m b/Toolbox/gsw_sigma0_CT_exact.m index a6b471e..dea8c02 100644 --- a/Toolbox/gsw_sigma0_CT_exact.m +++ b/Toolbox/gsw_sigma0_CT_exact.m @@ -29,9 +29,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma0_pt0_exact.m b/Toolbox/gsw_sigma0_pt0_exact.m index a42efc1..145e85c 100644 --- a/Toolbox/gsw_sigma0_pt0_exact.m +++ b/Toolbox/gsw_sigma0_pt0_exact.m @@ -25,9 +25,9 @@ % that is, potential density minus 1000 kg/m^3. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma1.m b/Toolbox/gsw_sigma1.m index 1006624..4cd6831 100644 --- a/Toolbox/gsw_sigma1.m +++ b/Toolbox/gsw_sigma1.m @@ -31,9 +31,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma1_CT.m b/Toolbox/gsw_sigma1_CT.m index e749b20..4394ded 100644 --- a/Toolbox/gsw_sigma1_CT.m +++ b/Toolbox/gsw_sigma1_CT.m @@ -37,9 +37,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma1_CT_exact.m b/Toolbox/gsw_sigma1_CT_exact.m index e2e59d6..574b077 100644 --- a/Toolbox/gsw_sigma1_CT_exact.m +++ b/Toolbox/gsw_sigma1_CT_exact.m @@ -30,9 +30,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma2.m b/Toolbox/gsw_sigma2.m index 799f7a4..01a87af 100644 --- a/Toolbox/gsw_sigma2.m +++ b/Toolbox/gsw_sigma2.m @@ -31,9 +31,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma2_CT.m b/Toolbox/gsw_sigma2_CT.m index f8852fa..31e4cef 100644 --- a/Toolbox/gsw_sigma2_CT.m +++ b/Toolbox/gsw_sigma2_CT.m @@ -37,9 +37,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma2_CT_exact.m b/Toolbox/gsw_sigma2_CT_exact.m index f014773..083efa6 100644 --- a/Toolbox/gsw_sigma2_CT_exact.m +++ b/Toolbox/gsw_sigma2_CT_exact.m @@ -30,9 +30,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma3.m b/Toolbox/gsw_sigma3.m index f334b3d..dbeb872 100644 --- a/Toolbox/gsw_sigma3.m +++ b/Toolbox/gsw_sigma3.m @@ -31,9 +31,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma3_CT.m b/Toolbox/gsw_sigma3_CT.m index e3e19a0..730a3c1 100644 --- a/Toolbox/gsw_sigma3_CT.m +++ b/Toolbox/gsw_sigma3_CT.m @@ -37,9 +37,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma3_CT_exact.m b/Toolbox/gsw_sigma3_CT_exact.m index 5a65140..967bc92 100644 --- a/Toolbox/gsw_sigma3_CT_exact.m +++ b/Toolbox/gsw_sigma3_CT_exact.m @@ -30,9 +30,9 @@ % that is, this potential density - 1000 kg m^-3. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma4.m b/Toolbox/gsw_sigma4.m index aa8b785..c89b54b 100644 --- a/Toolbox/gsw_sigma4.m +++ b/Toolbox/gsw_sigma4.m @@ -31,9 +31,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma4_CT.m b/Toolbox/gsw_sigma4_CT.m index 6ff377e..ecf45dd 100644 --- a/Toolbox/gsw_sigma4_CT.m +++ b/Toolbox/gsw_sigma4_CT.m @@ -37,9 +37,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sigma4_CT_exact.m b/Toolbox/gsw_sigma4_CT_exact.m index 0a19ef1..56d4100 100644 --- a/Toolbox/gsw_sigma4_CT_exact.m +++ b/Toolbox/gsw_sigma4_CT_exact.m @@ -30,9 +30,9 @@ % that is, this potential density - 1000 kg/m^3. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sound_speed.m b/Toolbox/gsw_sound_speed.m index 3a461b0..377f730 100644 --- a/Toolbox/gsw_sound_speed.m +++ b/Toolbox/gsw_sound_speed.m @@ -32,9 +32,9 @@ % sound_speed = speed of sound in seawater [ m/s ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd Macrh, 2011) +% VERSION NUMBER: 3.01 (23rd Macrh, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sound_speed_CT.m b/Toolbox/gsw_sound_speed_CT.m index 5bfe8b0..d080fc9 100644 --- a/Toolbox/gsw_sound_speed_CT.m +++ b/Toolbox/gsw_sound_speed_CT.m @@ -38,9 +38,9 @@ % sound_speed_CT = speed of sound in seawater [ m/s ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd Macrh, 2011) +% VERSION NUMBER: 3.01 (23rd Macrh, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sound_speed_CT_exact.m b/Toolbox/gsw_sound_speed_CT_exact.m index 0239d45..9af9eab 100644 --- a/Toolbox/gsw_sound_speed_CT_exact.m +++ b/Toolbox/gsw_sound_speed_CT_exact.m @@ -23,9 +23,9 @@ % sound_speed_CT_exact = speed of sound in seawater [ m/s ] % % AUTHOR: -% David Jackett, Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% David Jackett, Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (5th April, 2011) +% VERSION NUMBER: 3.01 (5th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_sound_speed_t_exact.m b/Toolbox/gsw_sound_speed_t_exact.m index 5ee77e1..507a491 100644 --- a/Toolbox/gsw_sound_speed_t_exact.m +++ b/Toolbox/gsw_sound_speed_t_exact.m @@ -22,9 +22,9 @@ % sound_speed_t_exact = speed of sound in seawater [ m/s ] % % AUTHOR: -% David Jackett, Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% David Jackett, Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_specvol.m b/Toolbox/gsw_specvol.m index 20324ca..eb356a3 100644 --- a/Toolbox/gsw_specvol.m +++ b/Toolbox/gsw_specvol.m @@ -30,9 +30,9 @@ % specvol = specific volume [ m^3/kg ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (18th March, 2011) +% VERSION NUMBER: 3.01 (18th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_specvol_CT.m b/Toolbox/gsw_specvol_CT.m index 80fd3de..f7c96fd 100644 --- a/Toolbox/gsw_specvol_CT.m +++ b/Toolbox/gsw_specvol_CT.m @@ -36,9 +36,9 @@ % specvol_CT = specific volume [ m^3/kg ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (18th March, 2011) +% VERSION NUMBER: 3.01 (18th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_specvol_CT_exact.m b/Toolbox/gsw_specvol_CT_exact.m index 397049e..5f7200b 100644 --- a/Toolbox/gsw_specvol_CT_exact.m +++ b/Toolbox/gsw_specvol_CT_exact.m @@ -28,9 +28,9 @@ % specvol_CT_exact = specific volume [ m^3/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (6th April, 2011) +% VERSION NUMBER: 3.01 (6th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_specvol_anom.m b/Toolbox/gsw_specvol_anom.m index 7191988..de84f87 100644 --- a/Toolbox/gsw_specvol_anom.m +++ b/Toolbox/gsw_specvol_anom.m @@ -32,9 +32,9 @@ % specvol_anom = specific volume anomaly [ m^3/kg ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_specvol_anom_CT.m b/Toolbox/gsw_specvol_anom_CT.m index 715ca5e..30b874a 100644 --- a/Toolbox/gsw_specvol_anom_CT.m +++ b/Toolbox/gsw_specvol_anom_CT.m @@ -38,9 +38,9 @@ % specvol_anom_CT = specific volume anomaly [ m^3/kg ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_specvol_anom_CT_exact.m b/Toolbox/gsw_specvol_anom_CT_exact.m index b145692..afcbaec 100644 --- a/Toolbox/gsw_specvol_anom_CT_exact.m +++ b/Toolbox/gsw_specvol_anom_CT_exact.m @@ -31,9 +31,9 @@ % specvol_anom_CT = specific volume anomaly [ m^3/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (6th April, 2011) +% VERSION NUMBER: 3.01 (6th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_specvol_anom_t_exact.m b/Toolbox/gsw_specvol_anom_t_exact.m index 890c16c..645fa93 100644 --- a/Toolbox/gsw_specvol_anom_t_exact.m +++ b/Toolbox/gsw_specvol_anom_t_exact.m @@ -25,9 +25,9 @@ % specvol_anom_t_exact = specific volume anomaly [ m^3/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_specvol_t_exact.m b/Toolbox/gsw_specvol_t_exact.m index 8c7cac1..18df2b9 100644 --- a/Toolbox/gsw_specvol_t_exact.m +++ b/Toolbox/gsw_specvol_t_exact.m @@ -22,9 +22,9 @@ % specvol_t_exact = specific volume [ m^3/kg ] % % AUTHOR: -% David Jackett and Paul Barker [ help_gsw@csiro.au ] +% David Jackett and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_steric_height.m b/Toolbox/gsw_steric_height.m index 99be279..1f3ac50 100644 --- a/Toolbox/gsw_steric_height.m +++ b/Toolbox/gsw_steric_height.m @@ -73,9 +73,9 @@ % on the whole vertical profile is returned as NaN. % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (20th May, 2011) +% VERSION NUMBER: 3.01 (20th May, 2011) % % REFERENCES: % Griffies, S. M., 2004: Fundamentals of Ocean Climate Models. Princeton, diff --git a/Toolbox/gsw_t90_from_t48.m b/Toolbox/gsw_t90_from_t48.m index db402c6..d221df9 100644 --- a/Toolbox/gsw_t90_from_t48.m +++ b/Toolbox/gsw_t90_from_t48.m @@ -18,9 +18,9 @@ % t90 = in-situ temperature (ITS-90) [ deg C ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_t90_from_t68.m b/Toolbox/gsw_t90_from_t68.m index e969664..bceaa8f 100644 --- a/Toolbox/gsw_t90_from_t68.m +++ b/Toolbox/gsw_t90_from_t68.m @@ -18,9 +18,9 @@ % t90 = in-situ temperature (ITS-90) [ deg C ] % % AUTHOR: -% Paul Barker and Trevor McDougall [ help_gsw@csiro.au ] +% Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_t_freezing.m b/Toolbox/gsw_t_freezing.m index 13365ca..73af384 100644 --- a/Toolbox/gsw_t_freezing.m +++ b/Toolbox/gsw_t_freezing.m @@ -30,7 +30,7 @@ % AUTHOR: % Trevor McDougall, Paul Barker and Rainer Feistal [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3th November, 2011) +% VERSION NUMBER: 3.01 (3th November, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_t_from_CT.m b/Toolbox/gsw_t_from_CT.m index 14a3f94..134a3ea 100644 --- a/Toolbox/gsw_t_from_CT.m +++ b/Toolbox/gsw_t_from_CT.m @@ -23,9 +23,9 @@ % t = in-situ temperature (ITS-90) [ deg C ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/gsw_t_from_rho_exact.m b/Toolbox/gsw_t_from_rho_exact.m index aaca704..ba35866 100644 --- a/Toolbox/gsw_t_from_rho_exact.m +++ b/Toolbox/gsw_t_from_rho_exact.m @@ -32,9 +32,9 @@ % outputs the second variable will be set to NaN. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (21th April, 2011) +% VERSION NUMBER: 3.01 (21th April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_t_maxdensity_exact.m b/Toolbox/gsw_t_maxdensity_exact.m index f961932..aff0b42 100644 --- a/Toolbox/gsw_t_maxdensity_exact.m +++ b/Toolbox/gsw_t_maxdensity_exact.m @@ -26,9 +26,9 @@ % given Absolute Salinity and pressure. % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (3rd April, 2011) +% VERSION NUMBER: 3.01 (3rd April, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_thermobaric.m b/Toolbox/gsw_thermobaric.m index 9f78e1c..e2c4e27 100644 --- a/Toolbox/gsw_thermobaric.m +++ b/Toolbox/gsw_thermobaric.m @@ -34,9 +34,9 @@ % pressure in Pa not dbar. % % AUTHOR: -% David Jackett, Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (24th March, 2011) +% VERSION NUMBER: 3.01 (24th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_uPS.m b/Toolbox/gsw_uPS.m index 32de801..ed834d3 100644 --- a/Toolbox/gsw_uPS.m +++ b/Toolbox/gsw_uPS.m @@ -14,9 +14,9 @@ % uPS = unit conversion factor for salinities [ g/kg ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_valence_factor.m b/Toolbox/gsw_valence_factor.m index 8dedf4e..ab97fa1 100644 --- a/Toolbox/gsw_valence_factor.m +++ b/Toolbox/gsw_valence_factor.m @@ -18,9 +18,9 @@ % [ unitless ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_ver.m b/Toolbox/gsw_ver.m index 1d2d9e7..15b5392 100644 --- a/Toolbox/gsw_ver.m +++ b/Toolbox/gsw_ver.m @@ -13,7 +13,7 @@ % AUTHOR: % Paul Barker and Trevor McDougall [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (15th May, 2011) +% VERSION NUMBER: 3.01 (15th May, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/gsw_z_from_depth.m b/Toolbox/gsw_z_from_depth.m index dd7fc71..7634c85 100644 --- a/Toolbox/gsw_z_from_depth.m +++ b/Toolbox/gsw_z_from_depth.m @@ -17,9 +17,9 @@ % z = height [ m ] % % AUTHOR: -% Winston [ help_gsw@csiro.au ] +% Winston [ god@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011) +% VERSION NUMBER: 3.01 (26th March, 2011) % % This software is available from http://www.TEOS-10.org % diff --git a/Toolbox/gsw_z_from_p.m b/Toolbox/gsw_z_from_p.m index bd78823..6f4a148 100644 --- a/Toolbox/gsw_z_from_p.m +++ b/Toolbox/gsw_z_from_p.m @@ -43,9 +43,9 @@ % % AUTHOR: % Trevor McDougall, Claire Roberts-Thomson & Paul Barker. -% [ help_gsw@csiro.au ] +% [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011) +% VERSION NUMBER: 3.01 (26th March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/library/gsw_Fdelta.m b/Toolbox/library/gsw_Fdelta.m index 9debb94..6397037 100644 --- a/Toolbox/library/gsw_Fdelta.m +++ b/Toolbox/library/gsw_Fdelta.m @@ -32,9 +32,9 @@ % Fdelta = ratio of SA to Sstar, minus 1 [ unitless ] % % AUTHOR: -% Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th May, 2011) +% VERSION NUMBER: 3.01 (26th May, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/library/gsw_Hill_ratio_at_SP2.m b/Toolbox/library/gsw_Hill_ratio_at_SP2.m index 134e471..67a1dbc 100644 --- a/Toolbox/library/gsw_Hill_ratio_at_SP2.m +++ b/Toolbox/library/gsw_Hill_ratio_at_SP2.m @@ -21,9 +21,9 @@ % Hill_ratio = Hill ratio at SP of 2 [ unitless ] % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (26th March, 2011) +% VERSION NUMBER: 3.01 (26th March, 2011) % % REFERENCES: % Hill, K.D., T.M. Dauphinee & D.J. Woods, 1986: The extension of the diff --git a/Toolbox/library/gsw_SAAR.m b/Toolbox/library/gsw_SAAR.m index e5d196a..aa67164 100644 --- a/Toolbox/library/gsw_SAAR.m +++ b/Toolbox/library/gsw_SAAR.m @@ -37,12 +37,12 @@ % hundred kilometres inland from the coast. % % AUTHOR: -% David Jackett [ help_gsw@csiro.au ] +% David Jackett [ help@teos-10.org ] % % MODIFIED: % Paul Barker and Trevor McDougall % -% VERSION NUMBER: 3.0 (31st May, 2011) +% VERSION NUMBER: 3.01 (31st May, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/library/gsw_SA_from_SP_Baltic.m b/Toolbox/library/gsw_SA_from_SP_Baltic.m index 32e44f9..006832d 100644 --- a/Toolbox/library/gsw_SA_from_SP_Baltic.m +++ b/Toolbox/library/gsw_SA_from_SP_Baltic.m @@ -22,9 +22,9 @@ % SA_baltic = Absolute Salinity in the Baltic Sea [ g kg^-1 ] % % AUTHOR: -% David Jackett, Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 2.0 (23rd July, 2010) +% VERSION NUMBER: 3.01 (23rd July, 2010) % % REFERENCES: % Feistel, R., S. Weinreben, H. Wolf, S. Seitz, P. Spitzer, B. Adel, diff --git a/Toolbox/library/gsw_SP_from_SA_Baltic.m b/Toolbox/library/gsw_SP_from_SA_Baltic.m index 5e068a2..fb2ad40 100644 --- a/Toolbox/library/gsw_SP_from_SA_Baltic.m +++ b/Toolbox/library/gsw_SP_from_SA_Baltic.m @@ -21,9 +21,9 @@ % SP_baltic = Practical Salinity [ unitless ] % % AUTHOR: -% David Jackett, Trevor McDougall & Paul Barker [ help_gsw@csiro.au ] +% David Jackett, Trevor McDougall & Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % % REFERENCES: % Feistel, R., S. Weinreben, H. Wolf, S. Seitz, P. Spitzer, B. Adel, diff --git a/Toolbox/library/gsw_data_v3_0.mat b/Toolbox/library/gsw_data_v3_0.mat index 66baa5c..11a9bfb 100644 Binary files a/Toolbox/library/gsw_data_v3_0.mat and b/Toolbox/library/gsw_data_v3_0.mat differ diff --git a/Toolbox/library/gsw_delta_SA_ref.m b/Toolbox/library/gsw_delta_SA_ref.m index 6c6122c..67ae240 100644 --- a/Toolbox/library/gsw_delta_SA_ref.m +++ b/Toolbox/library/gsw_delta_SA_ref.m @@ -36,12 +36,12 @@ % hundred kilometres inland from the coast. % % AUTHOR: -% David Jackett [ help_gsw@csiro.au ] +% David Jackett [ help@teos-10.org ] % % MODIFIED: % Paul Barker and Trevor McDougall % -% VERSION NUMBER: 3.0 (23rd March, 2011) +% VERSION NUMBER: 3.01 (23rd March, 2011) % % REFERENCES: % IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of diff --git a/Toolbox/library/gsw_enthalpy_SSO_0_p.m b/Toolbox/library/gsw_enthalpy_SSO_0_p.m index 8d79fd8..ca99129 100644 --- a/Toolbox/library/gsw_enthalpy_SSO_0_p.m +++ b/Toolbox/library/gsw_enthalpy_SSO_0_p.m @@ -9,7 +9,7 @@ % version of the Gibbs function, that is, a streamlined version of the % code "gsw_enthalpy(SA,CT,p)". % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % %========================================================================== diff --git a/Toolbox/library/gsw_entropy_part.m b/Toolbox/library/gsw_entropy_part.m index 1cdc2b4..fb79de9 100644 --- a/Toolbox/library/gsw_entropy_part.m +++ b/Toolbox/library/gsw_entropy_part.m @@ -10,7 +10,7 @@ % but are not needed when calculating potential temperature from in-situ % temperature. % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % %========================================================================== diff --git a/Toolbox/library/gsw_entropy_part_zerop.m b/Toolbox/library/gsw_entropy_part_zerop.m index e260860..f9ff8b4 100644 --- a/Toolbox/library/gsw_entropy_part_zerop.m +++ b/Toolbox/library/gsw_entropy_part_zerop.m @@ -12,7 +12,7 @@ % The inputs to "gsw_entropy_part_zerop(SA,pt0)" are Absolute Salinity % and potential temperature with reference sea pressure of zero dbar. % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % %========================================================================== diff --git a/Toolbox/library/gsw_gibbs.m b/Toolbox/library/gsw_gibbs.m index 71738c5..bfbad5f 100644 --- a/Toolbox/library/gsw_gibbs.m +++ b/Toolbox/library/gsw_gibbs.m @@ -43,12 +43,12 @@ % withstanding that the pressure input into this routine is in dbar. % % AUTHOR: -% David Jackett [ help_gsw@csiro.au ] +% David Jackett [ help@teos-10.org ] % % MODIFIED: % Trevor McDougall and Paul Barker % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % % REFERENCES: diff --git a/Toolbox/library/gsw_gibbs_pt0_pt0.m b/Toolbox/library/gsw_gibbs_pt0_pt0.m index 6919218..28b245b 100644 --- a/Toolbox/library/gsw_gibbs_pt0_pt0.m +++ b/Toolbox/library/gsw_gibbs_pt0_pt0.m @@ -9,7 +9,7 @@ % "gsw_pt_from_CT(SA,CT)" ,"gsw_pt0_from_t(SA,t,p)" and % "gsw_pt_from_entropy(SA,entropy)". % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % This function is unchanged from version 2.0 (24th September, 2010). % %========================================================================== diff --git a/Toolbox/library/gsw_infunnel.m b/Toolbox/library/gsw_infunnel.m index deb4c94..7c29b29 100644 --- a/Toolbox/library/gsw_infunnel.m +++ b/Toolbox/library/gsw_infunnel.m @@ -24,15 +24,14 @@ % (McDougall et al., 2011). % % AUTHOR: -% Trevor McDougall and Paul Barker [ help_gsw@csiro.au ] +% Trevor McDougall and Paul Barker [ help@teos-10.org ] % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % -% McDougall T. J., P. M. Barker, D. R. Jackett, C. Roberts-Thomson, R. -% Feistel and R. W. Hallberg, 2011: A computationally efficient 48-term -% expression for the density of seawater in terms of Conservative -% Temperature, and related properties of seawater. To be submitted -% to Ocean Science Discussions. +% McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2011: A +% computationally efficient 48-term expression for the density of +% seawater in terms of Conservative Temperature, and related properties +% of seawater. To be submitted to Ocean Science Discussions. % % The software is available from http://www.TEOS-10.org % diff --git a/Toolbox/library/gsw_interp_SA_CT.m b/Toolbox/library/gsw_interp_SA_CT.m index 7a0be46..2cffb15 100644 --- a/Toolbox/library/gsw_interp_SA_CT.m +++ b/Toolbox/library/gsw_interp_SA_CT.m @@ -1,10 +1,11 @@ function [SA_i, CT_i] = gsw_interp_SA_CT(SA,CT,p,p_i) + % gsw_interp_SA_CT linear interpolation to p_i on a cast %========================================================================== % This function interpolates the cast with respect to the interpolating % variable p. This function finds the values of SA, CT at p_i on this cast. % -% VERSION NUMBER: 3.0 (8th April, 2011) +% VERSION NUMBER: 3.01 (8th April, 2011) % % This fuction was adapted from Matlab's interp1q. %========================================================================== diff --git a/Toolbox/library/gsw_interp_ref_cast.m b/Toolbox/library/gsw_interp_ref_cast.m index d9eae37..38b104a 100644 --- a/Toolbox/library/gsw_interp_ref_cast.m +++ b/Toolbox/library/gsw_interp_ref_cast.m @@ -13,7 +13,7 @@ % the interpolation will take place in sigma 2 space, any other input % will result in the programme working in gamma_n space. % -% VERSION NUMBER: 3.0 (14th April, 2011) +% VERSION NUMBER: 3.01 (14th April, 2011) % % REFERENCE: % Jackett, D. R. and T. J. McDougall, 1997: A neutral density variable diff --git a/Toolbox/library/gsw_specvol_SSO_0_p.m b/Toolbox/library/gsw_specvol_SSO_0_p.m index 0dea5de..259fd1a 100644 --- a/Toolbox/library/gsw_specvol_SSO_0_p.m +++ b/Toolbox/library/gsw_specvol_SSO_0_p.m @@ -9,7 +9,7 @@ % version of specific volume, that is, a streamlined version of the code % "gsw_specvol(SA,CT,p)". % -% VERSION NUMBER: 3.0 (29th March, 2011) +% VERSION NUMBER: 3.01 (29th March, 2011) % %==========================================================================