Skip to content

Commit

Permalink
Merge tag 'ctsm1.0.dev028' into n_dom_landunits
Browse files Browse the repository at this point in the history
Interpolate out-of-the-box initial conditions and remove expensive tests

Two main changes (plus some small additional changes):

1. Removed / reworked some expensive tests

2. Interpolated all out-of-the-box initial conditions, so that the
   out-of-the-box version is now compatible with our current
   configuration. The changes from before were (a) our standard
   configuration now uses the gx1v7 rather than gx1v6 land mask; (b)
   many inactive points are now absent in memory.

See ESCOMP#622 for details.

- Resolves ESCOMP#312
- Partially addresses ESCOMP#275 (just a bit)

Conflicts resolved:
	doc/ChangeLog
	doc/ChangeSum
  • Loading branch information
slevis-lmwg committed Feb 26, 2019
2 parents 0d38697 + b6981ad commit 5cedfe0
Show file tree
Hide file tree
Showing 28 changed files with 380 additions and 148 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Steps for interpolating out-of-the-box initial conditions

These are the steps that should be taken when interpolating (via
`init_interp`) out-of-the-box initial conditions files. This is often done
so that we'll have out-of-the-box initial conditions files that are
compatible with the current memory allocation, etc. (thus not requiring
`init_interp` to be run all the time).

Do the following for each initial conditions file you want to
interpolate:

1. From the latest master tag, create and run a test using the
appropriate compset and resolution for this initial conditions
file. Note that there may be other options (like carbon isotopes)
that also need to be turned on. While doing this, generate
baselines. e.g., run
`SMS_Ld1.f09_g17.I1850Clm50Sp.cheyenne_intel.clm-default` or
`SMS_Ld1.f09_g17.I1850Clm50BgcCrop.cheyenne_intel.clm-ciso`, with
baseline generation.

- Confirm that the test points to the desired, original finidat file,
and that `use_init_interp` is .true. by default.

2. Rename the `finidat_interp_dest.nc` file that was generated by this
test, giving it a name that matches the original initial conditions
file, but with a new date stamp. Move this file into place
(`$CESMDATAROOT/inputdata/lnd/clm2/initdata_map/`).

3. Add global metadata to the new file, mentioning the original file,
the test used to generate this new file, the tag used to run this
test, and a summary of what is different on this new version. For
example:

```
ncatted -h -a Notes_190111,global,c,c,'Interpolated from clmi.I1850Clm50BgcCrop.1366-01-01.0.9x1.25_gx1v6_simyr1850_c171213.nc. This is the finidat_interp_dest.nc file from SMS_Ln1.f09_g17.I1850Clm50BgcCrop.cheyenne_intel, run from ctsm1.0.dev022. Updates from the previous file are: (1) uses gx1v7 rather than gx1v6; (2) many inactive points are absent.'
```

4. Using `ncdump -h`, diff the headers of the new and old files, and
make sure that there are no unexpected differences. Especially look
for missing fields on the new file, which could indicate, for
example, that carbon isotopes were turned on in the original run but
not in your new run.

5. Update `namelist_defaults_ctsm.xml` to point to the new file.

- Be sure to change any attributes in both the `finidat` entry and
the `init_interp_attributes` entry for this file. In particular, if
the old file had the attribute `use_init_interp=".true."`, this
should now be removed.

6. Rerun the one-day test for which you generated baselines, comparing
against these baselines. Check the following:

- `use_init_interp` should be .false.

- The test should use the new `finidat` file

- The test should pass and be bit-for-bit with the baseline
56 changes: 28 additions & 28 deletions bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -474,11 +474,11 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
Or one specific file will be chosen over another.
-->
<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm4_5_GSWP3v1"
>hgrid=0.9x1.25 maxpft=17 mask=gx1v6 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.false. irrigate=.false. glc_nec=10
>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.false. irrigate=.true. glc_nec=10
</init_interp_attributes>

<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm4_5_CRUv7"
>hgrid=0.9x1.25 maxpft=17 mask=gx1v6 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.false. irrigate=.false. glc_nec=10
>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.false. irrigate=.true. glc_nec=10
</init_interp_attributes>

<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm4_5_cam6.0"
Expand All @@ -487,20 +487,20 @@ attributes from the config_cache.xml file (with keys converted to upper-case).

<!-- These two needs to specify use_cn=F/T since there is a version for both, other files just use the BGC version -->
<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_GSWP3v1" use_cn=".false."
>hgrid=0.9x1.25 maxpft=17 mask=gx1v6 use_cn=.false. use_nitrif_denitrif=.false. use_vertsoilc=.false. use_crop=.false. irrigate=.true. glc_nec=10
>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_nitrif_denitrif=.false. use_vertsoilc=.false. use_crop=.false. irrigate=.true. glc_nec=10
</init_interp_attributes>

<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_GSWP3v1" use_cn=".true."
>hgrid=0.9x1.25 maxpft=79 mask=gx1v6 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.false. glc_nec=10
>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.false. glc_nec=10
</init_interp_attributes>

<!-- These two needs to specify use_cn=F/T since there is a version for both, other files just use the BGC version -->
<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_CRUv7" use_cn=".true."
>hgrid=0.9x1.25 maxpft=79 mask=gx1v6 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.false. glc_nec=10
>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_nitrif_denitrif=.true. use_vertsoilc=.true. use_crop=.true. irrigate=.false. glc_nec=10
</init_interp_attributes>

<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_CRUv7" use_cn=".false."
>hgrid=0.9x1.25 maxpft=17 mask=gx1v6 use_cn=.false. use_nitrif_denitrif=.false. use_vertsoilc=.false. use_crop=.false. irrigate=.true. glc_nec=10
>hgrid=0.9x1.25 maxpft=17 mask=gx1v7 use_cn=.false. use_nitrif_denitrif=.false. use_vertsoilc=.false. use_crop=.false. irrigate=.true. glc_nec=10
</init_interp_attributes>

<init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
Expand All @@ -516,64 +516,64 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
(if it will work on an exact match, leave use_init_interp off)
-->

<finidat hgrid="0.9x1.25" maxpft="17" mask="gx1v6" use_cn=".true." use_cndv=".false." use_fates=".false."
<finidat hgrid="0.9x1.25" maxpft="17" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" use_nitrif_denitrif=".true." use_vertsoilc=".true." sim_year="1850"
ic_tod="0" glc_nec="10" use_crop=".false." irrigate=".false." use_init_interp=".true."
ic_tod="0" glc_nec="10" use_crop=".false." irrigate=".true."
lnd_tuning_mode="clm4_5_GSWP3v1"
>lnd/clm2/initdata_map/clmi.I1850Clm45BgcGs.0901-01-01.0.9x1.25_gx1v6_simyr1850_c180204.nc
>lnd/clm2/initdata_map/clmi.I1850Clm45BgcGs.0901-01-01.0.9x1.25_gx1v7_simyr1850_c190111.nc
</finidat>

<finidat hgrid="0.9x1.25" maxpft="17" mask="gx1v6" use_cn=".true." use_cndv=".false." use_fates=".false."
<finidat hgrid="0.9x1.25" maxpft="17" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" use_nitrif_denitrif=".true." use_vertsoilc=".true." sim_year="1850"
ic_tod="0" glc_nec="10" use_crop=".false." irrigate=".false." use_init_interp=".true."
ic_tod="0" glc_nec="10" use_crop=".false." irrigate=".true."
lnd_tuning_mode="clm4_5_CRUv7"
>lnd/clm2/initdata_map/clmi.I1850Clm45BgcCruGs.1101-01-01.0.9x1.25_gx1v6_simyr1850_c180204.nc
>lnd/clm2/initdata_map/clmi.I1850Clm45BgcCruGs.1101-01-01.0.9x1.25_gx1v7_simyr1850_c190111.nc
</finidat>

<finidat hgrid="0.9x1.25" maxpft="79" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" use_nitrif_denitrif=".true." use_vertsoilc=".true." sim_year="1850"
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false." use_init_interp=".true."
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
lnd_tuning_mode="clm4_5_cam6.0"
>lnd/clm2/initdata_map/clmi.B1850.0161-01-01.0.9x1.25_gx1v7_simyr1850_c180130.nc
>lnd/clm2/initdata_map/clmi.B1850.0161-01-01.0.9x1.25_gx1v7_simyr1850_c190111.nc
</finidat>


<finidat hgrid="0.9x1.25" maxpft="17" mask="gx1v6" use_cn=".false." use_cndv=".false." use_fates=".false."
<finidat hgrid="0.9x1.25" maxpft="17" mask="gx1v7" use_cn=".false." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" use_nitrif_denitrif=".false." use_vertsoilc=".false." sim_year="1850"
ic_tod="0" glc_nec="10" use_crop=".false." irrigate=".true." use_init_interp=".true."
ic_tod="0" glc_nec="10" use_crop=".false." irrigate=".true."
lnd_tuning_mode="clm5_0_GSWP3v1"
>lnd/clm2/initdata_map/clmi.I1850Clm50Sp.0181-01-01.0.9x1.25_gx1v6_simyr1850_c171214.nc
>lnd/clm2/initdata_map/clmi.I1850Clm50Sp.0181-01-01.0.9x1.25_gx1v7_simyr1850_c190111.nc
</finidat>


<finidat hgrid="0.9x1.25" maxpft="79" mask="gx1v6" use_cn=".true." use_cndv=".false." use_fates=".false."
<finidat hgrid="0.9x1.25" maxpft="79" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" use_nitrif_denitrif=".true." use_vertsoilc=".true." sim_year="1850"
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false." use_init_interp=".true."
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
lnd_tuning_mode="clm5_0_GSWP3v1"
>lnd/clm2/initdata_map/clmi.I1850Clm50BgcCrop.1366-01-01.0.9x1.25_gx1v6_simyr1850_c171213.nc
>lnd/clm2/initdata_map/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c190116.nc
</finidat>


<finidat hgrid="0.9x1.25" maxpft="79" mask="gx1v6" use_cn=".true." use_cndv=".false." use_fates=".false."
<finidat hgrid="0.9x1.25" maxpft="79" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" use_nitrif_denitrif=".true." use_vertsoilc=".true." sim_year="1850"
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false." use_init_interp=".true."
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
lnd_tuning_mode="clm5_0_CRUv7"
>lnd/clm2/initdata_map/clmi.I1850Clm50BgcCropCru.1526-01-01.0.9x1.25_gx1v6_simyr1850_c180109b.nc
>lnd/clm2/initdata_map/clmi.I1850Clm50BgcCropCru-ciso.1526-01-01.0.9x1.25_gx1v7_simyr1850_c190116.nc
</finidat>


<finidat hgrid="0.9x1.25" maxpft="79" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" use_nitrif_denitrif=".true." use_vertsoilc=".true." sim_year="1850"
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false." use_init_interp=".true."
ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
lnd_tuning_mode="clm5_0_cam6.0"
>lnd/clm2/initdata_map/clmi.B1850.0161-01-01.0.9x1.25_gx1v7_simyr1850_c180130.nc
>lnd/clm2/initdata_map/clmi.B1850.0161-01-01.0.9x1.25_gx1v7_simyr1850_c190111.nc
</finidat>

<finidat hgrid="0.9x1.25" maxpft="17" mask="gx1v6" use_cn=".false." use_cndv=".false." use_fates=".false."
<finidat hgrid="0.9x1.25" maxpft="17" mask="gx1v7" use_cn=".false." use_cndv=".false." use_fates=".false."
ic_ymd="18500101" use_nitrif_denitrif=".false." use_vertsoilc=".false." sim_year="1850"
ic_tod="0" glc_nec="10" use_crop=".false." irrigate=".true." use_init_interp=".true."
ic_tod="0" glc_nec="10" use_crop=".false." irrigate=".true."
lnd_tuning_mode="clm5_0_CRUv7"
>lnd/clm2/initdata_map/clmi.I1850Clm50SpCru.1706-01-01.0.9x1.25_gx1v6_simyr1850_c180110.nc
>lnd/clm2/initdata_map/clmi.I1850Clm50SpCru.1706-01-01.0.9x1.25_gx1v7_simyr1850_c190111.nc
</finidat>


Expand Down
Loading

0 comments on commit 5cedfe0

Please sign in to comment.