Added test cdd map for cdd unit test

ec-jrc · Oct 24, 2023 · 554e5e9 · 554e5e9
1 parent a76b556
commit 554e5e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/tests/data/cdd_temp_map.nc b/tests/data/cdd_temp_map.nc
diff --git a/tests/data/template_test.nc b/tests/data/template_test.nc
diff --git a/tests/test_interpolation.py b/tests/test_interpolation.py
@@ -25,7 +25,7 @@ def test_interpolation_use_scipy_nearest(self):
         shape_target = PCRasterReader(config_dict['interpolation.latMap']).values.shape
         assert shape_target == values_resampled.shape
 
-    @pytest.mark.slow
+    #@pytest.mark.slow
     def test_interpolation_create_scipy_invdist(self):
         d = deepcopy(config_dict)
         d['interpolation.create'] = True
@@ -45,7 +45,7 @@ def test_interpolation_create_scipy_invdist(self):
         assert shape_target == values_resampled.shape
         os.unlink('tests/data/tbl_pf10tp_550800_scipy_invdist.npy.gz')
 
-    @pytest.mark.slow
+    #@pytest.mark.slow
     def test_interpolation_create_scipy_adw(self):
         d = deepcopy(config_dict)
         d['interpolation.create'] = True
@@ -72,8 +72,11 @@ def test_interpolation_create_scipy_cdd(self):
         d['interpolation.create'] = True
         d['interpolation.parallel'] = True
         d['interpolation.mode'] = 'cdd'
-        d['interpolation.cdd_map'] = 'tests/data/cdd_map.nc'
+        d['interpolation.lonMap'] = 'tests/data/template_test.nc'
+        d['interpolation.latMap'] = 'tests/data/template_test.nc'
+        d['interpolation.cdd_map'] = 'tests/data/cdd_temp_map.nc'
         d['interpolation.cdd_options'] = None
+        d['interpolation.cdd_mode'] = 'MixHofstraShepard'
         d['interpolation.use_broadcasting'] = True
         file = d['input.file']
         reader = GRIBReader(file)
@@ -87,7 +90,7 @@ def test_interpolation_create_scipy_cdd(self):
         values_resampled = interpolator.interpolate_scipy(lats, lons, values_in, grid_id, messages.grid_details)
         shape_target = PCRasterReader(d['interpolation.latMap']).values.shape
         assert shape_target == values_resampled.shape
-        os.unlink('tests/data/tbl_pf10tp_550800_scipy_adw.npy.gz')
+        os.unlink('tests/data/tbl_input_360000_scipy_cdd.npy.gz')
 
     @pytest.mark.slow
     def test_interpolation_create_scipy_bilinear(self):
@@ -112,7 +115,7 @@ def test_interpolation_create_scipy_bilinear(self):
         values_resampled = interpolator.interpolate_scipy(lats, lons, values_in, grid_id, messages.grid_details)
         shape_target = PCRasterReader(d['interpolation.latMap']).values.shape
         assert shape_target == values_resampled.shape
-        os.unlink('tests/data/tbl_era5t2avg_441_scipy_bilinear.npy.gz')
+        os.unlink('tests/data/tbl_era5t2avg_360000_scipy_bilinear.npy.gz')
 
     @pytest.mark.slow
     def test_interpolation_create_scipy_triangulation(self):
@@ -137,7 +140,7 @@ def test_interpolation_create_scipy_triangulation(self):
         values_resampled = interpolator.interpolate_scipy(lats, lons, values_in, grid_id, messages.grid_details)
         shape_target = PCRasterReader(d['interpolation.latMap']).values.shape
         assert shape_target == values_resampled.shape
-        os.unlink('tests/data/tbl_era5t2avg_441_scipy_triangulation.npy.gz')
+        os.unlink('tests/data/tbl_era5t2avg_360000_scipy_triangulation.npy.gz')
 
     @pytest.mark.slow
     def test_interpolation_create_scipy_bilinear_delaunay(self):
@@ -162,7 +165,7 @@ def test_interpolation_create_scipy_bilinear_delaunay(self):
         values_resampled = interpolator.interpolate_scipy(lats, lons, values_in, grid_id, messages.grid_details)
         shape_target = PCRasterReader(d['interpolation.latMap']).values.shape
         assert shape_target == values_resampled.shape
-        os.unlink('tests/data/tbl_era5t2avg_441_scipy_bilinear_delaunay.npy.gz')
+        os.unlink('tests/data/tbl_era5t2avg_360000_scipy_bilinear_delaunay.npy.gz')
 
     @pytest.mark.slow
     def test_interpolation_create_eccodes_nearest(self):