Skip to content

Commit

Permalink
Version 3.03
Browse files Browse the repository at this point in the history
Added

isentropic compressibility (kappa) for the 48-term equation of state.
gsw_rho_first derivatves and gsw_rho_first derivatves_CT_exact.
gsw_alpha_on_beta and gsw_alpha_on_beta_CT_exact.
gsw_t_from_pt0
gsw_t_from_entropy
gsw_adiabatic_lapse_rate_from_CT.
gsw_deltaSA_from_rho_t_exact.
Remaned gsw_entropy_t_exact to gsw_entropy_from_t, and added ths inverse
function (gsw_t_from_entropy)

Renamed gsw_adiabatic_lapse_rate_t_exact to
gsw_adiabatic_lapse_rate_from_t
  • Loading branch information
PaulMBarker committed May 29, 2015
1 parent 259e142 commit e6a5996
Show file tree
Hide file tree
Showing 213 changed files with 4,337 additions and 1,949 deletions.
215 changes: 116 additions & 99 deletions Toolbox/Contents.m

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Toolbox/gsw_Abs_Pressure_from_p.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (13th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_C3515.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (13th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% Culkin and Smith, 1980: Determination of the Concentration of Potassium
Expand Down
7 changes: 2 additions & 5 deletions Toolbox/gsw_CT_first_derivatives.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (11th March, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down Expand Up @@ -79,12 +79,9 @@
%--------------------------------------------------------------------------

cp0 = 3991.86795711963; % from Eqn. 3.3.3 of IOC et al. (2010).
n0 = 0;
n2 = 2;
pr0 = zeros(size(SA));
abs_pt = 273.15 + pt;

CT_pt = - (abs_pt.*gsw_gibbs(n0,n2,n0,SA,pt,pr0))./cp0;
CT_pt = - (abs_pt.*gsw_gibbs_pt0_pt0(SA,pt))./cp0;

%--------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_CT_freezing.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
% AUTHOR:
% Trevor McDougall, Paul Barker and Rainer Feistal [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (13th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_CT_from_entropy.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker. [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (13th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_CT_from_pt.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
% AUTHOR:
% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (13th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
11 changes: 3 additions & 8 deletions Toolbox/gsw_CT_from_rho.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
% Calculates the Conservative Temperature of a seawater sample, for given
% values of its density, Absolute Salinity and sea pressure (in dbar),
% using the computationally-efficient 48-term expression for density in
% terms of SA, CT and p (McDougall et al., 2011)
% terms of SA, CT and p (IOC et al., 2010)
%
% Note that the 48-term equation has been fitted in a restricted range of
% parameter space, and is most accurate inside the "oceanographic funnel"
% described in McDougall et al. (2011). The GSW library function
% described in IOC et al. (2010). The GSW library function
% "gsw_infunnel(SA,CT,p)" is avaialble to be used if one wants to test if
% some of one's data lies outside this "funnel".
%
Expand Down Expand Up @@ -43,19 +43,14 @@
% AUTHOR:
% Trevor McDougall & Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% 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
%
% McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2013: 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 J. Atm. Ocean. Technol., xx, yyy-zzz.
%
% The software is available from http://www.TEOS-10.org
%
%==========================================================================
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_CT_from_rho_exact.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
% AUTHOR:
% Trevor McDougall & Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (13th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_CT_from_t.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
% AUTHOR:
% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (13th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
13 changes: 4 additions & 9 deletions Toolbox/gsw_CT_maxdensity.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
% This function returns the Conservative temperature at which the density
% of seawater is a maximum, at given Absolute Salinity, SA, and sea
% pressure, p (in dbar). This function uses the computationally-efficient
% 48-term expression for density in terms of SA, CT and p (McDougall et
% al., 2013).
% 48-term expression for density in terms of SA, CT and p (IOC et
% al., 2010).
%
% Note that the 48-term equation has been fitted in a restricted range of
% parameter space, and is most accurate inside the "oceanographic funnel"
% described in McDougall et al. (2013). The GSW library function
% described in IOC et al. (2010). The GSW library function
% "gsw_infunnel(SA,CT,p)" is avaialble to be used if one wants to test if
% some of one's data lies outside this "funnel".
%
Expand All @@ -36,7 +36,7 @@
% AUTHOR:
% Trevor McDougall & Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.01 (3rd April, 2011)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand All @@ -45,11 +45,6 @@
% UNESCO (English), 196 pp. Available from http://www.TEOS-10.org
% See section 3.42 of this TEOS-10 Manual.
%
% McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2013: 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 J. Atm. Ocean. Technol., xx, yyy-zzz.
%
% McDougall T.J. and S.J. Wotherspoon, 2012: A simple modification of
% Newton’s method to achieve convergence of order "1 + sqrt(2)".
% Submitted to Applied Mathematics and Computation.
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_CT_maxdensity_exact.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
% AUTHOR:
% Trevor McDougall & Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
7 changes: 1 addition & 6 deletions Toolbox/gsw_CT_second_derivatives.m
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand All @@ -53,11 +53,6 @@
% UNESCO (English), 196 pp. Available from http://www.TEOS-10.org.
% See appendix A.12 of this TEOS-10 Manual.
%
% McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2013: 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 J. Atm. Ocean. Technol., xx, yyy-zzz.
%
% This software is available from http://www.TEOS-10.org
%
%==========================================================================
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_C_from_SP.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
% AUTHOR:
% Trevor McDougall, Paul Barker and Rich Pawlowicz [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (16th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% Hill, K.D., T.M. Dauphinee and D.J. Woods, 1986: The extension of the
Expand Down
11 changes: 3 additions & 8 deletions Toolbox/gsw_IPV_vs_fNsquared_ratio.m
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
% IPV_vs_fNsquared_ratio is evaluated at the mid pressure between the
% individual data points in the vertical. This function uses the
% computationally-efficient 48-term expression for density in terms of
% SA, CT and p (McDougall et al., 2013).
% SA, CT and p (IOC et al., 2010).
%
% Note that the 48-term equation has been fitted in a restricted range of
% parameter space, and is most accurate inside the "oceanographic funnel"
% described in McDougall et al. (2013). The GSW library function
% described in IOC et al. (2010). The GSW library function
% "gsw_infunnel(SA,CT,p)" is avaialble to be used if one wants to test if
% some of one's data lies outside this "funnel".
%
Expand Down Expand Up @@ -53,7 +53,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand All @@ -62,11 +62,6 @@
% UNESCO (English), 196 pp. Available from http://www.TEOS-10.org
% See Eqn. (3.20.5) of this TEOS-10 Manual.
%
% McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2013: 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 J. Atm. Ocean. Technol., xx, yyy-zzz.
%
% The software is available from http://www.TEOS-10.org
%
%==========================================================================
Expand Down
9 changes: 2 additions & 7 deletions Toolbox/gsw_Nsquared.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
% efficient 48-term expression for density in terms of SA, CT and p. The
% 48-term equation has been fitted in a restricted range of parameter
% space, and is most accurate inside the "oceanographic funnel" described
% in McDougall et al. (2013). The GSW library function
% in IOC et al. (2010). The GSW library function
% "gsw_infunnel(SA,CT,p)" is avaialble to be used if one wants to test if
% some of one's data lies outside this "funnel".
%
Expand All @@ -49,7 +49,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% Griffies, S. M., 2004: Fundamentals of Ocean Climate Models. Princeton,
Expand All @@ -61,11 +61,6 @@
% UNESCO (English), 196 pp. Available from http://www.TEOS-10.org
% See section 3.10 and Eqn. (3.10.2) of this TEOS-10 Manual.
%
% McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2013: 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 J. Atm. Ocean. Technol., xx, yyy-zzz.
%
% The software is available from http://www.TEOS-10.org
%
%==========================================================================
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_P0.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_R_from_SP.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
% AUTHOR:
% Trevor McDougall, Paul Barker and Rich Pawlowicz [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% Culkin and Smith, 1980: Determination of the Concentration of Potassium
Expand Down
6 changes: 3 additions & 3 deletions Toolbox/gsw_SA_CT_plot.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ function gsw_SA_CT_plot(SA,CT,p_ref,isopycs,title_string)
% point for p = 0 dbar assuming the seawater is completely saturated with
% dissolved air and user defined potential density contours. This
% function uses the computationally efficient 48-term expression for
% density in terms of SA, CT and p (McDougall et al., 2011).
% density in terms of SA, CT and p (McDougall et al., 2013).
%
% Note that the 48-term equation has been fitted in a restricted range of
% parameter space, and is most accurate inside the "oceanographic funnel"
% described in McDougall et al. (2011). The GSW library function
% described in McDougall et al. (2013). The GSW library function
% "gsw_infunnel(SA,CT,p)" is avaialble to be used if one wants to test if
% some of one's data lies outside this "funnel".
%
Expand Down Expand Up @@ -47,7 +47,7 @@ function gsw_SA_CT_plot(SA,CT,p_ref,isopycs,title_string)
% MODIFIED:
% Paul Barker & Trevor McDougall
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2013: A
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_SA_Sstar_from_SP.m
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
% AUTHOR:
% Paul Barker and Trevor McDougall [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (7th January, 2013)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_SA_from_SP.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
% AUTHOR:
% David Jackett, Trevor McDougall & Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (7th January, 2013)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_SA_from_Sstar.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
% AUTHOR:
% David Jackett, Trevor McDougall and Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (7th January, 2013)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
11 changes: 3 additions & 8 deletions Toolbox/gsw_SA_from_rho.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
% Calculates the Absolute Salinity of a seawater sample, for given values
% of its density, Conservative Temperature and sea pressure (in dbar).
% This function uses the computationally-efficient 48-term expression for
% density in terms of SA, CT and p (McDougall et al., 2013).
% density in terms of SA, CT and p (IOC et al., 2013).
%
% Note that the 48-term equation has been fitted in a restricted range of
% parameter space, and is most accurate inside the "oceanographic funnel"
% described in McDougall et al. (2013). The GSW library function
% described in IOC et al. (2013). The GSW library function
% "gsw_infunnel(SA,CT,p)" is avaialble to be used if one wants to test if
% some of one's data lies outside this "funnel".
%
Expand All @@ -37,7 +37,7 @@
% AUTHOR:
% Trevor McDougall & Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand All @@ -46,11 +46,6 @@
% UNESCO (English), 196 pp. Available from http://www.TEOS-10.org
% See section 2.5 of this TEOS-10 Manual.
%
% McDougall, T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2013: 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 J. Atm. Ocean. Technol., xx, yyy-zzz.
%
% Millero, F. J., R. Feistel, D. G. Wright, and T. J. McDougall, 2008:
% The composition of Standard Seawater and the definition of the
% Reference-Composition Salinity Scale, Deep-Sea Res. I, 55, 50-72.
Expand Down
11 changes: 3 additions & 8 deletions Toolbox/gsw_SA_from_rho_CT.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
% Calculates the Absolute Salinity of a seawater sample, for given values
% of its density, Conservative Temperature and sea pressure (in dbar).
% This function uses the computationally-efficient 48-term expression for
% density in terms of SA, CT and p (McDougall et al., 2013).
% density in terms of SA, CT and p (IOC et al., 2013).
%
% Note that the 48-term equation has been fitted in a restricted range of
% parameter space, and is most accurate inside the "oceanographic funnel"
% described in McDougall et al. (2013). The GSW library function
% described in IOC et al. (2013). The GSW library function
% "gsw_infunnel(SA,CT,p)" is avaialble to be used if one wants to test if
% some of one's data lies outside this "funnel".
%
Expand All @@ -43,7 +43,7 @@
% AUTHOR:
% Trevor McDougall & Paul Barker [ help@teos-10.org ]
%
% VERSION NUMBER: 3.02 (15th November, 2012)
% VERSION NUMBER: 3.03 (29th April, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand All @@ -52,11 +52,6 @@
% UNESCO (English), 196 pp. Available from http://www.TEOS-10.org
% See section 2.5 of this TEOS-10 Manual.
%
% McDougall T.J., P.M. Barker, R. Feistel and D.R. Jackett, 2013: 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 J. Atm. Ocean. Technol., xx, yyy-zzz.
%
% Millero, F. J., R. Feistel, D. G. Wright, and T. J. McDougall, 2008:
% The composition of Standard Seawater and the definition of the
% Reference-Composition Salinity Scale, Deep-Sea Res. I, 55, 50-72.
Expand Down
Loading

0 comments on commit e6a5996

Please sign in to comment.