Skip to content

Commit

Permalink
change ne30pg3_t232 to ne30pg3_ne30pg3_t232
Browse files Browse the repository at this point in the history
  • Loading branch information
brian-eaton committed Feb 4, 2025
1 parent 60fa0a8 commit 8e3c2ea
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
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
22 changes: 11 additions & 11 deletions cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
<option name="comment" >CAM7-LT aquaplanet</option>
</options>
</test>
<test compset="QPLT" grid="ne30pg3_t232" name="ERP_D_Ln9" testmods="cam/outfrq3s_cosp">
<test compset="QPLT" grid="ne30pg3_ne30pg3_t232" 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_t232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<test compset="QPMT" grid="ne30pg3_ne30pg3_t232" 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_t232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="FLTHIST" grid="ne30pg3_ne30pg3_t232" 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_t232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<test compset="FLTHIST" grid="ne30pg3_ne30pg3_t232" 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_t232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<test compset="FLTHIST" grid="ne3pg3_ne30pg3_t232" 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_t232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="FMTHIST" grid="ne30pg3_ne30pg3_t232" 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_t232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
<test compset="FMTHIST" grid="ne30pg3_ne30pg3_t232" 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_t232" name="SMS_D_Ln9_P1280x1" testmods="cam/outfrq9s_Leung_dust">
<test compset="FHISTC_MTt1s" grid="ne30pg3_ne30pg3_t232" 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_t232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="FHISTC_MTt1s" grid="ne30pg3_ne30pg3_t232" 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_t232" name="SMS_D_Ln9" testmods="cam/outfrq9s">
<test compset="FHISTC_MTt4s" grid="ne30pg3_ne30pg3_t232" 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_t232" name="ERP_Ld3" testmods="cam/outfrq1d_aoa">
<test compset="FHISTC_MTt4s" grid="ne30pg3_ne30pg3_t232" 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
8 changes: 7 additions & 1 deletion doc/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,16 @@ 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_t232
using ne30pg3_ne30pg3_mg17 now use ne30pg3_ne30pg3_t232
. 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.

Expand Down

0 comments on commit 8e3c2ea

Please sign in to comment.