Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change cam7 testing to use MOM t232 mask. #1246

Draft
wants to merge 4 commits into
base: cam_development
Choose a base branch
from
Draft

Change cam7 testing to use MOM t232 mask. #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
045e4d3
update grid masks for cam7 tests
brian-eaton Jan 30, 2025
60fa0a8
update to cam6_4_057
brian-eaton Jan 30, 2025
8e3c2ea
change ne30pg3_t232 to ne30pg3_ne30pg3_t232
brian-eaton Feb 4, 2025
e6cdeca
change ne30pg3_ne30pg3_t232 to ne30pg3_ne30pg3_mt232
brian-eaton Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute

[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.8
url = https://github.com/brian-eaton/ccs_config_cesm.git
fxtag = cam_t232
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
fxDONOTUSEurl = https://github.com/brian-eaton/ccs_config_cesm.git

[submodule "cime"]
path = cime
Expand Down
24 changes: 12 additions & 12 deletions cime_config/testdefs/testlist_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
</options>
</test>

<test compset="F2000climo" grid="f19_f19" name="SMS_Ln9" testmods="cam/silhs">
<test compset="F2000climo" grid="f19_f19_mg17" name="SMS_Ln9" testmods="cam/silhs">
<machines>
<machine name="derecho" compiler="intel" category="aux_cam"/>
<machine name="derecho" compiler="intel" category="cam_silhs"/>
Expand Down Expand Up @@ -199,7 +199,7 @@
<option name="comment" >CAM7-LT aquaplanet</option>
</options>
</test>
<test compset="QPLT" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq3s_cosp">
<test compset="QPLT" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq3s_cosp">
<machines>
<machine name="derecho" compiler="intel" category="aux_cam"/>
<machine name="derecho" compiler="intel" category="prealpha"/>
Expand All @@ -218,7 +218,7 @@
<option name="comment" >CAM7-MT aquaplanet</option>
</options>
</test>
<test compset="QPMT" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<test compset="QPMT" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="derecho" compiler="intel" category="aux_cam"/>
<machine name="derecho" compiler="intel" category="prealpha"/>
Expand Down Expand Up @@ -1886,7 +1886,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test compset="FLTHIST" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="FLTHIST" grid="ne30pg3_ne30pg3_mt232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="derecho" compiler="intel" category="prealpha"/>
</machines>
Expand All @@ -1895,7 +1895,7 @@
<option name="comment">CAM7 low top ~40 km</option>
</options>
</test>
<test compset="FLTHIST" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<test compset="FLTHIST" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="derecho" compiler="intel" category="aux_cam"/>
</machines>
Expand All @@ -1904,7 +1904,7 @@
<option name="comment">CAM7 low top ~40 km</option>
</options>
</test>
<test compset="FLTHIST" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<test compset="FLTHIST" grid="ne3pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="izumi" compiler="gnu" category="aux_cam"/>
</machines>
Expand All @@ -1913,7 +1913,7 @@
<option name="comment">CAM7 low top ~40 km</option>
</options>
</test>
<test compset="FMTHIST" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="FMTHIST" grid="ne30pg3_ne30pg3_mt232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="derecho" compiler="intel" category="aux_cam"/>
</machines>
Expand All @@ -1922,7 +1922,7 @@
<option name="comment">CAM7 mid top ~80 km</option>
</options>
</test>
<test compset="FMTHIST" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<test compset="FMTHIST" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="derecho" compiler="intel" category="prealpha"/>
</machines>
Expand Down Expand Up @@ -2376,7 +2376,7 @@
<option name="wallclock">00:10:00</option>
</options>
</test>
<test compset="FHISTC_MTt1s" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9_P1280x1" testmods="cam/outfrq9s_Leung_dust">
<test compset="FHISTC_MTt1s" grid="ne30pg3_ne30pg3_mt232" name="SMS_D_Ln9_P1280x1" testmods="cam/outfrq9s_Leung_dust">
<machines>
<machine name="derecho" compiler="intel" category="aux_cam"/>
<machine name="derecho" compiler="intel" category="camchem"/>
Expand All @@ -2386,7 +2386,7 @@
<option name="comment" >Low-top CAM-Chem with MAM5 aerosols and cam7 physics</option>
</options>
</test>
<test compset="FHISTC_MTt1s" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="FHISTC_MTt1s" grid="ne30pg3_ne30pg3_mt232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="derecho" compiler="intel" category="camchem"/>
</machines>
Expand All @@ -2395,7 +2395,7 @@
<option name="comment" >Medium-top CAM-Chem with MAM5 aerosols and cam7 physics</option>
</options>
</test>
<test compset="FHISTC_MTt4s" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="FHISTC_MTt4s" grid="ne30pg3_ne30pg3_mt232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<machines>
<machine name="derecho" compiler="intel" category="camchem"/>
</machines>
Expand All @@ -2404,7 +2404,7 @@
<option name="comment" >Medium-top CAM-Chem with simpler climate chemistry</option>
</options>
</test>
<test compset="FHISTC_MTt4s" grid="ne30pg3_ne30pg3_mg17" name="ERP_Ld3" testmods="cam/outfrq1d_aoa">
<test compset="FHISTC_MTt4s" grid="ne30pg3_ne30pg3_mt232" name="ERP_Ld3" testmods="cam/outfrq1d_aoa">
<machines>
<machine name="derecho" compiler="intel" category="camchem"/>
<machine name="derecho" compiler="intel" category="aux_cam"/>
Expand Down
66 changes: 66 additions & 0 deletions doc/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,71 @@
===============================================================

Tag name:
Originator(s):
Date:
One-line Summary: updates to grid masks
Github PR URL:

Purpose of changes (include the issue number and title text for each relevant GitHub issue):

Resolves #1236 - Change our testing from using the POP land/ocean mask to
the MOM t232 land/ocean mask
- The cam7 tests using the ne30pg3_ne30pg3_mg17 grid have been updated to
use ne30pg3_ne30pg3_mt232.
- One test used the f19_f19 grid which used the gx1v6 mask. That test is
updated to use f19_f19_mg17.

Describe any changes made to build system:

Describe any changes made to the namelist:

List any changes to the defaults for the boundary datasets:

Describe any substantial timing or memory changes:

Code reviewed by:

List all files eliminated:

List all files added and what they do:

List all existing files that have been modified, and describe the changes:

.gitmodules
- update ccs_config module to:
url = https://github.com/brian-eaton/ccs_config_cesm.git
fxtag = cam_t232
*** This is temporary until PR#211 is merged in ESMCI/ccs_config_cesm

cime_config/testdefs/testlist_cam.xml
. update mask in ne30pg3 grids used for cam7 tests:
- tests of FLTHIST, FMTHIST, FHISTC_MTt1s, FHISTC_MTt4s, QPLT, and QPMT
using ne30pg3_ne30pg3_mg17 now use ne30pg3_ne30pg3_mt232
. There is one test using the f19_f19 grid. This grid is using the gx1v6
mask which will be removed. Update test to use f19_f19_mg17 grid.

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

derecho/intel/aux_cam:

derecho/nvhpc/aux_cam:

izumi/nag/aux_cam:

izumi/gnu/aux_cam:

CAM tag used for the baseline comparison tests if different than previous
tag:

Summarize any changes to answers: BFB, only some test definitions have
changed.

===============================================================
===============================================================

Tag name: cam6_4_057
Originator(s): brianpm, eaton, nusbaume
Date: Jan 29 2025
Expand Down