fix (fatest Landuse test): Get the FatesColdLandUse test working by u…

…sing a transient compset longname, and adjusting some things in the test-mod

cime_config/testdefs/testlist_clm.xml

@@ -3072,7 +3072,7 @@
       <option name="comment">Exact restart debug test covering Fates CNP nutrients mode.</option>
     </options>
   </test>
-  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesColdLandUse">
+  <test name="ERS_D_Ld30" grid="f45_f45_mg37" compset="HIST_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV_SESP" testmods="clm/FatesColdLandUse">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>
       <machine name="izumi" compiler="nag" category="fates"/>

cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/shell_commands

@@ -1,3 +1,7 @@
 #!/bin/bash
 
-./xmlchange CLM_BLDNML_OPTS="-clm_demand flanduse_timeseries" --append
+# Make sure the use-case is a transient one, so that that the landuse.timeeries file is used
+# TODO: Have cases that turn FATES landuse on, use transient compsets and require that they do
+#       See: https://github.com/ESCOMP/CTSM/issues/2304
+#            https://github.com/ESCOMP/CTSM/issues/1617
+./xmlchange --force CLM_NML_USE_CASE=20thC_transient

cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/user_nl_clm

@@ -1 +1,7 @@
+! FATES LandUse using the CTSM landuse timeseries file for the transitions
+! Turn off transient lakes and urban right now, until this is handled in
+! the build-namelist
+!    See:    https://github.com/ESCOMP/CTSM/issues/1617
 fates_harvest_mode = 'landuse_timeseries'
+do_transient_lakes = .false.
+do_transient_urban = .false.