Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add additional models to provider JSON #331

Merged
merged 13 commits into from
Sep 6, 2024
Merged

Add additional models to provider JSON #331

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dc11d4f
Add additional models
robbibt Sep 6, 2024
fe9aca0
Update provider database
robbibt Sep 6, 2024
4d2ffe2
Fix name
robbibt Sep 6, 2024
9dbc2f2
Update provider database
robbibt Sep 6, 2024
86eeb3d
Manually define constituents
robbibt Sep 6, 2024
5594eac
Update AVISO.json
robbibt Sep 6, 2024
c507a4a
Update AVISO.json
robbibt Sep 6, 2024
8490486
Update AVISO.json
robbibt Sep 6, 2024
9912ac2
Update provider database
robbibt Sep 6, 2024
409688f
Fix TPXO8-atlas-nc
robbibt Sep 6, 2024
0263997
Update provider database
robbibt Sep 6, 2024
b4a1079
fix: add parse constituents back to model load
tsutterley Sep 6, 2024
26fdd5f
ci: only run pytest if secrets are accessible
tsutterley Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 240 additions & 1 deletion providers/AVISO.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,83 @@
}
},
"elevation": {
"FES2012": {
"format": "FES-netcdf",
"constituents": [
Copy link
Contributor Author

@robbibt robbibt Sep 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is specifying constituents necessary, or will pyTMD auto-guess the constituent names? (previously, I had simply used "model_file": "fes2012/data/*_FES2012_SLEV.nc", but that wasn't being recognised here)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, the glob string capability isn't being run for the database as I figured the database will be more "maintained".

"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": [
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The one file I couldn't find a match for was Z0_FES2012_SLEV.nc - have left it out here for now

"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",
Copy link
Contributor Author

@robbibt robbibt Sep 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is E2 a match for eps2?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the constituents from the database and am running the files through the parser as before. Should make maintenance easier :)

"fes2012/data/S4_FES2012_SLEV.nc",
"fes2012/data/Ssa_FES2012_SLEV.nc",
"fes2012/data/La2_FES2012_SLEV.nc",
Copy link
Contributor Author

@robbibt robbibt Sep 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is La2 a match for l2? Or lambda2?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lambda2

"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",
"variable": "tide_ocean",
"scale": 0.01,
"reference": "https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html"
},
"FES2014": {
"constituents": [
"2n2",
Expand Down Expand Up @@ -204,6 +281,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",
Expand Down Expand Up @@ -366,6 +524,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",
Expand Down Expand Up @@ -448,4 +687,4 @@
"version": "FES2022"
}
}
}
}
60 changes: 60 additions & 0 deletions providers/GSFC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
23 changes: 22 additions & 1 deletion providers/TPXO.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,27 @@
"variable": "tide_ocean",
"version": "8"
},
"TPXO8-atlas-nc": {
"format": "ATLAS-netcdf",
"name": "TPXO8-atlas-nc",
"model_file": [
Copy link
Contributor Author

@robbibt robbibt Sep 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had previous used "model_file": "TPXO8_atlas_v1/hf.*_tpxo8_atlas_30c_v1.nc", so have attempted to adapt this to a list of model files

"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",
Expand Down Expand Up @@ -874,4 +895,4 @@
"version": "9.1"
}
}
}
}
Loading