Skip to content

Commit

Permalink
Merge remote-tracking branch 'escomp/master' into lilac_cap
Browse files Browse the repository at this point in the history 
Resolved Conflicts:
	Externals.cfg
	bld/unit_testers/build-namelist_test.pl
  • Loading branch information
@billsacks
billsacks committed Jul 1, 2020
2 parents a5f0f1c + 488860d commit 0544917
Show file tree
Hide file tree
Showing 52 changed files with 2,042 additions and 680 deletions.
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ required = True
local_path = cime
protocol = git
repo_url = https://github.com/ESMCI/cime
tag = branch_tags/cime5.8.23_a02
tag = branch_tags/cime5.8.24_a01
externals = ../Externals_cime.cfg
required = True

Expand Down
232 changes: 229 additions & 3 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions bld/namelist_files/namelist_defaults_ctsm_tools.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<scripgriddata hgrid="32x64" lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_32x64_nomask_c110308.nc</scripgriddata>
<scripgriddata hgrid="8x16" lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_8x16_nomask_c110308.nc</scripgriddata>

<!-- FV3 grids -->
<scripgriddata hgrid="C384" lmask="nomask" >atm/cam/coords/C384_SCRIP_desc.181018.nc</scripgriddata>
<scripgriddata hgrid="C192" lmask="nomask" >atm/cam/coords/C192_SCRIP_desc.181018.nc</scripgriddata>
<scripgriddata hgrid="C96" lmask="nomask" >atm/cam/coords/C96_SCRIP_desc.181018.nc</scripgriddata>
<scripgriddata hgrid="C48" lmask="nomask" >atm/cam/coords/C48_SCRIP_desc.181018.nc</scripgriddata>
<scripgriddata hgrid="C24" lmask="nomask" >atm/cam/coords/C24_SCRIP_desc.181018.nc</scripgriddata>

<!-- HOMME grids -->
<scripgriddata hgrid="ne240np4" lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne240np4_nomask_c091227.nc</scripgriddata>
<scripgriddata hgrid="ne120np4" lmask="nomask" >lnd/clm2/mappingdata/grids/SCRIPgrid_ne120np4_nomask_c101123.nc</scripgriddata>
Expand Down
3 changes: 1 addition & 2 deletions bld/namelist_files/namelist_definition_ctsm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1948,8 +1948,7 @@ CLM run type.

<entry id="res" type="char*30" category="default_settings"
group="default_settings"
valid_values=
"conus_30_x8,512x1024,360x720cru,128x256,64x128,48x96,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,0.125nldas2,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min">
valid_values="conus_30_x8,512x1024,360x720cru,128x256,64x128,48x96,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,0.125nldas2,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min,C24,C48,C96,C192,C384">
Horizontal resolutions
Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min, 1km-merge-10min and 0.33x0.33 are only used for CLM toolsI
</entry>
Expand Down
4 changes: 2 additions & 2 deletions bld/unit_testers/build-namelist_test.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ sub make_config_cache {
#
# Figure out number of tests that will run
#
my $ntests = 814;
my $ntests = 834;
if ( defined($opts{'compare'}) ) {
$ntests += 492;
$ntests += 507;
}
plan( tests=>$ntests );

Expand Down
18 changes: 0 additions & 18 deletions cime_config/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,6 @@
<lname>2000_DATM%QIA_CLM45%BGC-CROP_SICE_SOCN_SROF_SGLC_SWAV</lname>
</compset>

<!-- Primarily for testing (stub glc needed for single-point tests); uses Qian
atmospheric forcing simply to give faster datm throughput, which is
particularly relevant for single-point cases (where datm dominates the
runtime) -->
<compset>
<alias>I2000Clm50BgcCropQianGs</alias>
<lname>2000_DATM%QIA_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I2000Clm50BgcCruGs</alias>
<lname>2000_DATM%CRUv7_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
Expand Down Expand Up @@ -319,15 +310,6 @@
<lname>HIST_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>

<!-- Primarily for testing (stub glc needed for single-point tests); uses Qian
atmospheric forcing simply to give faster datm throughput, which is
particularly relevant for single-point cases (where datm dominates the
runtime) -->
<compset>
<alias>IHistClm50BgcCropQianGs</alias>
<lname>HIST_DATM%QIA_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>

<!-- Primarily for testing, not entirely sure this configure works -->
<compset>
<alias>I2000Clm50BgcDvCrop</alias>
Expand Down
111 changes: 111 additions & 0 deletions cime_config/config_pes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,117 @@
</pes>
</mach>
</grid>
<grid name="l%C96" >
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>1152</ntasks_atm>
<ntasks_lnd>864</ntasks_lnd>
<ntasks_rof>864</ntasks_rof>
<ntasks_ice>288</ntasks_ice>
<ntasks_ocn>256</ntasks_ocn>
<ntasks_glc>1152</ntasks_glc>
<ntasks_wav>32</ntasks_wav>
<ntasks_cpl>1152</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>3</nthrds_atm>
<nthrds_lnd>3</nthrds_lnd>
<nthrds_rof>3</nthrds_rof>
<nthrds_ice>3</nthrds_ice>
<nthrds_ocn>3</nthrds_ocn>
<nthrds_glc>3</nthrds_glc>
<nthrds_wav>3</nthrds_wav>
<nthrds_cpl>3</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>864</rootpe_ice>
<rootpe_ocn>1152</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>1408</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%C192" >
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>1152</ntasks_atm>
<ntasks_lnd>864</ntasks_lnd>
<ntasks_rof>864</ntasks_rof>
<ntasks_ice>288</ntasks_ice>
<ntasks_ocn>256</ntasks_ocn>
<ntasks_glc>1152</ntasks_glc>
<ntasks_wav>32</ntasks_wav>
<ntasks_cpl>1152</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>3</nthrds_atm>
<nthrds_lnd>3</nthrds_lnd>
<nthrds_rof>3</nthrds_rof>
<nthrds_ice>3</nthrds_ice>
<nthrds_ocn>3</nthrds_ocn>
<nthrds_glc>3</nthrds_glc>
<nthrds_wav>3</nthrds_wav>
<nthrds_cpl>3</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>864</rootpe_ice>
<rootpe_ocn>1152</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>1408</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%C384">
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>3456</ntasks_atm>
<ntasks_lnd>3456</ntasks_lnd>
<ntasks_rof>3456</ntasks_rof>
<ntasks_ice>3456</ntasks_ice>
<ntasks_ocn>3456</ntasks_ocn>
<ntasks_glc>3456</ntasks_glc>
<ntasks_wav>3456</ntasks_wav>
<ntasks_cpl>3456</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%1x1|l%CLM_USRDAT" >
<mach name="any">
<pes pesize="any" compset="any">
Expand Down
36 changes: 35 additions & 1 deletion cime_config/testdefs/testlist_clm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERI_D_Ld9" grid="C96_t061" compset="I2000Clm50SpRsGs" testmods="clm/default">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:60:00</option>
</options>
</test>
<test name="ERI_D_Ld9" grid="ne30_g16" compset="I2000Clm50BgcCruGs" testmods="clm/vrtlay">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
Expand Down Expand Up @@ -204,6 +212,23 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="ERP_D_Ld5" grid="ne30_g16" compset="I1850Clm50BgcCrop" testmods="clm/default">
<machines>
<machine name="izumi" compiler="nag" category="prealpha"/>
</machines>
<options>
<option name="wallclock">00:60:00</option>
</options>
</test>
<test name="ERP_D_Ld5" grid="C96_C96_mg17" compset="IHistClm50BgcCrop" testmods="clm/allActive">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Use a transient compset so we allocate and run all PFTs (non-transient cases only allocate memory for non-zero-weight PFTs)</option>
</options>
</test>
<test name="ERP_D_Ld5" grid="f10_f10_musgs" compset="IHistClm50BgcCrop" testmods="clm/allActive">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
Expand Down Expand Up @@ -773,6 +798,15 @@
<option name="comment" >Test transient PFTs (via HIST) in conjunction with changing glacier area. This test also covers the reset_dynbal_baselines option. CISM is not answer preserving across processor changes, but short test length should be OK.</option>
</options>
</test>
<test name="ERS_D_Ld10" grid="C96_C96_mg17" compset="IHistClm50Sp" testmods="clm/decStart">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >test transient PFTs (via HIST) with a December start, reading 78-pft data and running with 16 pfts</option>
</options>
</test>
<test name="ERS_D_Ld10" grid="f10_f10_musgs" compset="IHistClm50Sp" testmods="clm/collapse_pfts_78_to_16_decStart_f10">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
Expand Down Expand Up @@ -1069,7 +1103,7 @@
<option name="wallclock">00:60:00</option>
</options>
</test>
<test name="PEM_Ld1" grid="f10_f10_musgs" compset="I2000Clm50BgcCrop" testmods="clm/crop">
<test name="PEM_Ld1" grid="f10_f10_musgs" compset="I2000Clm50BgcCropGs" testmods="clm/crop">
<machines>
<machine name="izumi" compiler="intel" category="aux_clm"/>
<machine name="izumi" compiler="intel" category="prebeta"/>
Expand Down
Loading

0 comments on commit 0544917

Please sign in to comment.