Merge pull request #55 from efiring/update_matversion

Finish the update to gsw_matlab_v3_06_16.zip data.

gsw_check_data.h

@@ -1,10 +1,10 @@
 
 /*
 **  $Id$
-**  Extracted from ../gsw_matlab_v3_06_11/library/gsw_data_v3_0.mat
+**  Extracted from ../../gsw_matlab_v3_06_16/library/gsw_data_v3_0.mat
 **  version_date: 15th_May_2011
 **  version_number: 3.06.16
-**  mat_zip_version: 3_06_11
+**  mat_zip_version: 3_06_16
 */
 
 /*
@@ -8032,36 +8032,36 @@ static UNUSED double	p_mid_ipvfn2[132] = {
 #define	p_mid_ipvfn2_ca	2.3000211513135582e-08
 
 static UNUSED double	geo_strf_dyn_height[135] = {
-0, -0.5911034214399562, -1.1806439252923104, -1.7684650558066393,
--2.3548997511286331, -2.9393942266795459, -4.4138270084285578,
--5.7018667114771873, -6.825843630860307, -7.7737386924288545,
--8.5620081330599902, -9.2649033039875412, -10.357335048987016,
--11.250119836788921, -12.016231963659491, -12.715930646903955,
--13.943864423418352, -15.044587936807645, -16.056873329014806,
--16.996028543635198, -17.873281378970585, -18.693510206060999,
--19.460250176762429, -20.185412265311655, -20.860929617236724,
--21.505451055703716, -22.111319118724985, -23.527859871514927,
--24.82108334317542, -26.026248073802101, -27.176187051736772,
--28.282722344749779, -29.363588391482011, -30.419369529182685,
--31.459644431300564, -32.484343768028609, -33.508281057865567,
--34.52693323914032, -35.552275191175184, -36.571153388299429,
--37.590750654709275, -38.603684773173413, -39.62083726879311,
--40.630574901488529, -41.640306011084235, 0, -0.56388024349693844,
--1.1263582708638318, -1.6870554286444268, -2.2459829397179143,
--2.8011431433414105, -4.1361171927311657, -5.1849893683086163,
--6.0307202892794081, -6.7062244619059515, -7.2486271811689198,
--7.7260658198352283, -8.5135541886778725, -9.2424374097706199,
--9.9220035629064078, -10.588451128192085, -11.833205945890063,
--12.979545706352814, -14.029392142096063, -14.996568803684102,
--15.900132936306356, -16.743751939768106, -17.537981327641248,
--18.300181288930556, -19.014225699263072, -19.694271464352596,
--20.327486255636575, -21.797345218333088, -23.119815844578753,
--24.346875943486168, -25.523745939043785, -26.652421858053859,
--27.749884631022507, -28.809775304847655, -29.844810972649622,
--30.848462604134571, -31.82385380907607, -32.766349502753371,
--33.701321254756671, -34.628788494098842, -35.554446634605746,
--36.471627832272112, -37.390043822500665, -38.298866724272003,
--39.205290532788347, 0, -2.240330849582127, -4.457828737459038,
+0, -0.59110330279445367, -1.1806436880267834, -1.7684646999430444,
+-2.3548992770168469, -2.9393933341637579, -4.4138237590419775,
+-5.7018597043722714, -6.8258299810738654, -7.7737161728016799,
+-8.5619701888554527, -9.2648380548757352, -10.357235083601582,
+-11.250036942490798, -12.016159675090195, -12.715818118948338,
+-13.943691250779608, -15.044425151622235, -16.056741286359124,
+-16.995911399966829, -17.873167824260442, -18.693419207200794,
+-19.460208426201412, -20.185425796294268, -20.860999621920925,
+-21.505558342327337, -22.111409468501986, -23.527936024974508,
+-24.821360318995101, -26.026756583880267, -27.176890402651569,
+-28.283555139955798, -29.364489070613555, -30.420314255387893,
+-31.460617977003515, -32.485236437391549, -33.509034188125085,
+-34.527548009664983, -35.552751157486128, -36.571491717951012,
+-37.590951430200604, -38.603749140170784, -39.620764785927385,
+-40.63036670105592, -41.639962153186183, 0, -0.5638801970850863,
+-1.1263581780619003, -1.6870552894357822, -2.2459827540821031,
+-2.8011419381289961, -4.136110705472106, -5.1849738878712959,
+-6.0306893838753313, -6.7061732099946454, -7.2485579036174617,
+-7.7259845730308259, -8.5134973393364675, -9.2423798111069555,
+-9.9219210320217499, -10.588343304813247, -11.83303612565275,
+-12.979349154430137, -14.029218498257412, -14.996424072985999,
+-15.900007212288761, -16.743638597804235, -17.537895740135546,
+-18.300133161028871, -19.014213338513226, -19.694272548101392,
+-20.327438095354761, -21.79721489129027, -23.119934751053044,
+-24.347265865201479, -25.524300561300656, -26.653115406674512,
+-27.750698730740908, -28.810690442259176, -29.845841486221964,
+-30.849605081429793, -31.825053915650606, -32.767520197389906,
+-33.702422632627524, -34.629821156540828, -35.555410626706653,
+-36.472523731986584, -37.390871402039494, -38.299626545386957,
+-39.205982625657491, 0, -2.240330849582127, -4.457828737459038,
 -6.646391799711564, -8.8097004120596001, -10.953485694137456,
 -16.352438808384978, -21.259503743654498, 8.9999999999999998e+90,
 8.9999999999999998e+90, 8.9999999999999998e+90, 8.9999999999999998e+90,

gsw_saar_data.h

@@ -1,6 +1,6 @@
 /*
 **  $Id$
-**  Extracted from ../gsw_matlab_v3_06_11/library/gsw_data_v3_0.mat
+**  Extracted from ../../gsw_matlab_v3_06_16/library/gsw_data_v3_0.mat
 */
 static int	gsw_nx = 91, gsw_ny = 45, gsw_nz = 45;
 static char	*gsw_version_date = "15th_May_2011";

make_data_from_mat.py

@@ -2,12 +2,12 @@
 #  $Id$
 """
 Make gsw_check_data.h and gsw_saar_data.h from the current gsw_data_v3_0.mat,
-v3_06_11. Existing versions will be overwritten.
+v3_06_16. Existing versions will be overwritten.
 
 Version recording in the mat files is completely unreliable, so we override it.
 
 One function, geo_strf_dyn_height, is in a state of flux; until it is
-completely rewritten to match the matlab v3_06_12 version, and this file
+completely rewritten to match the matlab v3_06_16 version, and this file
 is rerun with the corresponding matfile, the test needs to be patched.
 Using the pchip-based version here, the difference is:
 
@@ -35,7 +35,8 @@
 
 # Edit the mat_filename as needed, but make sure there is enough path
 # info to show the matlab "version" it comes from.
-mat_filename = '../../gsw_matlab_v3_06_11/library/gsw_data_v3_0.mat'
+mat_zip_ver_string = "3_06_16"
+mat_filename = f'../../gsw_matlab_v{mat_zip_ver_string}/library/gsw_data_v3_0.mat'
 check_fname = 'gsw_check_data.h'
 saar_fname = 'gsw_saar_data.h'
 
@@ -326,7 +327,7 @@ def write_variable(out, var_name, v):
 
 version_date = mat['version_date']
 version_number = mat['version_number']
-mat_zip_version = "3_06_11"
+mat_zip_version = mat_zip_ver_string
 
 cv = dict()
 for name in mat['gsw_cv'].dtype.names: