Skip to content

Commit

Permalink
Update default model
Browse files Browse the repository at this point in the history
  • Loading branch information
@robbibt
robbibt committed Oct 4, 2024
1 parent 59a1883 commit b5c56c8
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion docs/migration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This more clearly describes the data, particularly when used in combination with

### Default model changed to "EOT20"

The default model has been changed from "FES2014" to the CC BY 4.0 Empirical Ocean Tide "EOT20" tide model:
The default model has been changed from "FES2014" to the open soyurce "EOT20" [Empirical Ocean Tide tide model (CC BY 4.0)](https://doi.org/10.17882/79489):

```
Hart-Davis Michael, Piccioni Gaia, Dettmering Denise, Schwatke Christian, Passaro Marcello, Seitz Florian (2021). EOT20 - A global Empirical Ocean Tide model from multi-mission satellite altimetry. SEANOE. https://doi.org/10.17882/79489
Expand Down
53 changes: 26 additions & 27 deletions docs/notebooks/Model_tides.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
{
"cell_type": "code",
"execution_count": 19,
"execution_count": 30,
"metadata": {
"tags": []
},
Expand All @@ -41,7 +41,7 @@
},
{
"cell_type": "code",
"execution_count": 20,
"execution_count": 31,
"metadata": {
"tags": []
},
Expand All @@ -54,12 +54,11 @@
" 󠀠🌊 | Model | Expected path \n",
"─────────────────────────────────────────────────────────────────────────────────────\n",
" ✅ │ EOT20 │ ../../tests/data/tide_models/EOT20/ocean_tides \n",
" ✅ │ GOT5.5 │ ../../tests/data/tide_models/GOT5.5/ocean_tides \n",
" ✅ │ HAMTIDE11 │ ../../tests/data/tide_models/hamtide \n",
"─────────────────────────────────────────────────────────────────────────────────────\n",
"\n",
"Summary:\n",
"Available models: 3/50\n"
"Available models: 2/50\n"
]
}
],
Expand Down Expand Up @@ -92,7 +91,7 @@
},
{
"cell_type": "code",
"execution_count": 21,
"execution_count": 32,
"metadata": {
"tags": []
},
Expand Down Expand Up @@ -188,7 +187,7 @@
"2018-01-01 04:00:00 122.2186 -18.0008 EOT20 1.181283"
]
},
"execution_count": 21,
"execution_count": 32,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -224,7 +223,7 @@
},
{
"cell_type": "code",
"execution_count": 22,
"execution_count": 33,
"metadata": {
"tags": []
},
Expand Down Expand Up @@ -266,7 +265,7 @@
},
{
"cell_type": "code",
"execution_count": 23,
"execution_count": 34,
"metadata": {
"tags": []
},
Expand All @@ -282,7 +281,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 2/2 [00:00<00:00, 15.78it/s]\n"
"100%|██████████| 2/2 [00:00<00:00, 11.67it/s]\n"
]
},
{
Expand Down Expand Up @@ -376,7 +375,7 @@
"2018-01-01 04:00:00 122.2186 -18.0008 1.181283 1.034931"
]
},
"execution_count": 23,
"execution_count": 34,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -404,7 +403,7 @@
},
{
"cell_type": "code",
"execution_count": 24,
"execution_count": 35,
"metadata": {
"tags": []
},
Expand All @@ -415,7 +414,7 @@
"<Axes: xlabel='time'>"
]
},
"execution_count": 24,
"execution_count": 35,
"metadata": {},
"output_type": "execute_result"
},
Expand Down Expand Up @@ -452,7 +451,7 @@
},
{
"cell_type": "code",
"execution_count": 25,
"execution_count": 36,
"metadata": {
"tags": []
},
Expand All @@ -475,7 +474,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 2/2 [00:00<00:00, 12.51it/s]\n"
"100%|██████████| 2/2 [00:00<00:00, 9.44it/s]\n"
]
},
{
Expand Down Expand Up @@ -554,7 +553,7 @@
"2018-01-20 122.22 -18.21 EOT20 -2.923815"
]
},
"execution_count": 25,
"execution_count": 36,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -584,7 +583,7 @@
},
{
"cell_type": "code",
"execution_count": 26,
"execution_count": 37,
"metadata": {
"tags": []
},
Expand Down Expand Up @@ -638,7 +637,7 @@
"1 2018-01-20 122.22 -18.21"
]
},
"execution_count": 26,
"execution_count": 37,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -663,7 +662,7 @@
},
{
"cell_type": "code",
"execution_count": 27,
"execution_count": 38,
"metadata": {
"tags": []
},
Expand All @@ -679,7 +678,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 2/2 [00:00<00:00, 13.73it/s]\n"
"100%|██████████| 2/2 [00:00<00:00, 13.61it/s]\n"
]
},
{
Expand Down Expand Up @@ -734,7 +733,7 @@
"1 2018-01-20 122.22 -18.21 -2.923815"
]
},
"execution_count": 27,
"execution_count": 38,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -763,7 +762,7 @@
},
{
"cell_type": "code",
"execution_count": 28,
"execution_count": 39,
"metadata": {
"tags": []
},
Expand All @@ -779,7 +778,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 4/4 [00:00<00:00, 13.50it/s]\n"
"100%|██████████| 4/4 [00:00<00:00, 15.01it/s]\n"
]
},
{
Expand Down Expand Up @@ -890,7 +889,7 @@
"2018-01-20 122.22 -18.21 HAMTIDE11 -2.662284"
]
},
"execution_count": 28,
"execution_count": 39,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -912,12 +911,12 @@
"tags": []
},
"source": [
"We can also run the function in **\"wide\"** format, which will return a new column for each tide model (e.g. `FES2014`, `HAMTIDE11` etc):"
"We can also run the function in **\"wide\"** format, which will return a new column for each tide model (e.g. `EOT20`, `HAMTIDE11` etc):"
]
},
{
"cell_type": "code",
"execution_count": 29,
"execution_count": 40,
"metadata": {
"tags": []
},
Expand All @@ -933,7 +932,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 4/4 [00:00<00:00, 12.80it/s]\n"
"100%|██████████| 4/4 [00:00<00:00, 17.02it/s]\n"
]
},
{
Expand Down Expand Up @@ -1017,7 +1016,7 @@
" 122.22 -18.21 -2.923815 -2.662284"
]
},
"execution_count": 29,
"execution_count": 40,
"metadata": {},
"output_type": "execute_result"
}
Expand Down

0 comments on commit b5c56c8

Please sign in to comment.