Include PRISM precipitation data stream

cime_config/config_component.xml

@@ -244,7 +244,9 @@
     <desc>Dataset name for user-created datasets. This is used as the argument
       in Buildconf/clm.buildnml to build-namelist -clm_usr_name. An example of
       such a dataset would be 1x1pt_boulderCO_c090722. The default value is UNSET.
-      This is an advanced flag and should only be used by expert users.</desc>
+      This is an advanced flag and should only be used by expert users. For NEON
+      cases, this can be set to either NEON or NEON.PRISM, the latter of which would
+      PRISM precipitation instead of the default NEON precipitation. </desc>
   </entry>
 
   <entry id="CLM_USRDAT_DIR">
@@ -295,6 +297,26 @@
       ABBY,BLAN,CPER,DEJU,GRSM,HEAL,KONA,LENO,NIWO,ONAQ,PUUM,SERC,SRER,TALL,TREE,WOOD,
       BARR,BONA,DCFS,DELA,GUAN,JERC,KONZ,MLBS,NOGP,ORNL,RMNP,SJER,STEI,TEAK,UKFS,WREF,
       BART,CLBJ,DSNY,HARV,JORN,LAJA,MOAB,OAES,OSBS,SCBI,SOAP,STER,TOOL,UNDE,YELL,
+      NEON_PRECIP.ABBY,NEON_PRECIP.BLAN,NEON_PRECIP.CPER,NEON_PRECIP.DEJU,NEON_PRECIP.GRSM,
+      NEON_PRECIP.HEAL,NEON_PRECIP.KONA,NEON_PRECIP.LENO,NEON_PRECIP.NIWO,NEON_PRECIP.ONAQ,
+      NEON_PRECIP.PUUM,NEON_PRECIP.SERC,NEON_PRECIP.SRER,NEON_PRECIP.TALL,NEON_PRECIP.TREE,
+      NEON_PRECIP.WOOD,NEON_PRECIP.BARR,NEON_PRECIP.BONA,NEON_PRECIP.DCFS,NEON_PRECIP.DELA,
+      NEON_PRECIP.GUAN,NEON_PRECIP.JERC,NEON_PRECIP.KONZ,NEON_PRECIP.MLBS,NEON_PRECIP.NOGP,
+      NEON_PRECIP.ORNL,NEON_PRECIP.RMNP,NEON_PRECIP.SJER,NEON_PRECIP.STEI,NEON_PRECIP.TEAK,
+      NEON_PRECIP.UKFS,NEON_PRECIP.WREF,NEON_PRECIP.BART,NEON_PRECIP.CLBJ,NEON_PRECIP.DSNY,
+      NEON_PRECIP.HARV,NEON_PRECIP.JORN,NEON_PRECIP.LAJA,NEON_PRECIP.MOAB,NEON_PRECIP.OAES,
+      NEON_PRECIP.OSBS,NEON_PRECIP.SCBI,NEON_PRECIP.SOAP,NEON_PRECIP.STER,NEON_PRECIP.TOOL,
+      NEON_PRECIP.UNDE,NEON_PRECIP.YELL,
+      PRISM_PRECIP.ABBY,PRISM_PRECIP.BLAN,PRISM_PRECIP.CPER,PRISM_PRECIP.DEJU,PRISM_PRECIP.GRSM,
+      PRISM_PRECIP.HEAL,PRISM_PRECIP.KONA,PRISM_PRECIP.LENO,PRISM_PRECIP.NIWO,PRISM_PRECIP.ONAQ,
+      PRISM_PRECIP.PUUM,PRISM_PRECIP.SERC,PRISM_PRECIP.SRER,PRISM_PRECIP.TALL,PRISM_PRECIP.TREE,
+      PRISM_PRECIP.WOOD,PRISM_PRECIP.BARR,PRISM_PRECIP.BONA,PRISM_PRECIP.DCFS,PRISM_PRECIP.DELA,
+      PRISM_PRECIP.GUAN,PRISM_PRECIP.JERC,PRISM_PRECIP.KONZ,PRISM_PRECIP.MLBS,PRISM_PRECIP.NOGP,
+      PRISM_PRECIP.ORNL,PRISM_PRECIP.RMNP,PRISM_PRECIP.SJER,PRISM_PRECIP.STEI,PRISM_PRECIP.TEAK,
+      PRISM_PRECIP.UKFS,PRISM_PRECIP.WREF,PRISM_PRECIP.BART,PRISM_PRECIP.CLBJ,PRISM_PRECIP.DSNY,
+      PRISM_PRECIP.HARV,PRISM_PRECIP.JORN,PRISM_PRECIP.LAJA,PRISM_PRECIP.MOAB,PRISM_PRECIP.OAES,
+      PRISM_PRECIP.OSBS,PRISM_PRECIP.SCBI,PRISM_PRECIP.SOAP,PRISM_PRECIP.STER,PRISM_PRECIP.TOOL,
+      PRISM_PRECIP.UNDE,PRISM_PRECIP.YELL,
     </valid_values>
     <default_value/>
     <group>run_component_ctsm</group>

cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands

@@ -1,5 +1,6 @@
 #!/bin/bash
 ./xmlchange CLM_USRDAT_NAME=NEON
+# we should also ensure that this can be set to NEON.PRISM
 ./xmlchange CCSM_CO2_PPMV=408.83
 # Set data forcing data to future scenario so will have data from 2018 to present-day
 ./xmlchange DATM_PRESAERO=SSP3-7.0

cime_config/usermods_dirs/NEON/NIWO/shell_commands

@@ -2,3 +2,4 @@
 ./xmlchange PTS_LON=254.41676
 ./xmlchange PTS_LAT=40.05236
 ./xmlchange DATM_YR_END=2018
+# remove DATM_YR_END xml change when running with PRISM precipitation

cime_config/usermods_dirs/NEON/defaults/shell_commands

@@ -1,5 +1,6 @@
 #!/bin/bash
 ./xmlchange CLM_USRDAT_NAME=NEON
+# This can be set to either NEON or NEON.PRISM
 ./xmlchange CCSM_CO2_PPMV=408.83
 # Set data forcing data to future scenario so will have data from 2018 to present-day
 ./xmlchange DATM_PRESAERO=SSP3-7.0

cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams

@@ -37,3 +37,13 @@ preso3.SSP3-7.0:year_first=2018
 preso3.SSP3-7.0:year_last=2022
 preso3.SSP3-7.0:year_align=2018
 preso3.SSP3-7.0:dtlimit=30
+
+NEON.${NEONSITE}:datavars = \
+  FSDS     Faxa_swdn, \
+  ZBOT     Sa_z, \
+  TBOT     Sa_tbot, \
+  WIND     Sa_wind, \
+  RH       Sa_rh,  \
+  PSRF     Sa_pbot, \
+  FLDS     Faxa_lwdn
+