diff --git a/cime_config/tests.py b/cime_config/tests.py
index 19ef3a4477cf..dac370d4ceb2 100644
--- a/cime_config/tests.py
+++ b/cime_config/tests.py
@@ -53,7 +53,8 @@
             "ERS.ELM_USRDAT.I1850CNPRDCTCBC.elm-snowveg_arctic",
             "ERS.ELM_USRDAT.I1850CNPRDCTCBC.elm-usrpft_default_I1850CNPRDCTCBC",
             "ERS.ELM_USRDAT.I1850CNPRDCTCBC.elm-usrpft_codetest_I1850CNPRDCTCBC",
-            "ERS.1x1_icycape.I1850GSWCNPRDCTCBC.elm-polygonal_tundra"
+            "ERS.1x1_icycape.I1850GSWCNPRDCTCBC.elm-polygonal_tundra",
+            "SMS_Ly1.ELM_USRDAT.I1850CNPRDCTCBC.elm-kilocraft",
             )
         },
 
diff --git a/components/data_comps/datm/cime_config/config_component.xml b/components/data_comps/datm/cime_config/config_component.xml
index 5b884ecd1ad1..2478e0f3fef5 100644
--- a/components/data_comps/datm/cime_config/config_component.xml
+++ b/components/data_comps/datm/cime_config/config_component.xml
@@ -10,12 +10,14 @@
        This file may have atm desc entries.
   -->
   <description modifier_mode="1">
-    <desc atm="DATM[%QIA][%WISOQIA][%CRU][%CRUv7][%GSWP3v1][%ERA5][%ERA56HR][%GSWP3w5e5][%MOSARTTEST][%NLDAS2][%CPLHIST][%E3SMWCv2][%CPLWCH][%1PT][%NYF][%IAF][%JRA][%JRA-1p5][%JRA-1p5-2023][%JRA-1p4-2018][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%CFSv2][%CFSR]"> Data driven ATM </desc>
+    <desc atm="DATM[%QIA][%WISOQIA][%CRU][%CRUv7][%GSWP3v1][%DaymetGSWP3][%DaymetERA5][%ERA5][%ERA56HR][%GSWP3w5e5][%MOSARTTEST][%NLDAS2][%CPLHIST][%E3SMWCv2][%CPLWCH][%1PT][%NYF][%IAF][%JRA][%JRA-1p5][%JRA-1p5-2023][%JRA-1p4-2018][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%CFSv2][%CFSR]"> Data driven ATM </desc>
     <desc option="QIA"> QIAN data set </desc>
     <desc option="WISOQIA">QIAN with water isotopes</desc>
     <desc option="CRU"> CRUNCEP data set </desc>
     <desc option="CRUv7"> CLM CRU NCEP v7 data set </desc>
     <desc option="GSWP3v1"> GSWP3v1 data set </desc>
+    <desc option="DaymetGSWP3"> Daymet NA data set, sub-daily downscaled with GSWP3 </desc>
+    <desc option="DaymetERA5"> Daymet NA data set, sub-daily downscaled with ERA5 for TESSFA project </desc>
     <desc option="ERA5"> Fifth generation ECMWF reanalysis </desc>
     <desc option="ERA56HR"> Fifth generation ECMWF reanalysis,6 hourly data </desc>
     <desc option="GSWP3w5e5"> GSWP3w5e5 data set </desc>
@@ -49,7 +51,7 @@
 
   <entry id="DATM_MODE">
     <type>char</type>
-    <valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,CLM1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,ELMERA5,ERA56HR,ELMGSWP3w5e5,CLMMOSARTTEST,CLMNLDAS2,CPLHIST,E3SMWCv2,CPLWCH,CORE_IAF_JRA,IAF_JRA_1p5,CORE_IAF_JRA_1p4_2018,CORE_RYF8485_JRA,CORE_RYF9091_JRA,CORE_RYF0304_JRA,CFSv2,CFSR</valid_values>
+    <valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,CLM1PT,CLMCRUNCEP,CLMCRUNCEPv7,CLMGSWP3v1,uELM_NA,uELM_TES,ELMERA5,ERA56HR,ELMGSWP3w5e5,CLMMOSARTTEST,CLMNLDAS2,CPLHIST,E3SMWCv2,CPLWCH,CORE_IAF_JRA,IAF_JRA_1p5,CORE_IAF_JRA_1p4_2018,CORE_RYF8485_JRA,CORE_RYF9091_JRA,CORE_RYF0304_JRA,CFSv2,CFSR</valid_values>
     <default_value>CORE2_NYF</default_value>
     <group>run_component_datm</group>
     <file>env_run.xml</file>
@@ -59,6 +61,8 @@
       WARNING for CLMNLDAS2: This is a regional forcing dataset over the U.S. (25-53N, 235-293E). Garbage data will be produced for runs extending beyond this regional domain. 
       WARNING for CLMGSWP3v1: Humidity is identically zero for last time step in Dec/2013 and all of 2014 so you should NOT use 2014
 data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
+      uELM_NA are GSWP3v2 downscaled with Daymet v4 for North America at km resolution (ultra-high res. land model).
+      uELM_TES are ERA5 downscaled with Daymet v4 for TESSFA at 4km resolution (ultra-high res. land model).
     </desc>
     <values match="last">
       <value compset="%NYF">CORE2_NYF</value>
@@ -75,6 +79,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
       <value compset="%CRU">CLMCRUNCEP</value>
       <value compset="%CRUv7">CLMCRUNCEPv7</value>
       <value compset="%GSWP3v1">CLMGSWP3v1</value>
+      <value compset="%DaymetGSWP3">uELM_NA</value>
+      <value compset="%DaymetERA5">uELM_TES</value>
       <value compset="%ERA5">ELMERA5</value>
       <value compset="%ERA56HR">ERA56HR</value>
       <value compset="%GSWP3w5e5">ELMGSWP3w5e5</value>
@@ -378,6 +384,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
       <value compset="1850.*_DATM%QIA">1</value>
       <value compset="1850.*_DATM%CRU">1</value>
       <value compset="1850.*_DATM%GSW">1</value>
+      <value compset="1850.*_DATM%DaymetGSWP3">1</value>
+      <value compset="1850.*_DATM%DaymetERA5">1</value> 
       <value compset="HIST.*_DATM%QIA">1895</value>
       <value compset="HIST.*_DATM%CRU">1901</value>
       <value compset="HIST.*_DATM%GSW">1901</value>
@@ -385,6 +393,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
       <value compset="20TR.*_DATM%QIA">1895</value>
       <value compset="20TR.*_DATM%CRU">1901</value>
       <value compset="20TR.*_DATM%GSW">1901</value>
+      <value compset="20TR.*_DATM%DaymetGSWP3">1980</value>      
+      <value compset="20TR.*_DATM%DaymetERA5">1980</value>
       <value compset="SSP.*_DATM%QIA">$DATM_CLMNCEP_YR_START</value>
       <value compset="SSP.*_DATM%CRU">$DATM_CLMNCEP_YR_START</value>
       <value compset="SSP.*_DATM%GSW">$DATM_CLMNCEP_YR_START</value>
@@ -414,6 +424,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
       <value compset="1850.*_DATM%QIA">1948</value>
       <value compset="1850.*_DATM%CRU">1901</value>
       <value compset="1850.*_DATM%GSW">1901</value>
+      <value compset="1850.*_DATM%DaymetGSWP3">1980</value>
+      <value compset="1850.*_DATM%DaymetERA5">1980</value>  
       <value compset="1850.*_DATM%NLDAS2">0</value>  <!-- Unsupported -->
       <value compset="2000.*_DATM%WISOQIA">2000</value>
       <value compset="2000.*_DATM%QIA">1972</value>
@@ -424,6 +436,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
       <value compset="20TR.*_DATM%QIA">1948</value>
       <value compset="20TR.*_DATM%CRU">1901</value>
       <value compset="20TR.*_DATM%GSW">1901</value>
+      <value compset="20TR.*_DATM%DaymetGSWP3">1980</value> 
+      <value compset="20TR.*_DATM%DaymetERA5">1980</value>
       <value compset="20TR.*_DATM%NLDAS2">0</value>  <!-- Unsupported -->
       <value compset="4804.*_DATM%QIA">1948</value>
       <value compset="SSP.*_DATM%QIA" >1995</value>
@@ -460,6 +474,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
       <value   compset="1850.*_DATM%CRU">1920</value>
       <value   compset="1850.*_DATM%GSW">1920</value>
       <value   compset="1850.*_DATM%GSWP3w5e5">1920</value>
+      <value   compset="1850.*_DATM%DaymetGSWP3">2014</value>
+      <value   compset="1850.*_DATM%DaymetERA5">2023</value>
       <value   compset="1850.*_DATM%NLDAS2">-1</value>  <!-- Unsupported -->
       <value   compset="2000.*_DATM%WISOQIA">2004</value>
       <value   compset="2000.*_DATM%QIA">2004</value>
@@ -472,6 +488,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
       <value   compset="20TR.*_DATM%CRU">1920</value>
       <value   compset="20TR.*_DATM%GSW">1920</value>
       <value   compset="20TR.*_DATM%GSWP3w5e5">1920</value>
+      <value   compset="20TR.*_DATM%DaymetGSWP3">2014</value>
+      <value   compset="20TR.*_DATM%DaymetERA5">2023</value> 
       <value   compset="20TR.*_DATM%NLDAS2">-1</value>  <!-- Unsupported -->
       <value   compset="4804.*_DATM%QIA">2004</value>
       <value   compset="SSP.*_DATM%QIA">2004</value>
diff --git a/components/data_comps/datm/cime_config/namelist_definition_datm.xml b/components/data_comps/datm/cime_config/namelist_definition_datm.xml
index 66689d1c933e..9e77e8fd36d0 100644
--- a/components/data_comps/datm/cime_config/namelist_definition_datm.xml
+++ b/components/data_comps/datm/cime_config/namelist_definition_datm.xml
@@ -36,6 +36,8 @@
     CLMCRUNCEP		= Run with the CLM CRU NCEP V4 ( default ) forcing valid from 1900 to 2010 (force CLM)
     CLMCRUNCEPv7 	= Run with the CLM CRU NCEP V7 forcing valid from 1900 to 2010 (force CLM)
     CLMGSWP3v1		= Run with the CLM GSWP3 V1 forcing (force CLM)
+    uELM_NA   = Run with the uELM GSWP3/daymet forcing (force high res. ELM)
+    uELM_TES   = Run with the uELM ERA5/daymet forcing (force high res. ELM) 
     ELMERA5             = Run with the ELM fifth generation ECMWF reanalysis from 1979 to present
     ERA56HR             = Run with the ELM fifth generation ECMWF reanalysis from 1979 to present
     ELMGSWP3w5e5        = Run with the ELM GSWP3-w5e5 forcing (force ELM)
@@ -143,6 +145,17 @@
     ELMGSWP3w5e5.Precip
     ELMGSWP3w5e5.TPQW
 
+    uELM_NA.FSDS
+    uELM_NA.FLDS
+    uELM_NA.TBOT
+    uELM_NA.QBOT
+    uELM_NA.PRECTmms
+    uELM_NA.PSRF
+    uELM_NA.WIND
+
+    uELM_TES.Prec
+    uELM_TES.Solr
+    uELM_TES.TPHWL
 
     CLMMOSARTTEST
 
@@ -250,6 +263,8 @@
       <value datm_mode="ELMERA5">ELMERA5.msdrswrf,ELMERA5.msdfswrf,ELMERA5.mcpr,ELMERA5.mlspr,ELMERA5.t2m,ELMERA5.sp,ELMERA5.d2m,ELMERA5.w10,ELMERA5.msdwlwrf</value>
       <value datm_mode="ERA56HR">ERA56HR.msdrswrf,ERA56HR.msdfswrf,ERA56HR.mcpr,ERA56HR.mlspr,ERA56HR.t2m,ERA56HR.sp,ERA56HR.d2m,ERA56HR.w10,ERA56HR.msdwlwrf</value>
       <value datm_mode="ELMGSWP3w5e5">ELMGSWP3w5e5.Solar,ELMGSWP3w5e5.Precip,ELMGSWP3w5e5.TPQW</value>
+      <value datm_mode="uELM_NA">uELM_NA.FSDS,uELM_NA.FLDS,uELM_NA.TBOT,uELM_NA.QBOT,uELM_NA.PRECTmms,uELM_NA.PSRF,uELM_NA.WIND</value>
+      <value datm_mode="uELM_TES">uELM_TES.Prec,uELM_TES.Solr,uELM_TES.TPQWL</value> 
       <value datm_mode="CLMMOSARTTEST">CLMMOSARTTEST</value>
       <value datm_mode="CLMNLDAS2">CLMNLDAS2.Solar,CLMNLDAS2.Precip,CLMNLDAS2.TPQW</value>
       <value datm_mode="CORE2_NYF" >CORE2_NYF.GISS,CORE2_NYF.GXGXS,CORE2_NYF.NCEP</value>
@@ -289,6 +304,8 @@
       <value stream="ELMERA5">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.ERA.0.25d.v5.c180614</value>
       <value stream="ERA56HR">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614</value>
       <value stream="ELMGSWP3w5e5">$DIN_LOC_ROOT/share/domains</value>
+      <value stream="uELM_NA">$DIN_LOC_ROOT/share/domains/domain.clm/</value>
+      <value stream="uELM_TES">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
       <value stream="CLMCRUNCEP\.">$DIN_LOC_ROOT/share/domains/domain.clm</value>
       <value stream="CLMCRUNCEP_V5">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.cruncep_qianFill.0.5d.V5.c140715</value>
       <value stream="CLMGSWP3">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.GSWP3.0.5d.v1.c170516</value>
@@ -366,6 +383,8 @@
       <value stream="ELMERA5">domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc</value>
       <value stream="ERA56HR">domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc</value>
       <value stream="ELMGSWP3w5e5">domain.lnd.360x720_gswp3.0v1.c170606.nc</value>
+      <value stream="uELM_NA">MOF21_domain.lnd.Daymet_NA.1km.1d.c240524.nc</value>
+      <value stream="uELM_TES">domain.lnd.Daymet.km.1d.nc</value>
       <value stream="CLMMOSARTTEST">domain.lnd.nldas2_0224x0464_c110415.nc</value>
       <value stream="CLMNLDAS2">domain.lnd.0.125nldas2_0.125nldas2.190410.nc</value>
       <value stream="CORE2_NYF.GISS">nyf.giss.T62.051007.nc</value>
@@ -589,6 +608,16 @@
       <value stream="ERA56HR.d2m">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/tdew</value>
       <value stream="ERA56HR.w10">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/wind</value>
       <value stream="ERA56HR.msdwlwrf">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/lwdn</value>
+      <value stream="uELM_NA.FSDS">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_NA.FLDS">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_NA.TBOT">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_NA.QBOT">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_NA.PRECTmms">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_NA.PSRF">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_NA.WIND">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_TES.Prec">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_TES.Solr">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
+      <value stream="uELM_TES.TPQWL">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.km.1d</value>
       <value stream="CLMMOSARTTEST">$DIN_LOC_ROOT/atm/datm7/NLDAS</value>
       <value stream="CLMNLDAS2.Solar">$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.NLDAS2.0.125d.v1/Solar</value>
       <value stream="CLMNLDAS2.Precip">$DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.NLDAS2.0.125d.v1/Precip</value>
@@ -701,6 +730,17 @@
       <value  stream="ELMGSWP3w5e5.Solar">gswp_w5e5.Solr.%ym.nc</value>
       <value  stream="ELMGSWP3w5e5.Precip">gswp_w5e5.Prec.%ym.nc</value>
       <value  stream="ELMGSWP3w5e5.TPQW">gswp_w5e5.TPQWL.%ym.nc</value>
+      <value stream="uELM_NA.FSDS">MOF21_clmforc.Daymet4.1km.1d.FSDS.%ym.nc</value>
+      <value stream="uELM_NA.FLDS">MOF21_clmforc.Daymet4.1km.1d.FLDS.%ym.nc</value>
+      <value stream="uELM_NA.TBOT">MOF21_clmforc.Daymet4.1km.1d.TBOT.%ym.nc</value>
+      <value stream="uELM_NA.QBOT">MOF21_clmforc.Daymet4.1km.1d.QBOT.%ym.nc</value>
+      <value stream="uELM_NA.PRECTmms">MOF21_clmforc.Daymet4.1km.1d.PRECTmms.%ym.nc</value>
+      <value stream="uELM_NA.PSRF">MOF21_clmforc.Daymet4.1km.1d.PSRF.%ym.nc</value>
+      <value stream="uELM_NA.WIND">MOF21_clmforc.Daymet4.1km.1d.WIND.%ym.nc</value>
+
+      <value stream="uELM_TES.Prec">clmforc.Daymet.km.1d.Prec.%ym.nc</value>
+      <value stream="uELM_TES.Solr">clmforc.Daymet.km.1d.Solr.%ym.nc</value>
+      <value stream="uELM_TES.TPQWL">clmforc.Daymet.km.1d.TPQWL.%ym.nc</value>
       <value  stream="CLMMOSARTTEST">clmforc.nldas.%ym.nc</value>
       <value  stream="CLMNLDAS2.Solar">ctsmforc.NLDAS2.0.125d.v1.Solr.%ym.nc</value>
       <value  stream="CLMNLDAS2.Precip">ctsmforc.NLDAS2.0.125d.v1.Prec.%ym.nc</value>
@@ -1760,6 +1800,43 @@
       <value  stream="ERA56HR.msdfswrf">
         msdfswrf    swdndf
       </value>
+
+      <value  stream="uELM_NA.FSDS">
+        FSDS swdn
+      </value>
+      <value  stream="uELM_NA.PRECTmms">
+        PRECTmms precn
+      </value>
+      <value  stream="uELM_NA.TBOT">
+        TBOT     tbot
+      </value>
+      <value  stream="uELM_NA.WIND">
+        WIND     wind
+      </value>
+      <value  stream="uELM_NA.QBOT">
+        QBOT     shum
+      </value>
+      <value  stream="uELM_NA.PSRF">
+        PSRF     pbot
+      </value>
+      <value  stream="uELM_NA.FLDS">
+        FLDS     lwdn
+      </value>
+
+      <value  stream="uELM_TES.Prec">
+        PRECTmms precn
+      </value>
+      <value  stream="uELM_TES.Solr">
+        FSDS swdn
+      </value>
+      <value  stream="uELM_TES.TPQWL">
+        TBOT     tbot
+        QBOT     shum
+        PSRF     pbot
+        FLDS     lwdn
+        WIND     wind                        
+      </value>
+
       <value  stream="ERA56HR.mcpr">
         mcpr    precc
       </value>
@@ -2075,6 +2152,8 @@
       <value stream="ELMERA5">$DATM_CLMNCEP_YR_ALIGN</value>
       <value stream="ERA56HR">$DATM_CLMNCEP_YR_ALIGN</value>
       <value stream="ELMGSWP3w5e5">$DATM_CLMNCEP_YR_ALIGN</value>
+      <value stream="uELM_NA">$DATM_CLMNCEP_YR_ALIGN</value>
+      <value stream="uELM_TES">$DATM_CLMNCEP_YR_ALIGN</value>
       <value stream="CLMMOSARTTEST">$DATM_CLMNCEP_YR_ALIGN</value>
       <value stream="CLMNLDAS2">$DATM_CLMNCEP_YR_ALIGN</value>
       <value stream="CORE2_NYF">1</value>
@@ -2133,6 +2212,8 @@
       <value stream="ELMERA5">$DATM_CLMNCEP_YR_START</value>
       <value stream="ERA56HR">$DATM_CLMNCEP_YR_START</value>
       <value stream="ELMGSWP3w5e5">$DATM_CLMNCEP_YR_START</value>
+      <value stream="uELM_NA">$DATM_CLMNCEP_YR_START</value>
+      <value stream="uELM_TES">$DATM_CLMNCEP_YR_START</value>
       <value stream="CLMMOSARTTEST">$DATM_CLMNCEP_YR_START</value>
       <value stream="CLMNLDAS2">$DATM_CLMNCEP_YR_START</value>
       <value stream="CORE2_NYF">1</value>
@@ -2213,6 +2294,8 @@
       <value stream="ELMERA5">$DATM_CLMNCEP_YR_END  </value>
       <value stream="ERA56HR">$DATM_CLMNCEP_YR_END  </value>
       <value stream="ELMGSWP3w5e5">$DATM_CLMNCEP_YR_END  </value>
+      <value stream="uELM_NA">$DATM_CLMNCEP_YR_END</value>
+      <value stream="uELM_TES">$DATM_CLMNCEP_YR_END</value>  
       <value stream="CLMMOSARTTEST">$DATM_CLMNCEP_YR_END  </value>
       <value stream="CLMNLDAS2">$DATM_CLMNCEP_YR_END  </value>
       <value stream="CORE2_NYF">1</value>
@@ -2380,6 +2463,7 @@
       <value datm_mode="CLM">CLMNCEP</value>
       <value datm_mode="ELMERA5">CLMNCEP</value>
       <value datm_mode="ERA56HR">CLMNCEP</value>
+      <value datm_mode="uELM">CLMNCEP</value>
       <value datm_mode="ELM">CLMNCEP</value>
       <value datm_mode="CORE2_NYF">CORE2_NYF</value>
       <value datm_mode="CORE2_IAF">CORE2_IAF</value>
@@ -2507,6 +2591,8 @@
       <value stream="CLMCRUNCEP" atm_grid="hcru">copy</value>
       <value stream="CLMGSWP3" atm_grid="hcru">copy</value>
       <value stream="ELMGSWP3w5e5" atm_grid="hcru">copy</value>
+      <value stream="uELM_NA">copy</value>
+      <value stream="uELM_TES">copy</value> 
       <value stream="CLMNLDAS2" atm_grid="0.125nldas2">copy</value>
       <value stream="co2tseries">nn</value>
     </values>
@@ -2604,6 +2690,16 @@
       <value stream="ERA56HR.msdwlwrf">linear</value>
       <value stream="ELMGSWP3w5e5.Solar">coszen</value>
       <value stream="ELMGSWP3w5e5.Precip">nearest</value>
+      <value stream="uELM_NA.FSDS">coszen</value>
+      <value stream="uELM_NA.PRECTmms">nearest</value>
+      <value stream="uELM_NA.FLDS">linear</value>
+      <value stream="uELM_NA.TBOT">linear</value>
+      <value stream="uELM_NA.QBOT">linear</value>
+      <value stream="uELM_NA.PSRF">linear</value>
+      <value stream="uELM_NA.WIND">linear</value>
+      <value stream="uELM_TES.Solr">coszen</value>
+      <value stream="uELM_TES.Prec">nearest</value>
+      <value stream="uELM_TES.TPHWL">linear</value> 
       <value stream="CLMNLDAS2.Solar">coszen</value>
       <value stream="CLMNLDAS2.Precip">nearest</value>
       <value stream="BC.CRUNCEP.GPCP.Precip">nearest</value>
@@ -2649,6 +2745,7 @@
       <value stream="co2tseries.SSP">extend</value>
       <value datm_mode="CLM1PT">extend</value>
       <value atm_grid="CLM_USRDAT">cycle</value>
+      <value atm_grid="ELM_USRDAT">cycle</value>
     </values>
   </entry>
 
diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/kilocraft/shell_commands b/components/elm/cime_config/testdefs/testmods_dirs/elm/kilocraft/shell_commands
new file mode 100644
index 000000000000..caad6dceead4
--- /dev/null
+++ b/components/elm/cime_config/testdefs/testmods_dirs/elm/kilocraft/shell_commands
@@ -0,0 +1,11 @@
+./xmlchange DATM_MODE=uELM_NA
+./xmlchange DATM_CLMNCEP_YR_END=1948
+./xmlchange DATM_CLMNCEP_YR_START=2014
+./xmlchange DATM_CLMNCEP_YR_END=2014
+./xmlchange ATM_NCPL=24
+
+./xmlchange ATM_DOMAIN_PATH='$DIN_LOC_ROOT/share/domains/domain.clm'
+./xmlchange LND_DOMAIN_PATH='$DIN_LOC_ROOT/share/domains/domain.clm'
+./xmlchange ATM_DOMAIN_FILE="MOF21_domain.lnd.Daymet_NA.1km.1d.c240524.nc"
+./xmlchange LND_DOMAIN_FILE="MOF21_domain.lnd.Daymet_NA.1km.1d.c240524.nc"
+./xmlchange NTASKS=1
diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/kilocraft/user_nl_elm b/components/elm/cime_config/testdefs/testmods_dirs/elm/kilocraft/user_nl_elm
new file mode 100644
index 000000000000..74585f1673fb
--- /dev/null
+++ b/components/elm/cime_config/testdefs/testmods_dirs/elm/kilocraft/user_nl_elm
@@ -0,0 +1 @@
+fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/MOF21_surfdata.Daymet_NA.1km.1d.c240524.nc'