Updated GSW toolbox from v3.05 to v3.06.

aodn · Aug 29, 2017 · 87aa02a · 87aa02a
1 parent 9c3454b
commit 87aa02a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/Preprocessing/depthPP.m b/Preprocessing/depthPP.m
@@ -532,7 +532,7 @@
                 computedDepth = - gsw_z_from_p(relPres, sample_data{iCurSam}.geospatial_lat_min);
                 clear relPres;
                 computedDepthComment = ['depthPP: Depth computed using the ' ...
-                    'Gibbs-SeaWater toolbox (TEOS-10) v3.05 from latitude and ' ...
+                    'Gibbs-SeaWater toolbox (TEOS-10) v3.06 from latitude and ' ...
                     presComment '.'];
             else
                 % latitude does change in the dataset, so we use the mean
@@ -543,7 +543,7 @@
                 computedDepth = - gsw_z_from_p(relPres, meanLat);
                 clear relPres;
                 computedDepthComment = ['depthPP: Depth computed using the ' ...
-                    'Gibbs-SeaWater toolbox (TEOS-10) v3.05 from mean latitude and ' ...
+                    'Gibbs-SeaWater toolbox (TEOS-10) v3.06 from mean latitude and ' ...
                     presComment '.'];
             end
         else
@@ -628,14 +628,14 @@
                             zOther = - gsw_z_from_p(relPresOther, sample_data{iCurSam}.geospatial_lat_min);
                             computedDepthComment  = ['depthPP: Depth inferred from only one neighbouring pressure sensor ' ...
                                 descOtherSam{iCurSam}{iFirst + 1} ', using the Gibbs-SeaWater toolbox ' ...
-                                '(TEOS-10) v3.05 from latitude and ' presComment '.'];
+                                '(TEOS-10) v3.06 from latitude and ' presComment '.'];
                         else
                             meanLat = sample_data{iCurSam}.geospatial_lat_min + ...
                                 (sample_data{iCurSam}.geospatial_lat_max - sample_data{iCurSam}.geospatial_lat_min)/2;
                             zOther = - gsw_z_from_p(relPresOther, meanLat);
                             computedDepthComment  = ['depthPP: Depth inferred from only one neighbouring pressure sensor ' ...
                                 descOtherSam{iCurSam}{iFirst + 1} ', using the Gibbs-SeaWater toolbox ' ...
-                                '(TEOS-10) v3.05 from mean latitude and ' presComment '.'];
+                                '(TEOS-10) v3.06 from mean latitude and ' presComment '.'];
                         end
                     else
                         % without latitude information, we assume 1dbar ~= 1m
@@ -730,7 +730,7 @@
                             computedDepthComment = ['depthPP: Depth inferred from ' ...
                                 '2 neighbouring pressure sensors ' descOtherSam{iCurSam}{iFirst + 1} ...
                                 ' and ' descOtherSam{iCurSam}{iSecond + 1} ', using the ' ...
-                                'Gibbs-SeaWater toolbox (TEOS-10) v3.05 from latitude and ' ...
+                                'Gibbs-SeaWater toolbox (TEOS-10) v3.06 from latitude and ' ...
                                 presComment '.'];
                         else
                             meanLat = sample_data{iCurSam}.geospatial_lat_min + ...
@@ -742,7 +742,7 @@
                             computedDepthComment = ['depthPP: Depth inferred from ' ...
                                 '2 neighbouring pressure sensors ' descOtherSam{iCurSam}{iFirst + 1} ...
                                 ' and ' descOtherSam{iCurSam}{iSecond + 1} ', using the ' ...
-                                'Gibbs-SeaWater toolbox (TEOS-10) v3.05 from mean latitude and ' ...
+                                'Gibbs-SeaWater toolbox (TEOS-10) v3.06 from mean latitude and ' ...
                                 presComment '.'];
                         end
                     else

diff --git a/Preprocessing/oxygenPP.m b/Preprocessing/oxygenPP.m
@@ -136,7 +136,7 @@
   oxsolSurf = gsw_O2sol_SP_pt(psal, potTemp); % sea bird calculates OXSOL using psal and local temperature, not potential temperature
   oxsolSurfComment = ['OXSOL_SURFACE derived from TEMP, PSAL and ' presName ...
       ' using gsw_O2sol_SP_pt from the Gibbs-SeaWater toolbox (TEOS-10) ' ...
-      'v3.05 and sw_ptmp from the SeaWater toolbox (EOS-80) v1.1.'];
+      'v3.06 and sw_ptmp from the SeaWater toolbox (EOS-80) v1.1.'];
 
   % add oxygen solubility at atmospheric pressure as new variable in data set
   sample_data{k} = addVar(...

diff --git a/Preprocessing/salinityPP.m b/Preprocessing/salinityPP.m
@@ -89,7 +89,7 @@
   psal = gsw_SP_from_R(R, temp, presRel);
 
   dimensions = sam.variables{tempIdx}.dimensions;
-  salinityComment = ['salinityPP.m: derived from CNDC, TEMP and ' presName ' using the Gibbs-SeaWater toolbox (TEOS-10) v3.05'];
+  salinityComment = ['salinityPP.m: derived from CNDC, TEMP and ' presName ' using the Gibbs-SeaWater toolbox (TEOS-10) v3.06'];
 
   if isfield(sam.variables{tempIdx}, 'coordinates')
       coordinates = sam.variables{tempIdx}.coordinates;

diff --git a/Seawater/gsw_p_from_z.m b/Seawater/gsw_p_from_z.m
@@ -1,6 +1,6 @@
 function p = gsw_p_from_z(z,lat,geo_strf_dyn_height,sea_surface_geopotental)
 
-% gsw_p_from_z                      pressure from height (76-term equation)
+% gsw_p_from_z                      pressure from height (75-term equation)
 %==========================================================================
 %
 % USAGE:
@@ -61,18 +61,19 @@
 %   temperature and density of seawater.  J. Atmosph. Ocean. Tech., 20,
 %   pp. 730-741.
 %
-%  McDougall T.J. and S.J. Wotherspoon, 2013: A simple modification of 
+%  McDougall, T.J., and S.J. Wotherspoon, 2013: A simple modification of 
 %   Newton's method to achieve convergence of order 1 + sqrt(2).  Applied 
-%   Mathematics Letters, 29, 20-25.  
+%   Mathematics Letters, 29, pp. 20-25.  
 %
-%  Moritz, 2000: Goedetic reference system 1980. J. Geodesy, 74, 128-133.
+%  Moritz, H., 2000: Geodetic reference system 1980. J. Geodesy, 74, 
+%   pp. 128-133.
 %
 %  Roquet, F., G. Madec, T.J. McDougall, P.M. Barker, 2015: Accurate
 %   polynomial expressions for the density and specifc volume of seawater
-%   using the TEOS-10 standard. Ocean Modelling.
+%   using the TEOS-10 standard. Ocean Modelling, 90, pp. 29-43.
 %
 %  Saunders, P.M., 1981: Practical conversion of pressure to depth. 
-%   Journal of Physical Oceanography, 11, 573-574.
+%   Journal of Physical Oceanography, 11, pp. 573-574.
 %
 %  This software is available from http://www.TEOS-10.org
 %

diff --git a/Seawater/gsw_z_from_p.m b/Seawater/gsw_z_from_p.m
@@ -48,7 +48,7 @@
 %  Trevor McDougall, Claire Roberts-Thomson & Paul Barker.
 %                                                      [ help@teos-10.org ]
 %
-% VERSION NUMBER: 3.04 (10th December, 2013)
+% VERSION NUMBER: 3.05 (27th January 2015)
 %
 % REFERENCES:
 %  IOC, SCOR and IAPSO, 2010: The international thermodynamic equation of 
@@ -61,11 +61,12 @@
 %   temperature and density of seawater.  J. Atmosph. Ocean. Tech., 20,
 %   pp. 730-741.
 %
-%  Moritz (2000) Goedetic reference system 1980. J. Geodesy, 74, 128-133.
+%  Moritz, H., 2000: Geodetic reference system 1980. J. Geodesy, 74, 
+%   pp. 128-133.
 %
 %  Roquet, F., G. Madec, T.J. McDougall, P.M. Barker, 2015: Accurate
 %   polynomial expressions for the density and specifc volume of seawater
-%   using the TEOS-10 standard. Ocean Modelling.
+%   using the TEOS-10 standard. Ocean Modelling, 90, pp. 29-43.
 %
 %  This software is available from http://www.TEOS-10.org
 %