You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge branch 'dev_14_15_to_release' into release-clm5.0
From dev014 & dev015: CMIP6 compset modifiers, output usermods & fixes
Bring in all changes from ctsm1.0.dev014 and ctsm1.0.dev015:
From ctsm1.0.dev015:
(1) Support %BGC-CROP-CMIP6DECK and %BGC-CROP-CMIP6WACCMDECK compset
modifiers, so that we can turn on the necessary options
(output-related and others) via new CMIP6-specific compsets.
(2) Turn on carbon isotopes in CMIP6 runs (from Erik Kluzek)
(3) Remove setting of CCSM_BGC=CO2A in the cmip6 usermods
(4) Add usermods directories for getting typical extra output that's
wanted in many cases: output_crop, output_crop_highfreq, output_bgc,
output_bgc_highfreq, output_sp, and output_sp_highfreq. These can be
enabled by adding something like '--user-mods-dir output_crop' on
the create_newcase line (that short-hand works for an I compset; for
F or B compsets, you need to provide the full path to the usermod
directory).
(4) Allow holes in the number of history tapes. Holes are cases where,
for example, we have h0, h1 and h3 tapes, but no h2 tape (because
there are no fields on the h2 tape). (This is needed for (3).)
(5) Fix reading and writing of 1-d logical global arrays. This fixes#24 for real (rather than just preventing an attempt to
read/write 1-d logical arrays, as was done in the previous 'fix').
(6) Add C13_NBP and C14_NBP diagnostic fields (from Keith Oleson)
(7) Make a bunch of carbon isotope diagnostic fields inactive by default
(8) Don't allow interpolation (use_init_interp) from a case without
carbon isotopes to a case with carbon isotopes: Due to
#67, interpolation from a case
without carbon isotopes to a case with carbon isotopes yields
incorrect initialization values for the carbon isotopes. Now that
we're turning carbon isotopes on via some semi-out-of-the-box
usermods (for cmip6), it is becoming more important to check to make
sure someone doesn't shoot themselves in the foot this way.
(9) Add tests of the new output usermods as well as of the CMIP6 compset
modifiers
From ctsm1.0.dev014: Four miscellaneous minor, bit-for-bit bug fixes:
(1) Py3 pylint check and address cime issue ESMCI/cime#2822 (from Jim
Edwards: #526)
(2) Change uppercase DEBUG variables to lowercase debug (requested by
Jim Edwards to avoid conflicting with the DEBUG CPP token)
(Fixes#534)
(3) Remove unnecessary line of code in LunaMod.F90 that was causing
problems with some compilers due to an uninitialized variable
(Fixes#322)
(4) Add r8 to 0 constant to fix build issue with XLF compiler (from Jim
Edwards: #531)
Copy file name to clipboardExpand all lines: bld/namelist_files/namelist_definition_clm4_5.xml
+10Lines changed: 10 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -1973,6 +1973,16 @@ Flag to use the atmospheric time series of C13 concentrations from natural abund
1973
1973
Filename with time series of atmospheric Delta C13 data, which use CMIP6 format. variables in file are "time" and "delta13co2_in_air". time variable is in format: years since 1850-01-01 0:0:0.0. units are permil.
<descoption="BGCDV" >BGC (vert. resol. CN and methane) with dynamic vegetation:</desc>
31
31
<descoption="BGCDV-CROP" >BGC (vert. resol. CN and methane) with dynamic vegetation and prognostic crop:</desc>
32
+
<descoption="BGC-CROP-CMIP6DECK">BGC (vert. resol. CN and methane) with prognostic crop, with modifications appropriate for CMIP6 DECK experiments:</desc>
33
+
<descoption="BGC-CROP-CMIP6WACCMDECK">BGC (vert. resol. CN and methane) with prognostic crop, with modifications appropriate for CMIP6 WACCM DECK experiments:</desc>
32
34
</description>
33
35
34
36
<entryid="COMP_LND">
@@ -224,6 +226,19 @@
224
226
precedence over any settings for finidat in the $CASEROOT/user_clm_clm file.</desc>
<optionname="comment" >Include a long ERS test of the cmip6 configuration, though at coarse resolution</option>
993
+
<optionname="comment" >Include a long ERS test of the cmip6 configuration, though at coarse resolution. This gives a year+ test covering the output_crop usermod, which is something we want: if this is removed, we should add a test of at least a year duration covering the output_crop usermod. This test needs to use init_interp to work, because of adding virtual Antarctica columns (currently the default out-of-the-box setting uses init_interp for this).</option>
<optionname="comment" >Include a short debug test of the cmip6 configuration at the production resolution</option>
1501
+
<optionname="comment" >This gives a short debug test of the cmip6 configuration as well as a test of the cmip6 configuration at the production resolution, both of which we want. This test needs to use init_interp to work, because of adding virtual Antarctica columns (currently the default out-of-the-box setting uses init_interp for this).</option>
<optionname="comment" >The main point of this test is simply to make sure that the CMIP6WACCMDECK moifierd works. (This configuration is basically the same as I1850Clm50BgcCropCmip6, but without cmip6_glaciers_virtual_antarctica - so we don't need huge coverage of this.) Month-long so that we actually get some history output (because this test exercises a usermods directory with only monthly and yearly output).</option>
<optionname="comment">Want at least a month-long debug test covering the output_crop usermod, as well as a test covering the output_crop_highfreq usermod. (Note that we already have a year+ test of output_crop via a cmip6 test, so having this test just be a month, rather than a year, seems good enough.)</option>
<optionname="comment">Want a year-long test covering the output_bgc and output_bgc_highfreq usermods; don't want a highfreq, year-long global test because of the output volume, so this is single-point.</option>
<optionname="comment">Want a year-long test covering the output_sp and output_sp_highfreq usermods; don't want a highfreq, year-long global test because of the output volume, so this is single-point.</option>
0 commit comments