remove references to observations_root_dir (dir_obs) (#324)

MESMER-group · Nov 2, 2023 · 3c2be6a · 3c2be6a
1 parent fff6936
commit 3c2be6a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/examples/config_tas_cmip6ng_example.py b/examples/config_tas_cmip6ng_example.py
@@ -26,9 +26,6 @@
 # cmip-ng
 dir_cmipng = os.path.join(TEST_DATA_ROOT, f"cmip{gen}-ng")
 
-# observations
-dir_obs = os.path.join(TEST_DATA_ROOT, "observations")
-
 # mesmer output
 dir_aux = os.path.join(EXAMPLE_OUTPUT_ROOT, "auxiliary")
 dir_mesmer_params = os.path.join(EXAMPLE_OUTPUT_ROOT, "calibrated_parameters")

diff --git a/mesmer/calibrate_mesmer/calibrate_mesmer.py b/mesmer/calibrate_mesmer/calibrate_mesmer.py
@@ -27,7 +27,6 @@ def __init__(
         scenarios,
         cmip_generation,
         cmip_data_root_dir,
-        observations_root_dir,
         auxiliary_data_dir,
         reference_period_type,
         reference_period_start_year,
@@ -58,7 +57,6 @@ def __init__(
         self.gen = cmip_generation
 
         self.dir_cmipng = cmip_data_root_dir
-        self.dir_obs = observations_root_dir
         self.dir_aux = auxiliary_data_dir
         self.ref = {
             "type": reference_period_type,
@@ -122,7 +120,6 @@ def _calibrate_tas(
     threshold_land,
     output_file,
     cmip_data_root_dir=None,
-    observations_root_dir=None,
     auxiliary_data_dir=None,
     cmip_generation=6,
     reference_period_type="individ",
@@ -164,7 +161,6 @@ def _calibrate_tas(
         scenarios=scenarios_to_train,
         cmip_generation=cmip_generation,
         cmip_data_root_dir=cmip_data_root_dir,
-        observations_root_dir=observations_root_dir,
         auxiliary_data_dir=auxiliary_data_dir,
         reference_period_type=reference_period_type,
         reference_period_start_year=reference_period_start_year,

diff --git a/tests/integration/test_calibrate_mesmer.py b/tests/integration/test_calibrate_mesmer.py
@@ -96,11 +96,6 @@ def test_calibrate_mesmer(
         "calibrate-coarse-grid",
         f"cmip{test_cmip_generation}-ng",
     )
-    test_observations_root_dir = os.path.join(
-        test_data_root_dir,
-        "calibrate-coarse-grid",
-        "observations",
-    )
     test_auxiliary_data_dir = os.path.join(
         test_data_root_dir,
         "calibrate-coarse-grid",
@@ -114,7 +109,6 @@ def test_calibrate_mesmer(
         output_file=test_output_file,
         cmip_data_root_dir=test_cmip_data_root_dir,
         cmip_generation=test_cmip_generation,
-        observations_root_dir=test_observations_root_dir,
         auxiliary_data_dir=test_auxiliary_data_dir,
         use_tas2=use_tas2,
         use_hfds=use_hfds,