Merge pull request #1326 from knutfrode/dev

[run-ex] Updating HYCOM thredds URL, and removing GRIB reader from add_readers_from_list
OpenDrift · Jun 24, 2024 · 95a88bb · 95a88bb
2 parents 572f1ba + 4cd56d9
commit 95a88bb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/examples/example_long_global_thredds.py b/examples/example_long_global_thredds.py
@@ -14,7 +14,7 @@
 # - Ocean forecast from global HYCOM model
 # - Weather forecast from NOAA/NCEP
 o.add_readers_from_list([
-    'https://tds.hycom.org/thredds/dodsC/GLBy0.08/latest',
+    'https://www.ncei.noaa.gov/thredds-coastal/dodsC/hycom/hycom_sfc_agg/HYCOM_Surface_Aggregation_best.ncd',
     'https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd'])
 
 o.seed_elements(lat=24, lon=-81, time=datetime.utcnow(),

diff --git a/examples/example_long_vietnam.py b/examples/example_long_vietnam.py
@@ -13,7 +13,7 @@
 # - Ocean forecast from global Hycom
 # - Weather forecast from NOAA/NCEP
 o.add_readers_from_list([
-    'https://tds.hycom.org/thredds/dodsC/GLBy0.08/latest',
+    'https://www.ncei.noaa.gov/thredds-coastal/dodsC/hycom/hycom_sfc_agg/HYCOM_Surface_Aggregation_best.ncd',
     'https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd'])
 
 # Seed some particles

diff --git a/examples/example_oilspill_seafloor_biodegradation.py b/examples/example_oilspill_seafloor_biodegradation.py
@@ -15,7 +15,7 @@
 #%%
 # Current from HYCOM and wind from NCEP GFS
 o.add_readers_from_list([
-    'https://tds.hycom.org/thredds/dodsC/GLBy0.08/expt_93.0/uv3z',
+    'https://www.ncei.noaa.gov/thredds-coastal/dodsC/hycom/hycom_sfc_agg/HYCOM_Surface_Aggregation_best.ncd',
     'https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd'])
 o.set_config('environment:constant:ocean_mixed_layer_thickness', 20)
 o.set_config('drift', {'current_uncertainty': 0, 'wind_uncertainty': 0, 'horizontal_diffusivity': 20})

diff --git a/opendrift/models/leeway.py b/opendrift/models/leeway.py
@@ -76,7 +76,7 @@ class LeewayObj(LagrangianArray):
          ('capsized', {
             'dtype': np.uint8,
             'units': '1',
-            'description': '0 is not capsized, changed to 1 after capsizing (irreversible). After capsizing, leeway coeffieiencts are reduced as given by config item "capsized:leeway_fraction"',
+            'description': '0 is not capsized, changed to 1 after capsizing (irreversible). After capsizing, leeway coeffieiencts are reduced as given by config item capsized:leeway_fraction',
             'seed': True,
             'default': 0
         }),

diff --git a/opendrift/readers/__init__.py b/opendrift/readers/__init__.py
@@ -77,7 +77,6 @@ def reader_from_url(url, timeout=10):
 
     reader_modules = ['reader_netCDF_CF_generic',
                       'reader_ROMS_native',
-                      'reader_grib',
                       'reader_copernicusmarine']
 
     for rm in reader_modules:

diff --git a/opendrift/scripts/data_sources.txt b/opendrift/scripts/data_sources.txt
@@ -18,5 +18,4 @@ https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmosp
 cmems_mod_glo_wav_anfc_0.083deg_PT3H-i
 cmems_mod_glo_phy_anfc_merged-uv_PT1H-i
 /vol/vvfelles/opendrift/forcing_data/mercator/mercator_aggregate.nc
-https://tds.hycom.org/thredds/dodsC/GLBy0.08/latest
-https://tds.hycom.org/thredds/dodsC/GLBy0.08/expt_93.0/uv3z
+https://www.ncei.noaa.gov/thredds-coastal/dodsC/hycom/hycom_sfc_agg/HYCOM_Surface_Aggregation_best.ncd