Merge pull request #110 from MET-OM/dev-cmems-tide

Dev cmems tide

Author: bjorkqvi

dnora/read/cmems_functions.py

@@ -37,9 +37,8 @@ def ds_cmems_read(
         maximum_latitude=lat[1],
         start_datetime=start_time.strftime("%Y-%m-%dT%H:%M:00"),
         end_datetime=end_time.strftime("%Y-%m-%dT%H:%M:00"),
-        minimum_depth=kwargs.get('minimum_depth'),
-        maximum_depth=kwargs.get('maximum_depth'),
+        minimum_depth=kwargs.get('minimum_depth',0),
+        maximum_depth=kwargs.get('maximum_depth',0),
 
     )
-
     return ds

dnora/read/current/cmems.py

@@ -27,8 +27,6 @@ class Global(ProductReader):
             ds_cmems_read,
             dataset_id="cmems_obs-mob_glo_phy-cur_my_0.25deg_PT1H-i",
             variables=["uo","vo"],
-            minimum_depth=0,
-            maximum_depth=0,
         ),
         ds_aliases={"uo": gp.ocean.XCurrent, "vo": gp.ocean.YCurrent},
         default_data_source=DataSource.REMOTE,
@@ -37,4 +35,37 @@ class Global(ProductReader):
     file_structure = FileStructure()
 
     def post_processing(self):
-        return FillNaNs(0)
+        return FillNaNs(0)
+
+@deprecated_class_call("CMEMS", "cmems", "current")
+class EuropeNW(ProductReader):
+    """The ocean physics reanalysis for the North-West European Shelf is produced using an ocean assimilation model, with tides, at 7 km horizontal resolution.
+    The ocean model is NEMO (Nucleus for European Modelling of the Ocean), using the 3DVar NEMOVAR system to assimilate observations. 
+    These are surface temperature and vertical profiles of temperature and salinity. The model is forced by lateral boundary conditions from the 
+    GloSea5, one of the multi-models used by GLOBAL_REANALYSIS_PHY_001_026 and at the Baltic boundary by the BALTICSEA_REANALYSIS_PHY_003_011. 
+    The atmospheric forcing is given by the ECMWF ERA5 atmospheric reanalysis. The river discharge is from a daily climatology.
+
+    
+    Note: This reader reads the hourly 2D surface fields of surface currents.
+
+    DOI (product): https://doi.org/10.48670/moi-00059
+    https://data.marine.copernicus.eu/product/NWSHELF_MULTIYEAR_PHY_004_009/description
+    """
+
+    product_configuration = ProductConfiguration(
+        ds_creator_function=partial(
+            ds_cmems_read,
+            dataset_id="cmems_mod_nws_phy-uv_my_7km-2D_PT1H-i",
+            variables=["uo","vo"],
+        ),
+        ds_aliases={"uo": gp.ocean.XCurrent, "vo": gp.ocean.YCurrent},
+        default_data_source=DataSource.REMOTE,
+    )
+
+    file_structure = FileStructure()
+
+    def post_processing(self):
+        return FillNaNs(0)
+    
+
+    

dnora/read/waterlevel/cmems.py

@@ -39,3 +39,32 @@ class Global(ProductReader):
 
     def post_processing(self):
         return FillNaNs(0)
+
+@deprecated_class_call("CMEMS", "cmems", "waterlevel")
+class EuropeNW(ProductReader):
+    """The ocean physics reanalysis for the North-West European Shelf is produced using an ocean assimilation model, with tides, at 7 km horizontal resolution.
+    The ocean model is NEMO (Nucleus for European Modelling of the Ocean), using the 3DVar NEMOVAR system to assimilate observations. 
+    These are surface temperature and vertical profiles of temperature and salinity. The model is forced by lateral boundary conditions from the 
+    GloSea5, one of the multi-models used by GLOBAL_REANALYSIS_PHY_001_026 and at the Baltic boundary by the BALTICSEA_REANALYSIS_PHY_003_011. 
+    The atmospheric forcing is given by the ECMWF ERA5 atmospheric reanalysis. The river discharge is from a daily climatology.
+
+    
+    Note: This reader reads the hourly 2D surface fields of sea surface height.
+
+    DOI (product): https://doi.org/10.48670/moi-00059
+    https://data.marine.copernicus.eu/product/NWSHELF_MULTIYEAR_PHY_004_009/description
+    """
+
+    product_configuration = ProductConfiguration(
+        ds_creator_function=partial(
+            ds_cmems_read,
+            dataset_id="cmems_mod_nws_phy-ssh_my_7km-2D_PT1H-i",
+            variables=["zos"],
+        ),
+        default_data_source=DataSource.REMOTE,
+    )
+
+    file_structure = FileStructure()
+
+    def post_processing(self):
+        return FillNaNs(0)

tests/test_readers/test_remote_current_readers.py

@@ -2,12 +2,22 @@
 import pytest
 import pandas as pd
 import numpy as np
+import os, shutil
 
 
+def grid_is_covered(grid, skeleton):
+    assert skeleton.lon()[0] < grid.lon()[0]
+    assert skeleton.lon()[-1] >= grid.lon()[-1]
+    assert skeleton.lat()[0] < grid.lat()[0]
+    assert skeleton.lat()[-1] >= grid.lat()[-1]
 @pytest.fixture(scope="session")
 def grid():
     return dn.grid.Grid(lon=(10, 14), lat=(60, 61))
 
+@pytest.fixture(scope="session")
+def grid2():
+    return dn.grid.Grid(lon=(4, 6), lat=(58, 61))
+
 
 @pytest.fixture(scope="session")
 def grid160():
@@ -23,7 +33,9 @@ def timevec():
 def timevec2017():
     return pd.date_range("2017-04-01 00:00:00", "2017-04-01 23:00:00", freq="1h")
 
-
+def cleanup():
+    if os.path.isdir("dnora_current_temp"):
+        shutil.rmtree("dnora_current_temp")
 @pytest.mark.remote
 def test_norkyst800(grid, timevec):
     model = dn.modelrun.ModelRun(grid, year=2022, month=4, day=1)
@@ -52,3 +64,25 @@ def test_norfjords160(grid160, timevec):
     assert np.all(model.current().time() == timevec)
     assert model.current().u(strict=True) is not None
     assert model.current().v(strict=True) is not None
+
+@pytest.mark.remote
+def test_cmems_global(grid, timevec):
+    cleanup()
+    model = dn.modelrun.ModelRun(grid, year=2022, month=4, day=1)
+    model.import_current(dn.read.current.cmems.Global(), expansion_factor=1.5)
+
+    assert np.all(model.current().time() == timevec)
+
+    grid_is_covered(grid, model.current())
+    cleanup()
+
+
+@pytest.mark.remote
+def test_cmems_europe(grid2, timevec):
+    cleanup()
+    model = dn.modelrun.ModelRun(grid2, year=2022, month=4, day=1)
+    model.import_current(dn.read.current.cmems.EuropeNW())
+    assert np.all(model.current().time() == timevec)
+
+    grid_is_covered(grid2, model.current())
+    cleanup()

tests/test_readers/test_remote_waterlevel_readers.py

@@ -40,11 +40,22 @@ def test_era5(grid, timevec):
 
 
 @pytest.mark.remote
-def test_cmems(grid, timevec):
+def test_cmems_global(grid, timevec):
     cleanup()
     model = dn.modelrun.ModelRun(grid, year=2023, month=4, day=1)
     model.import_waterlevel(dn.read.waterlevel.cmems.Global())
     assert np.all(model.waterlevel().time() == timevec)
 
+    grid_is_covered(grid, model.waterlevel())
+    cleanup()
+
+
+@pytest.mark.remote
+def test_cmems_europe(grid, timevec):
+    cleanup()
+    model = dn.modelrun.ModelRun(grid, year=2023, month=4, day=1)
+    model.import_waterlevel(dn.read.waterlevel.cmems.EuropeNW())
+    assert np.all(model.waterlevel().time() == timevec)
+
     grid_is_covered(grid, model.waterlevel())
     cleanup()