From bc11d975ee68586733bc6e1cc6905b330320559d Mon Sep 17 00:00:00 2001 From: Knut-Frode Dagestad Date: Mon, 24 Jun 2024 10:28:59 +0200 Subject: [PATCH 1/3] Removed double quote from docstring, as giving problems for Drifty --- opendrift/models/leeway.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendrift/models/leeway.py b/opendrift/models/leeway.py index 02368c6f0..665f9b132 100644 --- 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 }), From b3e140f599d0ec2b1fced72402e2b85a89414785 Mon Sep 17 00:00:00 2001 From: Knut-Frode Dagestad Date: Mon, 24 Jun 2024 11:01:52 +0200 Subject: [PATCH 2/3] Replaced two obsolete URLS for HYCOM (tds.hycom.org) with new aggregate from ncei.noaa.gov --- examples/example_long_global_thredds.py | 2 +- examples/example_long_vietnam.py | 2 +- examples/example_oilspill_seafloor_biodegradation.py | 2 +- opendrift/scripts/data_sources.txt | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/example_long_global_thredds.py b/examples/example_long_global_thredds.py index b27b170e1..bd855dc16 100755 --- 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 index 0235cc4c7..8a7927a2e 100755 --- 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 index afcedd480..a86e89402 100755 --- 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/scripts/data_sources.txt b/opendrift/scripts/data_sources.txt index 687ed962a..ec6d0ea01 100644 --- 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 From 4cd56d9f3d14860b53b6fa590ccf809b122bf138 Mon Sep 17 00:00:00 2001 From: Knut-Frode Dagestad Date: Mon, 24 Jun 2024 11:07:52 +0200 Subject: [PATCH 3/3] [run-ex] Removed GRIB reader from list included in add_readers_from_list --- opendrift/readers/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/opendrift/readers/__init__.py b/opendrift/readers/__init__.py index 76b14cf19..25a8fae95 100644 --- 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: