Merge branch 'wwieder-ONAQ_correction' into NEON_fates

ESCOMP · Jan 12, 2023 · c366a6a · c366a6a
2 parents 187ef47 + dc101f3
commit c366a6a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/cime_config/usermods_dirs/NEON/BLAN/shell_commands b/cime_config/usermods_dirs/NEON/BLAN/shell_commands
@@ -1,3 +1,3 @@
 ./xmlchange NEONSITE=BLAN
-./xmlchange PTS_LON=281.92885
-./xmlchange PTS_LAT=39.06044
+./xmlchange PTS_LON=281.958212
+./xmlchange PTS_LAT=39.033698
diff --git a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands
@@ -1,7 +1,7 @@
 #!/bin/bash
 ./xmlchange NEONSITE=ONAQ
-./xmlchange PTS_LON=276.49815
-./xmlchange PTS_LAT=35.68839
+./xmlchange PTS_LON=247.54755
+./xmlchange PTS_LAT=40.17760
 ./xmlchange DATM_YR_END=2019
 # Different default number of months to run for transient case
 if  [[ $compset =~ ^HIST ]]; then

diff --git a/cime_config/usermods_dirs/NEON/ORNL/shell_commands b/cime_config/usermods_dirs/NEON/ORNL/shell_commands
@@ -1,3 +1,3 @@
 ./xmlchange NEONSITE=ORNL
-./xmlchange PTS_LON=275.83419000000004
-./xmlchange PTS_LAT=35.57525
+./xmlchange PTS_LON=275.717412
+./xmlchange PTS_LAT=35.964128
diff --git a/cime_config/usermods_dirs/NEON/UNDE/shell_commands b/cime_config/usermods_dirs/NEON/UNDE/shell_commands
@@ -1,3 +1,3 @@
 ./xmlchange NEONSITE=UNDE
-./xmlchange PTS_LON=270.6779
-./xmlchange PTS_LAT=46.14103
+./xmlchange PTS_LON=270.462746
+./xmlchange PTS_LAT=46.23391
diff --git a/cime_config/usermods_dirs/NEON/defaults/user_nl_clm b/cime_config/usermods_dirs/NEON/defaults/user_nl_clm
@@ -19,7 +19,7 @@
 !----------------------------------------------------------------------------------
 
 flanduse_timeseries = ' '   ! This isn't needed for a non transient case, but will be once we start using transient compsets
-fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_map/NEON/surfdata_1x1_NEON_${NEONSITE}_hist_78pfts_CMIP6_simyr2000_c221111.nc"
+fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_map/NEON/surfdata_1x1_NEON_${NEONSITE}_hist_78pfts_CMIP6_simyr2000_c230111.nc"
 
 stream_fldfilename_lightng = '$DIN_LOC_ROOT/atm/datm7/NASA_LIS/clmforc.Li_2016_climo1995-2013.360x720.lnfm_Total_NEONarea_c210625.nc'
 stream_meshfile_lightng = '$DIN_LOC_ROOT/atm/datm7/NASA_LIS/ESMF_MESH.Li_2016.360x720.NEONarea_cdf5_c221104.nc'

diff --git a/tools/site_and_regional/neon_sites_dompft.csv b/tools/site_and_regional/neon_sites_dompft.csv
@@ -1,7 +1,7 @@
 ,Site,Domain,Lat,Lon,pft,start_year,end_year
 1,BART, 1, 44.06516,  -71.28834,7,2018,2021
 2,HARV, 1, 42.53562,  -72.17562,7,2018,2021
-3,BLAN, 2, 39.06044,  -78.07115,7,2018,2021
+3,BLAN, 2, 39.033698,  -78.041788,7,2018,2021
 4,SCBI, 2, 38.89209,  -78.13764,7,2018,2021
 5,SERC, 2, 38.89124,  -76.55884,7,2018,2021
 6,DSNY, 3, 28.12919,  -81.43394,14,2018,2021
@@ -11,13 +11,13 @@
 10,LAJA, 4, 18.02184,  -67.07608,14,2019,2021
 11,STEI, 5, 45.50760,  -89.58880,7,2018,2021
 12,TREE, 5, 45.49266,  -89.58748,7,2018,2021
-13,UNDE, 5, 46.14103,  -89.32210,7,2018,2021
+13,UNDE, 5, 46.23391,  -89.537254,7,2018,2021
 14,KONA, 6, 39.10828,  -96.61044,19,2018,2021
 15,KONZ, 6, 39.10070,  -96.56227,14,2018,2021
 16,UKFS, 6, 39.04168,  -95.20495,7,2018,2021
 17,GRSM, 7, 35.68839,  -83.50185,7,2018,2021
 18,MLBS, 7, 37.37783,  -80.52425,7,2018,2019
-19,ORNL, 7, 35.57525,  -84.16581,7,2018,2021
+19,ORNL, 7, 35.964128,  -84.282588,7,2018,2021
 20,DELA, 8, 32.54092,  -87.80341,7,2018,2021
 21,LENO, 8, 31.85310,  -88.16103,7,2021,2021
 22,TALL, 8, 32.95106,  -87.39410,1,2018,2021
@@ -34,7 +34,7 @@
 33,NIWO,13, 40.05236, -105.58324,12,2018,2021
 34,JORN,14, 32.59052, -106.84377,14,2018,2021
 35,SRER,14, 31.91068, -110.83549,9,2018,2021
-36,ONAQ,15, 35.68839,  -83.50185,9,2018,2019
+36,ONAQ,15, 40.17760, -112.45245,9,2018,2019
 37,ABBY,16,45.762378,-122.329672,1,2018,2021
 38,WREF,16, 45.81637, -121.95838,1,2019,2021
 39,SJER,17,37.107117, -119.73300,13,2019,2021