Skip to content

Commit c32f886

Browse files
jonbobjonbob
committed
Merge branch 'mark-petersen/mpas/correct-conservation-check' into next (PR #6643)
Correct ocean conservation check settings Currently, the ocean conservation check analysis member overwrites the first entry in the file with a zero after restarts for some variables. This PR corrects this behavior so that the first day's entry in a monthly conservation check file is identical between continuous runs and a run with a restart break. Adds a new mpaso testdef and corresponding stealth test. Fixes #6642 [NML] for some mpaso resolutions [BFB]
2 parents 8af7fb8 + 87182bb commit c32f886

File tree

5 files changed

+11
-28
lines changed

5 files changed

+11
-28
lines changed

‎cime_config/tests.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@
267267
"SMS_D_Ld1.T62_oQU240wLI.GMPAS-IAF-PISMF.mpaso-impl_top_drag",
268268
"SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-harmonic_mean_drag",
269269
"SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-upwind_advection",
270+
"ERS_Ld5_D.T62_oQU240.GMPAS-IAF.mpaso-conservation_check",
270271
)
271272
},
272273

‎components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,37 +1232,10 @@
12321232

12331233
<!-- AM_conservationCheck -->
12341234
<config_AM_conservationCheck_enable>.false.</config_AM_conservationCheck_enable>
1235-
<config_AM_conservationCheck_enable ocn_grid="SOwISC12to60E2r4">.true.</config_AM_conservationCheck_enable>
1236-
<config_AM_conservationCheck_enable ocn_grid="ECwISC30to60E2r1">.true.</config_AM_conservationCheck_enable>
1237-
<config_AM_conservationCheck_enable ocn_grid="IcoswISC30E3r5">.true.</config_AM_conservationCheck_enable>
1238-
<config_AM_conservationCheck_enable ocn_grid="IcosXISC30E3r7">.true.</config_AM_conservationCheck_enable>
1239-
<config_AM_conservationCheck_enable ocn_grid="FRISwISC08to60E3r1">.true.</config_AM_conservationCheck_enable>
1240-
<config_AM_conservationCheck_enable ocn_grid="FRISwISC04to60E3r1">.true.</config_AM_conservationCheck_enable>
1241-
<config_AM_conservationCheck_enable ocn_grid="FRISwISC02to60E3r1">.true.</config_AM_conservationCheck_enable>
1242-
<config_AM_conservationCheck_enable ocn_grid="FRISwISC01to60E3r1">.true.</config_AM_conservationCheck_enable>
1243-
<config_AM_conservationCheck_enable ocn_grid="RRSwISC6to18E3r5">.true.</config_AM_conservationCheck_enable>
12441235
<config_AM_conservationCheck_compute_interval>'dt'</config_AM_conservationCheck_compute_interval>
12451236
<config_AM_conservationCheck_output_stream>'conservationCheckOutput'</config_AM_conservationCheck_output_stream>
12461237
<config_AM_conservationCheck_compute_on_startup>.false.</config_AM_conservationCheck_compute_on_startup>
1247-
<config_AM_conservationCheck_compute_on_startup ocn_grid="SOwISC12to60E2r4">.true.</config_AM_conservationCheck_compute_on_startup>
1248-
<config_AM_conservationCheck_compute_on_startup ocn_grid="ECwISC30to60E2r1">.true.</config_AM_conservationCheck_compute_on_startup>
1249-
<config_AM_conservationCheck_compute_on_startup ocn_grid="IcoswISC30E3r5">.true.</config_AM_conservationCheck_compute_on_startup>
1250-
<config_AM_conservationCheck_compute_on_startup ocn_grid="IcosXISC30E3r7">.true.</config_AM_conservationCheck_compute_on_startup>
1251-
<config_AM_conservationCheck_compute_on_startup ocn_grid="FRISwISC08to60E3r1">.true.</config_AM_conservationCheck_compute_on_startup>
1252-
<config_AM_conservationCheck_compute_on_startup ocn_grid="FRISwISC04to60E3r1">.true.</config_AM_conservationCheck_compute_on_startup>
1253-
<config_AM_conservationCheck_compute_on_startup ocn_grid="FRISwISC02to60E3r1">.true.</config_AM_conservationCheck_compute_on_startup>
1254-
<config_AM_conservationCheck_compute_on_startup ocn_grid="FRISwISC01to60E3r1">.true.</config_AM_conservationCheck_compute_on_startup>
1255-
<config_AM_conservationCheck_compute_on_startup ocn_grid="RRSwISC6to18E3r5">.true.</config_AM_conservationCheck_compute_on_startup>
12561238
<config_AM_conservationCheck_write_on_startup>.false.</config_AM_conservationCheck_write_on_startup>
1257-
<config_AM_conservationCheck_write_on_startup ocn_grid="SOwISC12to60E2r4">.true.</config_AM_conservationCheck_write_on_startup>
1258-
<config_AM_conservationCheck_write_on_startup ocn_grid="ECwISC30to60E2r1">.true.</config_AM_conservationCheck_write_on_startup>
1259-
<config_AM_conservationCheck_write_on_startup ocn_grid="IcoswISC30E3r5">.true.</config_AM_conservationCheck_write_on_startup>
1260-
<config_AM_conservationCheck_write_on_startup ocn_grid="IcosXISC30E3r7">.true.</config_AM_conservationCheck_write_on_startup>
1261-
<config_AM_conservationCheck_write_on_startup ocn_grid="FRISwISC08to60E3r1">.true.</config_AM_conservationCheck_write_on_startup>
1262-
<config_AM_conservationCheck_write_on_startup ocn_grid="FRISwISC04to60E3r1">.true.</config_AM_conservationCheck_write_on_startup>
1263-
<config_AM_conservationCheck_write_on_startup ocn_grid="FRISwISC02to60E3r1">.true.</config_AM_conservationCheck_write_on_startup>
1264-
<config_AM_conservationCheck_write_on_startup ocn_grid="FRISwISC01to60E3r1">.true.</config_AM_conservationCheck_write_on_startup>
1265-
<config_AM_conservationCheck_write_on_startup ocn_grid="RRSwISC6to18E3r5">.true.</config_AM_conservationCheck_write_on_startup>
12661239
<config_AM_conservationCheck_write_to_logfile>.true.</config_AM_conservationCheck_write_to_logfile>
12671240
<config_AM_conservationCheck_restart_stream>'conservationCheckRestart'</config_AM_conservationCheck_restart_stream>
12681241

‎components/mpas-ocean/cime_config/buildnml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ def buildnml(case, caseroot, compname):
11561156
lines.append(' filename_interval="00-01-00_00:00:00"')
11571157
lines.append(' reference_time="01-01-01_00:00:00"')
11581158
lines.append(' output_interval="00-00-01_00:00:00"')
1159-
lines.append(' clobber_mode="truncate"')
1159+
lines.append(' clobber_mode="append"')
11601160
lines.append(' packages="conservationCheckAMPKG">')
11611161
lines.append('')
11621162
lines.append('<var name="xtime"/>')

‎components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/README‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
This testdef is used to test the conservation check analysis member, which
2+
wasintroduced in MPAS-Ocean PR #4521 and has been made a stealth feature in
3+
#6643. This test turns on the consevation check analysis member by setting:
4+
5+
config_AM_conservationCheck_enable = .true.
6+
7+
However, it should be noted that MPAS-Ocean history files are not currently
8+
included in E3SM testing so non-BFB results will not be detected.

‎components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/user_nl_mpaso‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config_AM_conservationCheck_enable = .true.

0 commit comments

Comments
 (0)