From dc11d4f1c4566dba0509381d39ff7996c56f7684 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Fri, 6 Sep 2024 12:05:26 +1000 Subject: [PATCH 01/13] Add additional models --- providers/AVISO.json | 172 +++++++++++++++++++++++++++++++++++++++++++ providers/GSFC.json | 60 +++++++++++++++ providers/TPXO.json | 11 +++ 3 files changed, 243 insertions(+) diff --git a/providers/AVISO.json b/providers/AVISO.json index 4c8b2489..46047b3b 100644 --- a/providers/AVISO.json +++ b/providers/AVISO.json @@ -123,6 +123,16 @@ } }, "elevation": { + "FES2012": { + "format": "FES-netcdf", + "model_file": "fes2012/data/*_FES2012_SLEV.nc", + "name": "FES2012", + "type": "z", + "version": "FES2012", + "variable": "tide_ocean", + "scale": 0.01, + "reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html" + }, "FES2014": { "constituents": [ "2n2", @@ -204,6 +214,87 @@ "variable": "tide_ocean", "version": "FES2014" }, + "FES2014_extrapolated": { + "constituents": [ + "2n2", + "eps2", + "j1", + "k1", + "k2", + "l2", + "lambda2", + "m2", + "m3", + "m4", + "m6", + "m8", + "mf", + "mks2", + "mm", + "mn4", + "ms4", + "msf", + "msqm", + "mtm", + "mu2", + "n2", + "n4", + "nu2", + "o1", + "p1", + "q1", + "r2", + "s1", + "s2", + "s4", + "sa", + "ssa", + "t2" + ], + "format": "FES-netcdf", + "model_file": [ + "fes2014/ocean_tide_extrapolated/2n2.nc", + "fes2014/ocean_tide_extrapolated/eps2.nc", + "fes2014/ocean_tide_extrapolated/j1.nc", + "fes2014/ocean_tide_extrapolated/k1.nc", + "fes2014/ocean_tide_extrapolated/k2.nc", + "fes2014/ocean_tide_extrapolated/l2.nc", + "fes2014/ocean_tide_extrapolated/la2.nc", + "fes2014/ocean_tide_extrapolated/m2.nc", + "fes2014/ocean_tide_extrapolated/m3.nc", + "fes2014/ocean_tide_extrapolated/m4.nc", + "fes2014/ocean_tide_extrapolated/m6.nc", + "fes2014/ocean_tide_extrapolated/m8.nc", + "fes2014/ocean_tide_extrapolated/mf.nc", + "fes2014/ocean_tide_extrapolated/mks2.nc", + "fes2014/ocean_tide_extrapolated/mm.nc", + "fes2014/ocean_tide_extrapolated/mn4.nc", + "fes2014/ocean_tide_extrapolated/ms4.nc", + "fes2014/ocean_tide_extrapolated/msf.nc", + "fes2014/ocean_tide_extrapolated/msqm.nc", + "fes2014/ocean_tide_extrapolated/mtm.nc", + "fes2014/ocean_tide_extrapolated/mu2.nc", + "fes2014/ocean_tide_extrapolated/n2.nc", + "fes2014/ocean_tide_extrapolated/n4.nc", + "fes2014/ocean_tide_extrapolated/nu2.nc", + "fes2014/ocean_tide_extrapolated/o1.nc", + "fes2014/ocean_tide_extrapolated/p1.nc", + "fes2014/ocean_tide_extrapolated/q1.nc", + "fes2014/ocean_tide_extrapolated/r2.nc", + "fes2014/ocean_tide_extrapolated/s1.nc", + "fes2014/ocean_tide_extrapolated/s2.nc", + "fes2014/ocean_tide_extrapolated/s4.nc", + "fes2014/ocean_tide_extrapolated/sa.nc", + "fes2014/ocean_tide_extrapolated/ssa.nc", + "fes2014/ocean_tide_extrapolated/t2.nc" + ], + "name": "FES2014_extrapolated", + "reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "FES2014" + }, "FES2014_load": { "constituents": [ "2n2", @@ -366,6 +457,87 @@ "variable": "tide_ocean", "version": "FES2022" }, + "FES2022_extrapolated": { + "constituents": [ + "2n2", + "eps2", + "j1", + "k1", + "k2", + "l2", + "lambda2", + "m2", + "m3", + "m4", + "m6", + "m8", + "mf", + "mks2", + "mm", + "mn4", + "ms4", + "msf", + "msqm", + "mtm", + "mu2", + "n2", + "n4", + "nu2", + "o1", + "p1", + "q1", + "r2", + "s1", + "s2", + "s4", + "sa", + "ssa", + "t2" + ], + "format": "FES-netcdf", + "model_file": [ + "fes2022b/ocean_tide_extrapolated/2n2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/eps2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/j1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/k1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/k2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/l2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/lambda2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m3_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m6_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m8_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mf_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mks2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mm_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mn4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/ms4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/msf_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/msqm_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mtm_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mu2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/n2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/n4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/nu2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/o1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/p1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/q1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/r2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/s1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/s2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/s4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/sa_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/ssa_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/t2_fes2022.nc" + ], + "name": "FES2022_extrapolated", + "reference": "https://doi.org/10.24400/527896/A01-2024.004", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "FES2022" + }, "FES2022_load": { "constituents": [ "2n2", diff --git a/providers/GSFC.json b/providers/GSFC.json index 3472b1f1..71e017df 100644 --- a/providers/GSFC.json +++ b/providers/GSFC.json @@ -207,6 +207,66 @@ "scale": 0.01, "compressed": false, "reference": "https://ntrs.nasa.gov/citations/19990089548" + }, + "GOT5.6": { + "format": "GOT-netcdf", + "name": "GOT5.6", + "model_file": [ + "GOT5.5/ocean_tides/2n2.nc", + "GOT5.5/ocean_tides/j1.nc", + "GOT5.5/ocean_tides/k1.nc", + "GOT5.5/ocean_tides/k2.nc", + "GOT5.6/ocean_tides/l2.nc", + "GOT5.6/ocean_tides/m1.nc", + "GOT5.5/ocean_tides/m2.nc", + "GOT5.6/ocean_tides/m3.nc", + "GOT5.5/ocean_tides/m4.nc", + "GOT5.5/ocean_tides/ms4.nc", + "GOT5.5/ocean_tides/mu2.nc", + "GOT5.6/ocean_tides/n2.nc", + "GOT5.5/ocean_tides/o1.nc", + "GOT5.5/ocean_tides/oo1.nc", + "GOT5.5/ocean_tides/p1.nc", + "GOT5.5/ocean_tides/q1.nc", + "GOT5.5/ocean_tides/s1.nc", + "GOT5.5/ocean_tides/s2.nc", + "GOT5.5/ocean_tides/sig1.nc" + ], + "type": "z", + "variable": "tide_ocean", + "version": "5.6", + "scale": 0.01, + "reference": "https://doi.org/10.1126/sciadv.abd4744" + }, + "GOT5.6_extrapolated": { + "format": "GOT-netcdf", + "name": "GOT5.6_extrapolated", + "model_file": [ + "GOT5.5/extrapolated/2n2x.nc", + "GOT5.5/extrapolated/j1x.nc", + "GOT5.5/extrapolated/k1x.nc", + "GOT5.5/extrapolated/k2x.nc", + "GOT5.6/extrapolated/l2x.nc", + "GOT5.6/extrapolated/m1x.nc", + "GOT5.5/extrapolated/m2x.nc", + "GOT5.6/extrapolated/m3x.nc", + "GOT5.5/extrapolated/m4x.nc", + "GOT5.5/extrapolated/ms4x.nc", + "GOT5.5/extrapolated/mu2x.nc", + "GOT5.6/extrapolated/n2x.nc", + "GOT5.5/extrapolated/o1x.nc", + "GOT5.5/extrapolated/oo1x.nc", + "GOT5.5/extrapolated/p1x.nc", + "GOT5.5/extrapolated/q1x.nc", + "GOT5.5/extrapolated/s1x.nc", + "GOT5.5/extrapolated/s2x.nc", + "GOT5.5/extrapolated/sig1x.nc" + ], + "type": "z", + "variable": "tide_ocean", + "version": "5.6", + "scale": 0.01, + "reference": "https://doi.org/10.1126/sciadv.abd4744" } } } \ No newline at end of file diff --git a/providers/TPXO.json b/providers/TPXO.json index e3d6fcca..283a8710 100644 --- a/providers/TPXO.json +++ b/providers/TPXO.json @@ -111,6 +111,17 @@ ], "version": "8" }, + "TPXO8-atlas-nc": { + "format": "ATLAS-netcdf", + "name": "TPXO8-atlas-v1", + "model_file": "TPXO8_atlas_v1/hf.*_tpxo8_atlas_30c_v1.nc", + "grid_file": "TPXO8_atlas_v1/grid_tpxo8atlas_30_v1.nc", + "type": "z", + "version": "v1", + "variable": "tide_ocean", + "scale": 0.001, + "reference": "https://www.tpxo.net/global/tpxo8-atlas" + }, "TPXO9-atlas": { "format": "OTIS", "grid_file": "TPXO9_atlas/grid_tpxo9_atlas", From fe9aca04b78bb682d151b8533721ec48c187500a Mon Sep 17 00:00:00 2001 From: robbibt Date: Fri, 6 Sep 2024 02:10:22 +0000 Subject: [PATCH 02/13] Update provider database --- pyTMD/data/database.json | 243 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) diff --git a/pyTMD/data/database.json b/pyTMD/data/database.json index a4329442..c20e058b 100644 --- a/pyTMD/data/database.json +++ b/pyTMD/data/database.json @@ -406,6 +406,17 @@ ], "version": "8" }, + "TPXO8-atlas-nc": { + "format": "ATLAS-netcdf", + "grid_file": "TPXO8_atlas_v1/grid_tpxo8atlas_30_v1.nc", + "model_file": "TPXO8_atlas_v1/hf.*_tpxo8_atlas_30c_v1.nc", + "name": "TPXO8-atlas-v1", + "reference": "https://www.tpxo.net/global/tpxo8-atlas", + "scale": 0.001, + "type": "z", + "variable": "tide_ocean", + "version": "v1" + }, "TPXO9-atlas": { "format": "OTIS", "grid_file": "TPXO9_atlas/grid_tpxo9_atlas", @@ -980,6 +991,16 @@ "variable": "tide_load", "version": "EOT20" }, + "FES2012": { + "format": "FES-netcdf", + "model_file": "fes2012/data/*_FES2012_SLEV.nc", + "name": "FES2012", + "reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "FES2012" + }, "FES2014": { "constituents": [ "2n2", @@ -1061,6 +1082,87 @@ "variable": "tide_ocean", "version": "FES2014" }, + "FES2014_extrapolated": { + "constituents": [ + "2n2", + "eps2", + "j1", + "k1", + "k2", + "l2", + "lambda2", + "m2", + "m3", + "m4", + "m6", + "m8", + "mf", + "mks2", + "mm", + "mn4", + "ms4", + "msf", + "msqm", + "mtm", + "mu2", + "n2", + "n4", + "nu2", + "o1", + "p1", + "q1", + "r2", + "s1", + "s2", + "s4", + "sa", + "ssa", + "t2" + ], + "format": "FES-netcdf", + "model_file": [ + "fes2014/ocean_tide_extrapolated/2n2.nc", + "fes2014/ocean_tide_extrapolated/eps2.nc", + "fes2014/ocean_tide_extrapolated/j1.nc", + "fes2014/ocean_tide_extrapolated/k1.nc", + "fes2014/ocean_tide_extrapolated/k2.nc", + "fes2014/ocean_tide_extrapolated/l2.nc", + "fes2014/ocean_tide_extrapolated/la2.nc", + "fes2014/ocean_tide_extrapolated/m2.nc", + "fes2014/ocean_tide_extrapolated/m3.nc", + "fes2014/ocean_tide_extrapolated/m4.nc", + "fes2014/ocean_tide_extrapolated/m6.nc", + "fes2014/ocean_tide_extrapolated/m8.nc", + "fes2014/ocean_tide_extrapolated/mf.nc", + "fes2014/ocean_tide_extrapolated/mks2.nc", + "fes2014/ocean_tide_extrapolated/mm.nc", + "fes2014/ocean_tide_extrapolated/mn4.nc", + "fes2014/ocean_tide_extrapolated/ms4.nc", + "fes2014/ocean_tide_extrapolated/msf.nc", + "fes2014/ocean_tide_extrapolated/msqm.nc", + "fes2014/ocean_tide_extrapolated/mtm.nc", + "fes2014/ocean_tide_extrapolated/mu2.nc", + "fes2014/ocean_tide_extrapolated/n2.nc", + "fes2014/ocean_tide_extrapolated/n4.nc", + "fes2014/ocean_tide_extrapolated/nu2.nc", + "fes2014/ocean_tide_extrapolated/o1.nc", + "fes2014/ocean_tide_extrapolated/p1.nc", + "fes2014/ocean_tide_extrapolated/q1.nc", + "fes2014/ocean_tide_extrapolated/r2.nc", + "fes2014/ocean_tide_extrapolated/s1.nc", + "fes2014/ocean_tide_extrapolated/s2.nc", + "fes2014/ocean_tide_extrapolated/s4.nc", + "fes2014/ocean_tide_extrapolated/sa.nc", + "fes2014/ocean_tide_extrapolated/ssa.nc", + "fes2014/ocean_tide_extrapolated/t2.nc" + ], + "name": "FES2014_extrapolated", + "reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "FES2014" + }, "FES2014_load": { "constituents": [ "2n2", @@ -1223,6 +1325,87 @@ "variable": "tide_ocean", "version": "FES2022" }, + "FES2022_extrapolated": { + "constituents": [ + "2n2", + "eps2", + "j1", + "k1", + "k2", + "l2", + "lambda2", + "m2", + "m3", + "m4", + "m6", + "m8", + "mf", + "mks2", + "mm", + "mn4", + "ms4", + "msf", + "msqm", + "mtm", + "mu2", + "n2", + "n4", + "nu2", + "o1", + "p1", + "q1", + "r2", + "s1", + "s2", + "s4", + "sa", + "ssa", + "t2" + ], + "format": "FES-netcdf", + "model_file": [ + "fes2022b/ocean_tide_extrapolated/2n2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/eps2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/j1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/k1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/k2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/l2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/lambda2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m3_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m6_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/m8_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mf_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mks2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mm_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mn4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/ms4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/msf_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/msqm_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mtm_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/mu2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/n2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/n4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/nu2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/o1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/p1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/q1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/r2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/s1_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/s2_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/s4_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/sa_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/ssa_fes2022.nc", + "fes2022b/ocean_tide_extrapolated/t2_fes2022.nc" + ], + "name": "FES2022_extrapolated", + "reference": "https://doi.org/10.24400/527896/A01-2024.004", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "FES2022" + }, "FES2022_load": { "constituents": [ "2n2", @@ -1512,6 +1695,66 @@ "variable": "tide_load", "version": "5.5" }, + "GOT5.6": { + "format": "GOT-netcdf", + "model_file": [ + "GOT5.5/ocean_tides/2n2.nc", + "GOT5.5/ocean_tides/j1.nc", + "GOT5.5/ocean_tides/k1.nc", + "GOT5.5/ocean_tides/k2.nc", + "GOT5.6/ocean_tides/l2.nc", + "GOT5.6/ocean_tides/m1.nc", + "GOT5.5/ocean_tides/m2.nc", + "GOT5.6/ocean_tides/m3.nc", + "GOT5.5/ocean_tides/m4.nc", + "GOT5.5/ocean_tides/ms4.nc", + "GOT5.5/ocean_tides/mu2.nc", + "GOT5.6/ocean_tides/n2.nc", + "GOT5.5/ocean_tides/o1.nc", + "GOT5.5/ocean_tides/oo1.nc", + "GOT5.5/ocean_tides/p1.nc", + "GOT5.5/ocean_tides/q1.nc", + "GOT5.5/ocean_tides/s1.nc", + "GOT5.5/ocean_tides/s2.nc", + "GOT5.5/ocean_tides/sig1.nc" + ], + "name": "GOT5.6", + "reference": "https://doi.org/10.1126/sciadv.abd4744", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "5.6" + }, + "GOT5.6_extrapolated": { + "format": "GOT-netcdf", + "model_file": [ + "GOT5.5/extrapolated/2n2x.nc", + "GOT5.5/extrapolated/j1x.nc", + "GOT5.5/extrapolated/k1x.nc", + "GOT5.5/extrapolated/k2x.nc", + "GOT5.6/extrapolated/l2x.nc", + "GOT5.6/extrapolated/m1x.nc", + "GOT5.5/extrapolated/m2x.nc", + "GOT5.6/extrapolated/m3x.nc", + "GOT5.5/extrapolated/m4x.nc", + "GOT5.5/extrapolated/ms4x.nc", + "GOT5.5/extrapolated/mu2x.nc", + "GOT5.6/extrapolated/n2x.nc", + "GOT5.5/extrapolated/o1x.nc", + "GOT5.5/extrapolated/oo1x.nc", + "GOT5.5/extrapolated/p1x.nc", + "GOT5.5/extrapolated/q1x.nc", + "GOT5.5/extrapolated/s1x.nc", + "GOT5.5/extrapolated/s2x.nc", + "GOT5.5/extrapolated/sig1x.nc" + ], + "name": "GOT5.6_extrapolated", + "reference": "https://doi.org/10.1126/sciadv.abd4744", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "5.6" + }, "Gr1km-v2": { "format": "OTIS", "grid_file": "greenlandTMD_v2/grid_Greenland8.v2", From 4d2ffe21da31936f3cdbe9cbbfa7760980f11488 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Fri, 6 Sep 2024 12:18:30 +1000 Subject: [PATCH 03/13] Fix name --- providers/TPXO.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/TPXO.json b/providers/TPXO.json index 283a8710..b9142649 100644 --- a/providers/TPXO.json +++ b/providers/TPXO.json @@ -113,7 +113,7 @@ }, "TPXO8-atlas-nc": { "format": "ATLAS-netcdf", - "name": "TPXO8-atlas-v1", + "name": "TPXO8-atlas-nc", "model_file": "TPXO8_atlas_v1/hf.*_tpxo8_atlas_30c_v1.nc", "grid_file": "TPXO8_atlas_v1/grid_tpxo8atlas_30_v1.nc", "type": "z", @@ -885,4 +885,4 @@ "version": "9.1" } } -} \ No newline at end of file +} From 9dbc2f290d7c1313350490fb3ae2d55da492f275 Mon Sep 17 00:00:00 2001 From: robbibt Date: Fri, 6 Sep 2024 02:19:03 +0000 Subject: [PATCH 04/13] Update provider database --- pyTMD/data/database.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyTMD/data/database.json b/pyTMD/data/database.json index c20e058b..d444c34e 100644 --- a/pyTMD/data/database.json +++ b/pyTMD/data/database.json @@ -410,7 +410,7 @@ "format": "ATLAS-netcdf", "grid_file": "TPXO8_atlas_v1/grid_tpxo8atlas_30_v1.nc", "model_file": "TPXO8_atlas_v1/hf.*_tpxo8_atlas_30c_v1.nc", - "name": "TPXO8-atlas-v1", + "name": "TPXO8-atlas-nc", "reference": "https://www.tpxo.net/global/tpxo8-atlas", "scale": 0.001, "type": "z", From 86eeb3d56105622edb427754c4acb0f714e136e3 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Fri, 6 Sep 2024 12:52:01 +1000 Subject: [PATCH 05/13] Manually define constituents --- providers/AVISO.json | 72 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/providers/AVISO.json b/providers/AVISO.json index 46047b3b..96e29570 100644 --- a/providers/AVISO.json +++ b/providers/AVISO.json @@ -125,7 +125,75 @@ "elevation": { "FES2012": { "format": "FES-netcdf", - "model_file": "fes2012/data/*_FES2012_SLEV.nc", + "constituents": [ + "t2" + "msf", + "mtm", + "l2", + "mm", + "q1", + "2n2", + "n4", + "o1", + "m3", + "n2", + "k1", + "s1", + "ms4", + "r2", + "mu2", + "eps2", + "s4", + "ssa", + "l2", + "mn4", + "m2", + "j1", + "m6", + "mf", + "m4", + "p1", + "k2", + "mks2", + "s2", + "m8", + "nu2" + ], + "model_file": [ + "fes2012/data/T2_FES2012_SLEV.nc", + "fes2012/data/MSf_FES2012_SLEV.nc", + "fes2012/data/Mtm_FES2012_SLEV.nc", + "fes2012/data/L2_FES2012_SLEV.nc", + # "fes2012/data/Z0_FES2012_SLEV.nc", # no match + "fes2012/data/Mm_FES2012_SLEV.nc", + "fes2012/data/Q1_FES2012_SLEV.nc", + "fes2012/data/2N2_FES2012_SLEV.nc", + "fes2012/data/N4_FES2012_SLEV.nc", + "fes2012/data/O1_FES2012_SLEV.nc", + "fes2012/data/M3_FES2012_SLEV.nc", + "fes2012/data/N2_FES2012_SLEV.nc", + "fes2012/data/K1_FES2012_SLEV.nc", + "fes2012/data/S1_FES2012_SLEV.nc", + "fes2012/data/MS4_FES2012_SLEV.nc", + "fes2012/data/R2_FES2012_SLEV.nc", + "fes2012/data/Mu2_FES2012_SLEV.nc", + "fes2012/data/E2_FES2012_SLEV.nc", # eps2? + "fes2012/data/S4_FES2012_SLEV.nc", + "fes2012/data/Ssa_FES2012_SLEV.nc", + "fes2012/data/La2_FES2012_SLEV.nc", # l2? + "fes2012/data/MN4_FES2012_SLEV.nc", + "fes2012/data/M2_FES2012_SLEV.nc", + "fes2012/data/J1_FES2012_SLEV.nc", + "fes2012/data/M6_FES2012_SLEV.nc", + "fes2012/data/Mf_FES2012_SLEV.nc", + "fes2012/data/M4_FES2012_SLEV.nc", + "fes2012/data/P1_FES2012_SLEV.nc", + "fes2012/data/K2_FES2012_SLEV.nc", + "fes2012/data/MKS2_FES2012_SLEV.nc", + "fes2012/data/S2_FES2012_SLEV.nc", + "fes2012/data/M8_FES2012_SLEV.nc", + "fes2012/data/Nu2_FES2012_SLEV.nc" + ] "name": "FES2012", "type": "z", "version": "FES2012", @@ -620,4 +688,4 @@ "version": "FES2022" } } -} \ No newline at end of file +} From 5594eaccc02ca44c79664395554662eed4b76988 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Fri, 6 Sep 2024 12:55:43 +1000 Subject: [PATCH 06/13] Update AVISO.json --- providers/AVISO.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/providers/AVISO.json b/providers/AVISO.json index 96e29570..c9e2f3ed 100644 --- a/providers/AVISO.json +++ b/providers/AVISO.json @@ -163,8 +163,7 @@ "fes2012/data/T2_FES2012_SLEV.nc", "fes2012/data/MSf_FES2012_SLEV.nc", "fes2012/data/Mtm_FES2012_SLEV.nc", - "fes2012/data/L2_FES2012_SLEV.nc", - # "fes2012/data/Z0_FES2012_SLEV.nc", # no match + "fes2012/data/L2_FES2012_SLEV.nc", "fes2012/data/Mm_FES2012_SLEV.nc", "fes2012/data/Q1_FES2012_SLEV.nc", "fes2012/data/2N2_FES2012_SLEV.nc", @@ -177,10 +176,10 @@ "fes2012/data/MS4_FES2012_SLEV.nc", "fes2012/data/R2_FES2012_SLEV.nc", "fes2012/data/Mu2_FES2012_SLEV.nc", - "fes2012/data/E2_FES2012_SLEV.nc", # eps2? + "fes2012/data/E2_FES2012_SLEV.nc", "fes2012/data/S4_FES2012_SLEV.nc", "fes2012/data/Ssa_FES2012_SLEV.nc", - "fes2012/data/La2_FES2012_SLEV.nc", # l2? + "fes2012/data/La2_FES2012_SLEV.nc", "fes2012/data/MN4_FES2012_SLEV.nc", "fes2012/data/M2_FES2012_SLEV.nc", "fes2012/data/J1_FES2012_SLEV.nc", From c507a4a01f8859d021935bf008fcb97114c8dee9 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Fri, 6 Sep 2024 12:57:25 +1000 Subject: [PATCH 07/13] Update AVISO.json --- providers/AVISO.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/AVISO.json b/providers/AVISO.json index c9e2f3ed..cd1bdc1e 100644 --- a/providers/AVISO.json +++ b/providers/AVISO.json @@ -126,7 +126,7 @@ "FES2012": { "format": "FES-netcdf", "constituents": [ - "t2" + "t2", "msf", "mtm", "l2", From 8490486d4754e54cb219380de5308d25551f6751 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Fri, 6 Sep 2024 12:58:41 +1000 Subject: [PATCH 08/13] Update AVISO.json --- providers/AVISO.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/AVISO.json b/providers/AVISO.json index cd1bdc1e..184d423e 100644 --- a/providers/AVISO.json +++ b/providers/AVISO.json @@ -192,7 +192,7 @@ "fes2012/data/S2_FES2012_SLEV.nc", "fes2012/data/M8_FES2012_SLEV.nc", "fes2012/data/Nu2_FES2012_SLEV.nc" - ] + ], "name": "FES2012", "type": "z", "version": "FES2012", From 9912ac20c9c975ab2031837dc3038f3700102713 Mon Sep 17 00:00:00 2001 From: robbibt Date: Fri, 6 Sep 2024 02:59:19 +0000 Subject: [PATCH 09/13] Update provider database --- pyTMD/data/database.json | 69 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/pyTMD/data/database.json b/pyTMD/data/database.json index d444c34e..b28be209 100644 --- a/pyTMD/data/database.json +++ b/pyTMD/data/database.json @@ -992,8 +992,75 @@ "version": "EOT20" }, "FES2012": { + "constituents": [ + "t2", + "msf", + "mtm", + "l2", + "mm", + "q1", + "2n2", + "n4", + "o1", + "m3", + "n2", + "k1", + "s1", + "ms4", + "r2", + "mu2", + "eps2", + "s4", + "ssa", + "l2", + "mn4", + "m2", + "j1", + "m6", + "mf", + "m4", + "p1", + "k2", + "mks2", + "s2", + "m8", + "nu2" + ], "format": "FES-netcdf", - "model_file": "fes2012/data/*_FES2012_SLEV.nc", + "model_file": [ + "fes2012/data/T2_FES2012_SLEV.nc", + "fes2012/data/MSf_FES2012_SLEV.nc", + "fes2012/data/Mtm_FES2012_SLEV.nc", + "fes2012/data/L2_FES2012_SLEV.nc", + "fes2012/data/Mm_FES2012_SLEV.nc", + "fes2012/data/Q1_FES2012_SLEV.nc", + "fes2012/data/2N2_FES2012_SLEV.nc", + "fes2012/data/N4_FES2012_SLEV.nc", + "fes2012/data/O1_FES2012_SLEV.nc", + "fes2012/data/M3_FES2012_SLEV.nc", + "fes2012/data/N2_FES2012_SLEV.nc", + "fes2012/data/K1_FES2012_SLEV.nc", + "fes2012/data/S1_FES2012_SLEV.nc", + "fes2012/data/MS4_FES2012_SLEV.nc", + "fes2012/data/R2_FES2012_SLEV.nc", + "fes2012/data/Mu2_FES2012_SLEV.nc", + "fes2012/data/E2_FES2012_SLEV.nc", + "fes2012/data/S4_FES2012_SLEV.nc", + "fes2012/data/Ssa_FES2012_SLEV.nc", + "fes2012/data/La2_FES2012_SLEV.nc", + "fes2012/data/MN4_FES2012_SLEV.nc", + "fes2012/data/M2_FES2012_SLEV.nc", + "fes2012/data/J1_FES2012_SLEV.nc", + "fes2012/data/M6_FES2012_SLEV.nc", + "fes2012/data/Mf_FES2012_SLEV.nc", + "fes2012/data/M4_FES2012_SLEV.nc", + "fes2012/data/P1_FES2012_SLEV.nc", + "fes2012/data/K2_FES2012_SLEV.nc", + "fes2012/data/MKS2_FES2012_SLEV.nc", + "fes2012/data/S2_FES2012_SLEV.nc", + "fes2012/data/M8_FES2012_SLEV.nc", + "fes2012/data/Nu2_FES2012_SLEV.nc" + ], "name": "FES2012", "reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html", "scale": 0.01, From 409688faf5ad7113237553e30295f88b082f3051 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Fri, 6 Sep 2024 13:10:18 +1000 Subject: [PATCH 10/13] Fix TPXO8-atlas-nc --- providers/TPXO.json | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/providers/TPXO.json b/providers/TPXO.json index b9142649..ca6d1a36 100644 --- a/providers/TPXO.json +++ b/providers/TPXO.json @@ -111,17 +111,6 @@ ], "version": "8" }, - "TPXO8-atlas-nc": { - "format": "ATLAS-netcdf", - "name": "TPXO8-atlas-nc", - "model_file": "TPXO8_atlas_v1/hf.*_tpxo8_atlas_30c_v1.nc", - "grid_file": "TPXO8_atlas_v1/grid_tpxo8atlas_30_v1.nc", - "type": "z", - "version": "v1", - "variable": "tide_ocean", - "scale": 0.001, - "reference": "https://www.tpxo.net/global/tpxo8-atlas" - }, "TPXO9-atlas": { "format": "OTIS", "grid_file": "TPXO9_atlas/grid_tpxo9_atlas", @@ -609,6 +598,27 @@ "variable": "tide_ocean", "version": "8" }, + "TPXO8-atlas-nc": { + "format": "ATLAS-netcdf", + "name": "TPXO8-atlas-nc", + "model_file": [ + "TPXO8_atlas_v1/hf.k1_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.n2_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.o1_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.q1_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.s2_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.k2_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.p1_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.m4_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.m2_tpxo8_atlas_30c_v1.nc" + ], + "grid_file": "TPXO8_atlas_v1/grid_tpxo8atlas_30_v1.nc", + "type": "z", + "version": "v1", + "variable": "tide_ocean", + "scale": 0.001, + "reference": "http://volkov.oce.orst.edu/tides/tpxo8_atlas.html" + }, "TPXO9-atlas": { "format": "OTIS", "grid_file": "TPXO9_atlas/grid_tpxo9_atlas", From 0263997de51d5438f6a72c40b4165bdad83f1273 Mon Sep 17 00:00:00 2001 From: robbibt Date: Fri, 6 Sep 2024 03:10:50 +0000 Subject: [PATCH 11/13] Update provider database --- pyTMD/data/database.json | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pyTMD/data/database.json b/pyTMD/data/database.json index b28be209..b9bdf2a8 100644 --- a/pyTMD/data/database.json +++ b/pyTMD/data/database.json @@ -406,17 +406,6 @@ ], "version": "8" }, - "TPXO8-atlas-nc": { - "format": "ATLAS-netcdf", - "grid_file": "TPXO8_atlas_v1/grid_tpxo8atlas_30_v1.nc", - "model_file": "TPXO8_atlas_v1/hf.*_tpxo8_atlas_30c_v1.nc", - "name": "TPXO8-atlas-nc", - "reference": "https://www.tpxo.net/global/tpxo8-atlas", - "scale": 0.001, - "type": "z", - "variable": "tide_ocean", - "version": "v1" - }, "TPXO9-atlas": { "format": "OTIS", "grid_file": "TPXO9_atlas/grid_tpxo9_atlas", @@ -1964,6 +1953,27 @@ "variable": "tide_ocean", "version": "8" }, + "TPXO8-atlas-nc": { + "format": "ATLAS-netcdf", + "grid_file": "TPXO8_atlas_v1/grid_tpxo8atlas_30_v1.nc", + "model_file": [ + "TPXO8_atlas_v1/hf.k1_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.n2_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.o1_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.q1_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.s2_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.k2_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.p1_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.m4_tpxo8_atlas_30c_v1.nc", + "TPXO8_atlas_v1/hf.m2_tpxo8_atlas_30c_v1.nc" + ], + "name": "TPXO8-atlas-nc", + "reference": "http://volkov.oce.orst.edu/tides/tpxo8_atlas.html", + "scale": 0.001, + "type": "z", + "variable": "tide_ocean", + "version": "v1" + }, "TPXO9-atlas": { "format": "OTIS", "grid_file": "TPXO9_atlas/grid_tpxo9_atlas", From b4a10797b4835cc812fbff1d6359b7e575ccd3c7 Mon Sep 17 00:00:00 2001 From: tsutterley Date: Fri, 6 Sep 2024 09:14:03 -0700 Subject: [PATCH 12/13] fix: add parse constituents back to model load drop constituents from database --- providers/AVISO.json | 292 +---------------------------------- providers/GSFC.json | 30 +++- pyTMD/data/database.json | 320 ++++----------------------------------- pyTMD/io/model.py | 6 + 4 files changed, 67 insertions(+), 581 deletions(-) diff --git a/providers/AVISO.json b/providers/AVISO.json index 184d423e..034280fc 100644 --- a/providers/AVISO.json +++ b/providers/AVISO.json @@ -1,42 +1,6 @@ { "current": { "FES2014": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": { "u": [ @@ -125,45 +89,11 @@ "elevation": { "FES2012": { "format": "FES-netcdf", - "constituents": [ - "t2", - "msf", - "mtm", - "l2", - "mm", - "q1", - "2n2", - "n4", - "o1", - "m3", - "n2", - "k1", - "s1", - "ms4", - "r2", - "mu2", - "eps2", - "s4", - "ssa", - "l2", - "mn4", - "m2", - "j1", - "m6", - "mf", - "m4", - "p1", - "k2", - "mks2", - "s2", - "m8", - "nu2" - ], "model_file": [ "fes2012/data/T2_FES2012_SLEV.nc", "fes2012/data/MSf_FES2012_SLEV.nc", "fes2012/data/Mtm_FES2012_SLEV.nc", - "fes2012/data/L2_FES2012_SLEV.nc", + "fes2012/data/L2_FES2012_SLEV.nc", "fes2012/data/Mm_FES2012_SLEV.nc", "fes2012/data/Q1_FES2012_SLEV.nc", "fes2012/data/2N2_FES2012_SLEV.nc", @@ -201,42 +131,6 @@ "reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html" }, "FES2014": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2014/ocean_tide/2n2.nc", @@ -282,42 +176,6 @@ "version": "FES2014" }, "FES2014_extrapolated": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2014/ocean_tide_extrapolated/2n2.nc", @@ -355,7 +213,7 @@ "fes2014/ocean_tide_extrapolated/ssa.nc", "fes2014/ocean_tide_extrapolated/t2.nc" ], - "name": "FES2014_extrapolated", + "name": "FES2014", "reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html", "scale": 0.01, "type": "z", @@ -363,42 +221,6 @@ "version": "FES2014" }, "FES2014_load": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2014/load_tide/2n2.nc", @@ -444,42 +266,6 @@ "version": "FES2014" }, "FES2022": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2022b/ocean_tide/2n2_fes2022.nc", @@ -525,42 +311,6 @@ "version": "FES2022" }, "FES2022_extrapolated": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2022b/ocean_tide_extrapolated/2n2_fes2022.nc", @@ -598,7 +348,7 @@ "fes2022b/ocean_tide_extrapolated/ssa_fes2022.nc", "fes2022b/ocean_tide_extrapolated/t2_fes2022.nc" ], - "name": "FES2022_extrapolated", + "name": "FES2022", "reference": "https://doi.org/10.24400/527896/A01-2024.004", "scale": 0.01, "type": "z", @@ -606,42 +356,6 @@ "version": "FES2022" }, "FES2022_load": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2022b/load_tide/2n2_fes2022.nc", diff --git a/providers/GSFC.json b/providers/GSFC.json index 71e017df..c464817d 100644 --- a/providers/GSFC.json +++ b/providers/GSFC.json @@ -180,6 +180,33 @@ "variable": "tide_load", "version": "5.5" }, + "GOT5.5_extrapolated": { + "format": "GOT-netcdf", + "name": "GOT5.5", + "model_file": [ + "GOT5.5/extrapolated/2n2x.nc", + "GOT5.5/extrapolated/j1x.nc", + "GOT5.5/extrapolated/k1x.nc", + "GOT5.5/extrapolated/k2x.nc", + "GOT5.5/extrapolated/m2x.nc", + "GOT5.5/extrapolated/m4x.nc", + "GOT5.5/extrapolated/ms4x.nc", + "GOT5.5/extrapolated/mu2x.nc", + "GOT5.5/extrapolated/n2x.nc", + "GOT5.5/extrapolated/o1x.nc", + "GOT5.5/extrapolated/oo1x.nc", + "GOT5.5/extrapolated/p1x.nc", + "GOT5.5/extrapolated/q1x.nc", + "GOT5.5/extrapolated/s1x.nc", + "GOT5.5/extrapolated/s2x.nc", + "GOT5.5/extrapolated/sig1x.nc" + ], + "type": "z", + "variable": "tide_ocean", + "version": "5.5", + "scale": 0.01, + "reference": "https://ntrs.nasa.gov/citations/19990089548" + }, "GOT5.5D": { "format": "GOT-netcdf", "name": "GOT5.5D", @@ -205,7 +232,6 @@ "variable": "tide_ocean", "version": "5.5", "scale": 0.01, - "compressed": false, "reference": "https://ntrs.nasa.gov/citations/19990089548" }, "GOT5.6": { @@ -240,7 +266,7 @@ }, "GOT5.6_extrapolated": { "format": "GOT-netcdf", - "name": "GOT5.6_extrapolated", + "name": "GOT5.6", "model_file": [ "GOT5.5/extrapolated/2n2x.nc", "GOT5.5/extrapolated/j1x.nc", diff --git a/pyTMD/data/database.json b/pyTMD/data/database.json index b9bdf2a8..62cc7f5f 100644 --- a/pyTMD/data/database.json +++ b/pyTMD/data/database.json @@ -99,42 +99,6 @@ ] }, "FES2014": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": { "u": [ @@ -981,40 +945,6 @@ "version": "EOT20" }, "FES2012": { - "constituents": [ - "t2", - "msf", - "mtm", - "l2", - "mm", - "q1", - "2n2", - "n4", - "o1", - "m3", - "n2", - "k1", - "s1", - "ms4", - "r2", - "mu2", - "eps2", - "s4", - "ssa", - "l2", - "mn4", - "m2", - "j1", - "m6", - "mf", - "m4", - "p1", - "k2", - "mks2", - "s2", - "m8", - "nu2" - ], "format": "FES-netcdf", "model_file": [ "fes2012/data/T2_FES2012_SLEV.nc", @@ -1058,42 +988,6 @@ "version": "FES2012" }, "FES2014": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2014/ocean_tide/2n2.nc", @@ -1139,42 +1033,6 @@ "version": "FES2014" }, "FES2014_extrapolated": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2014/ocean_tide_extrapolated/2n2.nc", @@ -1212,7 +1070,7 @@ "fes2014/ocean_tide_extrapolated/ssa.nc", "fes2014/ocean_tide_extrapolated/t2.nc" ], - "name": "FES2014_extrapolated", + "name": "FES2014", "reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html", "scale": 0.01, "type": "z", @@ -1220,42 +1078,6 @@ "version": "FES2014" }, "FES2014_load": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2014/load_tide/2n2.nc", @@ -1301,42 +1123,6 @@ "version": "FES2014" }, "FES2022": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2022b/ocean_tide/2n2_fes2022.nc", @@ -1382,42 +1168,6 @@ "version": "FES2022" }, "FES2022_extrapolated": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2022b/ocean_tide_extrapolated/2n2_fes2022.nc", @@ -1455,7 +1205,7 @@ "fes2022b/ocean_tide_extrapolated/ssa_fes2022.nc", "fes2022b/ocean_tide_extrapolated/t2_fes2022.nc" ], - "name": "FES2022_extrapolated", + "name": "FES2022", "reference": "https://doi.org/10.24400/527896/A01-2024.004", "scale": 0.01, "type": "z", @@ -1463,42 +1213,6 @@ "version": "FES2022" }, "FES2022_load": { - "constituents": [ - "2n2", - "eps2", - "j1", - "k1", - "k2", - "l2", - "lambda2", - "m2", - "m3", - "m4", - "m6", - "m8", - "mf", - "mks2", - "mm", - "mn4", - "ms4", - "msf", - "msqm", - "mtm", - "mu2", - "n2", - "n4", - "nu2", - "o1", - "p1", - "q1", - "r2", - "s1", - "s2", - "s4", - "sa", - "ssa", - "t2" - ], "format": "FES-netcdf", "model_file": [ "fes2022b/load_tide/2n2_fes2022.nc", @@ -1697,7 +1411,6 @@ "version": "5.5" }, "GOT5.5D": { - "compressed": false, "format": "GOT-netcdf", "model_file": [ "GOT5.5/ocean_tides/2n2.nc", @@ -1724,6 +1437,33 @@ "variable": "tide_ocean", "version": "5.5" }, + "GOT5.5_extrapolated": { + "format": "GOT-netcdf", + "model_file": [ + "GOT5.5/extrapolated/2n2x.nc", + "GOT5.5/extrapolated/j1x.nc", + "GOT5.5/extrapolated/k1x.nc", + "GOT5.5/extrapolated/k2x.nc", + "GOT5.5/extrapolated/m2x.nc", + "GOT5.5/extrapolated/m4x.nc", + "GOT5.5/extrapolated/ms4x.nc", + "GOT5.5/extrapolated/mu2x.nc", + "GOT5.5/extrapolated/n2x.nc", + "GOT5.5/extrapolated/o1x.nc", + "GOT5.5/extrapolated/oo1x.nc", + "GOT5.5/extrapolated/p1x.nc", + "GOT5.5/extrapolated/q1x.nc", + "GOT5.5/extrapolated/s1x.nc", + "GOT5.5/extrapolated/s2x.nc", + "GOT5.5/extrapolated/sig1x.nc" + ], + "name": "GOT5.5", + "reference": "https://ntrs.nasa.gov/citations/19990089548", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "5.5" + }, "GOT5.5_load": { "format": "GOT-netcdf", "model_file": [ @@ -1804,7 +1544,7 @@ "GOT5.5/extrapolated/s2x.nc", "GOT5.5/extrapolated/sig1x.nc" ], - "name": "GOT5.6_extrapolated", + "name": "GOT5.6", "reference": "https://doi.org/10.1126/sciadv.abd4744", "scale": 0.01, "type": "z", diff --git a/pyTMD/io/model.py b/pyTMD/io/model.py index 509d1b55..c25bd11f 100644 --- a/pyTMD/io/model.py +++ b/pyTMD/io/model.py @@ -209,6 +209,9 @@ def elevation(self, m: str, extra_databases: list = []): self.grid_file = self.pathfinder(self.grid_file) # validate paths: model constituent files self.model_file = self.pathfinder(self.model_file) + # get model constituents from constituent files + if self.format in ('FES-ascii','FES-netcdf',): + self.parse_constituents() # return the model parameters self.validate_format() return self @@ -240,6 +243,9 @@ def current(self, m: str, extra_databases: list = []): # validate paths: model constituent files for key, val in self.model_file.items(): self.model_file[key] = self.pathfinder(val) + # get model constituents from constituent files + if self.format in ('FES-ascii','FES-netcdf',): + self.parse_constituents() # return the model parameters self.validate_format() return self From 26fdd5fab1b0b0321014ebfb644917894316334e Mon Sep 17 00:00:00 2001 From: tsutterley Date: Fri, 6 Sep 2024 13:53:01 -0700 Subject: [PATCH 13/13] ci: only run pytest if secrets are accessible --- .github/workflows/Dockerfile | 313 ------------------ .github/workflows/python-request.yml | 14 + .../workflows/update-provider-database.yml | 6 +- providers/GSFC.json | 27 ++ pyTMD/data/database.json | 27 ++ 5 files changed, 71 insertions(+), 316 deletions(-) delete mode 100644 .github/workflows/Dockerfile diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile deleted file mode 100644 index e126ffed..00000000 --- a/.github/workflows/Dockerfile +++ /dev/null @@ -1,313 +0,0 @@ -FROM python:3.9-slim-buster - -LABEL Tyler Sutterley "tsutterl@uw.edu" - -ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" - -RUN useradd --create-home --shell /bin/bash pytmd - -RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - build-essential \ - ca-certificates \ - cmake \ - git \ - libboost-dev \ - libexpat1-dev \ - libldap2-dev \ - libtool \ - liburiparser-dev \ - libxml2-dev \ - pkg-config \ - wget \ - unzip && \ - apt-get clean - -WORKDIR /tmp - -ENV JOBS 2 - -ENV CFLAGS="-fPIC" -ENV ZLIB_VERSION=1.2.12 -RUN wget -q http://zlib.net/zlib-${ZLIB_VERSION}.tar.gz && \ - tar -xzf zlib-${ZLIB_VERSION}.tar.gz && \ - cd zlib-${ZLIB_VERSION} && \ - ./configure --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean && \ - cd contrib/minizip && \ - autoreconf -fvi && \ - ./configure --quiet --prefix=/usr/local/ && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV CFLAGS="-fPIC" -ENV SZIP_SHORT_VERSION=2.1.1 -ENV SZIP_VERSION=2.1.1 -RUN wget -q https://support.hdfgroup.org/ftp/lib-external/szip/${SZIP_SHORT_VERSION}/src/szip-${SZIP_VERSION}.tar.gz && \ - tar -xzf szip-${SZIP_VERSION}.tar.gz && \ - cd szip-${SZIP_VERSION} && \ - ./configure --quiet --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV OPENSSL_SHORT_VERSION=1.1.1 -ENV OPENSSL_VERSION=1.1.1k -RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \ - tar -xzf openssl-${OPENSSL_VERSION}.tar.gz && \ - cd openssl-${OPENSSL_VERSION} && \ - ./config shared --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV CURL_VERSION=7.77.0 -RUN wget -q https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \ - tar -xzf curl-${CURL_VERSION}.tar.gz && \ - cd curl-${CURL_VERSION} && \ - ./configure --quiet \ - --enable-versioned-symbols \ - --enable-openssl-auto-load-config \ - --with-openssl \ - --with-zlib=/usr/local \ - --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV XZ_VERSION=5.2.5 -RUN wget -q https://tukaani.org/xz/xz-${XZ_VERSION}.tar.gz && \ - tar -xzf xz-${XZ_VERSION}.tar.gz && \ - cd xz-${XZ_VERSION} && \ - ./configure --quiet --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV OPENMPI_SHORT_VERSION=v4.1 -ENV OPENMPI_VERSION=4.1.1 -RUN wget -q https://download.open-mpi.org/release/open-mpi/${OPENMPI_SHORT_VERSION}/openmpi-${OPENMPI_VERSION}.tar.gz && \ - tar -xzf openmpi-${OPENMPI_VERSION}.tar.gz && \ - cd openmpi-${OPENMPI_VERSION} && \ - ./configure --quiet --prefix=/usr/local && \ - make all install && \ - make clean - -ENV SQLITE_VERSION=3350500 -ENV SQLITE_YEAR 2021 -RUN wget -q https://sqlite.org/${SQLITE_YEAR}/sqlite-autoconf-${SQLITE_VERSION}.tar.gz && \ - tar -xzf sqlite-autoconf-${SQLITE_VERSION}.tar.gz && \ - cd sqlite-autoconf-${SQLITE_VERSION} && \ - ./configure --quiet --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV LIBJPEG_SHORT_VERSION=9d -ENV LIBJPEG_VERSION=v9d -RUN wget -q http://ijg.org/files/jpegsrc.${LIBJPEG_VERSION}.tar.gz && \ - tar -xzf jpegsrc.${LIBJPEG_VERSION}.tar.gz && \ - cd jpeg-${LIBJPEG_SHORT_VERSION} && \ - ./configure --quiet --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV ZLIBLIB="/usr/local/lib" -ENV ZLIBINC="/usr/local/include" -ENV CPPFLAGS="-I/usr/local/include" -ENV LDFLAGS="-L/usr/local/lib" -ENV LD_LIBRARY_PATH="${ZLIBLIB}:${LD_LIBRARY_PATH}" -ENV CFLAGS="-Wall -O -funroll-loops -malign-loops=2 -malign-functions=2" -ENV LIBPNG_VERSION=1.6.37 -RUN wget -q https://download.sourceforge.net/libpng/libpng-${LIBPNG_VERSION}.tar.gz && \ - tar -xzf libpng-${LIBPNG_VERSION}.tar.gz && \ - cd libpng-${LIBPNG_VERSION} && \ - ./configure --quiet --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV LIBTIFF_VERSION=4.2.0 -RUN wget -q https://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz && \ - tar -xzf tiff-${LIBTIFF_VERSION}.tar.gz && \ - cd tiff-${LIBTIFF_VERSION} && \ - ./configure --quiet --prefix=/usr/local \ - --with-jpeg-include-dir=/usr/local/include \ - --with-jpeg-lib-dir=/usr/local/lib && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV LIBKML_VERSION=1.3.0 -RUN wget -q https://github.com/libkml/libkml/archive/${LIBKML_VERSION}.tar.gz && \ - tar -xzf ${LIBKML_VERSION}.tar.gz && \ - cd libkml-${LIBKML_VERSION} && \ - mkdir build && \ - cd build && \ - cmake \ - -DZLIB_INCLUDE_DIR=/usr/local/include \ - -DMINIZIP_LIBRARY=/usr/local/lib \ - -DMINIZIP_INCLUDE_DIR=/usr/local/lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/local/ .. && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV CC=mpicc -ENV HDF5_VERSION=1.10.5 -RUN wget -q https://support.hdfgroup.org/ftp/HDF5/current/src/hdf5-${HDF5_VERSION}.tar.gz && \ - tar -xzf hdf5-${HDF5_VERSION}.tar.gz && \ - cd hdf5-${HDF5_VERSION} && \ - ./configure --quiet \ - --enable-parallel \ - --enable-hl \ - --enable-shared \ - --prefix=/usr/local \ - --with-zlib=/usr/local \ - --with-szlib=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV CC=mpicc -ENV CPPFLAGS="-I/usr/local/include" -ENV LDFLAGS="-L/usr/local/lib -lhdf5_hl -lhdf5 -lz -lm -lcurl" -ENV NETCDF_VERSION=4.7.4 -RUN wget -q ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-c-${NETCDF_VERSION}.tar.gz && \ - tar -xzf netcdf-c-${NETCDF_VERSION}.tar.gz && \ - cd netcdf-c-${NETCDF_VERSION} && \ - ./configure --quiet \ - --enable-shared \ - --enable-parallel-tests \ - --enable-netcdf-4 \ - --enable-nczarr \ - --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV GEOS_VERSION=3.9.1 -RUN wget -q https://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2 && \ - tar -xjf geos-${GEOS_VERSION}.tar.bz2 && \ - cd geos-${GEOS_VERSION} && \ - ./configure --quiet --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -ENV PROJ_VERSION=8.0.1 -ENV PROJ_DATUMGRID_VERSION=1.8 -ENV PROJ_NETWORK ON -ENV SQLITE3_CFLAGS="-I/usr/local/include" -ENV SQLITE3_LIBS="-L/usr/local/lib -lsqlite3" -RUN wget -q https://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz && \ - wget -q http://download.osgeo.org/proj/proj-datumgrid-${PROJ_DATUMGRID_VERSION}.zip && \ - tar -xzf proj-${PROJ_VERSION}.tar.gz && \ - unzip proj-datumgrid-${PROJ_DATUMGRID_VERSION}.zip -d proj-${PROJ_VERSION}/data/ && \ - cd proj-${PROJ_VERSION} && \ - mkdir build && \ - cd build && \ - cmake \ - -DSQLITE3_INCLUDE_DIR=/usr/local/include/ \ - -DSQLITE3_LIBRARY=/usr/local/lib/libsqlite3.so \ - -DTIFF_INCLUDE_DIR=/usr/local/include \ - -DTIFF_LIBRARY_RELEASE=/usr/local/lib/libtiff.so \ - -DCURL_INCLUDE_DIR=/usr/local/include/ \ - -DCURL_LIBRARY=/usr/local/lib/libcurl.so \ - -DPYTHON_EXECUTABLE=/usr/local/bin/python3 \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/local/ .. && \ - cmake --build . && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean && \ - projsync --system-directory --all - -ENV CC=mpicc -ENV CPPFLAGS="-I/usr/local/include" -ENV LDFLAGS="-L/usr/local/lib" -ENV LIBKML_CFLAGS="/usr/local/include" -ENV LIBKML_LIB="/usr/local/lib" -ENV HDF5_CFLAGS="--enable-parallel --enable-hl --enable-shared" -ENV HDF5_INCLUDE="/usr/local/include" -ENV HDF5_LIBS="/usr/local/lib" -ENV GDAL_VERSION=3.3.0 -RUN wget -q https://download.osgeo.org/gdal/CURRENT/gdal-${GDAL_VERSION}.tar.gz && \ - tar -xzf gdal-${GDAL_VERSION}.tar.gz && \ - cd gdal-${GDAL_VERSION} && \ - ./configure --quiet \ - --disable-debug \ - --disable-static \ - --with-hdf5=/usr/local \ - --with-netcdf=/usr/local \ - --with-curl=/usr/local/bin/curl-config \ - --with-crypto=/usr/local \ - --with-geos=/usr/local/bin/geos-config \ - --with-geotiff \ - --with-hide-internal-symbols=yes \ - --with-libkml=/usr/local \ - --with-libkml-inc=/usr/local/include \ - --with-libkml-lib=/usr/local/lib \ - --with-liblzma=/usr/local \ - --with-libtiff=/usr/local \ - --with-libz=/usr/local \ - --with-jpeg=/usr/local \ - --with-openjpeg \ - --with-png=/usr/local \ - --with-proj=/usr/local \ - --with-sqlite3=/usr/local \ - --with-proj=/usr/local \ - --with-rename-internal-libgeotiff-symbols=yes \ - --with-rename-internal-libtiff-symbols=yes \ - --with-threads=yes \ - --without-hdf4 \ - --without-idb \ - --without-jpeg12 \ - --without-perl \ - --without-python \ - --prefix=/usr/local && \ - make --quiet --jobs=${JOBS} && \ - make --quiet install && \ - make clean - -RUN ldconfig - -RUN rm -rf /tmp/* - -WORKDIR /home/pytmd - -ENV MPICC=mpicc -ENV CC=mpicc -ENV HDF5_MPI="ON" - -RUN pip3 install --no-cache-dir --no-binary=h5py,cartopy \ - cartopy \ - gdal \ - h5py \ - lxml \ - matplotlib \ - netCDF4 \ - numpy \ - pandas \ - pyproj \ - python-dateutil \ - pyyaml \ - scikit-learn \ - scipy \ - setuptools_scm - -COPY . . - -RUN --mount=source=.git,target=.git,type=bind \ - pip install --no-cache-dir --no-deps . - -USER pytmd - -CMD ["bash"] diff --git a/.github/workflows/python-request.yml b/.github/workflows/python-request.yml index 78564310..0fb24f64 100644 --- a/.github/workflows/python-request.yml +++ b/.github/workflows/python-request.yml @@ -54,13 +54,25 @@ jobs: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: "Check if repository secrets are accessible" + id: secrets + run: | + if [ "${{ secrets.MY_KEY }}" == '' ] ; then + echo "accessible=false" >> $GITHUB_OUTPUT; + echo "::debug::GitHub secrets unavailable for Actions"; + else + echo "accessible=true" >> $GITHUB_OUTPUT; + echo "::debug::GitHub secrets available for Actions"; + fi - name: Checkout Matlab TMD Toolbox + if: steps.changes.secrets.accessible == 'true' uses: actions/checkout@v4 with: repository: EarthAndSpaceResearch/TMD_Matlab_Toolbox_v2.5 path: TMD_Matlab_Toolbox ref: master - name: Test with pytest + if: steps.changes.secrets.accessible == 'true' run: | pip install --no-deps . pytest --verbose --capture=no --cov=./ --cov-report=xml \ @@ -70,6 +82,7 @@ jobs: --aws-secret=${{ secrets.AWS_SECRET_ACCESS_KEY }} \ --aws-region=${{ secrets.AWS_REGION_NAME }} - name: Upload coverage to Codecov + if: steps.changes.secrets.accessible == 'true' uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} @@ -80,6 +93,7 @@ jobs: fail_ci_if_error: true verbose: true - name: Archive code coverage results + if: steps.changes.secrets.accessible == 'true' uses: actions/upload-artifact@v3 with: name: code-coverage-report diff --git a/.github/workflows/update-provider-database.yml b/.github/workflows/update-provider-database.yml index 9d339c41..c6a18f6c 100644 --- a/.github/workflows/update-provider-database.yml +++ b/.github/workflows/update-provider-database.yml @@ -49,14 +49,14 @@ jobs: id: changes run: | if [ -n "$(git status --porcelain)" ] ; then - echo "DETECTED=true" >> $GITHUB_OUTPUT; + echo "detected=true" >> $GITHUB_OUTPUT; echo "::debug::Changes detected"; else - echo "DETECTED=false" >> $GITHUB_OUTPUT; + echo "detected=false" >> $GITHUB_OUTPUT; echo "::debug::No changes detected"; fi - name: Checkout PR and Push Changes - if: steps.changes.outputs.DETECTED == 'true' + if: steps.changes.outputs.detected == 'true' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | diff --git a/providers/GSFC.json b/providers/GSFC.json index c464817d..b593c137 100644 --- a/providers/GSFC.json +++ b/providers/GSFC.json @@ -234,6 +234,33 @@ "scale": 0.01, "reference": "https://ntrs.nasa.gov/citations/19990089548" }, + "GOT5.5D_extrapolated": { + "format": "GOT-netcdf", + "name": "GOT5.5D", + "model_file": [ + "GOT5.5/extrapolated/2n2x.nc", + "GOT5.5/extrapolated/j1x.nc", + "GOT5.5D/extrapolated/k1_5.5Dx.nc", + "GOT5.5/extrapolated/k2x.nc", + "GOT5.5D/extrapolated/m2_5.5Dx.nc", + "GOT5.5/extrapolated/m4x.nc", + "GOT5.5/extrapolated/ms4x.nc", + "GOT5.5/extrapolated/mu2x.nc", + "GOT5.5/extrapolated/n2x.nc", + "GOT5.5/extrapolated/o1x.nc", + "GOT5.5/extrapolated/oo1x.nc", + "GOT5.5D/extrapolated/p1_5.5Dx.nc", + "GOT5.5/extrapolated/q1x.nc", + "GOT5.5D/extrapolated/s1_5.5Dx.nc", + "GOT5.5D/extrapolated/s2_5.5Dx.nc", + "GOT5.5/extrapolated/sig1x.nc" + ], + "type": "z", + "variable": "tide_ocean", + "version": "5.5", + "scale": 0.01, + "reference": "https://ntrs.nasa.gov/citations/19990089548" + }, "GOT5.6": { "format": "GOT-netcdf", "name": "GOT5.6", diff --git a/pyTMD/data/database.json b/pyTMD/data/database.json index 62cc7f5f..32b5b2bf 100644 --- a/pyTMD/data/database.json +++ b/pyTMD/data/database.json @@ -1437,6 +1437,33 @@ "variable": "tide_ocean", "version": "5.5" }, + "GOT5.5D_extrapolated": { + "format": "GOT-netcdf", + "model_file": [ + "GOT5.5/extrapolated/2n2x.nc", + "GOT5.5/extrapolated/j1x.nc", + "GOT5.5D/extrapolated/k1_5.5Dx.nc", + "GOT5.5/extrapolated/k2x.nc", + "GOT5.5D/extrapolated/m2_5.5Dx.nc", + "GOT5.5/extrapolated/m4x.nc", + "GOT5.5/extrapolated/ms4x.nc", + "GOT5.5/extrapolated/mu2x.nc", + "GOT5.5/extrapolated/n2x.nc", + "GOT5.5/extrapolated/o1x.nc", + "GOT5.5/extrapolated/oo1x.nc", + "GOT5.5D/extrapolated/p1_5.5Dx.nc", + "GOT5.5/extrapolated/q1x.nc", + "GOT5.5D/extrapolated/s1_5.5Dx.nc", + "GOT5.5D/extrapolated/s2_5.5Dx.nc", + "GOT5.5/extrapolated/sig1x.nc" + ], + "name": "GOT5.5D", + "reference": "https://ntrs.nasa.gov/citations/19990089548", + "scale": 0.01, + "type": "z", + "variable": "tide_ocean", + "version": "5.5" + }, "GOT5.5_extrapolated": { "format": "GOT-netcdf", "model_file": [