From e92cad4ab97fe90749e6edbe33376ad4ab5143d0 Mon Sep 17 00:00:00 2001 From: Jo Basevi Date: Wed, 28 Aug 2024 11:18:06 +1000 Subject: [PATCH] ACCESS-ESM1.5 QA test: Add check for no repreated fields between CICE namelists --- src/model_config_tests/qa/test_access_esm1p5_config.py | 10 ++++++++++ .../ice/cice_in.nml | 4 +++- .../ice/ice_history.nml | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/model_config_tests/qa/test_access_esm1p5_config.py b/src/model_config_tests/qa/test_access_esm1p5_config.py index 928083b..b279e11 100644 --- a/src/model_config_tests/qa/test_access_esm1p5_config.py +++ b/src/model_config_tests/qa/test_access_esm1p5_config.py @@ -228,3 +228,13 @@ def test_cice_configuration_icefields_nml_in_ice_history_nml( assert cice_in_path.is_file() cice_in = f90nml.read(cice_in_path) assert ICEFIELDS_NML_NAME not in cice_in, icefields_nml_error_msg + + # Check no repeated fields between the two namelist files + common_nmls = set(cice_in) & set(ice_history_nml) + for nml in common_nmls: + repeated_fields = set(cice_in[nml]) & set(ice_history_nml[nml]) + assert repeated_fields == set(), ( + f"Found repeated fields for '{nml}' namelist" + f" in {CICE_IN_NML_FNAME} and {ICE_HISTORY_NML_FNAME}" + f": {repeated_fields}" + ) diff --git a/tests/resources/access/configurations/release-preindustrial+concentrations/ice/cice_in.nml b/tests/resources/access/configurations/release-preindustrial+concentrations/ice/cice_in.nml index 6731b06..8e2b3ff 100644 --- a/tests/resources/access/configurations/release-preindustrial+concentrations/ice/cice_in.nml +++ b/tests/resources/access/configurations/release-preindustrial+concentrations/ice/cice_in.nml @@ -1,3 +1,5 @@ &setup_nml - mock_field = 365 + days_per_year = 365 + , year_init = 0001 + , istep0 = 0 / \ No newline at end of file diff --git a/tests/resources/access/configurations/release-preindustrial+concentrations/ice/ice_history.nml b/tests/resources/access/configurations/release-preindustrial+concentrations/ice/ice_history.nml index 68b5254..92f9d3e 100644 --- a/tests/resources/access/configurations/release-preindustrial+concentrations/ice/ice_history.nml +++ b/tests/resources/access/configurations/release-preindustrial+concentrations/ice/ice_history.nml @@ -1,3 +1,9 @@ +&setup_nml + , histfreq = 'd','m','x','x','x' + , histfreq_n = 1, 1, 1, 1, 1 + , hist_avg = .true. +/ + &icefields_nml mock_field = .true. / \ No newline at end of file