fix oceanval calls in a couple of tests

Author: robertjwilson

tests/test_gridded_matchups.py

@@ -23,16 +23,16 @@ def test_gridded(self):
             model_variable = "votemper",
             obs_variable = "votemper",
             climatology = True,
-            vertical = True,
             start = 2000, 
-            end = 2010
+            end = 2000
         )
 
         oceanval.matchup(
             sim_dir = "data/example",
             start = 2000,
             end = 2000,
             ask = False,
+            thickness = "data/example/e3t.nc",
             cores = 1)
 
         assert os.path.exists("oceanval_matchups/gridded/temperature/foo_temperature_surface.nc")
@@ -58,11 +58,6 @@ def test_gridded(self):
         max_diff = np.abs(df['diff']).max()
         assert max_diff < 1e-5
 
-        ds = nc.open_data("oceanval_matchups/gridded/temperature/foo_temperature_vertical.nc")
-        df = ds.to_dataframe().assign(diff = lambda x: x.model - x.observation)
-        # get absolute max difference
-        max_diff = np.abs(df['diff']).max()
-        assert max_diff < 1e-5
 #        shutil.rmtree("oceanval_matchups/gridded/temperature", ignore_errors=True)
         shutil.rmtree("oceanval_matchups", ignore_errors=True)
 
@@ -159,8 +154,7 @@ def test_gridded(self):
             name = "temperature",
             obs_path="data/evaldata/point/nws/all/temperature",
             source = "foo",
-            model_variable = "votemper",
-            vertical = True
+            model_variable = "votemper"
         )
         oceanval.matchup(
             sim_dir = "data/example",

tests/test_short_simulations.py

@@ -19,6 +19,7 @@ def test_a_short_one(self):
             climatology = True
             )
         oceanval.matchup("data/monthly",
+            ask = False,
             start = 2000, end = 2000)
 
         import nctoolkit as nc