From a2fb3e7af1b9bb39db6531b87e735240ae973c50 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Tue, 24 Sep 2024 11:11:50 -0500 Subject: [PATCH 1/7] Correct ocean conservation check settings --- .../namelist_defaults_mpaso.xml | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml index fd2785616655..4f9b5d8fe4d3 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -1232,37 +1232,10 @@ .false. -.true. -.true. -.true. -.true. -.true. -.true. -.true. -.true. -.true. 'dt' 'conservationCheckOutput' .false. -.true. -.true. -.true. -.true. -.true. -.true. -.true. -.true. -.true. .false. -.true. -.true. -.true. -.true. -.true. -.true. -.true. -.true. -.true. .true. 'conservationCheckRestart' From beca87f8cece8ad0b650ee4ee3587cd9e2b2f2b9 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 25 Sep 2024 04:29:47 -0500 Subject: [PATCH 2/7] Change conservationCheckOutput to append clobber mode --- components/mpas-ocean/cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml index 8f5193c334be..1b413efbb863 100755 --- a/components/mpas-ocean/cime_config/buildnml +++ b/components/mpas-ocean/cime_config/buildnml @@ -1156,7 +1156,7 @@ def buildnml(case, caseroot, compname): lines.append(' filename_interval="00-01-00_00:00:00"') lines.append(' reference_time="01-01-01_00:00:00"') lines.append(' output_interval="00-00-01_00:00:00"') - lines.append(' clobber_mode="truncate"') + lines.append(' clobber_mode="append"') lines.append(' packages="conservationCheckAMPKG">') lines.append('') lines.append('') From ff5aa6f2732488223737315fa464f7ccc933628f Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 25 Sep 2024 05:02:08 -0500 Subject: [PATCH 3/7] Add a stealth ERS test for conservation check AM --- cime_config/tests.py | 1 + .../testmods_dirs/mpaso/conservation_check/README | 8 ++++++++ .../testmods_dirs/mpaso/conservation_check/shell_commands | 2 ++ .../testmods_dirs/mpaso/conservation_check/user_nl_mpaso | 1 + 4 files changed, 12 insertions(+) create mode 100644 components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README create mode 100644 components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands create mode 100644 components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/user_nl_mpaso diff --git a/cime_config/tests.py b/cime_config/tests.py index 1cbf28b83974..c24f24e22f72 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -266,6 +266,7 @@ "SMS_D_Ld1.T62_oQU240wLI.GMPAS-IAF-PISMF.mpaso-impl_top_drag", "SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-harmonic_mean_drag", "SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-upwind_advection", + "ERS_D.T62_oQU240.GMPAS-IAF.mpaso-conservation_check", ) }, diff --git a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README new file mode 100644 index 000000000000..9e13f46ced04 --- /dev/null +++ b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README @@ -0,0 +1,8 @@ +This testdef is used to test the conservation check analysis member, which +wasintroduced in MPAS-Ocean PR #4521 and has been made a stealth feature in +#6643. This test turns on the consevation check analysis member by setting: + + config_AM_conservationCheck_enable = .true. + +Then, it enables the use of MPAS-Ocean history files in testing by running +a sed command to modify env_archive.xml. \ No newline at end of file diff --git a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands new file mode 100644 index 000000000000..67789cfe69c7 --- /dev/null +++ b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands @@ -0,0 +1,2 @@ +# include mpas-ocean outputs in testing +sed -i 's#compclass="ocn" exclude_testing="true"#compclass="ocn" exclude_testing="false"#g' env_archive.xml diff --git a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/user_nl_mpaso b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/user_nl_mpaso new file mode 100644 index 000000000000..c57241a9fcf2 --- /dev/null +++ b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/user_nl_mpaso @@ -0,0 +1 @@ + config_AM_conservationCheck_enable = .true. From 663e88019b52561bb4d00963c78e05b114554272 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Wed, 25 Sep 2024 11:38:44 -0500 Subject: [PATCH 4/7] Update stealth test based on review --- cime_config/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/tests.py b/cime_config/tests.py index c24f24e22f72..c707f607690c 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -266,7 +266,7 @@ "SMS_D_Ld1.T62_oQU240wLI.GMPAS-IAF-PISMF.mpaso-impl_top_drag", "SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-harmonic_mean_drag", "SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-upwind_advection", - "ERS_D.T62_oQU240.GMPAS-IAF.mpaso-conservation_check", + "ERS_Ld5_D.T62_oQU240.GMPAS-IAF.mpaso-conservation_check", ) }, From 448f4f18f5b71c5cd694ce7764fcc3ea0a5bb9dd Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 25 Sep 2024 15:16:23 -0500 Subject: [PATCH 5/7] Fix sed command --- .../testmods_dirs/mpaso/conservation_check/shell_commands | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands index 67789cfe69c7..62c82542595f 100644 --- a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands +++ b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands @@ -1,2 +1,3 @@ # include mpas-ocean outputs in testing -sed -i 's#compclass="ocn" exclude_testing="true"#compclass="ocn" exclude_testing="false"#g' env_archive.xml +sed 's|compname="mpaso" exclude_testing="true"|compname="mpaso" exclude_testing="false"|' env_archive.xml > tmp_env_archive.xml +mv tmp_env_archive.xml env_archive.xml From 2982d4af4f10b5a09628927bbfe54b58e8628062 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 26 Sep 2024 01:04:28 -0500 Subject: [PATCH 6/7] Update conservation_check test to remove sed command --- .../testdefs/testmods_dirs/mpaso/conservation_check/README | 6 ++++-- .../testmods_dirs/mpaso/conservation_check/shell_commands | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands diff --git a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README index 9e13f46ced04..ef7ef254823b 100644 --- a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README +++ b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README @@ -4,5 +4,7 @@ wasintroduced in MPAS-Ocean PR #4521 and has been made a stealth feature in config_AM_conservationCheck_enable = .true. -Then, it enables the use of MPAS-Ocean history files in testing by running -a sed command to modify env_archive.xml. \ No newline at end of file +However, it shoudl be noted that MPAS-Ocean history files are not currently +included in E3SM testing so non-BFB results will not be detected unless one +manually changes to 'compname="mpaso" exclude_testing="false"' in the file +cime_config/config_archive.xml. diff --git a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands deleted file mode 100644 index 62c82542595f..000000000000 --- a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands +++ /dev/null @@ -1,3 +0,0 @@ -# include mpas-ocean outputs in testing -sed 's|compname="mpaso" exclude_testing="true"|compname="mpaso" exclude_testing="false"|' env_archive.xml > tmp_env_archive.xml -mv tmp_env_archive.xml env_archive.xml From 87182bba27827f59b0bda3df94cdb6553d18a928 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 26 Sep 2024 20:03:55 +0200 Subject: [PATCH 7/7] Fix readme for the new test --- .../testdefs/testmods_dirs/mpaso/conservation_check/README | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README index ef7ef254823b..fb85b185fd47 100644 --- a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README +++ b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README @@ -4,7 +4,5 @@ wasintroduced in MPAS-Ocean PR #4521 and has been made a stealth feature in config_AM_conservationCheck_enable = .true. -However, it shoudl be noted that MPAS-Ocean history files are not currently -included in E3SM testing so non-BFB results will not be detected unless one -manually changes to 'compname="mpaso" exclude_testing="false"' in the file -cime_config/config_archive.xml. +However, it should be noted that MPAS-Ocean history files are not currently +included in E3SM testing so non-BFB results will not be detected.