Skip to content

Commit

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

seawater properties at the freezing temperature
thermodynamic properties of ice Ih
thermodynamic interaction between ice Ih and seawater
thermodynamic interaction between sea ice and seawater
dissolved gasses
gsw_CT_from_enthalpy and gsw_CT_from_enthalpy_exact
gsw_CT_first_derivatives_wrt_t_exact
gsw_enthalpy_first_derivatives_wrt_t_exact
gsw_t_deriv_chem_potential_water_t_exact
Renamed gsw_streric_height to gsw_geo_strf_steric_height

Renamed gsw_CT_freezing to gsw_CT_freezing_poly

Renamed gsw_t_freezing to gsw_t_freezing_poly

Renamed gsw_brineSA_CT to gsw_brineSA_CT_poly

Renamed gsw_brineSA_t to gsw_brineSA_t_poly
  • Loading branch information
@PaulMBarker
PaulMBarker committed May 29, 2015
1 parent e6a5996 commit 670c248
Show file tree
Hide file tree
Showing 274 changed files with 10,391 additions and 3,709 deletions.
2 changes: 1 addition & 1 deletion Toolbox/gsw_Abs_Pressure_from_p.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ [email protected] ]
%
% VERSION NUMBER: 3.03 (29th April, 2013)
% VERSION NUMBER: 3.04 (10th December, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
156 changes: 156 additions & 0 deletions Toolbox/gsw_Arsol.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
function Arsol = gsw_Arsol(SA,CT,p,long,lat)

% gsw_Arsol solubility of Ar in seawater
%==========================================================================
%
% USAGE:
% Arsol = gsw_Arsol(SA,CT,p,long,lat)
%
% DESCRIPTION:
% Calculates the argon, Ar, concentration expected at equilibrium with air
% at an Absolute Pressure of 101325 Pa (sea pressure of 0 dbar) including
% saturated water vapor. This function uses the solubility coefficients
% as listed in Hamme and Emerson (2004).
%
% INPUT:
% SA = Absolute Salinity [ g/kg ]
% CT = Conservative Temperature (ITS-90) [ deg C ]
% p = sea pressure [ dbar ]
% ( i.e. absolute pressure - 10.1325 dbar )
% long = longitude in decimal degrees [ 0 ... +360 ]
% or [ -180 ... +180 ]
% lat = latitude in decimal degrees north [ -90 ... +90 ]
%
% SA & CT need to have the same dimensions. p, lat and long may have
% dimensions 1x1 or Mx1 or 1xN or MxN, where SA and CT are MxN.
%
% OUTPUT:
% Arsol = solubility of argon [ umol/kg ]
%
% AUTHOR: Roberta Hamme, Paul Barker and Trevor McDougall
% [ [email protected] ]
%
% VERSION NUMBER: 3.04 (10th December, 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
%
% Hamme, R., and S. Emerson, 2004: The solubility of neon, nitrogen and
% argon in distilled water and seawater. Deep-Sea Research, 51,
% 1517-1528.
%
% The software is available from http://www.TEOS-10.org
%
%==========================================================================

%--------------------------------------------------------------------------
% Check variables and resize if necessary
%--------------------------------------------------------------------------

if nargin ~= 5
error('gsw_Arsol: Requires five inputs')
end %if

[ms,ns] = size(SA);
[mt,nt] = size(CT);
[mp,np] = size(p);

if (mt ~= ms | nt ~= ns)
error('gsw_Arsol: SA and CT must have same dimensions')
end

if (mp == 1) & (np == 1) % p scalar - fill to size of SA
p = p*ones(ms,ns);
elseif (ns == np) & (mp == 1) % p is row vector,
p = p(ones(1,ms), :); % copy down each column.
elseif (ms == mp) & (np == 1) % p is column vector,
p = p(:,ones(1,ns)); % copy across each row.
elseif (ns == mp) & (np == 1) % p is a transposed row vector,
p = p.'; % transpose, then
p = p(ones(1,ms), :); % copy down each column.
elseif (ms == mp) & (ns == np)
% ok
else
error('gsw_Arsol: Inputs array dimensions arguments do not agree')
end %if

[mla,nla] = size(lat);

if (mla == 1) & (nla == 1) % lat is a scalar - fill to size of SA
lat = lat*ones(ms,ns);
elseif (ns == nla) & (mla == 1) % lat is a row vector,
lat = lat(ones(1,ms), :); % copy down each column.
elseif (ms == mla) & (nla == 1) % lat is a column vector,
lat = lat(:,ones(1,ns)); % copy across each row.
elseif (ns == mla) & (nla == 1) % lat is a transposed row vector,
lat = lat.'; % transpose, then
lat = lat(ones(1,ms), :); % copy down each column.
elseif (ms == mla) & (ns == nla)
% ok
else
error('gsw_Arsol: Inputs array dimensions arguments do not agree')
end %if

[mlo,nlo] = size(long);
long(long < 0) = long(long < 0) + 360;

if (mlo == 1) & (nlo == 1) % long is a scalar - fill to size of SA
long = long*ones(ms,ns);
elseif (ns == nlo) & (mlo == 1) % long is a row vector,
long = long(ones(1,ms), :); % copy down each column.
elseif (ms == mlo) & (nlo == 1) % long is a column vector,
long = long(:,ones(1,ns)); % copy across each row.
elseif (ns == mlo) & (nlo == 1) % long is a transposed row vector,
long = long.'; % transpose, then
long = long(ones(1,ms), :); % copy down each column.
elseif (ms == mlo) & (ns == nlo)
% ok
else
error('gsw_Arsol: Inputs array dimensions arguments do not agree')
end %if

if ms == 1
SA = SA.';
CT = CT.';
p = p.';
lat = lat.';
long = long.';
transposed = 1;
else
transposed = 0;
end

%--------------------------------------------------------------------------
% Start of the calculation
%--------------------------------------------------------------------------

SP = gsw_SP_from_SA(SA,p,long,lat);

x = SP; % Note that salinity argument is Practical Salinity, this is
% beacuse the major ionic components of seawater related to Cl
% are what affect the solubility of non-electrolytes in seawater.

pt = gsw_pt_from_CT(SA,CT); % pt is potential temperature referenced to
% the sea surface.
y = log((298.15 - pt)./(273.15 + pt)); % pt is the temperature in degress C
% on the 1990 International Temperature Scale ITS-90.

% The coefficents below are from Table 4 of Hamme and Emerson (2004)
a0 = 2.79150;
a1 = 3.17609;
a2 = 4.13116;
a3 = 4.90379;
b0 = -6.96233e-3;
b1 = -7.66670e-3;
b2 = -1.16888e-2;

Arsol = exp(a0 + y.*(a1 + y.*(a2 + a3*y)) + x.*(b0 + y.*(b1 + b2*y)));

if transposed
Arsol = Arsol.';
end

end
93 changes: 93 additions & 0 deletions Toolbox/gsw_Arsol_SP_pt.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
function Arsol = gsw_Arsol_SP_pt(SP,pt)

% gsw_Arsol_SP_pt solubility of Ar in seawater
%==========================================================================
%
% USAGE:
% Arsol = gsw_Arsol_SP_pt(SP,pt)
%
% DESCRIPTION:
% Calculates the argon, Ar, concentration expected at equilibrium with air
% at an Absolute Pressure of 101325 Pa (sea pressure of 0 dbar) including
% saturated water vapor This function uses the solubility coefficients
% as listed in Hamme and Emerson (2004).
%
% INPUT:
% SP = Practical Salinity (PSS-78) [ unitless ]
% pt = potential temperature (ITS-90) referenced [ deg C ]
% to one standard atmosphere (0 dbar).
%
% SP & pt need to have the same dimensions.
%
% OUTPUT:
% Arsol = solubility of argon [ umol/kg ]
%
% AUTHOR: Roberta Hamme, Paul Barker and Trevor McDougall
% [ [email protected] ]
%
% VERSION NUMBER: 3.03 (4th September, 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
%
% Hamme, R., and S. Emerson, 2004: The solubility of neon, nitrogen and
% argon in distilled water and seawater. Deep-Sea Research, 51,
% 1517-1528.
%
% The software is available from http://www.TEOS-10.org
%
%==========================================================================

%--------------------------------------------------------------------------
% Check variables and resize if necessary
%--------------------------------------------------------------------------

if nargin ~=2
error('gsw_Arsol_SP_pt: Requires two inputs')
end %if

[ms,ns] = size(SP);
[mt,nt] = size(pt);

if (mt ~= ms | nt ~= ns)
error('gsw_Arsol_SP_pt: SP and pt must have same dimensions')
end

if ms == 1
SP = SP';
pt = pt';
transposed = 1;
else
transposed = 0;
end

%--------------------------------------------------------------------------
% Start of the calculation
%--------------------------------------------------------------------------

x = SP; % Note that salinity argument is Practical Salinity, this is
% beacuse the major ionic components of seawater related to Cl
% are what affect the solubility of non-electrolytes in seawater.

y = log((298.15 - pt)./(273.15 + pt)); % pt is the temperature in degress C
% on the 1990 International Temperature Scale ITS-90.

% The coefficents below are from Table 4 of Hamme and Emerson (2004)
a0 = 2.79150;
a1 = 3.17609;
a2 = 4.13116;
a3 = 4.90379;
b0 = -6.96233e-3;
b1 = -7.66670e-3;
b2 = -1.16888e-2;

Arsol = exp(a0 + y.*(a1 + y.*(a2 + a3*y)) + x.*(b0 + y.*(b1 + b2*y)));

if transposed
Arsol = Arsol.';
end

end
2 changes: 1 addition & 1 deletion Toolbox/gsw_C3515.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ [email protected] ]
%
% VERSION NUMBER: 3.03 (29th April, 2013)
% VERSION NUMBER: 3.04 (10th December, 2013)
%
% REFERENCES:
% Culkin and Smith, 1980: Determination of the Concentration of Potassium
Expand Down
2 changes: 1 addition & 1 deletion Toolbox/gsw_CT_first_derivatives.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
% AUTHOR:
% Trevor McDougall and Paul Barker [ [email protected] ]
%
% VERSION NUMBER: 3.03 (11th March, 2013)
% VERSION NUMBER: 3.04 (10th December, 2013)
%
% REFERENCES:
% IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
Expand Down
Loading

0 comments on commit 670c248

Please sign in to comment.