Add a stealth ERS test for conservation check AM

xylar · mark-petersen · commit ff5aa6f27324 · 2024-09-25T08:41:45.000-05:00
diff --git 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
@@ -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.
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
@@ -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
@@ -0,0 +1 @@
+ config_AM_conservationCheck_enable = .true.

Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,7 @@`
`266`	`266`	`"SMS_D_Ld1.T62_oQU240wLI.GMPAS-IAF-PISMF.mpaso-impl_top_drag",`
`267`	`267`	`"SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-harmonic_mean_drag",`
`268`	`268`	`"SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-upwind_advection",`
	`269`	`+ "ERS_D.T62_oQU240.GMPAS-IAF.mpaso-conservation_check",`
`269`	`270`	`)`
`270`	`271`	`},`
`271`	`272`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# include mpas-ocean outputs in testing`
	`2`	`+sed -i 's#compclass="ocn" exclude_testing="true"#compclass="ocn" exclude_testing="false"#g' env_archive.xml`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ config_AM_conservationCheck_enable = .true.`