Merge pull request #1329 from metno/tweak_cli_cams283

add evaluation type for cams283, tweak rtol fairmode
metno · Aug 30, 2024 · 48a93f8 · 48a93f8
2 parents b4704be + 6ddfcf8
commit 48a93f8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/pyaerocom/aeroval/fairmode_stats.py b/pyaerocom/aeroval/fairmode_stats.py
@@ -77,7 +77,7 @@ def fairmode_stats(obs_var: str, stats: dict) -> dict:
     assert np.isclose(
         rmsu * beta_mqi,
         np.sqrt((bias) ** 2 + (mod_std - obs_std) ** 2 + (2 * obs_std * mod_std * (1 - R))),
-        rtol=1e-3,
+        rtol=1e-2,
     ), "failed MQI check"
 
     fairmode = dict(

diff --git a/pyaerocom/scripts/cams2_83/evaluation.py b/pyaerocom/scripts/cams2_83/evaluation.py
@@ -43,7 +43,7 @@ def freqs_config(self) -> dict:
                 main_freq="daily",
                 forecast_evaluation=True,
             )
-
+        
         if self == "season":
             return dict(
                 freqs=["hourly", "daily"],
@@ -71,7 +71,8 @@ def freqs_config(self) -> dict:
 
     def periods(self, start_date: date, end_date: date) -> list[str]:
         if self == "long":
-            return make_period_ys(start_date, end_date)
+            if (start_date.year != end_date.year):
+                return make_period_ys(start_date, end_date)
         return make_period(start_date, end_date)
 
 

diff --git a/tests/cams2_83/test_cams2_83_evaluation.py b/tests/cams2_83/test_cams2_83_evaluation.py
@@ -17,6 +17,13 @@
             ["2021-2024", "2021", "2022", "2023", "2024"],
             id="long",
         ),
+        pytest.param(
+            "long",
+            datetime(2024, 3, 1),
+            datetime(2024, 8, 31),
+            ["20240301-20240831"],
+            id="long",
+        ),
         pytest.param(
             "week",
             datetime(2023, 12, 28),