Skip to content

Commit

Permalink
Version 3.02
Browse files Browse the repository at this point in the history
Improved computation efficiency.

Minor bug fixes.
  • Loading branch information
PaulMBarker committed May 29, 2015
1 parent e513c64 commit a36b452
Show file tree
Hide file tree
Showing 179 changed files with 850 additions and 1,106 deletions.
6 changes: 0 additions & 6 deletions html/.BridgeLabelsAndRatings

This file was deleted.

Binary file removed html/Thumbs.db
Binary file not shown.
2 changes: 1 addition & 1 deletion html/gsw_Abs_Pressure_from_p.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall and Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (26th May, 2011)</pre>
<pre>3.02 (16th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
seawater - 2010: Calculation and use of thermodynamic properties.
Expand Down
2 changes: 1 addition & 1 deletion html/gsw_C3515.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h2>EXAMPLE:<a name="4"></a></h2>
<h2>AUTHOR:<a name="5"></a></h2>
<pre>Trevor McDougall and Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="6"></a></h2>
<pre>3.01 (18th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCE:<a name="7"></a></h2>
<pre>Culkin and Smith, 1980: Determination of the Concentration of Potassium
Chloride Solution Having the Same Electrical Conductivity, at 15C and
Expand Down
11 changes: 5 additions & 6 deletions html/gsw_CT_first_derivatives.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,16 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall and Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (26th August, 2010)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>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 <a href="http://www.TEOS-10.org" title="TEOS-10">the TEOS-10 web site.</a>
<a href="../pdf/CT_first_derivative.pdf" title="TEOS-10">See Eqns. (A.12.3) and (A.12.9a,b) of this TEOS-10 Manual.</a></pre>
<pre>McDougall T. J., D. R. Jackett, P. M. Barker, C. Roberts-Thomson, R.
Feistel and R. W. Hallberg, 2010: A computationally efficient 25-term
expression for the density of seawater in terms of Conservative
Temperature, and related properties of seawater. To be submitted
to Ocean Science Discussions.</pre>
<pre>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.</pre>
<pre>This software is available from <a href="http://www.TEOS-10.org" title="TEOS-10">http://www.TEOS-10.org</a></pre></font>
</div></body></html>
2 changes: 1 addition & 1 deletion html/gsw_CT_freezing.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Paul Barker, Trevor McDougall and Rainer Feistal [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (4th November, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
seawater - 2010: Calculation and use of thermodynamic properties.
Expand Down
2 changes: 1 addition & 1 deletion html/gsw_CT_from_entropy.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall and Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (13th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
seawater - 2010: Calculation and use of thermodynamic properties.
Expand Down
2 changes: 1 addition & 1 deletion html/gsw_CT_from_pt.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>David Jackett, Trevor McDougall and Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (5th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
seawater - 2010: Calculation and use of thermodynamic properties.
Expand Down
14 changes: 7 additions & 7 deletions html/gsw_CT_from_rho.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ <h2>DESCRIPTION:<a name="2"></a></h2>
<pre>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).</pre>
of SA, CT and p (McDougall et al., 2013).</pre>
<pre>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". </pre>
<table width="500" border="0">
Expand Down Expand Up @@ -126,16 +126,16 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall &amp; Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (26th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>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 <a href="http://www.TEOS-10.org" title="TEOS-10">the TEOS-10 web site</a>.
<a href="../pdf/CT_from_rho.pdf" title="TEOS-10">See sections 3.1 and 3.3 of this TEOS-10 Manual.</a></pre>
<pre>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. </pre>
<pre>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.</pre>
<pre>The software is available from <a href="http://www.TEOS-10.org" title="TEOS-10">http://www.TEOS-10.org</a></pre></font>
</div></body></html>
12 changes: 6 additions & 6 deletions html/gsw_CT_from_rho_exact.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h2>DESCRIPTION:<a name="2"></a></h2>
<pre>Note that this function uses the full Gibbs function. There is an
alternative to calling this function, namely gsw_CT_from_rho(rho,SA,p),
which uses the computationally efficient 48-term expression for density
in terms of SA, CT and p (McDougall et al., 2011).</pre>
in terms of SA, CT and p (McDougall et al., 2013).</pre>
<table width="500" border="0">
<tr>
<td><a href="../pdf/CT_from_rho_exact.pdf"> <img src="TEOS-10_front_cover.jpg" width="60" height="82" alt="TEOS-10" style ="display: block; padding-right: 5px; padding-left: 5px; "></a></td>
Expand Down Expand Up @@ -122,16 +122,16 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall &amp; Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (26th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>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 <a href="http://www.TEOS-10.org" title="TEOS-10">the TEOS-10 web site</a>.
<a href="../pdf/CT_from_rho_exact.pdf" title="TEOS-10">See sections 3.1 and 3.3 of this TEOS-10 Manual.</a></pre>
<pre>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. </pre>
<pre>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.</pre>
<pre>The software is available from <a href="http://www.TEOS-10.org" title="TEOS-10">http://www.TEOS-10.org</a></pre></font>
</div></body></html>
2 changes: 1 addition & 1 deletion html/gsw_CT_from_t.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>David Jackett, Trevor McDougall and Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (16th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of
seawater - 2010: Calculation and use of thermodynamic properties.
Expand Down
14 changes: 7 additions & 7 deletions html/gsw_CT_maxdensity.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ <h2>DESCRIPTION:<a name="2"></a></h2>
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., 2011)</pre>
(McDougall et al., 2013)</pre>
<pre>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". </pre>
<table width="500" border="0">
Expand Down Expand Up @@ -113,16 +113,16 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall &amp; Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (26th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a>
</h2><pre>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 <a href="http://www.TEOS-10.org" title="TEOS-10">the TEOS-10 web site.</a>
<a href="../pdf/CT_maxdensity.pdf" title="TEOS-10">See section 3.42 of this TEOS-10 Manual.</a></pre>
<pre>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. </pre>
<pre>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.</pre>
<pre>The software is available from <a href="http://www.TEOS-10.org" title="TEOS-10">http://www.TEOS-10.org</a></pre></font>
</div></body></html>
14 changes: 7 additions & 7 deletions html/gsw_CT_maxdensity_exact.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ <h2>DESCRIPTION:<a name="2"></a></h2>
<pre>Note that this function uses the full Gibbs function. There is an
alternative to calling this function, namely gsw_enthalpy(SA,CT,p), which
uses the computationally efficient 48-term expression for density in
terms of SA, CT and p (McDougall et al., 2011). </pre>
terms of SA, CT and p (McDougall et al., 2013). </pre>
<pre>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".</pre>
<table width="500" border="0">
Expand Down Expand Up @@ -116,16 +116,16 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall &amp; Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (26th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a>
</h2><pre>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 <a href="http://www.TEOS-10.org" title="TEOS-10">the TEOS-10 web site.</a>
<a href="../pdf/CT_maxdensity.pdf" title="TEOS-10">See section 3.42 of this TEOS-10 Manual.</a></pre>
<pre>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. </pre>
<pre>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.</pre>
<pre>The software is available from <a href="http://www.TEOS-10.org" title="TEOS-10">http://www.TEOS-10.org</a></pre></font>
</div></body></html>
10 changes: 5 additions & 5 deletions html/gsw_CT_second_derivatives.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,16 @@ <h2>EXAMPLE:<a name="5"></a></h2>
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall and Paul Barker [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (16th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>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 <a href="http://www.TEOS-10.org">the TEOS-10 web site.</a>
<a href="../pdf/CT_second_derivative.pdf" title="TEOS-10">See appendix A.12 of this TEOS-10 Manual.</a></pre>
<pre>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. </pre>
<pre>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.</pre>
<pre>This software is available from <a href="http://www.TEOS-10.org" title="TEOS-10">http://www.TEOS-10.org</a></pre></font>
</div></body></html>
11 changes: 7 additions & 4 deletions html/gsw_C_from_SP.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ <h2>DESCRIPTION:<a name="2"></a></h2>
salinities. This accuracy is achieved by having four different
polynomials for the starting value of Rtx (the square root of Rt) in
four different ranges of SP, and by using one and a half iterations of
a computationally efficient modified Newton-Raphson technique to find
the root of the equation. </pre>
a computationally efficient modified Newton-Raphson technique (McDougall
and Wotherspoon, 2012) to find the root of the equation. </pre>

<pre>Note that strictly speaking PSS-78 (Unesco, 1983) defines Practical
Salinity in terms of the conductivity ratio, R, without actually
Expand Down Expand Up @@ -128,7 +128,7 @@ <h2>EXAMPLE:<a name="5"></a></h2
<h2>AUTHOR:<a name="6"></a></h2>
<pre>Trevor McDougall, Paul Barker and Rich Pawlowicz [ <a href="mailto:[email protected]">[email protected]</a> ]</pre>
<h2>VERSION NUMBER:<a name="7"></a></h2>
<pre>3.01 (16th May, 2011)</pre>
<pre>3.02 (17th November, 2012)</pre>
<h2>REFERENCES:<a name="8"></a></h2>
<pre>Hill, K.D., T.M. Dauphinee and D.J. Woods, 1986: The extension of the
Practical Salinity Scale 1978 to low salinities. IEEE J. Oceanic Eng.,
Expand All @@ -138,7 +138,10 @@ <h2>REFERENCES:<a name="8"></a></h2>
Intergovernmental Oceanographic Commission, Manuals and Guides No. 56,
UNESCO (English), 196 pp. Available from <a href="http://www.TEOS-10.org">the TEOS-10 web site</a>.
<a href="../pdf/C_from_SP.pdf">See appendix E of this TEOS-10 Manual.</a></pre>
<pre>Unesco, 1983: Algorithms for computation of fundamental properties of
<pre>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. </pre>
<pre>Unesco, 1983: Algorithms for computation of fundamental properties of
seawater. Unesco Technical Papers in Marine Science, 44, 53 pp.</pre>
<pre>The software is available from <a href="http://www.TEOS-10.org" title="TEOS-10">http://www.TEOS-10.org</a></pre></font>
</div></body></html>
Loading

0 comments on commit a36b452

Please sign in to comment.