Skip to content

Commit 3511875

Browse files
nusbaumenusbaume
authored
Merge pull request #1186 from sjsprecious/update_gpu_tests
cam6_4_046: Update GPU tests with new XML options
2 parents 7502085 + 9a14ae3 commit 3511875

File tree

12 files changed

+192
-12
lines changed

12 files changed

+192
-12
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,21 +144,21 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
144144
[submodule "ccs_config"]
145145
path = ccs_config
146146
url = https://github.com/ESMCI/ccs_config_cesm.git
147-
fxtag = ccs_config_cesm1.0.7
147+
fxtag = ccs_config_cesm1.0.8
148148
fxrequired = ToplevelRequired
149149
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
150150

151151
[submodule "cime"]
152152
path = cime
153153
url = https://github.com/ESMCI/cime
154-
fxtag = cime6.1.29
154+
fxtag = cime6.1.41
155155
fxrequired = ToplevelRequired
156156
fxDONOTUSEurl = https://github.com/ESMCI/cime
157157

158158
[submodule "cmeps"]
159159
path = components/cmeps
160160
url = https://github.com/ESCOMP/CMEPS.git
161-
fxtag = cmeps1.0.16
161+
fxtag = cmeps1.0.22
162162
fxrequired = ToplevelRequired
163163
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
164164

‎ccs_config‎

‎cime‎

Submodule cime updated 34 files

‎cime_config/testdefs/testlist_cam.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@
14891489
<!-- (unsupported) -->
14901490
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
14911491

1492-
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="ERS_Ln9_G4-a100-openacc" testmods="cam/outfrq9s_mg3_default">
1492+
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="ERS_Ln9" testmods="cam/outfrq9s_gpu_default">
14931493
<machines>
14941494
<machine name="derecho" compiler="nvhpc" category="derecho_gpu"/>
14951495
<machine name="derecho" compiler="nvhpc" category="aux_cam"/>
@@ -1498,7 +1498,7 @@
14981498
<option name="wallclock">00:30:00</option>
14991499
</options>
15001500
</test>
1501-
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="ERS_Ln9_G4-a100-openacc" testmods="cam/outfrq9s_mg3_pcols760">
1501+
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="ERS_Ln9" testmods="cam/outfrq9s_gpu_pcols760">
15021502
<machines>
15031503
<machine name="derecho" compiler="nvhpc" category="derecho_gpu"/>
15041504
<machine name="derecho" compiler="nvhpc" category="prealpha"/>

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_gpu_default/shell_commands‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
./xmlchange NTASKS=128
2+
./xmlchange NTHRDS=1
3+
./xmlchange ROOTPE='0'
4+
./xmlchange ROF_NCPL=`./xmlquery --value ATM_NCPL`
5+
./xmlchange GLC_NCPL=`./xmlquery --value ATM_NCPL`
6+
./xmlchange CAM_CONFIG_OPTS=' -microphys mg3 -rad rrtmg' --append
7+
./xmlchange TIMER_DETAIL='6'
8+
./xmlchange TIMER_LEVEL='999'
9+
./xmlchange GPU_TYPE=a100
10+
./xmlchange OPENACC_GPU_OFFLOAD=TRUE
11+
./xmlchange OVERSUBSCRIBE_GPU=TRUE
12+
./xmlchange NGPUS_PER_NODE=4

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_gpu_default/user_nl_cam‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
mfilt=1,1,1,1,1,1
2+
ndens=1,1,1,1,1,1
3+
nhtfrq=9,9,9,9,9,9
4+
inithist='ENDOFRUN'

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_gpu_default/user_nl_clm‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
!----------------------------------------------------------------------------------
2+
! Users should add all user specific namelist changes below in the form of
3+
! namelist_var = new_namelist_value
4+
!
5+
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
6+
! are set in the CLM_NAMELIST_OPTS env variable.
7+
!
8+
! EXCEPTIONS:
9+
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
10+
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
11+
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
12+
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
13+
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
14+
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
15+
! Set dtime with L_NCPL option
16+
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
17+
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
18+
! (includes $inst_string for multi-ensemble cases)
19+
! Set glc_grid with CISM_GRID option
20+
! Set glc_smb with GLC_SMB option
21+
! Set maxpatch_glcmec with GLC_NEC option
22+
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
23+
!----------------------------------------------------------------------------------
24+
hist_nhtfrq = 9
25+
hist_mfilt = 1
26+
hist_ndens = 1

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_gpu_pcols760/shell_commands‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
./xmlchange NTASKS=64
2+
./xmlchange NTHRDS=1
3+
./xmlchange ROOTPE='0'
4+
./xmlchange ROF_NCPL=`./xmlquery --value ATM_NCPL`
5+
./xmlchange GLC_NCPL=`./xmlquery --value ATM_NCPL`
6+
./xmlchange CAM_CONFIG_OPTS=' -microphys mg3 -rad rrtmg -pcols 760 ' --append
7+
./xmlchange TIMER_DETAIL='6'
8+
./xmlchange TIMER_LEVEL='999'
9+
./xmlchange GPU_TYPE=a100
10+
./xmlchange OPENACC_GPU_OFFLOAD=TRUE
11+
./xmlchange OVERSUBSCRIBE_GPU=TRUE
12+
./xmlchange NGPUS_PER_NODE=4

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_gpu_pcols760/user_nl_cam‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
mfilt=1,1,1,1,1,1
2+
ndens=1,1,1,1,1,1
3+
nhtfrq=9,9,9,9,9,9
4+
inithist='ENDOFRUN'

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_gpu_pcols760/user_nl_clm‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
!----------------------------------------------------------------------------------
2+
! Users should add all user specific namelist changes below in the form of
3+
! namelist_var = new_namelist_value
4+
!
5+
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
6+
! are set in the CLM_NAMELIST_OPTS env variable.
7+
!
8+
! EXCEPTIONS:
9+
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
10+
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
11+
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
12+
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
13+
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
14+
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
15+
! Set dtime with L_NCPL option
16+
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
17+
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
18+
! (includes $inst_string for multi-ensemble cases)
19+
! Set glc_grid with CISM_GRID option
20+
! Set glc_smb with GLC_SMB option
21+
! Set maxpatch_glcmec with GLC_NEC option
22+
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
23+
!----------------------------------------------------------------------------------
24+
hist_nhtfrq = 9
25+
hist_mfilt = 1
26+
hist_ndens = 1

0 commit comments

Comments
 (0)