Merge tag 'ctsm5.2.017' into fix/excess-ice-cold-start

Dust emissions control moved to cmeps

Remove the dust emissions namelist items from CTSM and use the namelist in the drv_flds_in for CMEPS.

This updates CTSM to use the namelist control in CMEPS (in ESCOMP/CMEPS#429). So the CMEPS external needs to be updated, and the
namelist control in CTSM changed to use CMEPS rather than the internal CTSM control settings and the CTSM ones removed.

The new XML variable:

   LND_SETS_DUST_EMIS_DRV_FLDS

controls whether dust emission settings are set by CTSM or by CAM. Only one or the other can set them, and it's required so when CAM
and CTSM are running together they need to know which one will select.

This required some changes for LILAC. The drv_flds_in namelist file is now required for LILAC, and read for dust emissions
(and dust emissions only) at the LILAC lnd_comp_esmf.F90 level.

Add a unit test for the CMEPS code to make sure it's working correctly. This validates the code both for CAM and CTSM.

Fix the cidinahoBR test in the build-namelist unit tester.

 Conflicts:
	bld/unit_testers/build-namelist_test.pl
	src/biogeophys/TemperatureType.F90

.git-blame-ignore-revs

@@ -26,6 +26,7 @@ d866510188d26d51bcd6d37239283db690af7e82
 0dcd0a3c1abcaffe5529f8d79a6bc34734b195c7
 e096358c832ab292ddfd22dd5878826c7c788968
 475831f0fb0e31e97f630eac4e078c886558b61c
+fd5f177131d63d39e79a13918390bdfb642d781e
 # Ran SystemTests and python/ctsm through black python formatter
 5364ad66eaceb55dde2d3d598fe4ce37ac83a93c
 8056ae649c1b37f5e10aaaac79005d6e3a8b2380
@@ -36,6 +37,7 @@ e096358c832ab292ddfd22dd5878826c7c788968
 6fccf682eaf718615407d9bacdd3903b8786a03d
 2500534eb0a83cc3aff94b30fb62e915054030bf
 78d05967c2b027dc9776a884716597db6ef7f57c
+47839a77229c61555e3b8932927bb54cdc511b27
 a0d014fae9550dd9ffbc934abd29ef16176f8208
 c7b7ca1d94ac19abb9ecea9fb5b712ddbdd6645d
 b565b55ce7a9f8d812a573d716a5fd3d78cfea81
@@ -46,4 +48,6 @@ aa04d1f7d86cc2503b98b7e2b2d84dbfff6c316b
 6c6f57e948bfa31e60b383536cc21663fedb8b70
 9660667b1267dcd4150889f5f39db540158be74a
 665cf86102e09b4c4c5a140700676dca23bc55a9
+1a49e547ba3c48fa483f9ae81a8f05adcd6b888c
 045d90f1d80f713eb3ae0ac58f6c2352937f1eb0
+753fda3ff0147837231a73c9c728dd9ce47b5997

.gitmodules

@@ -28,31 +28,31 @@
 [submodule "fates"]
 path = src/fates
 url = https://github.com/NGEET/fates
-fxtag = sci.1.73.0_api.35.0.0
+fxtag = sci.1.77.1_api.36.0.0
 fxrequired = AlwaysRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/NCAR/fates-release
 
 [submodule "cism"]
 path = components/cism
 url = https://github.com/ESCOMP/CISM-wrapper
-fxtag = cismwrap_2_2_001
+fxtag = cismwrap_2_2_002
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
 
 [submodule "rtm"]
 path = components/rtm
 url = https://github.com/ESCOMP/RTM
-fxtag = rtm1_0_79
+fxtag = rtm1_0_80
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/RTM
 
 [submodule "mosart"]
 path = components/mosart
 url = https://github.com/ESCOMP/MOSART
-fxtag = mosart1_0_49
+fxtag = mosart1.1.02
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
@@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
 [submodule "ccs_config"]
 path = ccs_config
 url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm0.0.106
+fxtag = ccs_config_cesm1.0.0
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
@@ -84,7 +84,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps0.14.63
+fxtag = cmeps0.14.77
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

bld/env_run.xml

@@ -9,6 +9,7 @@ Sample env_run.xml file that allows build-namelist to be run for testing in this
 -->
 <entry id="DIN_LOC_ROOT"         value="MYDINLOCROOT"  /> 
 <entry id="GLC_TWO_WAY_COUPLING" value="FALSE"         /> 
+<entry id="LND_SETS_DUST_EMIS_DRV_FLDS" value="TRUE"   /> 
 <entry id="NEONSITE"             value=""              /> 
 
 </config_definition>

bld/namelist_files/namelist_defaults_dust_emis.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet type="text/xsl" href="namelist_defaults.xsl"?>
+
+<namelist_defaults>
+
+<!--
+Values to use by default for creation of CLM model driver namelists.
+The element names are the same as the corresponding namelist
+variables.  Values that depend on the model configuration use
+attributes to express the dependency.  The recognized attributes
+are: RESOLUTION, defaults, mask, ic_ymd, ic_tod, sim_year and all configuration
+attributes from the config_cache.xml file (with keys converted to upper-case).
+-->
+
+<!-- Defaults for dust_emis_inparm namelist  -->
+<dust_emis_method>Zender_2003</dust_emis_method>
+
+<zender_soil_erod_source>atm</zender_soil_erod_source>
+
+</namelist_defaults>

bld/namelist_files/namelist_defaults_overall.xml

@@ -62,6 +62,7 @@ determine default values for namelists.
 <res sitespf_pt="1x1_urbanc_alpha"   >1x1_urbanc_alpha</res>
 <res sitespf_pt="1x1_numaIA"         >1x1_numaIA</res>
 <res sitespf_pt="1x1_smallvilleIA"   >1x1_smallvilleIA</res>
+<res sitespf_pt="1x1_cidadinhoBR"    >1x1_cidadinhoBR</res>
 
 <!-- Default simulation year -->
 <sim_year>2000</sim_year>
@@ -110,6 +111,7 @@ determine default values for namelists.
 <mask hgrid="1x1_urbanc_alpha"    >test</mask>
 <mask hgrid="1x1_numaIA"          >navy</mask>
 <mask hgrid="1x1_smallvilleIA"    >test</mask>
+<mask hgrid="1x1_cidadinhoBR"     >test</mask>
 <mask                             >gx1v7</mask>
 
 <!-- Default glacier model options -->