Skip to content

Commit

Permalink
add DATAMODELTEST compset alias
Browse files Browse the repository at this point in the history
  • Loading branch information
jedwards4b committed Sep 6, 2024
1 parent e0c561d commit f90b42e
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 5 deletions.
57 changes: 57 additions & 0 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0"?>

<compsets version="2.0">

<help>
=========================================
compset naming convention
=========================================
The compset longname below has the specified order
atm, lnd, ice, ocn, river, glc wave cesm-options

The notation for the compset longname is
TIME_ATM[%phys]_LND[%phys]_ICE[%phys]_OCN[%phys]_ROF[%phys]_GLC[%phys]_WAV[%phys][_ESP%phys][_BGC%phys]
Where for the specific compsets below the following is supported
TIME = Time period (e.g. 2000, HIST, RCP8...)
ATM = [CAM40, CAM50, CAM60]
LND = [CLM45, CLM50, SLND]
ICE = [CICE, DICE, SICE]
OCN = [MOM6, DOCN, SOCN]
ROF = [RTM, MOSART, SROF]
GLC = [CISM2, DGLC, SGLC]
WAV = [WW3, DWAV, XWAV, SWAV]
ESP = [SESP]
BGC = optional BGC scenario

The OPTIONAL %phys attributes specify submodes of the given system
For example DOCN%DOM is the data ocean model for DOCN
ALL the possible %phys choices for each component are listed.
ALL data models must have a %phys option that corresponds to the data model mode

Each compset node is associated with the following elements
- lname
- alias
- support (optional description of the support level for this compset)
Each compset node can also have the following attributes
- grid (optional regular expression match for grid to work with the compset)
</help>
<compset>
<alias>DATAMODELTEST</alias>
<lname>HIST_DATM%JRA_DLND%SCPL_DICE%SSMI_DOCN%DOM_DGLC%NOEVOLVE_DWAV%CLIMO</lname>
</compset>


<entries>
<entry id="RUN_STARTDATE">
<values>
<value compset="1850[CE]?_" >0001-01-01</value>
<value compset="2000[CE]?_" >2000-01-01</value>
<value compset="HIST[CE]?_" >1850-01-01</value>
<value compset="5505[CE]?_" >1955-01-01</value>
<value compset="RCP[2468][CE]?_">2005-01-01</value>
<value compset="2013[CE]?_" >2013-01-01</value>
</values>
</entry>
</entries>

</compsets>
2 changes: 0 additions & 2 deletions datm/atm_comp_nuopc.F90
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,7 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
! local variables
logical :: first_time = .true.
character(len=CL) :: rpfile
character(len=16) :: timestr
character(*), parameter :: subName = '(datm_comp_run) '
integer :: yr, mon, day
!-------------------------------------------------------------------------------

rc = ESMF_SUCCESS
Expand Down
14 changes: 11 additions & 3 deletions dglc/cime_config/testdefs/testlist_dglc.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<testlist version="2.0">

<test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f10_f10_ais8gris4_mg37" name="SMS_Ly3">
<test compset="2000_SATM_SLND_SICE_SOCN_SROF_DGLC%NOEVOLVE_SWAV" grid="f10_f10_ais8gris4_mg37" name="SMS_Ly3">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Expand All @@ -10,7 +10,7 @@
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f10_f10_ais8_mg37" name="SMS_Ly3">
<test compset="2000_SATM_SLND_SICE_SOCN_SROF_DGLC%NOEVOLVE_SWAV" grid="f10_f10_ais8_mg37" name="SMS_Ly3">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Expand All @@ -19,7 +19,7 @@
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f19_g17_gris4" name="SMS_Ly3">
<test compset="2000_SATM_SLND_SICE_SOCN_SROF_DGLC%NOEVOLVE_SWAV" grid="f19_g17_gris4" name="SMS_Ly3">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Expand All @@ -29,4 +29,12 @@
</options>
</test>

<test compset="DATAMODELTEST" grid="f10_f10_ais8gris4_mg37" name="SMS_D_Ld3">
<machines name="derecho" compiler="gnu" category="aux_cdeps"/>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>


</testlist>

0 comments on commit f90b42e

Please sign in to comment.