From 39451d8d3f81e8d8f8ad5091e296b6debf0445a5 Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Wed, 13 Sep 2023 09:48:54 -0600 Subject: [PATCH 01/43] Add ncl script that creates PLUMBER2 csv file, and the file itself. --- tools/site_and_regional/PLUMBER2_sites.csv | 174 ++++++++++++++++++ .../create_PLUMBER2_sites_csv.ncl | 173 +++++++++++++++++ 2 files changed, 347 insertions(+) create mode 100644 tools/site_and_regional/PLUMBER2_sites.csv create mode 100644 tools/site_and_regional/create_PLUMBER2_sites_csv.ncl diff --git a/tools/site_and_regional/PLUMBER2_sites.csv b/tools/site_and_regional/PLUMBER2_sites.csv new file mode 100644 index 0000000000..241b4ef88b --- /dev/null +++ b/tools/site_and_regional/PLUMBER2_sites.csv @@ -0,0 +1,174 @@ +#start_year and end_year are used to define DATM_YR_START and DATM_YR_END. +#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight. +#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data. +,Site,Lat,Lon,pft1,pft1-%,pft2,pft2-%,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL +1,AR-SLu,-33.464802,-66.459808,5,50.00,7,50.00,2010,2010,2010-01-01,10800,48 +2,AT-Neu,47.116669,11.317500,13,100.00,-999,-999.00,2002,2012,2001-12-31,82800,48 +3,AU-ASM,-22.283001,133.248993,1,100.00,-999,-999.00,2011,2017,2010-12-31,54000,48 +4,AU-Cow,-16.238190,145.427155,4,100.00,-999,-999.00,2010,2015,2009-12-31,50400,48 +5,AU-Cpr,-34.002060,140.589127,7,30.00,14,70.00,2011,2017,2010-12-31,46800,48 +6,AU-Ctr,-16.103279,145.446854,4,100.00,-999,-999.00,2010,2017,2009-12-31,50400,48 +7,AU-Cum,-33.613297,150.722473,5,100.00,-999,-999.00,2013,2018,2012-12-31,46800,48 +8,AU-DaP,-14.063300,131.318100,14,100.00,-999,-999.00,2009,2012,2008-12-31,54000,48 +9,AU-DaS,-14.159283,131.388000,6,30.00,14,70.00,2010,2017,2009-12-31,54000,48 +10,AU-Dry,-15.258800,132.370605,6,30.00,14,70.00,2011,2015,2010-12-31,54000,48 +11,AU-Emr,-23.858700,148.474594,14,100.00,-999,-999.00,2012,2013,2011-12-31,50400,48 +12,AU-Gin,-31.375000,115.650002,7,70.00,14,30.00,2012,2017,2011-12-31,57600,48 +13,AU-GWW,-30.191299,120.654099,7,30.00,14,70.00,2013,2017,2012-12-31,57600,48 +14,AU-How,-12.495200,131.149994,6,70.00,14,30.00,2003,2017,2002-12-31,54000,48 +15,AU-Lit,-13.179040,130.794495,6,70.00,14,30.00,2016,2017,2015-12-31,54000,48 +16,AU-Otw,-38.532341,142.816803,13,100.00,-999,-999.00,2009,2010,2008-12-31,46800,24 +17,AU-Rig,-36.649899,145.575897,14,100.00,-999,-999.00,2011,2016,2010-12-31,46800,48 +18,AU-Rob,-17.117500,145.630096,4,100.00,-999,-999.00,2014,2017,2013-12-31,50400,48 +19,AU-Sam,-27.388100,152.877808,14,100.00,-999,-999.00,2011,2017,2010-12-31,50400,48 +20,AU-Stp,-17.150700,133.350204,14,100.00,-999,-999.00,2010,2017,2009-12-31,54000,48 +21,AU-TTE,-22.287001,133.639999,10,30.00,14,70.00,2013,2017,2012-12-31,54000,48 +22,AU-Tum,-35.656601,148.151703,5,100.00,-999,-999.00,2002,2017,2001-12-31,46800,24 +23,AU-Whr,-36.673199,145.029404,5,100.00,-999,-999.00,2015,2016,2014-12-31,46800,48 +24,AU-Wrr,-43.095020,146.654495,5,100.00,-999,-999.00,2016,2017,2015-12-31,46800,48 +25,AU-Ync,-34.989300,146.290695,14,100.00,-999,-999.00,2011,2017,2010-12-31,46800,48 +26,BE-Bra,51.309166, 4.520560,1,19.22,7,80.78,2004,2014,2003-12-31,82800,48 +27,BE-Lon,50.551590, 4.746130,15,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 +28,BE-Vie,50.305069, 5.998050,1,25.93,7,74.07,1997,2014,1996-12-31,82800,48 +29,BR-Sa3,-3.018029,-54.971436,4,100.00,-999,-999.00,2001,2003,2001-01-01,14400,48 +30,BW-Ma1,-19.916500,23.560329,6,30.00,14,70.00,2000,2000,1999-12-31,79200,48 +31,CA-NS1,55.879200,-98.483887,2,100.00,-999,-999.00,2003,2003,2003-01-01,21600,48 +32,CA-NS2,55.905800,-98.524689,2,100.00,-999,-999.00,2002,2004,2002-01-01,21600,48 +33,CA-NS4,55.914398,-98.380615,2,100.00,-999,-999.00,2003,2004,2003-01-01,21600,48 +34,CA-NS5,55.863098,-98.484985,2,100.00,-999,-999.00,2003,2004,2003-01-01,21600,48 +35,CA-NS6,55.916698,-98.964417,10,30.00,13,70.00,2002,2004,2002-01-01,21600,48 +36,CA-NS7,56.635799,-99.948303,10,30.00,13,70.00,2003,2004,2003-01-01,21600,48 +37,CA-Qcu,49.267078,-74.036530,1,100.00,-999,-999.00,2002,2006,2002-01-01,18000,48 +38,CA-Qfo,49.692501,-74.342102,1,100.00,-999,-999.00,2004,2010,2004-01-01,18000,48 +39,CA-SF1,54.485001,-105.817596,1,100.00,-999,-999.00,2004,2006,2004-01-01,21600,48 +40,CA-SF2,54.253899,-105.877502,2,100.00,-999,-999.00,2003,2005,2003-01-01,21600,48 +41,CA-SF3,54.091599,-106.005310,10,30.00,13,70.00,2003,2005,2003-01-01,21600,48 +42,CH-Cha,47.210220, 8.410440,13,100.00,-999,-999.00,2006,2014,2005-12-31,82800,48 +43,CH-Dav,46.815334, 9.855920,1,100.00,-999,-999.00,1997,2014,1996-12-31,82800,48 +44,CH-Fru,47.115833, 8.537780,13,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 +45,CH-Oe1,47.285831, 7.731940,13,100.00,-999,-999.00,2002,2008,2001-12-31,82800,48 +46,CN-Cha,42.402500,128.095795,1, 8.79,7,91.21,2003,2005,2002-12-31,57600,48 +47,CN-Cng,44.593399,123.509201,14,100.00,-999,-999.00,2008,2009,2007-12-31,57600,48 +48,CN-Dan,30.497801,91.066399,12,100.00,-999,-999.00,2004,2005,2003-12-31,57600,48 +49,CN-Din,23.173300,112.536102,5,100.00,-999,-999.00,2003,2005,2002-12-31,57600,48 +50,CN-Du2,42.046700,116.283600,13,100.00,-999,-999.00,2007,2008,2006-12-31,57600,48 +51,CN-HaM,37.369999,101.180000,12,100.00,-999,-999.00,2002,2003,2001-12-31,57600,48 +52,CN-Qia,26.741400,115.058098,1,100.00,-999,-999.00,2003,2005,2002-12-31,57600,48 +53,CZ-wet,49.024651,14.770350,13,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 +54,DE-Bay,50.141941,11.866940,1,100.00,-999,-999.00,1997,1999,1996-12-31,82800,48 +55,DE-Geb,51.100101,10.914300,15,100.00,-999,-999.00,2001,2014,2000-12-31,82800,48 +56,DE-Gri,50.949471,13.512530,13,100.00,-999,-999.00,2004,2014,2003-12-31,82800,48 +57,DE-Hai,51.079166,10.453000,7,100.00,-999,-999.00,2000,2012,1999-12-31,82800,48 +58,DE-Kli,50.893059,13.522380,15,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 +59,DE-Meh,51.275311,10.655470,1, 1.27,7,98.73,2004,2006,2003-12-31,82800,48 +60,DE-Obe,50.786659,13.721290,1,100.00,-999,-999.00,2008,2014,2007-12-31,82800,48 +61,DE-Seh,50.870625, 6.449650,15,100.00,-999,-999.00,2008,2010,2007-12-31,82800,48 +62,DE-SfN,47.806389,11.327500,13,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 +63,DE-Tha,50.963612,13.566940,1,100.00,-999,-999.00,1998,2014,1997-12-31,82800,48 +64,DE-Wet,50.453499,11.457530,1,100.00,-999,-999.00,2002,2006,2001-12-31,82800,48 +65,DK-Fou,56.484200, 9.587220,15,100.00,-999,-999.00,2005,2005,2004-12-31,82800,48 +66,DK-Lva,55.683300,12.083300,13,100.00,-999,-999.00,2005,2006,2004-12-31,82800,48 +67,DK-Ris,55.530281,12.097220,15,100.00,-999,-999.00,2004,2005,2003-12-31,82800,48 +68,DK-Sor,55.485870,11.644640,7,100.00,-999,-999.00,1997,2014,1996-12-31,82800,48 +69,DK-ZaH,74.473282,-20.550293,12,100.00,-999,-999.00,2000,2013,2000-01-01,0,48 +70,ES-ES1,39.345970,-0.318817,1,100.00,-999,-999.00,1999,2006,1998-12-31,82800,48 +71,ES-ES2,39.275558,-0.315277,-999,-999.00,16,100.00,2005,2006,2004-12-31,82800,48 +72,ES-LgS,37.097935,-2.965820,10,30.00,13,70.00,2007,2007,2006-12-31,82800,48 +73,ES-LMa,39.941502,-5.773346,7,30.00,14,70.00,2004,2006,2003-12-31,82800,48 +74,ES-VDA,42.152180, 1.448500,7,30.00,13,70.00,2004,2004,2003-12-31,82800,48 +75,FI-Hyy,61.847500,24.295000,1,100.00,-999,-999.00,1996,2014,1995-12-31,79200,48 +76,FI-Kaa,69.140694,27.295031,12,100.00,-999,-999.00,2000,2002,1999-12-31,79200,48 +77,FI-Lom,67.997200,24.209181,12,100.00,-999,-999.00,2007,2009,2006-12-31,79200,48 +78,FI-Sod,67.361862,26.637831,1,100.00,-999,-999.00,2008,2014,2007-12-31,79200,48 +79,FR-Fon,48.476398, 2.780140,7,100.00,-999,-999.00,2005,2013,2004-12-31,82800,48 +80,FR-Gri,48.844219, 1.951910,15,100.00,-999,-999.00,2005,2013,2004-12-31,82800,48 +81,FR-Hes,48.674160, 7.065560,7,100.00,-999,-999.00,1997,2006,1996-12-31,82800,48 +82,FR-LBr,44.717110,-0.769287,1,100.00,-999,-999.00,2003,2008,2002-12-31,82800,48 +83,FR-Lq1,45.643059, 2.735830,13,100.00,-999,-999.00,2004,2006,2003-12-31,82800,48 +84,FR-Lq2,45.639191, 2.737030,13,100.00,-999,-999.00,2004,2006,2003-12-31,82800,48 +85,FR-Pue,43.741390, 3.595830,5,100.00,-999,-999.00,2000,2014,1999-12-31,82800,48 +86,GF-Guy, 5.278772,-52.924866,4,100.00,-999,-999.00,2004,2014,2004-01-01,10800,48 +87,HU-Bug,46.691101,19.601299,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 +88,ID-Pag,-2.345000,114.036392,4,100.00,-999,-999.00,2002,2003,2001-12-31,61200,48 +89,IE-Ca1,52.858791,-6.918152,15,100.00,-999,-999.00,2004,2006,2004-01-01,0,48 +90,IE-Dri,51.986691,-8.751801,13,100.00,-999,-999.00,2003,2005,2003-01-01,0,48 +91,IT-Amp,41.904099,13.605160,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 +92,IT-BCi,40.523800,14.957440,-999,-999.00,16,100.00,2005,2010,2004-12-31,82800,48 +93,IT-CA1,42.380409,12.026560,7,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 +94,IT-CA2,42.377220,12.026040,15,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 +95,IT-CA3,42.380001,12.022200,7,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 +96,IT-Col,41.849361,13.588140,7,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 +97,IT-Cpz,41.705250,12.376110,5,100.00,-999,-999.00,2001,2008,2000-12-31,82800,48 +98,IT-Isp,45.812641, 8.633580,7,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 +99,IT-Lav,45.956200,11.281320,1,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 +100,IT-LMa,45.152580, 7.582590,7,100.00,-999,-999.00,2003,2004,2002-12-31,82800,48 +101,IT-Mal,46.114021,11.703340,13,100.00,-999,-999.00,2003,2003,2002-12-31,82800,48 +102,IT-MBo,46.014679,11.045830,13,100.00,-999,-999.00,2003,2012,2002-12-31,82800,48 +103,IT-Noe,40.606178, 8.151170,10,70.00,14,30.00,2004,2014,2003-12-31,82800,48 +104,IT-Non,44.690189,11.091090,7,100.00,-999,-999.00,2002,2002,2001-12-31,82800,48 +105,IT-PT1,45.200871, 9.061040,7,100.00,-999,-999.00,2003,2004,2002-12-31,82800,48 +106,IT-Ren,46.586861,11.433690,1,100.00,-999,-999.00,2010,2013,2009-12-31,82800,48 +107,IT-Ro1,42.408119,11.930010,7,100.00,-999,-999.00,2002,2006,2001-12-31,82800,48 +108,IT-Ro2,42.390259,11.920930,7,100.00,-999,-999.00,2002,2008,2001-12-31,82800,48 +109,IT-SR2,43.732029,10.290950,1,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 +110,IT-SRo,43.727859,10.284440,1,100.00,-999,-999.00,2003,2012,2002-12-31,82800,48 +111,JP-SMF,35.261700,137.078796,1,29.81,7,70.19,2003,2006,2002-12-31,54000,48 +112,NL-Ca1,51.971001, 4.927000,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 +113,NL-Hor,52.240349, 5.071300,13,100.00,-999,-999.00,2008,2011,2007-12-31,82800,48 +114,NL-Loo,52.166580, 5.743560,1,100.00,-999,-999.00,1997,2013,1996-12-31,82800,48 +115,PL-wet,52.762199,16.309401,13,100.00,-999,-999.00,2004,2005,2003-12-31,82800,48 +116,PT-Esp,38.639400,-8.601807,5,100.00,-999,-999.00,2002,2004,2002-01-01,0,48 +117,PT-Mi1,38.540642,-8.000061,5,100.00,-999,-999.00,2005,2005,2005-01-01,0,48 +118,PT-Mi2,38.476501,-8.024536,14,100.00,-999,-999.00,2005,2006,2005-01-01,0,48 +119,RU-Che,68.613037,161.341431,12,100.00,-999,-999.00,2003,2004,2002-12-31,46800,48 +120,RU-Fyo,56.461529,32.922081,1,100.00,-999,-999.00,2003,2014,2002-12-31,75600,48 +121,RU-Zot,60.800800,89.350800,2,70.00,13,30.00,2003,2003,2002-12-31,61200,48 +122,SD-Dem,13.282900,30.478300,6,30.00,14,70.00,2005,2009,2004-12-31,75600,48 +123,SE-Deg,64.181969,19.556690,13,100.00,-999,-999.00,2002,2005,2001-12-31,82800,48 +124,UK-Gri,56.607220,-3.798065,1,100.00,-999,-999.00,2000,2001,2000-01-01,0,48 +125,UK-Ham,51.153530,-0.858307,7,100.00,-999,-999.00,2004,2004,2004-01-01,0,48 +126,UK-PL3,51.450001,-1.266663,1, 8.33,7,91.67,2005,2006,2005-01-01,0,48 +127,US-AR1,36.426701,-99.419983,14,100.00,-999,-999.00,2010,2012,2010-01-01,21600,48 +128,US-AR2,36.635799,-99.597504,14,100.00,-999,-999.00,2010,2011,2010-01-01,21600,48 +129,US-ARM,36.605801,-97.488800,15,100.00,-999,-999.00,2003,2012,2003-01-01,21600,48 +130,US-Aud,31.590700,-110.509201,14,100.00,-999,-999.00,2003,2005,2003-01-01,25200,48 +131,US-Bar,44.064640,-71.288086,1, 8.43,7,91.57,2005,2005,2005-01-01,18000,48 +132,US-Bkg,44.345291,-96.836182,14,100.00,-999,-999.00,2005,2006,2005-01-01,21600,48 +133,US-Blo,38.895302,-120.632751,1,100.00,-999,-999.00,2000,2006,2000-01-01,28800,48 +134,US-Bo1,40.006199,-88.290405,15,100.00,-999,-999.00,1997,2006,1997-01-01,21600,48 +135,US-Cop,38.090000,-109.389999,14,100.00,-999,-999.00,2002,2003,2002-01-01,25200,24 +136,US-FPe,48.307701,-105.101898,14,100.00,-999,-999.00,2000,2006,2000-01-01,25200,48 +137,US-GLE,41.366501,-106.239899,1,100.00,-999,-999.00,2009,2014,2009-01-01,25200,48 +138,US-Goo,34.254700,-89.873505,14,100.00,-999,-999.00,2004,2006,2004-01-01,21600,48 +139,US-Ha1,42.537800,-72.171509,7,100.00,-999,-999.00,1992,2012,1992-01-01,18000,24 +140,US-Ho1,45.204102,-68.740204,1,100.00,-999,-999.00,1996,2004,1996-01-01,18000,48 +141,US-KS2,28.608578,-80.671539,10,70.00,14,30.00,2003,2006,2003-01-01,18000,48 +142,US-Los,46.082699,-89.979187,13,100.00,-999,-999.00,2000,2008,2000-01-01,21600,48 +143,US-Me2,44.452301,-121.557404,1,100.00,-999,-999.00,2002,2014,2002-01-01,28800,48 +144,US-Me4,44.499199,-121.622406,1,100.00,-999,-999.00,1996,2000,1996-01-01,28800,48 +145,US-Me6,44.323299,-121.607803,1,100.00,-999,-999.00,2011,2014,2011-01-01,28800,48 +146,US-MMS,39.323200,-86.413086,7,100.00,-999,-999.00,1999,2014,1999-01-01,18000,24 +147,US-MOz,38.744110,-92.200012,7,100.00,-999,-999.00,2005,2006,2005-01-01,21600,48 +148,US-Myb,38.049801,-121.765106,13,100.00,-999,-999.00,2011,2014,2011-01-01,28800,48 +149,US-Ne1,41.165100,-96.476593,-999,-999.00,16,100.00,2002,2012,2002-01-01,21600,24 +150,US-Ne2,41.164902,-96.470093,-999,-999.00,16,100.00,2002,2012,2002-01-01,21600,24 +151,US-Ne3,41.179699,-96.439697,15,100.00,-999,-999.00,2002,2012,2002-01-01,21600,24 +152,US-NR1,40.032902,-105.546402,1,100.00,-999,-999.00,1999,2014,1999-01-01,25200,48 +153,US-PFa,45.945900,-90.272308,1, 8.18,7,91.82,1995,2014,1995-01-01,21600,24 +154,US-Prr,65.123703,-147.487595,2,100.00,-999,-999.00,2011,2013,2011-01-01,32400,48 +155,US-SP1,29.738070,-82.218781,1,100.00,-999,-999.00,2005,2005,2005-01-01,18000,48 +156,US-SP2,29.764799,-82.244812,1,100.00,-999,-999.00,2000,2004,2000-01-01,18000,48 +157,US-SP3,29.754770,-82.163269,5,100.00,-999,-999.00,1999,2004,1999-01-01,18000,48 +158,US-SRG,31.789400,-110.827698,14,100.00,-999,-999.00,2009,2014,2009-01-01,25200,48 +159,US-SRM,31.821400,-110.865997,7,70.00,14,30.00,2004,2014,2004-01-01,25200,48 +160,US-Syv,46.242001,-89.347717,1, 4.91,7,95.09,2002,2008,2002-01-01,21600,48 +161,US-Ton,38.431599,-120.966003,7,70.00,14,30.00,2001,2014,2001-01-01,28800,48 +162,US-Tw4,38.103001,-121.641403,13,100.00,-999,-999.00,2014,2014,2014-01-01,28800,48 +163,US-Twt,38.108700,-121.653107,-999,-999.00,16,100.00,2010,2014,2010-01-01,28800,48 +164,US-UMB,45.559799,-84.713806,7,100.00,-999,-999.00,2000,2014,2000-01-01,18000,24 +165,US-Var,38.413300,-120.950729,14,100.00,-999,-999.00,2001,2014,2001-01-01,28800,48 +166,US-WCr,45.805901,-90.079895,7,100.00,-999,-999.00,1999,2006,1999-01-01,21600,48 +167,US-Whs,31.743799,-110.052200,10,30.00,14,70.00,2008,2014,2008-01-01,25200,48 +168,US-Wkg,31.736500,-109.941895,14,100.00,-999,-999.00,2005,2014,2005-01-01,25200,48 +169,ZA-Kru,-25.019699,31.496901,6,30.00,14,70.00,2000,2002,1999-12-31,79200,48 +170,ZM-Mon,-15.437778,23.252781,6,100.00,-999,-999.00,2008,2008,2007-12-31,79200,48 diff --git a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl new file mode 100644 index 0000000000..aa7694da46 --- /dev/null +++ b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl @@ -0,0 +1,173 @@ +; NCL script +; create_PLUMBER2_sites_csv.ncl ; Keith Oleson, Sep 2023 +; This script generates a csv file for the NEON site_and_regional infrastructure +;************************************** + +load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/shea_util.ncl" + +begin + + print ("=========================================") + print ("Start Time: "+systemfunc("date") ) + print ("=========================================") + + +; Sites + sim = systemfunc("ls -1 " + "/glade/work/oleson/PLUMBER2/datm_files/") + + nsim = dimsizes(sim) + site_num = new(nsim,"integer") + atm_ncpl = new(nsim,"string") + startyear = new(nsim,"string") + endyear = new(nsim,"string") + localstartyear = new(nsim,"string") + startmonth = new(nsim,"string") + startday = new(nsim,"string") + run_startdate = new(nsim,"string") + starttod = new(nsim,"string") + nsteps = new(nsim,"string") + latitude = new(nsim,"double") + longitude = new(nsim,"double") + + pfttype = new((/nsim,2/),"integer") + pftperc = new((/nsim,2/),"double") + pctwet = new(nsim,"double") + + do sel = 0,nsim - 1 + + site_num(sel) = sel+1 + +; Specify input directory + f_in_dir = "/glade/work/oleson/PLUMBER2/datm_files/"+sim(sel)+"/CLM1PT_data/" + fls = systemfunc("ls " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*-*"+".nc") + command = "echo " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*.nc" + " | cut -c76-79" + startyear(sel) = systemfunc(command) + command = "echo " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*.nc" + " | cut -c81-84" + endyear(sel) = systemfunc(command) + print(fls) + datmfile = addfile(fls,"r") + time = datmfile->time + printVarSummary(time) + atm_ncpl(sel) = tostring(sprinti("%0.2i ",tointeger(86400./(time(1)-time(0))))) + print(atm_ncpl(sel)) + if (isint64(time)) then + tmp = toint(time) + copy_VarCoords(time,tmp) + copy_VarAtts(time,tmp) + else + tmp = time + copy_VarCoords(time,tmp) + copy_VarAtts(time,tmp) + end if + printVarSummary(tmp) + utc_date = cd_calendar(tmp(0),0) + print(utc_date) + localstartyear(sel) = tostring(tointeger(utc_date(0,0))) + print(localstartyear(sel)) + startmonth(sel) = tostring(sprinti("%0.2i ",tointeger(utc_date(0,1)))) + print(startmonth(sel)) + startday(sel) = tostring(sprinti("%0.2i ",tointeger(utc_date(0,2)))) + print(startday(sel)) + starttod(sel) = tostring(tointeger(utc_date(0,3)/24 * 86400)) + print(starttod(sel)) + nsteps(sel) = dimsizes(tmp) + + latitude(sel) = datmfile->LATIXY(0,0) + longitude(sel) = datmfile->LONGXY(0,0) + + if (longitude(sel) .gt. 180.d) then + longitude(sel) = longitude(sel) - 360.d + end if + + + delete(time) + delete(tmp) + delete(utc_date) + +; run_startdate(sel) = localstartyear(sel)+"-"+startmonth(sel)+"-"+startday(sel) + run_startdate(sel) = tostring(sprinti("%0.4i",tointeger(localstartyear(sel))))+"-"+tostring(sprinti("%0.2i",tointeger(startmonth(sel))))+"-"+tostring(sprinti("%0.2i",tointeger(startday(sel)))) + + f_in_dir = "/glade/work/oleson/PLUMBER2/input_files/"+sim(sel)+"/" + fls = systemfunc("ls " + f_in_dir + "surfdata_0.9x1.25_16pfts_" + sim(sel) + ".nc") + surfdatafile = addfile(fls,"r") + pct_natveg = surfdatafile->PCT_NATVEG(0,0) + if (pct_natveg .gt. 0.) then + pct_nat_pft = surfdatafile->PCT_NAT_PFT(:,0,0) + indx = ind(pct_nat_pft(:) .gt. 0) + npfts = dimsizes(indx) + print(npfts) + if (npfts .gt. 2) then + print((/"Number of pfts is > 2"/)) + pfttype(sel,:) = -999 + pftperc(sel,:) = -999. + else + pfttype(sel,:) = -999 + pftperc(sel,:) = -999. + do p = 0,npfts-1 + pfttype(sel,p) = indx(p) + pftperc(sel,p) = pct_nat_pft(indx(p)) + end do + end if + pctwet(sel) = 0. + delete(pct_nat_pft) + delete(indx) + else + print((/"PCT_NATVEG is zero"/)) + pfttype(sel,:) = -999 + pftperc(sel,:) = -999. + pct_wetland = surfdatafile->PCT_WETLAND(0,0) + if (pct_wetland .gt. 0.) then + print((/"Wetland Site"/)) + pctwet(sel) = pct_wetland + else + print((/"PCT_NATVEG and PCT_WETLAND are both zero"/)) + pctwet(sel) = 0. + pct_crop = surfdatafile->PCT_CROP(0,0) + if (pct_crop .gt. 0.) then + print((/"Crop Site"/)) + pct_cft = surfdatafile->PCT_CFT(:,0,0) + if (pct_cft(0) .gt. 0.) then + pfttype(sel,0) = 15 + pftperc(sel,0) = (/pct_cft(0)/) + else + pfttype(sel,0) = -999 + pftperc(sel,0) = -999. + end if + if (pct_cft(1) .gt. 0.) then + pfttype(sel,1) = 16 + pftperc(sel,1) = (/pct_cft(1)/) + else + pfttype(sel,1) = -999 + pftperc(sel,1) = -999. + end if + else + print((/"PCT_NATVEG, PCT_WETLAND, PCT_CROP are all zero"/)) + end if + end if + end if + + + + end do + + print((/"Done with Loop"/)) + + fname = "/glade/work/oleson/PLUMBER2/NEON_PLUMBER/PLUMBER2_sites.csv" + header = (/"#start_year and end_year are used to define DATM_YR_START and DATM_YR_END.", \ + "#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight.", \ + "#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data.", \ + ",Site,Lat,Lon,pft1,pft1-%,pft2,pft2-%,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL"/) + hlist = [/header/] + alist = [/site_num, sim, latitude, longitude, pfttype(:,0), pftperc(:,0), pfttype(:,1), pftperc(:,1), startyear, endyear, run_startdate, starttod, atm_ncpl/] + print(alist) + print((/"Done defining hlist and alist"/)) + write_table(fname, "w", hlist, "%s") + print((/"Done with header"/)) + write_table(fname, "a", alist, "%d,%s,%9.6f,%9.6f,%d,%5.2f,%d,%5.2f,%s,%s,%s,%s,%s") + + print ("=========================================") + print ("Finish Time: "+systemfunc("date") ) + print ("=========================================") + + end + From 30df16b04a527eac9c7c0a1e909805fed7d43c97 Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Wed, 13 Sep 2023 10:07:42 -0600 Subject: [PATCH 02/43] csv file header change. --- tools/site_and_regional/PLUMBER2_sites.csv | 2 +- tools/site_and_regional/create_PLUMBER2_sites_csv.ncl | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/site_and_regional/PLUMBER2_sites.csv b/tools/site_and_regional/PLUMBER2_sites.csv index 241b4ef88b..5cf0541632 100644 --- a/tools/site_and_regional/PLUMBER2_sites.csv +++ b/tools/site_and_regional/PLUMBER2_sites.csv @@ -1,4 +1,4 @@ -#start_year and end_year are used to define DATM_YR_START and DATM_YR_END. +#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears. #RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight. #ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data. ,Site,Lat,Lon,pft1,pft1-%,pft2,pft2-%,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL diff --git a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl index aa7694da46..d1476b821b 100644 --- a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl +++ b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl @@ -1,6 +1,7 @@ ; NCL script ; create_PLUMBER2_sites_csv.ncl ; Keith Oleson, Sep 2023 ; This script generates a csv file for the NEON site_and_regional infrastructure +; PLUMBER2_sites.csv ;************************************** load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/shea_util.ncl" @@ -12,7 +13,7 @@ begin print ("=========================================") -; Sites +; Sites (170 sites) sim = systemfunc("ls -1 " + "/glade/work/oleson/PLUMBER2/datm_files/") nsim = dimsizes(sim) @@ -152,8 +153,9 @@ begin print((/"Done with Loop"/)) - fname = "/glade/work/oleson/PLUMBER2/NEON_PLUMBER/PLUMBER2_sites.csv" - header = (/"#start_year and end_year are used to define DATM_YR_START and DATM_YR_END.", \ +; fname = "/glade/work/oleson/PLUMBER2/NEON_PLUMBER/PLUMBER2_sites.csv" + fname = "/glade/work/oleson/ctsm_PLUMBERcsv/tools/site_and_regional/PLUMBER2_sites.csv" + header = (/"#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \ "#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight.", \ "#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data.", \ ",Site,Lat,Lon,pft1,pft1-%,pft2,pft2-%,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL"/) From 5600744843c3bcff4a4554643cdadedc1926aa0c Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Wed, 13 Sep 2023 10:20:30 -0600 Subject: [PATCH 03/43] Add PLUMBER2 surface dataset wrapper. --- .../plumber2_surf_wrapper.py | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100755 tools/site_and_regional/plumber2_surf_wrapper.py diff --git a/tools/site_and_regional/plumber2_surf_wrapper.py b/tools/site_and_regional/plumber2_surf_wrapper.py new file mode 100755 index 0000000000..d8324db7cd --- /dev/null +++ b/tools/site_and_regional/plumber2_surf_wrapper.py @@ -0,0 +1,160 @@ +#! /usr/bin/env python3 +""" +|------------------------------------------------------------------| +|--------------------- Instructions -----------------------------| +|------------------------------------------------------------------| +This script is a simple wrapper for neon sites that performs the +following: + 1) For neon sites, subset surface dataset from global dataset + (i.e. ./subset_data.py ) + 2) Download neon and update the created surface dataset + based on the downloaded neon data. + (i.e. modify_singlept_site_neon.py) + +Instructions for running using conda python environments: + +../../py_env_create +conda activate ctsm_py + +""" +# TODO +# Automatic downloading of missing files if they are missing +#-[ ] Download neon sites and dom pft file +#-[ ] Make sure verbose works for printing out commands running + +# Import libraries +from __future__ import print_function + +import os +import sys +import tqdm +import logging +import argparse +import subprocess + +import pandas as pd + + + + +def get_parser(): + """ + Get parser object for this script. + """ + parser = argparse.ArgumentParser(description=__doc__, + formatter_class=argparse.RawDescriptionHelpFormatter) + + parser.print_usage = parser.print_help + + parser.add_argument('-v','--verbose', + help='Verbose mode will print more information. ', + action="store_true", + dest="verbose", + default=False) + + parser.add_argument('--16pft', + help='Create and/or modify 16-PFT surface datasets (e.g. for a FATES run) ', + action="store_true", + dest="pft_16", + default=True) + + parser.add_argument('-m', '--mixed', + help='Do not overwrite surface dataset to be just one dominant PFT at 100%', + action="store_true", + dest="mixed", + default=False) + + + return parser + + +def execute(command): + """ + Function for running a command on shell. + Args: + command (str): + command that we want to run. + Raises: + Error with the return code from shell. + """ + print ('\n',' >> ',*command,'\n') + + try: + subprocess.check_call(command, stdout=open(os.devnull, "w"), stderr=subprocess.STDOUT) + + except subprocess.CalledProcessError as e: + #raise RuntimeError("command '{}' return with error (code {}): {}".format(e.cmd, e.returncode, e.output)) + #print (e.ouput) + print (e) + + + + + + +def main(): + + args = get_parser().parse_args() + + if args.verbose: + logging.basicConfig(level=logging.DEBUG) + + + plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=3) + + + for i, row in tqdm.tqdm(plumber2_sites.iterrows()): + lat = row['Lat'] + lon = row['Lon'] + site = row['Site'] + pft1 = row['pft1'] + pctpft1 = row['pft1-%'] + pft2 = row['pft2'] + pctpft2 = row['pft2-%'] + # overwrite missing values from .csv file + if pft2 == -999: + pft2 = 0 + pctpft2 = 0 + + clmsite = "1x1_PLUMBER2_"+site + print ("Now processing site :", site) + + if args.mixed and args.pft_16: + # use surface dataset with 16 pfts, and don't overwrite with 100% 1 dominant PFT + # don't set crop flag + # don't set a dominant pft + subset_command = ['./subset_data','point','--lat',str(lat),'--lon',str(lon), + '--site',clmsite, '--create-surface','--uniform-snowpack', + '--cap-saturation','--verbose','--overwrite'] + #modify_command = ['./modify_singlept_site_neon.py', '--neon_site', site, '--surf_dir', + # 'subset_data_single_point', '--16pft'] + elif args.pft_16: + # use surface dataset with 16 pfts, but overwrite to 100% 1 dominant PFT + # don't set crop flag + # set dominant pft + subset_command = ['./subset_data','point','--lat',str(lat),'--lon',str(lon), + '--site',clmsite,'--dompft',str(pft1),str(pft2), + '--pctpft', str(pctpft1),str(pctpft2), '--create-surface', + '--uniform-snowpack','--cap-saturation','--verbose','--overwrite'] + elif args.mixed: + # use surface dataset with 78 pfts, and don't overwrite with 100% 1 dominant PFT + # NOTE: FATES will currently not run with a 78-PFT surface dataset + # set crop flag + # don't set dominant pft + subset_command = ['./subset_data','point','--lat',str(lat),'--lon',str(lon), + '--site',clmsite,'--crop','--create-surface', + '--uniform-snowpack','--cap-saturation','--verbose','--overwrite'] + else: + # use surface dataset with 78 pfts, and overwrite to 100% 1 dominant PFT + # NOTE: FATES will currently not run with a 78-PFT surface dataset + # set crop flag + # set dominant pft + subset_command = ['./subset_data', 'point', '--lat', str(lat), '--lon', str(lon), + '--site', clmsite,'--crop', '--dompft', str(pft1),str(pft2), + '--pctpft', str(pctpft1),str(pctpft2), '--create-surface', + '--uniform-snowpack', '--cap-saturation', '--verbose', '--overwrite'] + execute(subset_command) + +if __name__ == "__main__": + main() + From fe2788650a969307d2d5ec424b7ceb5257ab21ba Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Wed, 13 Sep 2023 11:22:40 -0600 Subject: [PATCH 04/43] Add PLUMBER2 usermods defaults. --- .../PLUMBER2/defaults/shell_commands | 44 ++++++++++++++++ .../PLUMBER2/defaults/user_nl_clm | 28 ++++++++++ .../PLUMBER2/defaults/user_nl_cpl | 20 ++++++++ .../PLUMBER2/defaults/user_nl_datm_streams | 51 +++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm create mode 100644 cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl create mode 100644 cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands new file mode 100644 index 0000000000..bf82d6e07d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -0,0 +1,44 @@ +#!/bin/bash +./xmlchange CLM_USRDAT_NAME=PLUMBER2 +./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 +./xmlchange DATM_PRESNDEP=SSP3-7.0 +./xmlchange DATM_PRESO3=SSP3-7.0 +# Explicitly set the MPI library to mpi-serial so won't have the build/run complexity of a full MPI library +./xmlchange MPILIB=mpi-serial +# Set years to run forcing data over +./xmlchange DATM_YR_ALIGN=2018,DATM_YR_END=2021,DATM_YR_START=2018 +# +# Save some variables that may be used later +# +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and don't cycle +if [[ $compset =~ ^HIST ]]; then + ./xmlchange DATM_YR_END=2022 + ./xmlchange RUN_STARTDATE=2018-01-01 + # Number of months that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_OPTION="nmonths" + ./xmlchange STOP_N=51 + fi + ./xmlchange CLM_NML_USE_CASE="2018-PD_transient" +else + ./xmlchange CLM_NML_USE_CASE="2018_control" +fi + +# If needed for SP simulations: & set history file variables +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_OPTION=nyears + fi + ./xmlchange CLM_FORCE_COLDSTART=on + + echo "hist_fincl2 = 'FCEV','FCTR','FGEV','FIRA','FSA','FSH','FPSN','H2OSOI','SNOW_DEPTH','TBOT','TSOI'" >> user_nl_clm +fi + +# Explicitly set PIO Type to NETCDF since this is a single processor case (should already be set this way) +./xmlchange PIO_TYPENAME=netcdf diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm new file mode 100644 index 0000000000..e71653a1f3 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -0,0 +1,28 @@ +!---------------------------------------------------------------------------------- +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! +! EXCEPTIONS: +! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting +! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting +! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting +! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting +! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting +! Set co2_ppmv with CCSM_CO2_PPMV option +! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options +! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases +! (includes $inst_string for multi-ensemble cases) +! or with CLM_FORCE_COLDSTART to do a cold start +! or set it with an explicit filename here. +! Set maxpatch_glcmec with GLC_NEC option +! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable +!---------------------------------------------------------------------------------- + +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/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c230913.nc" + +! h1 output stream +hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI', + 'HR','SNOW_DEPTH','TBOT','TSOI','SOILC_vr','FV','NET_NMIN_vr' +hist_mfilt(2) = 48 +hist_nhtfrq(2) = 1 diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl new file mode 100644 index 0000000000..e7f6c90a86 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl @@ -0,0 +1,20 @@ +!------------------------------------------------------------------------ +! Users should ONLY USE user_nl_cpl to change namelists variables +! for namelist variables in drv_in (except for the ones below) and +! any keyword/values in seq_maps.rc +! Users should add ALL user specific namelist and seq_maps.rc changes below +! using the following syntax +! namelist_var = new_namelist_value +! or +! mapname = new_map_name +! For example to change the default value of ocn2atm_fmapname to 'foo' use +! ocn2atm_fmapname = 'foo' +! +! Note that some namelist variables MAY NOT be changed in user_nl_cpl - +! they are defined in a $CASEROOT xml file and must be changed with +! xmlchange. +! +! For example, rather than set username to 'foo' in user_nl_cpl, call +! ./xmlchange USER=foo +!------------------------------------------------------------------------ +orb_iyear = 2018 diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams new file mode 100644 index 0000000000..20803f40ca --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -0,0 +1,51 @@ +!------------------------------------------------------------------------ +! This file is used to modify datm.streams.xml generated in $RUNDIR +! Entries should have the form +! :<= new stream_value> +! The following are accepted values for an assume streamname of foo +! foo:meshfile = character string +! foo:datafiles = comma separated string of full pathnames (e.g. file1,file2,file3...) +! foo:datavars = comma separated string of field pairs (e.g. foo foobar,foo2 foobar2...) +! foo:taxmode = one of [cycle, extend, limit] +! foo:tintalgo = one of [lower,upper,nearest,linear,coszen] +! foo:readmode = single (only suported mode right now) +! foo:mapalgo = one of [bilinear,redist,nn,consf,consd,none] +! foo:dtlimit = real (1.5 is default) +! foo:year_first = integer +! foo:year_last = integer +! foo:year_align = integer +! foo:vectors = one of [none,u:v] +! foo:lev_dimname: = one of [null,name of level dimenion name] +! foo:offset = integer +! As an example: +! foo:year_first = 1950 +! would change the stream year_first stream_entry to 1950 for the foo stream block +!------------------------------------------------------------------------ +CLM_USRDAT.CLM_USRDAT:datavars = ZBOT z, \ + TBOT tbot, \ + QBOT shum, \ + WIND wind, \ + PRECTmms precn, \ + FSDS swdn, \ + PSRF pbot, \ + FLDS lwdn + +! TODO, get right first and last years. + +presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2018-2030_monthly_0.9x1.25_c210826.nc +presaero.SSP3-7.0:year_first=2018 +presaero.SSP3-7.0:year_last=2022 +presaero.SSP3-7.0:year_align=2018 +presaero.SSP3-7.0:dtlimit=30 + +presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_2018-2030_monthly_c210826.nc +presndep.SSP3-7.0:year_first=2018 +presndep.SSP3-7.0:year_last=2022 +presndep.SSP3-7.0:year_align=2018 +presndep.SSP3-7.0:dtlimit=30 + +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 + From 8ee05b8a8971dc7b5996bce65cc403ea47b99188 Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Wed, 4 Oct 2023 09:54:26 -0600 Subject: [PATCH 05/43] Add canopy top and bottom heights. --- tools/site_and_regional/PLUMBER2_sites.csv | 343 +++++++++--------- .../create_PLUMBER2_sites_csv.ncl | 43 ++- 2 files changed, 207 insertions(+), 179 deletions(-) diff --git a/tools/site_and_regional/PLUMBER2_sites.csv b/tools/site_and_regional/PLUMBER2_sites.csv index 5cf0541632..f252fa1d61 100644 --- a/tools/site_and_regional/PLUMBER2_sites.csv +++ b/tools/site_and_regional/PLUMBER2_sites.csv @@ -1,174 +1,175 @@ +#pftX-cth and pftX-cbh are the site=specific canopy top and bottom heights #start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears. #RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight. #ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data. -,Site,Lat,Lon,pft1,pft1-%,pft2,pft2-%,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL -1,AR-SLu,-33.464802,-66.459808,5,50.00,7,50.00,2010,2010,2010-01-01,10800,48 -2,AT-Neu,47.116669,11.317500,13,100.00,-999,-999.00,2002,2012,2001-12-31,82800,48 -3,AU-ASM,-22.283001,133.248993,1,100.00,-999,-999.00,2011,2017,2010-12-31,54000,48 -4,AU-Cow,-16.238190,145.427155,4,100.00,-999,-999.00,2010,2015,2009-12-31,50400,48 -5,AU-Cpr,-34.002060,140.589127,7,30.00,14,70.00,2011,2017,2010-12-31,46800,48 -6,AU-Ctr,-16.103279,145.446854,4,100.00,-999,-999.00,2010,2017,2009-12-31,50400,48 -7,AU-Cum,-33.613297,150.722473,5,100.00,-999,-999.00,2013,2018,2012-12-31,46800,48 -8,AU-DaP,-14.063300,131.318100,14,100.00,-999,-999.00,2009,2012,2008-12-31,54000,48 -9,AU-DaS,-14.159283,131.388000,6,30.00,14,70.00,2010,2017,2009-12-31,54000,48 -10,AU-Dry,-15.258800,132.370605,6,30.00,14,70.00,2011,2015,2010-12-31,54000,48 -11,AU-Emr,-23.858700,148.474594,14,100.00,-999,-999.00,2012,2013,2011-12-31,50400,48 -12,AU-Gin,-31.375000,115.650002,7,70.00,14,30.00,2012,2017,2011-12-31,57600,48 -13,AU-GWW,-30.191299,120.654099,7,30.00,14,70.00,2013,2017,2012-12-31,57600,48 -14,AU-How,-12.495200,131.149994,6,70.00,14,30.00,2003,2017,2002-12-31,54000,48 -15,AU-Lit,-13.179040,130.794495,6,70.00,14,30.00,2016,2017,2015-12-31,54000,48 -16,AU-Otw,-38.532341,142.816803,13,100.00,-999,-999.00,2009,2010,2008-12-31,46800,24 -17,AU-Rig,-36.649899,145.575897,14,100.00,-999,-999.00,2011,2016,2010-12-31,46800,48 -18,AU-Rob,-17.117500,145.630096,4,100.00,-999,-999.00,2014,2017,2013-12-31,50400,48 -19,AU-Sam,-27.388100,152.877808,14,100.00,-999,-999.00,2011,2017,2010-12-31,50400,48 -20,AU-Stp,-17.150700,133.350204,14,100.00,-999,-999.00,2010,2017,2009-12-31,54000,48 -21,AU-TTE,-22.287001,133.639999,10,30.00,14,70.00,2013,2017,2012-12-31,54000,48 -22,AU-Tum,-35.656601,148.151703,5,100.00,-999,-999.00,2002,2017,2001-12-31,46800,24 -23,AU-Whr,-36.673199,145.029404,5,100.00,-999,-999.00,2015,2016,2014-12-31,46800,48 -24,AU-Wrr,-43.095020,146.654495,5,100.00,-999,-999.00,2016,2017,2015-12-31,46800,48 -25,AU-Ync,-34.989300,146.290695,14,100.00,-999,-999.00,2011,2017,2010-12-31,46800,48 -26,BE-Bra,51.309166, 4.520560,1,19.22,7,80.78,2004,2014,2003-12-31,82800,48 -27,BE-Lon,50.551590, 4.746130,15,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 -28,BE-Vie,50.305069, 5.998050,1,25.93,7,74.07,1997,2014,1996-12-31,82800,48 -29,BR-Sa3,-3.018029,-54.971436,4,100.00,-999,-999.00,2001,2003,2001-01-01,14400,48 -30,BW-Ma1,-19.916500,23.560329,6,30.00,14,70.00,2000,2000,1999-12-31,79200,48 -31,CA-NS1,55.879200,-98.483887,2,100.00,-999,-999.00,2003,2003,2003-01-01,21600,48 -32,CA-NS2,55.905800,-98.524689,2,100.00,-999,-999.00,2002,2004,2002-01-01,21600,48 -33,CA-NS4,55.914398,-98.380615,2,100.00,-999,-999.00,2003,2004,2003-01-01,21600,48 -34,CA-NS5,55.863098,-98.484985,2,100.00,-999,-999.00,2003,2004,2003-01-01,21600,48 -35,CA-NS6,55.916698,-98.964417,10,30.00,13,70.00,2002,2004,2002-01-01,21600,48 -36,CA-NS7,56.635799,-99.948303,10,30.00,13,70.00,2003,2004,2003-01-01,21600,48 -37,CA-Qcu,49.267078,-74.036530,1,100.00,-999,-999.00,2002,2006,2002-01-01,18000,48 -38,CA-Qfo,49.692501,-74.342102,1,100.00,-999,-999.00,2004,2010,2004-01-01,18000,48 -39,CA-SF1,54.485001,-105.817596,1,100.00,-999,-999.00,2004,2006,2004-01-01,21600,48 -40,CA-SF2,54.253899,-105.877502,2,100.00,-999,-999.00,2003,2005,2003-01-01,21600,48 -41,CA-SF3,54.091599,-106.005310,10,30.00,13,70.00,2003,2005,2003-01-01,21600,48 -42,CH-Cha,47.210220, 8.410440,13,100.00,-999,-999.00,2006,2014,2005-12-31,82800,48 -43,CH-Dav,46.815334, 9.855920,1,100.00,-999,-999.00,1997,2014,1996-12-31,82800,48 -44,CH-Fru,47.115833, 8.537780,13,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 -45,CH-Oe1,47.285831, 7.731940,13,100.00,-999,-999.00,2002,2008,2001-12-31,82800,48 -46,CN-Cha,42.402500,128.095795,1, 8.79,7,91.21,2003,2005,2002-12-31,57600,48 -47,CN-Cng,44.593399,123.509201,14,100.00,-999,-999.00,2008,2009,2007-12-31,57600,48 -48,CN-Dan,30.497801,91.066399,12,100.00,-999,-999.00,2004,2005,2003-12-31,57600,48 -49,CN-Din,23.173300,112.536102,5,100.00,-999,-999.00,2003,2005,2002-12-31,57600,48 -50,CN-Du2,42.046700,116.283600,13,100.00,-999,-999.00,2007,2008,2006-12-31,57600,48 -51,CN-HaM,37.369999,101.180000,12,100.00,-999,-999.00,2002,2003,2001-12-31,57600,48 -52,CN-Qia,26.741400,115.058098,1,100.00,-999,-999.00,2003,2005,2002-12-31,57600,48 -53,CZ-wet,49.024651,14.770350,13,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 -54,DE-Bay,50.141941,11.866940,1,100.00,-999,-999.00,1997,1999,1996-12-31,82800,48 -55,DE-Geb,51.100101,10.914300,15,100.00,-999,-999.00,2001,2014,2000-12-31,82800,48 -56,DE-Gri,50.949471,13.512530,13,100.00,-999,-999.00,2004,2014,2003-12-31,82800,48 -57,DE-Hai,51.079166,10.453000,7,100.00,-999,-999.00,2000,2012,1999-12-31,82800,48 -58,DE-Kli,50.893059,13.522380,15,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 -59,DE-Meh,51.275311,10.655470,1, 1.27,7,98.73,2004,2006,2003-12-31,82800,48 -60,DE-Obe,50.786659,13.721290,1,100.00,-999,-999.00,2008,2014,2007-12-31,82800,48 -61,DE-Seh,50.870625, 6.449650,15,100.00,-999,-999.00,2008,2010,2007-12-31,82800,48 -62,DE-SfN,47.806389,11.327500,13,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 -63,DE-Tha,50.963612,13.566940,1,100.00,-999,-999.00,1998,2014,1997-12-31,82800,48 -64,DE-Wet,50.453499,11.457530,1,100.00,-999,-999.00,2002,2006,2001-12-31,82800,48 -65,DK-Fou,56.484200, 9.587220,15,100.00,-999,-999.00,2005,2005,2004-12-31,82800,48 -66,DK-Lva,55.683300,12.083300,13,100.00,-999,-999.00,2005,2006,2004-12-31,82800,48 -67,DK-Ris,55.530281,12.097220,15,100.00,-999,-999.00,2004,2005,2003-12-31,82800,48 -68,DK-Sor,55.485870,11.644640,7,100.00,-999,-999.00,1997,2014,1996-12-31,82800,48 -69,DK-ZaH,74.473282,-20.550293,12,100.00,-999,-999.00,2000,2013,2000-01-01,0,48 -70,ES-ES1,39.345970,-0.318817,1,100.00,-999,-999.00,1999,2006,1998-12-31,82800,48 -71,ES-ES2,39.275558,-0.315277,-999,-999.00,16,100.00,2005,2006,2004-12-31,82800,48 -72,ES-LgS,37.097935,-2.965820,10,30.00,13,70.00,2007,2007,2006-12-31,82800,48 -73,ES-LMa,39.941502,-5.773346,7,30.00,14,70.00,2004,2006,2003-12-31,82800,48 -74,ES-VDA,42.152180, 1.448500,7,30.00,13,70.00,2004,2004,2003-12-31,82800,48 -75,FI-Hyy,61.847500,24.295000,1,100.00,-999,-999.00,1996,2014,1995-12-31,79200,48 -76,FI-Kaa,69.140694,27.295031,12,100.00,-999,-999.00,2000,2002,1999-12-31,79200,48 -77,FI-Lom,67.997200,24.209181,12,100.00,-999,-999.00,2007,2009,2006-12-31,79200,48 -78,FI-Sod,67.361862,26.637831,1,100.00,-999,-999.00,2008,2014,2007-12-31,79200,48 -79,FR-Fon,48.476398, 2.780140,7,100.00,-999,-999.00,2005,2013,2004-12-31,82800,48 -80,FR-Gri,48.844219, 1.951910,15,100.00,-999,-999.00,2005,2013,2004-12-31,82800,48 -81,FR-Hes,48.674160, 7.065560,7,100.00,-999,-999.00,1997,2006,1996-12-31,82800,48 -82,FR-LBr,44.717110,-0.769287,1,100.00,-999,-999.00,2003,2008,2002-12-31,82800,48 -83,FR-Lq1,45.643059, 2.735830,13,100.00,-999,-999.00,2004,2006,2003-12-31,82800,48 -84,FR-Lq2,45.639191, 2.737030,13,100.00,-999,-999.00,2004,2006,2003-12-31,82800,48 -85,FR-Pue,43.741390, 3.595830,5,100.00,-999,-999.00,2000,2014,1999-12-31,82800,48 -86,GF-Guy, 5.278772,-52.924866,4,100.00,-999,-999.00,2004,2014,2004-01-01,10800,48 -87,HU-Bug,46.691101,19.601299,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 -88,ID-Pag,-2.345000,114.036392,4,100.00,-999,-999.00,2002,2003,2001-12-31,61200,48 -89,IE-Ca1,52.858791,-6.918152,15,100.00,-999,-999.00,2004,2006,2004-01-01,0,48 -90,IE-Dri,51.986691,-8.751801,13,100.00,-999,-999.00,2003,2005,2003-01-01,0,48 -91,IT-Amp,41.904099,13.605160,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 -92,IT-BCi,40.523800,14.957440,-999,-999.00,16,100.00,2005,2010,2004-12-31,82800,48 -93,IT-CA1,42.380409,12.026560,7,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 -94,IT-CA2,42.377220,12.026040,15,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 -95,IT-CA3,42.380001,12.022200,7,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 -96,IT-Col,41.849361,13.588140,7,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 -97,IT-Cpz,41.705250,12.376110,5,100.00,-999,-999.00,2001,2008,2000-12-31,82800,48 -98,IT-Isp,45.812641, 8.633580,7,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 -99,IT-Lav,45.956200,11.281320,1,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 -100,IT-LMa,45.152580, 7.582590,7,100.00,-999,-999.00,2003,2004,2002-12-31,82800,48 -101,IT-Mal,46.114021,11.703340,13,100.00,-999,-999.00,2003,2003,2002-12-31,82800,48 -102,IT-MBo,46.014679,11.045830,13,100.00,-999,-999.00,2003,2012,2002-12-31,82800,48 -103,IT-Noe,40.606178, 8.151170,10,70.00,14,30.00,2004,2014,2003-12-31,82800,48 -104,IT-Non,44.690189,11.091090,7,100.00,-999,-999.00,2002,2002,2001-12-31,82800,48 -105,IT-PT1,45.200871, 9.061040,7,100.00,-999,-999.00,2003,2004,2002-12-31,82800,48 -106,IT-Ren,46.586861,11.433690,1,100.00,-999,-999.00,2010,2013,2009-12-31,82800,48 -107,IT-Ro1,42.408119,11.930010,7,100.00,-999,-999.00,2002,2006,2001-12-31,82800,48 -108,IT-Ro2,42.390259,11.920930,7,100.00,-999,-999.00,2002,2008,2001-12-31,82800,48 -109,IT-SR2,43.732029,10.290950,1,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 -110,IT-SRo,43.727859,10.284440,1,100.00,-999,-999.00,2003,2012,2002-12-31,82800,48 -111,JP-SMF,35.261700,137.078796,1,29.81,7,70.19,2003,2006,2002-12-31,54000,48 -112,NL-Ca1,51.971001, 4.927000,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 -113,NL-Hor,52.240349, 5.071300,13,100.00,-999,-999.00,2008,2011,2007-12-31,82800,48 -114,NL-Loo,52.166580, 5.743560,1,100.00,-999,-999.00,1997,2013,1996-12-31,82800,48 -115,PL-wet,52.762199,16.309401,13,100.00,-999,-999.00,2004,2005,2003-12-31,82800,48 -116,PT-Esp,38.639400,-8.601807,5,100.00,-999,-999.00,2002,2004,2002-01-01,0,48 -117,PT-Mi1,38.540642,-8.000061,5,100.00,-999,-999.00,2005,2005,2005-01-01,0,48 -118,PT-Mi2,38.476501,-8.024536,14,100.00,-999,-999.00,2005,2006,2005-01-01,0,48 -119,RU-Che,68.613037,161.341431,12,100.00,-999,-999.00,2003,2004,2002-12-31,46800,48 -120,RU-Fyo,56.461529,32.922081,1,100.00,-999,-999.00,2003,2014,2002-12-31,75600,48 -121,RU-Zot,60.800800,89.350800,2,70.00,13,30.00,2003,2003,2002-12-31,61200,48 -122,SD-Dem,13.282900,30.478300,6,30.00,14,70.00,2005,2009,2004-12-31,75600,48 -123,SE-Deg,64.181969,19.556690,13,100.00,-999,-999.00,2002,2005,2001-12-31,82800,48 -124,UK-Gri,56.607220,-3.798065,1,100.00,-999,-999.00,2000,2001,2000-01-01,0,48 -125,UK-Ham,51.153530,-0.858307,7,100.00,-999,-999.00,2004,2004,2004-01-01,0,48 -126,UK-PL3,51.450001,-1.266663,1, 8.33,7,91.67,2005,2006,2005-01-01,0,48 -127,US-AR1,36.426701,-99.419983,14,100.00,-999,-999.00,2010,2012,2010-01-01,21600,48 -128,US-AR2,36.635799,-99.597504,14,100.00,-999,-999.00,2010,2011,2010-01-01,21600,48 -129,US-ARM,36.605801,-97.488800,15,100.00,-999,-999.00,2003,2012,2003-01-01,21600,48 -130,US-Aud,31.590700,-110.509201,14,100.00,-999,-999.00,2003,2005,2003-01-01,25200,48 -131,US-Bar,44.064640,-71.288086,1, 8.43,7,91.57,2005,2005,2005-01-01,18000,48 -132,US-Bkg,44.345291,-96.836182,14,100.00,-999,-999.00,2005,2006,2005-01-01,21600,48 -133,US-Blo,38.895302,-120.632751,1,100.00,-999,-999.00,2000,2006,2000-01-01,28800,48 -134,US-Bo1,40.006199,-88.290405,15,100.00,-999,-999.00,1997,2006,1997-01-01,21600,48 -135,US-Cop,38.090000,-109.389999,14,100.00,-999,-999.00,2002,2003,2002-01-01,25200,24 -136,US-FPe,48.307701,-105.101898,14,100.00,-999,-999.00,2000,2006,2000-01-01,25200,48 -137,US-GLE,41.366501,-106.239899,1,100.00,-999,-999.00,2009,2014,2009-01-01,25200,48 -138,US-Goo,34.254700,-89.873505,14,100.00,-999,-999.00,2004,2006,2004-01-01,21600,48 -139,US-Ha1,42.537800,-72.171509,7,100.00,-999,-999.00,1992,2012,1992-01-01,18000,24 -140,US-Ho1,45.204102,-68.740204,1,100.00,-999,-999.00,1996,2004,1996-01-01,18000,48 -141,US-KS2,28.608578,-80.671539,10,70.00,14,30.00,2003,2006,2003-01-01,18000,48 -142,US-Los,46.082699,-89.979187,13,100.00,-999,-999.00,2000,2008,2000-01-01,21600,48 -143,US-Me2,44.452301,-121.557404,1,100.00,-999,-999.00,2002,2014,2002-01-01,28800,48 -144,US-Me4,44.499199,-121.622406,1,100.00,-999,-999.00,1996,2000,1996-01-01,28800,48 -145,US-Me6,44.323299,-121.607803,1,100.00,-999,-999.00,2011,2014,2011-01-01,28800,48 -146,US-MMS,39.323200,-86.413086,7,100.00,-999,-999.00,1999,2014,1999-01-01,18000,24 -147,US-MOz,38.744110,-92.200012,7,100.00,-999,-999.00,2005,2006,2005-01-01,21600,48 -148,US-Myb,38.049801,-121.765106,13,100.00,-999,-999.00,2011,2014,2011-01-01,28800,48 -149,US-Ne1,41.165100,-96.476593,-999,-999.00,16,100.00,2002,2012,2002-01-01,21600,24 -150,US-Ne2,41.164902,-96.470093,-999,-999.00,16,100.00,2002,2012,2002-01-01,21600,24 -151,US-Ne3,41.179699,-96.439697,15,100.00,-999,-999.00,2002,2012,2002-01-01,21600,24 -152,US-NR1,40.032902,-105.546402,1,100.00,-999,-999.00,1999,2014,1999-01-01,25200,48 -153,US-PFa,45.945900,-90.272308,1, 8.18,7,91.82,1995,2014,1995-01-01,21600,24 -154,US-Prr,65.123703,-147.487595,2,100.00,-999,-999.00,2011,2013,2011-01-01,32400,48 -155,US-SP1,29.738070,-82.218781,1,100.00,-999,-999.00,2005,2005,2005-01-01,18000,48 -156,US-SP2,29.764799,-82.244812,1,100.00,-999,-999.00,2000,2004,2000-01-01,18000,48 -157,US-SP3,29.754770,-82.163269,5,100.00,-999,-999.00,1999,2004,1999-01-01,18000,48 -158,US-SRG,31.789400,-110.827698,14,100.00,-999,-999.00,2009,2014,2009-01-01,25200,48 -159,US-SRM,31.821400,-110.865997,7,70.00,14,30.00,2004,2014,2004-01-01,25200,48 -160,US-Syv,46.242001,-89.347717,1, 4.91,7,95.09,2002,2008,2002-01-01,21600,48 -161,US-Ton,38.431599,-120.966003,7,70.00,14,30.00,2001,2014,2001-01-01,28800,48 -162,US-Tw4,38.103001,-121.641403,13,100.00,-999,-999.00,2014,2014,2014-01-01,28800,48 -163,US-Twt,38.108700,-121.653107,-999,-999.00,16,100.00,2010,2014,2010-01-01,28800,48 -164,US-UMB,45.559799,-84.713806,7,100.00,-999,-999.00,2000,2014,2000-01-01,18000,24 -165,US-Var,38.413300,-120.950729,14,100.00,-999,-999.00,2001,2014,2001-01-01,28800,48 -166,US-WCr,45.805901,-90.079895,7,100.00,-999,-999.00,1999,2006,1999-01-01,21600,48 -167,US-Whs,31.743799,-110.052200,10,30.00,14,70.00,2008,2014,2008-01-01,25200,48 -168,US-Wkg,31.736500,-109.941895,14,100.00,-999,-999.00,2005,2014,2005-01-01,25200,48 -169,ZA-Kru,-25.019699,31.496901,6,30.00,14,70.00,2000,2002,1999-12-31,79200,48 -170,ZM-Mon,-15.437778,23.252781,6,100.00,-999,-999.00,2008,2008,2007-12-31,79200,48 +,Site,Lat,Lon,pft1,pft1-%,pft1-cth,pft1-cbh,pft2,pft2-%,pft2-cth,pft2-cbh,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL +1,AR-SLu,-33.464802,-66.459808,5,50.00, 4.50, 0.13,7,50.00, 4.50, 2.59,2010,2010,2010-01-01,10800,48 +2,AT-Neu,47.116669,11.317500,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2001-12-31,82800,48 +3,AU-ASM,-22.283001,133.248993,1,100.00, 6.50, 3.25,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,54000,48 +4,AU-Cow,-16.238190,145.427155,4,100.00,22.00, 0.63,-999,-999.00,-999.00,-999.00,2010,2015,2009-12-31,50400,48 +5,AU-Cpr,-34.002060,140.589127,7,30.00, 4.00, 2.30,14,70.00, 0.50, 0.01,2011,2017,2010-12-31,46800,48 +6,AU-Ctr,-16.103279,145.446854,4,100.00,25.00, 0.71,-999,-999.00,-999.00,-999.00,2010,2017,2009-12-31,50400,48 +7,AU-Cum,-33.613297,150.722473,5,100.00,23.00, 0.66,-999,-999.00,-999.00,-999.00,2013,2018,2012-12-31,46800,48 +8,AU-DaP,-14.063300,131.318100,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2012,2008-12-31,54000,48 +9,AU-DaS,-14.159283,131.388000,6,30.00,16.40, 9.11,14,70.00, 0.50, 0.01,2010,2017,2009-12-31,54000,48 +10,AU-Dry,-15.258800,132.370605,6,30.00,12.30, 6.83,14,70.00, 0.50, 0.01,2011,2015,2010-12-31,54000,48 +11,AU-Emr,-23.858700,148.474594,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,50400,48 +12,AU-Gin,-31.375000,115.650002,7,70.00, 7.00, 4.02,14,30.00, 0.50, 0.01,2012,2017,2011-12-31,57600,48 +13,AU-GWW,-30.191299,120.654099,7,30.00,18.00,10.35,14,70.00, 0.50, 0.01,2013,2017,2012-12-31,57600,48 +14,AU-How,-12.495200,131.149994,6,70.00,16.00, 8.89,14,30.00, 0.50, 0.01,2003,2017,2002-12-31,54000,48 +15,AU-Lit,-13.179040,130.794495,6,70.00,20.00,11.11,14,30.00, 0.50, 0.01,2016,2017,2015-12-31,54000,48 +16,AU-Otw,-38.532341,142.816803,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2010,2008-12-31,46800,24 +17,AU-Rig,-36.649899,145.575897,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2016,2010-12-31,46800,48 +18,AU-Rob,-17.117500,145.630096,4,100.00,44.00, 1.26,-999,-999.00,-999.00,-999.00,2014,2017,2013-12-31,50400,48 +19,AU-Sam,-27.388100,152.877808,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,50400,48 +20,AU-Stp,-17.150700,133.350204,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2017,2009-12-31,54000,48 +21,AU-TTE,-22.287001,133.639999,10,30.00, 4.85, 0.97,14,70.00, 0.50, 0.01,2013,2017,2012-12-31,54000,48 +22,AU-Tum,-35.656601,148.151703,5,100.00,40.00, 1.14,-999,-999.00,-999.00,-999.00,2002,2017,2001-12-31,46800,24 +23,AU-Whr,-36.673199,145.029404,5,100.00,28.00, 0.80,-999,-999.00,-999.00,-999.00,2015,2016,2014-12-31,46800,48 +24,AU-Wrr,-43.095020,146.654495,5,100.00,90.00, 2.57,-999,-999.00,-999.00,-999.00,2016,2017,2015-12-31,46800,48 +25,AU-Ync,-34.989300,146.290695,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,46800,48 +26,BE-Bra,51.309166, 4.520560,1,19.22,21.00,10.50,7,80.78,21.00,12.08,2004,2014,2003-12-31,82800,48 +27,BE-Lon,50.551590, 4.746130,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 +28,BE-Vie,50.305069, 5.998050,1,25.93,35.00,17.50,7,74.07,35.00,20.13,1997,2014,1996-12-31,82800,48 +29,BR-Sa3,-3.018029,-54.971436,4,100.00,40.00, 1.14,-999,-999.00,-999.00,-999.00,2001,2003,2001-01-01,14400,48 +30,BW-Ma1,-19.916500,23.560329,6,30.00, 8.00, 4.44,14,70.00, 0.50, 0.01,2000,2000,1999-12-31,79200,48 +31,CA-NS1,55.879200,-98.483887,2,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2003,2003,2003-01-01,21600,48 +32,CA-NS2,55.905800,-98.524689,2,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2002,2004,2002-01-01,21600,48 +33,CA-NS4,55.914398,-98.380615,2,100.00, 7.00, 3.50,-999,-999.00,-999.00,-999.00,2003,2004,2003-01-01,21600,48 +34,CA-NS5,55.863098,-98.484985,2,100.00, 5.00, 2.50,-999,-999.00,-999.00,-999.00,2003,2004,2003-01-01,21600,48 +35,CA-NS6,55.916698,-98.964417,10,30.00, 4.00, 0.80,13,70.00, 0.50, 0.01,2002,2004,2002-01-01,21600,48 +36,CA-NS7,56.635799,-99.948303,10,30.00, 0.25, 0.05,13,70.00, 0.50, 0.01,2003,2004,2003-01-01,21600,48 +37,CA-Qcu,49.267078,-74.036530,1,100.00, 5.50, 2.75,-999,-999.00,-999.00,-999.00,2002,2006,2002-01-01,18000,48 +38,CA-Qfo,49.692501,-74.342102,1,100.00,14.00, 7.00,-999,-999.00,-999.00,-999.00,2004,2010,2004-01-01,18000,48 +39,CA-SF1,54.485001,-105.817596,1,100.00, 6.00, 3.00,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,21600,48 +40,CA-SF2,54.253899,-105.877502,2,100.00, 4.00, 2.00,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,21600,48 +41,CA-SF3,54.091599,-106.005310,10,30.00, 1.00, 0.20,13,70.00, 0.50, 0.01,2003,2005,2003-01-01,21600,48 +42,CH-Cha,47.210220, 8.410440,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2006,2014,2005-12-31,82800,48 +43,CH-Dav,46.815334, 9.855920,1,100.00,25.00,12.50,-999,-999.00,-999.00,-999.00,1997,2014,1996-12-31,82800,48 +44,CH-Fru,47.115833, 8.537780,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 +45,CH-Oe1,47.285831, 7.731940,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2008,2001-12-31,82800,48 +46,CN-Cha,42.402500,128.095795,1, 8.79,28.00,14.00,7,91.21,28.00,16.10,2003,2005,2002-12-31,57600,48 +47,CN-Cng,44.593399,123.509201,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2009,2007-12-31,57600,48 +48,CN-Dan,30.497801,91.066399,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,57600,48 +49,CN-Din,23.173300,112.536102,5,100.00,30.00, 0.86,-999,-999.00,-999.00,-999.00,2003,2005,2002-12-31,57600,48 +50,CN-Du2,42.046700,116.283600,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2008,2006-12-31,57600,48 +51,CN-HaM,37.369999,101.180000,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2003,2001-12-31,57600,48 +52,CN-Qia,26.741400,115.058098,1,100.00,13.00, 6.50,-999,-999.00,-999.00,-999.00,2003,2005,2002-12-31,57600,48 +53,CZ-wet,49.024651,14.770350,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 +54,DE-Bay,50.141941,11.866940,1,100.00,25.00,12.50,-999,-999.00,-999.00,-999.00,1997,1999,1996-12-31,82800,48 +55,DE-Geb,51.100101,10.914300,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2001,2014,2000-12-31,82800,48 +56,DE-Gri,50.949471,13.512530,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2014,2003-12-31,82800,48 +57,DE-Hai,51.079166,10.453000,7,100.00,33.00,18.97,-999,-999.00,-999.00,-999.00,2000,2012,1999-12-31,82800,48 +58,DE-Kli,50.893059,13.522380,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 +59,DE-Meh,51.275311,10.655470,1, 1.27, 1.00, 0.50,7,98.73, 1.00, 0.58,2004,2006,2003-12-31,82800,48 +60,DE-Obe,50.786659,13.721290,1,100.00,19.00, 9.50,-999,-999.00,-999.00,-999.00,2008,2014,2007-12-31,82800,48 +61,DE-Seh,50.870625, 6.449650,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2010,2007-12-31,82800,48 +62,DE-SfN,47.806389,11.327500,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 +63,DE-Tha,50.963612,13.566940,1,100.00,26.50,13.25,-999,-999.00,-999.00,-999.00,1998,2014,1997-12-31,82800,48 +64,DE-Wet,50.453499,11.457530,1,100.00,22.00,11.00,-999,-999.00,-999.00,-999.00,2002,2006,2001-12-31,82800,48 +65,DK-Fou,56.484200, 9.587220,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2005,2004-12-31,82800,48 +66,DK-Lva,55.683300,12.083300,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2004-12-31,82800,48 +67,DK-Ris,55.530281,12.097220,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,82800,48 +68,DK-Sor,55.485870,11.644640,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,1997,2014,1996-12-31,82800,48 +69,DK-ZaH,74.473282,-20.550293,12,100.00, 0.47, 0.01,-999,-999.00,-999.00,-999.00,2000,2013,2000-01-01,0,48 +70,ES-ES1,39.345970,-0.318817,1,100.00, 7.50, 3.75,-999,-999.00,-999.00,-999.00,1999,2006,1998-12-31,82800,48 +71,ES-ES2,39.275558,-0.315277,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2005,2006,2004-12-31,82800,48 +72,ES-LgS,37.097935,-2.965820,10,30.00, 0.20, 0.04,13,70.00, 0.50, 0.01,2007,2007,2006-12-31,82800,48 +73,ES-LMa,39.941502,-5.773346,7,30.00, 8.00, 4.60,14,70.00, 0.50, 0.01,2004,2006,2003-12-31,82800,48 +74,ES-VDA,42.152180, 1.448500,7,30.00, 0.50, 0.29,13,70.00, 0.50, 0.01,2004,2004,2003-12-31,82800,48 +75,FI-Hyy,61.847500,24.295000,1,100.00,14.00, 7.00,-999,-999.00,-999.00,-999.00,1996,2014,1995-12-31,79200,48 +76,FI-Kaa,69.140694,27.295031,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2002,1999-12-31,79200,48 +77,FI-Lom,67.997200,24.209181,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2009,2006-12-31,79200,48 +78,FI-Sod,67.361862,26.637831,1,100.00,12.70, 6.35,-999,-999.00,-999.00,-999.00,2008,2014,2007-12-31,79200,48 +79,FR-Fon,48.476398, 2.780140,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,2005,2013,2004-12-31,82800,48 +80,FR-Gri,48.844219, 1.951910,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2013,2004-12-31,82800,48 +81,FR-Hes,48.674160, 7.065560,7,100.00,13.00, 7.47,-999,-999.00,-999.00,-999.00,1997,2006,1996-12-31,82800,48 +82,FR-LBr,44.717110,-0.769287,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2003,2008,2002-12-31,82800,48 +83,FR-Lq1,45.643059, 2.735830,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2003-12-31,82800,48 +84,FR-Lq2,45.639191, 2.737030,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2003-12-31,82800,48 +85,FR-Pue,43.741390, 3.595830,5,100.00, 6.50, 0.19,-999,-999.00,-999.00,-999.00,2000,2014,1999-12-31,82800,48 +86,GF-Guy, 5.278772,-52.924866,4,100.00,35.00, 1.00,-999,-999.00,-999.00,-999.00,2004,2014,2004-01-01,10800,48 +87,HU-Bug,46.691101,19.601299,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 +88,ID-Pag,-2.345000,114.036392,4,100.00,26.00, 0.74,-999,-999.00,-999.00,-999.00,2002,2003,2001-12-31,61200,48 +89,IE-Ca1,52.858791,-6.918152,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,0,48 +90,IE-Dri,51.986691,-8.751801,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,0,48 +91,IT-Amp,41.904099,13.605160,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 +92,IT-BCi,40.523800,14.957440,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2005,2010,2004-12-31,82800,48 +93,IT-CA1,42.380409,12.026560,7,100.00, 5.50, 3.16,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 +94,IT-CA2,42.377220,12.026040,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 +95,IT-CA3,42.380001,12.022200,7,100.00, 3.50, 2.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 +96,IT-Col,41.849361,13.588140,7,100.00,13.00, 7.47,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 +97,IT-Cpz,41.705250,12.376110,5,100.00,13.00, 0.37,-999,-999.00,-999.00,-999.00,2001,2008,2000-12-31,82800,48 +98,IT-Isp,45.812641, 8.633580,7,100.00,19.00,10.93,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 +99,IT-Lav,45.956200,11.281320,1,100.00,28.00,14.00,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 +100,IT-LMa,45.152580, 7.582590,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,82800,48 +101,IT-Mal,46.114021,11.703340,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2003,2002-12-31,82800,48 +102,IT-MBo,46.014679,11.045830,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2012,2002-12-31,82800,48 +103,IT-Noe,40.606178, 8.151170,10,70.00, 1.20, 0.24,14,30.00, 0.50, 0.01,2004,2014,2003-12-31,82800,48 +104,IT-Non,44.690189,11.091090,7,100.00, 7.00, 4.03,-999,-999.00,-999.00,-999.00,2002,2002,2001-12-31,82800,48 +105,IT-PT1,45.200871, 9.061040,7,100.00,26.00,14.95,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,82800,48 +106,IT-Ren,46.586861,11.433690,1,100.00,28.00,14.00,-999,-999.00,-999.00,-999.00,2010,2013,2009-12-31,82800,48 +107,IT-Ro1,42.408119,11.930010,7,100.00,15.00, 8.62,-999,-999.00,-999.00,-999.00,2002,2006,2001-12-31,82800,48 +108,IT-Ro2,42.390259,11.920930,7,100.00,15.00, 8.62,-999,-999.00,-999.00,-999.00,2002,2008,2001-12-31,82800,48 +109,IT-SR2,43.732029,10.290950,1,100.00,19.00, 9.50,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 +110,IT-SRo,43.727859,10.284440,1,100.00,16.00, 8.00,-999,-999.00,-999.00,-999.00,2003,2012,2002-12-31,82800,48 +111,JP-SMF,35.261700,137.078796,1,29.81, 8.10, 4.05,7,70.19, 8.10, 4.66,2003,2006,2002-12-31,54000,48 +112,NL-Ca1,51.971001, 4.927000,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 +113,NL-Hor,52.240349, 5.071300,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2011,2007-12-31,82800,48 +114,NL-Loo,52.166580, 5.743560,1,100.00,15.50, 7.75,-999,-999.00,-999.00,-999.00,1997,2013,1996-12-31,82800,48 +115,PL-wet,52.762199,16.309401,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,82800,48 +116,PT-Esp,38.639400,-8.601807,5,100.00,20.00, 0.57,-999,-999.00,-999.00,-999.00,2002,2004,2002-01-01,0,48 +117,PT-Mi1,38.540642,-8.000061,5,100.00, 7.30, 0.21,-999,-999.00,-999.00,-999.00,2005,2005,2005-01-01,0,48 +118,PT-Mi2,38.476501,-8.024536,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,0,48 +119,RU-Che,68.613037,161.341431,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,46800,48 +120,RU-Fyo,56.461529,32.922081,1,100.00,21.00,10.50,-999,-999.00,-999.00,-999.00,2003,2014,2002-12-31,75600,48 +121,RU-Zot,60.800800,89.350800,2,70.00,12.00, 6.00,13,30.00, 0.50, 0.01,2003,2003,2002-12-31,61200,48 +122,SD-Dem,13.282900,30.478300,6,30.00, 1.50, 0.83,14,70.00, 0.50, 0.01,2005,2009,2004-12-31,75600,48 +123,SE-Deg,64.181969,19.556690,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2005,2001-12-31,82800,48 +124,UK-Gri,56.607220,-3.798065,1,100.00,10.00, 5.00,-999,-999.00,-999.00,-999.00,2000,2001,2000-01-01,0,48 +125,UK-Ham,51.153530,-0.858307,7,100.00,22.00,12.65,-999,-999.00,-999.00,-999.00,2004,2004,2004-01-01,0,48 +126,UK-PL3,51.450001,-1.266663,1, 8.33,22.00,11.00,7,91.67,22.00,12.65,2005,2006,2005-01-01,0,48 +127,US-AR1,36.426701,-99.419983,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2012,2010-01-01,21600,48 +128,US-AR2,36.635799,-99.597504,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2011,2010-01-01,21600,48 +129,US-ARM,36.605801,-97.488800,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2012,2003-01-01,21600,48 +130,US-Aud,31.590700,-110.509201,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,25200,48 +131,US-Bar,44.064640,-71.288086,1, 8.43,21.00,10.50,7,91.57,21.00,12.07,2005,2005,2005-01-01,18000,48 +132,US-Bkg,44.345291,-96.836182,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,21600,48 +133,US-Blo,38.895302,-120.632751,1,100.00, 4.70, 2.35,-999,-999.00,-999.00,-999.00,2000,2006,2000-01-01,28800,48 +134,US-Bo1,40.006199,-88.290405,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,1997,2006,1997-01-01,21600,48 +135,US-Cop,38.090000,-109.389999,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2003,2002-01-01,25200,24 +136,US-FPe,48.307701,-105.101898,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2006,2000-01-01,25200,48 +137,US-GLE,41.366501,-106.239899,1,100.00,10.00, 5.00,-999,-999.00,-999.00,-999.00,2009,2014,2009-01-01,25200,48 +138,US-Goo,34.254700,-89.873505,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,21600,48 +139,US-Ha1,42.537800,-72.171509,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,1992,2012,1992-01-01,18000,24 +140,US-Ho1,45.204102,-68.740204,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,1996,2004,1996-01-01,18000,48 +141,US-KS2,28.608578,-80.671539,10,70.00, 2.00, 0.40,14,30.00, 0.50, 0.01,2003,2006,2003-01-01,18000,48 +142,US-Los,46.082699,-89.979187,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2008,2000-01-01,21600,48 +143,US-Me2,44.452301,-121.557404,1,100.00,16.00, 8.00,-999,-999.00,-999.00,-999.00,2002,2014,2002-01-01,28800,48 +144,US-Me4,44.499199,-121.622406,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,1996,2000,1996-01-01,28800,48 +145,US-Me6,44.323299,-121.607803,1,100.00, 5.20, 2.60,-999,-999.00,-999.00,-999.00,2011,2014,2011-01-01,28800,48 +146,US-MMS,39.323200,-86.413086,7,100.00,27.00,15.52,-999,-999.00,-999.00,-999.00,1999,2014,1999-01-01,18000,24 +147,US-MOz,38.744110,-92.200012,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,21600,48 +148,US-Myb,38.049801,-121.765106,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2014,2011-01-01,28800,48 +149,US-Ne1,41.165100,-96.476593,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2002,2012,2002-01-01,21600,24 +150,US-Ne2,41.164902,-96.470093,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2002,2012,2002-01-01,21600,24 +151,US-Ne3,41.179699,-96.439697,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2002-01-01,21600,24 +152,US-NR1,40.032902,-105.546402,1,100.00,12.00, 6.00,-999,-999.00,-999.00,-999.00,1999,2014,1999-01-01,25200,48 +153,US-PFa,45.945900,-90.272308,1, 8.18,30.00,15.00,7,91.82,30.00,17.25,1995,2014,1995-01-01,21600,24 +154,US-Prr,65.123703,-147.487595,2,100.00, 7.00, 3.50,-999,-999.00,-999.00,-999.00,2011,2013,2011-01-01,32400,48 +155,US-SP1,29.738070,-82.218781,1,100.00,22.00,11.00,-999,-999.00,-999.00,-999.00,2005,2005,2005-01-01,18000,48 +156,US-SP2,29.764799,-82.244812,1,100.00, 1.00, 0.50,-999,-999.00,-999.00,-999.00,2000,2004,2000-01-01,18000,48 +157,US-SP3,29.754770,-82.163269,5,100.00,10.00, 0.29,-999,-999.00,-999.00,-999.00,1999,2004,1999-01-01,18000,48 +158,US-SRG,31.789400,-110.827698,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2014,2009-01-01,25200,48 +159,US-SRM,31.821400,-110.865997,7,70.00, 2.50, 1.44,14,30.00, 0.50, 0.01,2004,2014,2004-01-01,25200,48 +160,US-Syv,46.242001,-89.347717,1, 4.91,27.00,13.50,7,95.09,27.00,15.53,2002,2008,2002-01-01,21600,48 +161,US-Ton,38.431599,-120.966003,7,70.00, 7.10, 4.08,14,30.00, 0.50, 0.01,2001,2014,2001-01-01,28800,48 +162,US-Tw4,38.103001,-121.641403,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2014,2014,2014-01-01,28800,48 +163,US-Twt,38.108700,-121.653107,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2010,2014,2010-01-01,28800,48 +164,US-UMB,45.559799,-84.713806,7,100.00,20.00,11.50,-999,-999.00,-999.00,-999.00,2000,2014,2000-01-01,18000,24 +165,US-Var,38.413300,-120.950729,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2001,2014,2001-01-01,28800,48 +166,US-WCr,45.805901,-90.079895,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,1999,2006,1999-01-01,21600,48 +167,US-Whs,31.743799,-110.052200,10,30.00, 0.50, 0.10,14,70.00, 0.50, 0.01,2008,2014,2008-01-01,25200,48 +168,US-Wkg,31.736500,-109.941895,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2005-01-01,25200,48 +169,ZA-Kru,-25.019699,31.496901,6,30.00,12.00, 6.67,14,70.00, 0.50, 0.01,2000,2002,1999-12-31,79200,48 +170,ZM-Mon,-15.437778,23.252781,6,100.00,12.00, 6.67,-999,-999.00,-999.00,-999.00,2008,2008,2007-12-31,79200,48 diff --git a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl index d1476b821b..79a140486c 100644 --- a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl +++ b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl @@ -30,8 +30,14 @@ begin latitude = new(nsim,"double") longitude = new(nsim,"double") - pfttype = new((/nsim,2/),"integer") - pftperc = new((/nsim,2/),"double") + npfts_ch = 17 ; Number of pfts for canopy top/bottom height + + pfttype = new((/nsim,2/),"integer") ; pft type + pftperc = new((/nsim,2/),"double") ; pft % + pftcth = new((/nsim,2/),"double") ; pft canopy top height + pftcbh = new((/nsim,2/),"double") ; pft canopy bottom height +; pftcth = new((/nsim,npfts_ch/),"double") ; pft canopy top height +; pftcbh = new((/nsim,npfts_ch/),"double") ; pft canopy bottom height pctwet = new(nsim,"double") do sel = 0,nsim - 1 @@ -80,7 +86,6 @@ begin longitude(sel) = longitude(sel) - 360.d end if - delete(time) delete(tmp) delete(utc_date) @@ -92,6 +97,8 @@ begin fls = systemfunc("ls " + f_in_dir + "surfdata_0.9x1.25_16pfts_" + sim(sel) + ".nc") surfdatafile = addfile(fls,"r") pct_natveg = surfdatafile->PCT_NATVEG(0,0) + monthly_height_top = surfdatafile->MONTHLY_HEIGHT_TOP(0,:,0,0) ; For SP, all months have the same height + monthly_height_bot = surfdatafile->MONTHLY_HEIGHT_BOT(0,:,0,0) ; For SP, all months have the same height if (pct_natveg .gt. 0.) then pct_nat_pft = surfdatafile->PCT_NAT_PFT(:,0,0) indx = ind(pct_nat_pft(:) .gt. 0) @@ -101,12 +108,18 @@ begin print((/"Number of pfts is > 2"/)) pfttype(sel,:) = -999 pftperc(sel,:) = -999. + pftcth(sel,:) = -999. + pftcbh(sel,:) = -999. else pfttype(sel,:) = -999 pftperc(sel,:) = -999. + pftcth(sel,:) = -999. + pftcbh(sel,:) = -999. do p = 0,npfts-1 pfttype(sel,p) = indx(p) pftperc(sel,p) = pct_nat_pft(indx(p)) + pftcth(sel,p) = monthly_height_top(indx(p)) + pftcbh(sel,p) = monthly_height_bot(indx(p)) end do end if pctwet(sel) = 0. @@ -116,6 +129,8 @@ begin print((/"PCT_NATVEG is zero"/)) pfttype(sel,:) = -999 pftperc(sel,:) = -999. + pftcth(sel,:) = -999. + pftcbh(sel,:) = -999. pct_wetland = surfdatafile->PCT_WETLAND(0,0) if (pct_wetland .gt. 0.) then print((/"Wetland Site"/)) @@ -130,16 +145,24 @@ begin if (pct_cft(0) .gt. 0.) then pfttype(sel,0) = 15 pftperc(sel,0) = (/pct_cft(0)/) + pftcth(sel,0) = monthly_height_top(15) + pftcbh(sel,0) = monthly_height_bot(15) else pfttype(sel,0) = -999 pftperc(sel,0) = -999. + pftcth(sel,0) = -999. + pftcbh(sel,0) = -999. end if if (pct_cft(1) .gt. 0.) then pfttype(sel,1) = 16 pftperc(sel,1) = (/pct_cft(1)/) + pftcth(sel,1) = monthly_height_top(16) + pftcbh(sel,1) = monthly_height_bot(16) else pfttype(sel,1) = -999 pftperc(sel,1) = -999. + pftcth(sel,1) = -999. + pftcbh(sel,1) = -999. end if else print((/"PCT_NATVEG, PCT_WETLAND, PCT_CROP are all zero"/)) @@ -147,7 +170,10 @@ begin end if end if - +; do ch = 0,npfts_ch-1 +; pftcth(sel,ch) = monthly_height_top(ch) +; pftcbh(sel,ch) = monthly_height_bot(ch) +; end do end do @@ -155,17 +181,18 @@ begin ; fname = "/glade/work/oleson/PLUMBER2/NEON_PLUMBER/PLUMBER2_sites.csv" fname = "/glade/work/oleson/ctsm_PLUMBERcsv/tools/site_and_regional/PLUMBER2_sites.csv" - header = (/"#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \ + header = (/"#pftX-cth and pftX-cbh are the site=specific canopy top and bottom heights", \ + "#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \ "#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight.", \ "#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data.", \ - ",Site,Lat,Lon,pft1,pft1-%,pft2,pft2-%,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL"/) + ",Site,Lat,Lon,pft1,pft1-%,pft1-cth,pft1-cbh,pft2,pft2-%,pft2-cth,pft2-cbh,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL"/) hlist = [/header/] - alist = [/site_num, sim, latitude, longitude, pfttype(:,0), pftperc(:,0), pfttype(:,1), pftperc(:,1), startyear, endyear, run_startdate, starttod, atm_ncpl/] + alist = [/site_num, sim, latitude, longitude, pfttype(:,0), pftperc(:,0), pftcth(:,0), pftcbh(:,0), pfttype(:,1), pftperc(:,1), pftcth(:,1), pftcbh(:,1),startyear, endyear, run_startdate, starttod, atm_ncpl/] print(alist) print((/"Done defining hlist and alist"/)) write_table(fname, "w", hlist, "%s") print((/"Done with header"/)) - write_table(fname, "a", alist, "%d,%s,%9.6f,%9.6f,%d,%5.2f,%d,%5.2f,%s,%s,%s,%s,%s") + write_table(fname, "a", alist, "%d,%s,%9.6f,%9.6f,%d,%5.2f,%5.2f,%5.2f,%d,%5.2f,%5.2f,%5.2f,%s,%s,%s,%s,%s") print ("=========================================") print ("Finish Time: "+systemfunc("date") ) From 1272e5808ab086b36c0e1de94f94d910a24dbc32 Mon Sep 17 00:00:00 2001 From: wwieder Date: Thu, 5 Oct 2023 11:03:59 -0600 Subject: [PATCH 06/43] PLUMBER surface data & usermods --- .../PLUMBER2/AR-SLu/include_user_mods | 1 + .../PLUMBER2/AR-SLu/shell_commands | 29 + .../PLUMBER2/AT-Neu/include_user_mods | 1 + .../PLUMBER2/AT-Neu/shell_commands | 29 + .../PLUMBER2/AU-ASM/include_user_mods | 1 + .../PLUMBER2/AU-ASM/shell_commands | 29 + .../PLUMBER2/AU-Cow/include_user_mods | 1 + .../PLUMBER2/AU-Cow/shell_commands | 29 + .../PLUMBER2/AU-Cpr/include_user_mods | 1 + .../PLUMBER2/AU-Cpr/shell_commands | 29 + .../PLUMBER2/AU-Ctr/include_user_mods | 1 + .../PLUMBER2/AU-Ctr/shell_commands | 29 + .../PLUMBER2/AU-Cum/include_user_mods | 1 + .../PLUMBER2/AU-Cum/shell_commands | 29 + .../PLUMBER2/AU-DaP/include_user_mods | 1 + .../PLUMBER2/AU-DaP/shell_commands | 29 + .../PLUMBER2/AU-DaS/include_user_mods | 1 + .../PLUMBER2/AU-DaS/shell_commands | 29 + .../PLUMBER2/AU-Dry/include_user_mods | 1 + .../PLUMBER2/AU-Dry/shell_commands | 29 + .../PLUMBER2/AU-Emr/include_user_mods | 1 + .../PLUMBER2/AU-Emr/shell_commands | 29 + .../PLUMBER2/AU-GWW/include_user_mods | 1 + .../PLUMBER2/AU-GWW/shell_commands | 29 + .../PLUMBER2/AU-Gin/include_user_mods | 1 + .../PLUMBER2/AU-Gin/shell_commands | 29 + .../PLUMBER2/AU-How/include_user_mods | 1 + .../PLUMBER2/AU-How/shell_commands | 29 + .../PLUMBER2/AU-Lit/include_user_mods | 1 + .../PLUMBER2/AU-Lit/shell_commands | 29 + .../PLUMBER2/AU-Otw/include_user_mods | 1 + .../PLUMBER2/AU-Otw/shell_commands | 29 + .../PLUMBER2/AU-Rig/include_user_mods | 1 + .../PLUMBER2/AU-Rig/shell_commands | 29 + .../PLUMBER2/AU-Rob/include_user_mods | 1 + .../PLUMBER2/AU-Rob/shell_commands | 29 + .../PLUMBER2/AU-Sam/include_user_mods | 1 + .../PLUMBER2/AU-Sam/shell_commands | 29 + .../PLUMBER2/AU-Stp/include_user_mods | 1 + .../PLUMBER2/AU-Stp/shell_commands | 29 + .../PLUMBER2/AU-TTE/include_user_mods | 1 + .../PLUMBER2/AU-TTE/shell_commands | 29 + .../PLUMBER2/AU-Tum/include_user_mods | 1 + .../PLUMBER2/AU-Tum/shell_commands | 29 + .../PLUMBER2/AU-Whr/include_user_mods | 1 + .../PLUMBER2/AU-Whr/shell_commands | 29 + .../PLUMBER2/AU-Wrr/include_user_mods | 1 + .../PLUMBER2/AU-Wrr/shell_commands | 29 + .../PLUMBER2/AU-Ync/include_user_mods | 1 + .../PLUMBER2/AU-Ync/shell_commands | 29 + .../PLUMBER2/BE-Bra/include_user_mods | 1 + .../PLUMBER2/BE-Bra/shell_commands | 29 + .../PLUMBER2/BE-Lon/include_user_mods | 1 + .../PLUMBER2/BE-Lon/shell_commands | 29 + .../PLUMBER2/BE-Vie/include_user_mods | 1 + .../PLUMBER2/BE-Vie/shell_commands | 29 + .../PLUMBER2/BR-Sa3/include_user_mods | 1 + .../PLUMBER2/BR-Sa3/shell_commands | 29 + .../PLUMBER2/BW-Ma1/include_user_mods | 1 + .../PLUMBER2/BW-Ma1/shell_commands | 29 + .../PLUMBER2/CA-NS1/include_user_mods | 1 + .../PLUMBER2/CA-NS1/shell_commands | 29 + .../PLUMBER2/CA-NS2/include_user_mods | 1 + .../PLUMBER2/CA-NS2/shell_commands | 29 + .../PLUMBER2/CA-NS4/include_user_mods | 1 + .../PLUMBER2/CA-NS4/shell_commands | 29 + .../PLUMBER2/CA-NS5/include_user_mods | 1 + .../PLUMBER2/CA-NS5/shell_commands | 29 + .../PLUMBER2/CA-NS6/include_user_mods | 1 + .../PLUMBER2/CA-NS6/shell_commands | 29 + .../PLUMBER2/CA-NS7/include_user_mods | 1 + .../PLUMBER2/CA-NS7/shell_commands | 29 + .../PLUMBER2/CA-Qcu/include_user_mods | 1 + .../PLUMBER2/CA-Qcu/shell_commands | 29 + .../PLUMBER2/CA-Qfo/include_user_mods | 1 + .../PLUMBER2/CA-Qfo/shell_commands | 29 + .../PLUMBER2/CA-SF1/include_user_mods | 1 + .../PLUMBER2/CA-SF1/shell_commands | 29 + .../PLUMBER2/CA-SF2/include_user_mods | 1 + .../PLUMBER2/CA-SF2/shell_commands | 29 + .../PLUMBER2/CA-SF3/include_user_mods | 1 + .../PLUMBER2/CA-SF3/shell_commands | 29 + .../PLUMBER2/CH-Cha/include_user_mods | 1 + .../PLUMBER2/CH-Cha/shell_commands | 29 + .../PLUMBER2/CH-Dav/include_user_mods | 1 + .../PLUMBER2/CH-Dav/shell_commands | 29 + .../PLUMBER2/CH-Fru/include_user_mods | 1 + .../PLUMBER2/CH-Fru/shell_commands | 29 + .../PLUMBER2/CH-Oe1/include_user_mods | 1 + .../PLUMBER2/CH-Oe1/shell_commands | 29 + .../PLUMBER2/CN-Cha/include_user_mods | 1 + .../PLUMBER2/CN-Cha/shell_commands | 29 + .../PLUMBER2/CN-Cng/include_user_mods | 1 + .../PLUMBER2/CN-Cng/shell_commands | 29 + .../PLUMBER2/CN-Dan/include_user_mods | 1 + .../PLUMBER2/CN-Dan/shell_commands | 29 + .../PLUMBER2/CN-Din/include_user_mods | 1 + .../PLUMBER2/CN-Din/shell_commands | 29 + .../PLUMBER2/CN-Du2/include_user_mods | 1 + .../PLUMBER2/CN-Du2/shell_commands | 29 + .../PLUMBER2/CN-HaM/include_user_mods | 1 + .../PLUMBER2/CN-HaM/shell_commands | 29 + .../PLUMBER2/CN-Qia/include_user_mods | 1 + .../PLUMBER2/CN-Qia/shell_commands | 29 + .../PLUMBER2/CZ-wet/include_user_mods | 1 + .../PLUMBER2/CZ-wet/shell_commands | 32 + .../PLUMBER2/DE-Bay/include_user_mods | 1 + .../PLUMBER2/DE-Bay/shell_commands | 29 + .../PLUMBER2/DE-Geb/include_user_mods | 1 + .../PLUMBER2/DE-Geb/shell_commands | 29 + .../PLUMBER2/DE-Gri/include_user_mods | 1 + .../PLUMBER2/DE-Gri/shell_commands | 29 + .../PLUMBER2/DE-Hai/include_user_mods | 1 + .../PLUMBER2/DE-Hai/shell_commands | 29 + .../PLUMBER2/DE-Kli/include_user_mods | 1 + .../PLUMBER2/DE-Kli/shell_commands | 29 + .../PLUMBER2/DE-Meh/include_user_mods | 1 + .../PLUMBER2/DE-Meh/shell_commands | 29 + .../PLUMBER2/DE-Obe/include_user_mods | 1 + .../PLUMBER2/DE-Obe/shell_commands | 29 + .../PLUMBER2/DE-Seh/include_user_mods | 1 + .../PLUMBER2/DE-Seh/shell_commands | 29 + .../PLUMBER2/DE-SfN/include_user_mods | 1 + .../PLUMBER2/DE-SfN/shell_commands | 32 + .../PLUMBER2/DE-Tha/include_user_mods | 1 + .../PLUMBER2/DE-Tha/shell_commands | 29 + .../PLUMBER2/DE-Wet/include_user_mods | 1 + .../PLUMBER2/DE-Wet/shell_commands | 29 + .../PLUMBER2/DK-Fou/include_user_mods | 1 + .../PLUMBER2/DK-Fou/shell_commands | 29 + .../PLUMBER2/DK-Lva/include_user_mods | 1 + .../PLUMBER2/DK-Lva/shell_commands | 29 + .../PLUMBER2/DK-Ris/include_user_mods | 1 + .../PLUMBER2/DK-Ris/shell_commands | 29 + .../PLUMBER2/DK-Sor/include_user_mods | 1 + .../PLUMBER2/DK-Sor/shell_commands | 29 + .../PLUMBER2/DK-ZaH/include_user_mods | 1 + .../PLUMBER2/DK-ZaH/shell_commands | 29 + .../PLUMBER2/ES-ES1/include_user_mods | 1 + .../PLUMBER2/ES-ES1/shell_commands | 29 + .../PLUMBER2/ES-ES2/include_user_mods | 1 + .../PLUMBER2/ES-ES2/shell_commands | 29 + .../PLUMBER2/ES-LMa/include_user_mods | 1 + .../PLUMBER2/ES-LMa/shell_commands | 29 + .../PLUMBER2/ES-LgS/include_user_mods | 1 + .../PLUMBER2/ES-LgS/shell_commands | 29 + .../PLUMBER2/ES-VDA/include_user_mods | 1 + .../PLUMBER2/ES-VDA/shell_commands | 29 + .../PLUMBER2/FI-Hyy/include_user_mods | 1 + .../PLUMBER2/FI-Hyy/shell_commands | 29 + .../PLUMBER2/FI-Kaa/include_user_mods | 1 + .../PLUMBER2/FI-Kaa/shell_commands | 32 + .../PLUMBER2/FI-Lom/include_user_mods | 1 + .../PLUMBER2/FI-Lom/shell_commands | 32 + .../PLUMBER2/FI-Sod/include_user_mods | 1 + .../PLUMBER2/FI-Sod/shell_commands | 29 + .../PLUMBER2/FR-Fon/include_user_mods | 1 + .../PLUMBER2/FR-Fon/shell_commands | 29 + .../PLUMBER2/FR-Gri/include_user_mods | 1 + .../PLUMBER2/FR-Gri/shell_commands | 29 + .../PLUMBER2/FR-Hes/include_user_mods | 1 + .../PLUMBER2/FR-Hes/shell_commands | 29 + .../PLUMBER2/FR-LBr/include_user_mods | 1 + .../PLUMBER2/FR-LBr/shell_commands | 29 + .../PLUMBER2/FR-Lq1/include_user_mods | 1 + .../PLUMBER2/FR-Lq1/shell_commands | 29 + .../PLUMBER2/FR-Lq2/include_user_mods | 1 + .../PLUMBER2/FR-Lq2/shell_commands | 29 + .../PLUMBER2/FR-Pue/include_user_mods | 1 + .../PLUMBER2/FR-Pue/shell_commands | 29 + .../PLUMBER2/GF-Guy/include_user_mods | 1 + .../PLUMBER2/GF-Guy/shell_commands | 29 + .../PLUMBER2/HU-Bug/include_user_mods | 1 + .../PLUMBER2/HU-Bug/shell_commands | 29 + .../PLUMBER2/ID-Pag/include_user_mods | 1 + .../PLUMBER2/ID-Pag/shell_commands | 29 + .../PLUMBER2/IE-Ca1/include_user_mods | 1 + .../PLUMBER2/IE-Ca1/shell_commands | 29 + .../PLUMBER2/IE-Dri/include_user_mods | 1 + .../PLUMBER2/IE-Dri/shell_commands | 29 + .../PLUMBER2/IT-Amp/include_user_mods | 1 + .../PLUMBER2/IT-Amp/shell_commands | 29 + .../PLUMBER2/IT-BCi/include_user_mods | 1 + .../PLUMBER2/IT-BCi/shell_commands | 29 + .../PLUMBER2/IT-CA1/include_user_mods | 1 + .../PLUMBER2/IT-CA1/shell_commands | 29 + .../PLUMBER2/IT-CA2/include_user_mods | 1 + .../PLUMBER2/IT-CA2/shell_commands | 29 + .../PLUMBER2/IT-CA3/include_user_mods | 1 + .../PLUMBER2/IT-CA3/shell_commands | 29 + .../PLUMBER2/IT-Col/include_user_mods | 1 + .../PLUMBER2/IT-Col/shell_commands | 29 + .../PLUMBER2/IT-Cpz/include_user_mods | 1 + .../PLUMBER2/IT-Cpz/shell_commands | 29 + .../PLUMBER2/IT-Isp/include_user_mods | 1 + .../PLUMBER2/IT-Isp/shell_commands | 29 + .../PLUMBER2/IT-LMa/include_user_mods | 1 + .../PLUMBER2/IT-LMa/shell_commands | 29 + .../PLUMBER2/IT-Lav/include_user_mods | 1 + .../PLUMBER2/IT-Lav/shell_commands | 29 + .../PLUMBER2/IT-MBo/include_user_mods | 1 + .../PLUMBER2/IT-MBo/shell_commands | 29 + .../PLUMBER2/IT-Mal/include_user_mods | 1 + .../PLUMBER2/IT-Mal/shell_commands | 29 + .../PLUMBER2/IT-Noe/include_user_mods | 1 + .../PLUMBER2/IT-Noe/shell_commands | 29 + .../PLUMBER2/IT-Non/include_user_mods | 1 + .../PLUMBER2/IT-Non/shell_commands | 29 + .../PLUMBER2/IT-PT1/include_user_mods | 1 + .../PLUMBER2/IT-PT1/shell_commands | 29 + .../PLUMBER2/IT-Ren/include_user_mods | 1 + .../PLUMBER2/IT-Ren/shell_commands | 29 + .../PLUMBER2/IT-Ro1/include_user_mods | 1 + .../PLUMBER2/IT-Ro1/shell_commands | 29 + .../PLUMBER2/IT-Ro2/include_user_mods | 1 + .../PLUMBER2/IT-Ro2/shell_commands | 29 + .../PLUMBER2/IT-SR2/include_user_mods | 1 + .../PLUMBER2/IT-SR2/shell_commands | 29 + .../PLUMBER2/IT-SRo/include_user_mods | 1 + .../PLUMBER2/IT-SRo/shell_commands | 29 + .../PLUMBER2/JP-SMF/include_user_mods | 1 + .../PLUMBER2/JP-SMF/shell_commands | 29 + .../PLUMBER2/NL-Ca1/include_user_mods | 1 + .../PLUMBER2/NL-Ca1/shell_commands | 29 + .../PLUMBER2/NL-Hor/include_user_mods | 1 + .../PLUMBER2/NL-Hor/shell_commands | 29 + .../PLUMBER2/NL-Loo/include_user_mods | 1 + .../PLUMBER2/NL-Loo/shell_commands | 29 + .../PLUMBER2/PL-wet/include_user_mods | 1 + .../PLUMBER2/PL-wet/shell_commands | 32 + .../PLUMBER2/PT-Esp/include_user_mods | 1 + .../PLUMBER2/PT-Esp/shell_commands | 29 + .../PLUMBER2/PT-Mi1/include_user_mods | 1 + .../PLUMBER2/PT-Mi1/shell_commands | 29 + .../PLUMBER2/PT-Mi2/include_user_mods | 1 + .../PLUMBER2/PT-Mi2/shell_commands | 29 + .../PLUMBER2/RU-Che/include_user_mods | 1 + .../PLUMBER2/RU-Che/shell_commands | 32 + .../PLUMBER2/RU-Fyo/include_user_mods | 1 + .../PLUMBER2/RU-Fyo/shell_commands | 29 + .../PLUMBER2/RU-Zot/include_user_mods | 1 + .../PLUMBER2/RU-Zot/shell_commands | 29 + .../PLUMBER2/SD-Dem/include_user_mods | 1 + .../PLUMBER2/SD-Dem/shell_commands | 29 + .../PLUMBER2/SE-Deg/include_user_mods | 1 + .../PLUMBER2/SE-Deg/shell_commands | 32 + .../PLUMBER2/UK-Gri/include_user_mods | 1 + .../PLUMBER2/UK-Gri/shell_commands | 29 + .../PLUMBER2/UK-Ham/include_user_mods | 1 + .../PLUMBER2/UK-Ham/shell_commands | 29 + .../PLUMBER2/UK-PL3/include_user_mods | 1 + .../PLUMBER2/UK-PL3/shell_commands | 29 + .../PLUMBER2/US-AR1/include_user_mods | 1 + .../PLUMBER2/US-AR1/shell_commands | 29 + .../PLUMBER2/US-AR2/include_user_mods | 1 + .../PLUMBER2/US-AR2/shell_commands | 29 + .../PLUMBER2/US-ARM/include_user_mods | 1 + .../PLUMBER2/US-ARM/shell_commands | 29 + .../PLUMBER2/US-Aud/include_user_mods | 1 + .../PLUMBER2/US-Aud/shell_commands | 29 + .../PLUMBER2/US-Bar/include_user_mods | 1 + .../PLUMBER2/US-Bar/shell_commands | 29 + .../PLUMBER2/US-Bkg/include_user_mods | 1 + .../PLUMBER2/US-Bkg/shell_commands | 29 + .../PLUMBER2/US-Blo/include_user_mods | 1 + .../PLUMBER2/US-Blo/shell_commands | 29 + .../PLUMBER2/US-Bo1/include_user_mods | 1 + .../PLUMBER2/US-Bo1/shell_commands | 29 + .../PLUMBER2/US-Cop/include_user_mods | 1 + .../PLUMBER2/US-Cop/shell_commands | 29 + .../PLUMBER2/US-FPe/include_user_mods | 1 + .../PLUMBER2/US-FPe/shell_commands | 29 + .../PLUMBER2/US-GLE/include_user_mods | 1 + .../PLUMBER2/US-GLE/shell_commands | 29 + .../PLUMBER2/US-Goo/include_user_mods | 1 + .../PLUMBER2/US-Goo/shell_commands | 29 + .../PLUMBER2/US-Ha1/include_user_mods | 1 + .../PLUMBER2/US-Ha1/shell_commands | 29 + .../PLUMBER2/US-Ho1/include_user_mods | 1 + .../PLUMBER2/US-Ho1/shell_commands | 29 + .../PLUMBER2/US-KS2/include_user_mods | 1 + .../PLUMBER2/US-KS2/shell_commands | 29 + .../PLUMBER2/US-Los/include_user_mods | 1 + .../PLUMBER2/US-Los/shell_commands | 32 + .../PLUMBER2/US-MMS/include_user_mods | 1 + .../PLUMBER2/US-MMS/shell_commands | 29 + .../PLUMBER2/US-MOz/include_user_mods | 1 + .../PLUMBER2/US-MOz/shell_commands | 29 + .../PLUMBER2/US-Me2/include_user_mods | 1 + .../PLUMBER2/US-Me2/shell_commands | 29 + .../PLUMBER2/US-Me4/include_user_mods | 1 + .../PLUMBER2/US-Me4/shell_commands | 29 + .../PLUMBER2/US-Me6/include_user_mods | 1 + .../PLUMBER2/US-Me6/shell_commands | 29 + .../PLUMBER2/US-Myb/include_user_mods | 1 + .../PLUMBER2/US-Myb/shell_commands | 32 + .../PLUMBER2/US-NR1/include_user_mods | 1 + .../PLUMBER2/US-NR1/shell_commands | 29 + .../PLUMBER2/US-Ne1/include_user_mods | 1 + .../PLUMBER2/US-Ne1/shell_commands | 29 + .../PLUMBER2/US-Ne2/include_user_mods | 1 + .../PLUMBER2/US-Ne2/shell_commands | 29 + .../PLUMBER2/US-Ne3/include_user_mods | 1 + .../PLUMBER2/US-Ne3/shell_commands | 29 + .../PLUMBER2/US-PFa/include_user_mods | 1 + .../PLUMBER2/US-PFa/shell_commands | 29 + .../PLUMBER2/US-Prr/include_user_mods | 1 + .../PLUMBER2/US-Prr/shell_commands | 29 + .../PLUMBER2/US-SP1/include_user_mods | 1 + .../PLUMBER2/US-SP1/shell_commands | 29 + .../PLUMBER2/US-SP2/include_user_mods | 1 + .../PLUMBER2/US-SP2/shell_commands | 29 + .../PLUMBER2/US-SP3/include_user_mods | 1 + .../PLUMBER2/US-SP3/shell_commands | 29 + .../PLUMBER2/US-SRG/include_user_mods | 1 + .../PLUMBER2/US-SRG/shell_commands | 29 + .../PLUMBER2/US-SRM/include_user_mods | 1 + .../PLUMBER2/US-SRM/shell_commands | 29 + .../PLUMBER2/US-Syv/include_user_mods | 1 + .../PLUMBER2/US-Syv/shell_commands | 29 + .../PLUMBER2/US-Ton/include_user_mods | 1 + .../PLUMBER2/US-Ton/shell_commands | 29 + .../PLUMBER2/US-Tw4/include_user_mods | 1 + .../PLUMBER2/US-Tw4/shell_commands | 32 + .../PLUMBER2/US-Twt/include_user_mods | 1 + .../PLUMBER2/US-Twt/shell_commands | 29 + .../PLUMBER2/US-UMB/include_user_mods | 1 + .../PLUMBER2/US-UMB/shell_commands | 29 + .../PLUMBER2/US-Var/include_user_mods | 1 + .../PLUMBER2/US-Var/shell_commands | 29 + .../PLUMBER2/US-WCr/include_user_mods | 1 + .../PLUMBER2/US-WCr/shell_commands | 29 + .../PLUMBER2/US-Whs/include_user_mods | 1 + .../PLUMBER2/US-Whs/shell_commands | 29 + .../PLUMBER2/US-Wkg/include_user_mods | 1 + .../PLUMBER2/US-Wkg/shell_commands | 29 + .../PLUMBER2/ZA-Kru/include_user_mods | 1 + .../PLUMBER2/ZA-Kru/shell_commands | 29 + .../PLUMBER2/ZM-Mon/include_user_mods | 1 + .../PLUMBER2/ZM-Mon/shell_commands | 29 + .../PLUMBER2/defaults/shell_commands | 37 ++ .../PLUMBER2/defaults/user_nl_clm | 40 ++ .../PLUMBER2/defaults/user_nl_cpl | 20 + .../PLUMBER2/defaults/user_nl_datm_streams | 51 ++ .../site_and_regional/single_point_case.py | 45 +- python/ctsm/subset_data.py | 21 + tools/site_and_regional/PLUMBER2_sites.csv | 175 +++++ .../plumber2_surf_wrapper.py | 149 +++++ .../site_and_regional/plumber2_usermods.ipynb | 598 ++++++++++++++++++ 349 files changed, 6247 insertions(+), 19 deletions(-) create mode 100644 cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Dry/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Emr/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-GWW/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Gin/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-How/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Lit/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Otw/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Rig/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Rob/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Sam/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Stp/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-TTE/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Tum/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Whr/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Wrr/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Ync/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/BE-Bra/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/BE-Lon/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/BE-Vie/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/BR-Sa3/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/BW-Ma1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS4/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS5/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS6/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS7/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-Qcu/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-Qfo/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-SF1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-SF2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-SF3/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CH-Cha/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CH-Dav/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CH-Fru/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CH-Oe1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Cha/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Cng/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Dan/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Din/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Du2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-HaM/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Qia/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/CZ-wet/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Bay/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Geb/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Gri/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Hai/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Kli/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Meh/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Obe/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Seh/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-SfN/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Tha/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Wet/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-Fou/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-Lva/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-Ris/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-Sor/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-ZaH/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-ES1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-ES2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-LMa/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-LgS/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-VDA/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FI-Hyy/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FI-Kaa/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FI-Lom/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FI-Sod/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Fon/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Gri/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Hes/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-LBr/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Lq1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Lq2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Pue/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/GF-Guy/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/HU-Bug/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/ID-Pag/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IE-Ca1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IE-Dri/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Amp/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-BCi/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-CA1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-CA2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-CA3/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Col/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Cpz/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Isp/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-LMa/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Lav/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-MBo/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Mal/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Noe/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Non/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-PT1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Ren/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Ro1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Ro2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-SR2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-SRo/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/JP-SMF/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/NL-Ca1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/NL-Hor/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/NL-Loo/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/PL-wet/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/PT-Esp/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/PT-Mi1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/PT-Mi2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/RU-Che/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/RU-Fyo/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/RU-Zot/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/SD-Dem/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/SE-Deg/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/UK-Gri/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/UK-Ham/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/UK-PL3/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-AR1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-AR2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-ARM/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Aud/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Bar/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Bkg/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Blo/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Bo1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Cop/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-FPe/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-GLE/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Goo/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ha1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ho1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-KS2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Los/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-MMS/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-MOz/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Me2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Me4/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Me6/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Myb/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-NR1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ne1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ne2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ne3/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-PFa/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Prr/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SP1/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SP2/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SP3/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SRG/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SRM/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Syv/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ton/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Tw4/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Twt/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-UMB/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Var/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-WCr/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Whs/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Wkg/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/ZA-Kru/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/ZM-Mon/include_user_mods create mode 100644 cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands create mode 100644 cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm create mode 100644 cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl create mode 100644 cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams create mode 100644 tools/site_and_regional/PLUMBER2_sites.csv create mode 100755 tools/site_and_regional/plumber2_surf_wrapper.py create mode 100644 tools/site_and_regional/plumber2_usermods.ipynb diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands new file mode 100644 index 0000000000..e46607f7b6 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AR-SLu +./xmlchange PTS_LON=-66.459808 +./xmlchange PTS_LAT=-33.464802 +./xmlchange START_DATE=2010-01-01 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2010 +./xmlchange START_TOD=10800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2010" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands new file mode 100644 index 0000000000..0d8c681987 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AT-Neu +./xmlchange PTS_LON=11.3175 +./xmlchange PTS_LAT=47.116669 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands new file mode 100644 index 0000000000..446e7804e5 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-ASM +./xmlchange PTS_LON=133.248993 +./xmlchange PTS_LAT=-22.283001 +./xmlchange START_DATE=2010-12-31 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands new file mode 100644 index 0000000000..4ca0ae280e --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Cow +./xmlchange PTS_LON=145.427155 +./xmlchange PTS_LAT=-16.23819 +./xmlchange START_DATE=2009-12-31 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2015 +./xmlchange START_TOD=50400 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2015" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands new file mode 100644 index 0000000000..a1c1601db2 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Cpr +./xmlchange PTS_LON=140.589127 +./xmlchange PTS_LAT=-34.00206 +./xmlchange START_DATE=2010-12-31 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands new file mode 100644 index 0000000000..d1f51f5842 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Ctr +./xmlchange PTS_LON=145.446854 +./xmlchange PTS_LAT=-16.103279 +./xmlchange START_DATE=2009-12-31 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=50400 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands new file mode 100644 index 0000000000..947867cdca --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Cum +./xmlchange PTS_LON=150.722473 +./xmlchange PTS_LAT=-33.613297 +./xmlchange START_DATE=2012-12-31 +./xmlchange DATM_YR_ALIGN=2013 +./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_END=2018 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc'" >> user_nl_clm + echo "model_year_align_lai=2013" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + echo "stream_year_last_lai=2018" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands new file mode 100644 index 0000000000..73ac24ed07 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-DaP +./xmlchange PTS_LON=131.3181 +./xmlchange PTS_LAT=-14.0633 +./xmlchange START_DATE=2008-12-31 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands new file mode 100644 index 0000000000..86226737f3 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-DaS +./xmlchange PTS_LON=131.388 +./xmlchange PTS_LAT=-14.159283 +./xmlchange START_DATE=2009-12-31 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands new file mode 100644 index 0000000000..5cc12d9fcb --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Dry +./xmlchange PTS_LON=132.370605 +./xmlchange PTS_LAT=-15.2588 +./xmlchange START_DATE=2010-12-31 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2015 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2015" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands new file mode 100644 index 0000000000..f6770166a6 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Emr +./xmlchange PTS_LON=148.474594 +./xmlchange PTS_LAT=-23.8587 +./xmlchange START_DATE=2011-12-31 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=50400 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands new file mode 100644 index 0000000000..a956b4be68 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-GWW +./xmlchange PTS_LON=120.654099 +./xmlchange PTS_LAT=-30.191299 +./xmlchange START_DATE=2012-12-31 +./xmlchange DATM_YR_ALIGN=2013 +./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2013" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands new file mode 100644 index 0000000000..abfa3831ab --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Gin +./xmlchange PTS_LON=115.650002 +./xmlchange PTS_LAT=-31.375 +./xmlchange START_DATE=2011-12-31 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-How/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands new file mode 100644 index 0000000000..6a68112521 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-How +./xmlchange PTS_LON=131.149994 +./xmlchange PTS_LAT=-12.4952 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=15 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands new file mode 100644 index 0000000000..a2f3d127e8 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Lit +./xmlchange PTS_LON=130.794495 +./xmlchange PTS_LAT=-13.17904 +./xmlchange START_DATE=2015-12-31 +./xmlchange DATM_YR_ALIGN=2016 +./xmlchange DATM_YR_START=2016 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2016" >> user_nl_clm + echo "stream_year_first_lai=2016" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands new file mode 100644 index 0000000000..edebd299fa --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Otw +./xmlchange PTS_LON=142.816803 +./xmlchange PTS_LAT=-38.532341 +./xmlchange START_DATE=2008-12-31 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 +./xmlchange DATM_YR_END=2010 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.nc'" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + echo "stream_year_last_lai=2010" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands new file mode 100644 index 0000000000..ac2489a873 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Rig +./xmlchange PTS_LON=145.575897 +./xmlchange PTS_LAT=-36.649899 +./xmlchange START_DATE=2010-12-31 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2016 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2016.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2016" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands new file mode 100644 index 0000000000..2e5bf5f605 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Rob +./xmlchange PTS_LON=145.630096 +./xmlchange PTS_LAT=-17.1175 +./xmlchange START_DATE=2013-12-31 +./xmlchange DATM_YR_ALIGN=2014 +./xmlchange DATM_YR_START=2014 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=50400 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2014" >> user_nl_clm + echo "stream_year_first_lai=2014" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands new file mode 100644 index 0000000000..958fef041c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Sam +./xmlchange PTS_LON=152.877808 +./xmlchange PTS_LAT=-27.3881 +./xmlchange START_DATE=2010-12-31 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=50400 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands new file mode 100644 index 0000000000..2c520ca96a --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Stp +./xmlchange PTS_LON=133.350204 +./xmlchange PTS_LAT=-17.1507 +./xmlchange START_DATE=2009-12-31 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands new file mode 100644 index 0000000000..8cce8890af --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-TTE +./xmlchange PTS_LON=133.639999 +./xmlchange PTS_LAT=-22.287001 +./xmlchange START_DATE=2012-12-31 +./xmlchange DATM_YR_ALIGN=2013 +./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2013" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands new file mode 100644 index 0000000000..8bd0af3874 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Tum +./xmlchange PTS_LON=148.151703 +./xmlchange PTS_LAT=-35.656601 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=16 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands new file mode 100644 index 0000000000..b29bb9fbde --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Whr +./xmlchange PTS_LON=145.029404 +./xmlchange PTS_LAT=-36.673199 +./xmlchange START_DATE=2014-12-31 +./xmlchange DATM_YR_ALIGN=2015 +./xmlchange DATM_YR_START=2015 +./xmlchange DATM_YR_END=2016 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2015-2016.nc'" >> user_nl_clm + echo "model_year_align_lai=2015" >> user_nl_clm + echo "stream_year_first_lai=2015" >> user_nl_clm + echo "stream_year_last_lai=2016" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands new file mode 100644 index 0000000000..39707cec37 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Wrr +./xmlchange PTS_LON=146.654495 +./xmlchange PTS_LAT=-43.09502 +./xmlchange START_DATE=2015-12-31 +./xmlchange DATM_YR_ALIGN=2016 +./xmlchange DATM_YR_START=2016 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2016" >> user_nl_clm + echo "stream_year_first_lai=2016" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands new file mode 100644 index 0000000000..e4944892f0 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=AU-Ync +./xmlchange PTS_LON=146.290695 +./xmlchange PTS_LAT=-34.9893 +./xmlchange START_DATE=2010-12-31 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2017 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2017" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands new file mode 100644 index 0000000000..7906b2fe25 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=BE-Bra +./xmlchange PTS_LON=4.52056 +./xmlchange PTS_LAT=51.309166 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands new file mode 100644 index 0000000000..67fdd93545 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=BE-Lon +./xmlchange PTS_LON=4.74613 +./xmlchange PTS_LAT=50.55159 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands new file mode 100644 index 0000000000..f8d426a808 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=BE-Vie +./xmlchange PTS_LON=5.99805 +./xmlchange PTS_LAT=50.305069 +./xmlchange START_DATE=1996-12-31 +./xmlchange DATM_YR_ALIGN=1997 +./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=18 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands new file mode 100644 index 0000000000..32a92e42c7 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=BR-Sa3 +./xmlchange PTS_LON=-54.971436 +./xmlchange PTS_LAT=-3.018029 +./xmlchange START_DATE=2001-01-01 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 +./xmlchange DATM_YR_END=2003 +./xmlchange START_TOD=14400 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2003.nc'" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + echo "stream_year_last_lai=2003" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands new file mode 100644 index 0000000000..21498b6f7c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=BW-Ma1 +./xmlchange PTS_LON=23.560329 +./xmlchange PTS_LAT=-19.9165 +./xmlchange START_DATE=1999-12-31 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2000 +./xmlchange START_TOD=79200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2000.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2000" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands new file mode 100644 index 0000000000..66aaf53925 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-NS1 +./xmlchange PTS_LON=-98.483887 +./xmlchange PTS_LAT=55.8792 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2003 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2003" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands new file mode 100644 index 0000000000..ed95a230e2 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-NS2 +./xmlchange PTS_LON=-98.524689 +./xmlchange PTS_LAT=55.9058 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands new file mode 100644 index 0000000000..849138abd6 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-NS4 +./xmlchange PTS_LON=-98.380615 +./xmlchange PTS_LAT=55.914398 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands new file mode 100644 index 0000000000..cfd757503c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-NS5 +./xmlchange PTS_LON=-98.484985 +./xmlchange PTS_LAT=55.863098 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands new file mode 100644 index 0000000000..dbf2c20feb --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-NS6 +./xmlchange PTS_LON=-98.964417 +./xmlchange PTS_LAT=55.916698 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands new file mode 100644 index 0000000000..49ef2b6612 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-NS7 +./xmlchange PTS_LON=-99.948303 +./xmlchange PTS_LAT=56.635799 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands new file mode 100644 index 0000000000..f21cbc078d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-Qcu +./xmlchange PTS_LON=-74.03653 +./xmlchange PTS_LAT=49.267078 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands new file mode 100644 index 0000000000..1e1dfb15ec --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-Qfo +./xmlchange PTS_LON=-74.342102 +./xmlchange PTS_LAT=49.692501 +./xmlchange START_DATE=2004-01-01 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2010 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2010.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2010" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands new file mode 100644 index 0000000000..09bf748b74 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-SF1 +./xmlchange PTS_LON=-105.817596 +./xmlchange PTS_LAT=54.485001 +./xmlchange START_DATE=2004-01-01 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands new file mode 100644 index 0000000000..a2dd50beaa --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-SF2 +./xmlchange PTS_LON=-105.877502 +./xmlchange PTS_LAT=54.253899 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands new file mode 100644 index 0000000000..8b176bcf83 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CA-SF3 +./xmlchange PTS_LON=-106.00531 +./xmlchange PTS_LAT=54.091599 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands new file mode 100644 index 0000000000..56f41db087 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CH-Cha +./xmlchange PTS_LON=8.41044 +./xmlchange PTS_LAT=47.21022 +./xmlchange START_DATE=2005-12-31 +./xmlchange DATM_YR_ALIGN=2006 +./xmlchange DATM_YR_START=2006 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=9 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2006-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands new file mode 100644 index 0000000000..f0ea7c37af --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CH-Dav +./xmlchange PTS_LON=9.85592 +./xmlchange PTS_LAT=46.815334 +./xmlchange START_DATE=1996-12-31 +./xmlchange DATM_YR_ALIGN=1997 +./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=18 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands new file mode 100644 index 0000000000..8615418ada --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CH-Fru +./xmlchange PTS_LON=8.53778 +./xmlchange PTS_LAT=47.115833 +./xmlchange START_DATE=2006-12-31 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands new file mode 100644 index 0000000000..fde20d74b6 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CH-Oe1 +./xmlchange PTS_LON=7.73194 +./xmlchange PTS_LAT=47.285831 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2008 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2008" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands new file mode 100644 index 0000000000..b34158211c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CN-Cha +./xmlchange PTS_LON=128.095795 +./xmlchange PTS_LAT=42.4025 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands new file mode 100644 index 0000000000..981ff073a7 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CN-Cng +./xmlchange PTS_LON=123.509201 +./xmlchange PTS_LAT=44.593399 +./xmlchange START_DATE=2007-12-31 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_END=2009 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2009.nc'" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + echo "stream_year_last_lai=2009" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands new file mode 100644 index 0000000000..3b4c41f2f4 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CN-Dan +./xmlchange PTS_LON=91.066399 +./xmlchange PTS_LAT=30.497801 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Din/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands new file mode 100644 index 0000000000..587eabcd6b --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CN-Din +./xmlchange PTS_LON=112.536102 +./xmlchange PTS_LAT=23.1733 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands new file mode 100644 index 0000000000..cab3a19e5a --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CN-Du2 +./xmlchange PTS_LON=116.2836 +./xmlchange PTS_LAT=42.0467 +./xmlchange START_DATE=2006-12-31 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_END=2008 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2008.nc'" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + echo "stream_year_last_lai=2008" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands new file mode 100644 index 0000000000..925fe17299 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CN-HaM +./xmlchange PTS_LON=101.18 +./xmlchange PTS_LAT=37.369999 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2003 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2003" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands new file mode 100644 index 0000000000..bc9403e5d9 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=CN-Qia +./xmlchange PTS_LON=115.058098 +./xmlchange PTS_LAT=26.7414 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=57600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands new file mode 100644 index 0000000000..5ccf2e6d65 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=CZ-wet +./xmlchange PTS_LON=14.77035 +./xmlchange PTS_LAT=49.024651 +./xmlchange START_DATE=2006-12-31 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands new file mode 100644 index 0000000000..80d73be9e2 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Bay +./xmlchange PTS_LON=11.86694 +./xmlchange PTS_LAT=50.141941 +./xmlchange START_DATE=1996-12-31 +./xmlchange DATM_YR_ALIGN=1997 +./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_END=1999 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-1999.nc'" >> user_nl_clm + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + echo "stream_year_last_lai=1999" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands new file mode 100644 index 0000000000..338fab3a7a --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Geb +./xmlchange PTS_LON=10.9143 +./xmlchange PTS_LAT=51.100101 +./xmlchange START_DATE=2000-12-31 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=14 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands new file mode 100644 index 0000000000..fbcf2ca27c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Gri +./xmlchange PTS_LON=13.51253 +./xmlchange PTS_LAT=50.949471 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands new file mode 100644 index 0000000000..1c46068e79 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Hai +./xmlchange PTS_LON=10.453 +./xmlchange PTS_LAT=51.079166 +./xmlchange START_DATE=1999-12-31 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=13 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands new file mode 100644 index 0000000000..ffbf433bca --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Kli +./xmlchange PTS_LON=13.52238 +./xmlchange PTS_LAT=50.893059 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands new file mode 100644 index 0000000000..721341909d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Meh +./xmlchange PTS_LON=10.65547 +./xmlchange PTS_LAT=51.275311 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands new file mode 100644 index 0000000000..1904bd6356 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Obe +./xmlchange PTS_LON=13.72129 +./xmlchange PTS_LAT=50.786659 +./xmlchange START_DATE=2007-12-31 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands new file mode 100644 index 0000000000..9dd6d550be --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Seh +./xmlchange PTS_LON=6.44965 +./xmlchange PTS_LAT=50.870625 +./xmlchange START_DATE=2007-12-31 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_END=2010 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2010.nc'" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + echo "stream_year_last_lai=2010" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands new file mode 100644 index 0000000000..e335e275cb --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=DE-SfN +./xmlchange PTS_LON=11.3275 +./xmlchange PTS_LAT=47.806389 +./xmlchange START_DATE=2012-12-31 +./xmlchange DATM_YR_ALIGN=2013 +./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2013" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands new file mode 100644 index 0000000000..e44066e6e9 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Tha +./xmlchange PTS_LON=13.56694 +./xmlchange PTS_LAT=50.963612 +./xmlchange START_DATE=1997-12-31 +./xmlchange DATM_YR_ALIGN=1998 +./xmlchange DATM_YR_START=1998 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=17 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1998-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=1998" >> user_nl_clm + echo "stream_year_first_lai=1998" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands new file mode 100644 index 0000000000..12456bf371 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DE-Wet +./xmlchange PTS_LON=11.45753 +./xmlchange PTS_LAT=50.453499 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands new file mode 100644 index 0000000000..3acbee86a5 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DK-Fou +./xmlchange PTS_LON=9.58722 +./xmlchange PTS_LAT=56.4842 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands new file mode 100644 index 0000000000..cc857a8c4d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DK-Lva +./xmlchange PTS_LON=12.0833 +./xmlchange PTS_LAT=55.6833 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands new file mode 100644 index 0000000000..2c56f619df --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DK-Ris +./xmlchange PTS_LON=12.09722 +./xmlchange PTS_LAT=55.530281 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands new file mode 100644 index 0000000000..9fac964f8d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DK-Sor +./xmlchange PTS_LON=11.64464 +./xmlchange PTS_LAT=55.48587 +./xmlchange START_DATE=1996-12-31 +./xmlchange DATM_YR_ALIGN=1997 +./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=18 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands new file mode 100644 index 0000000000..7044daed5c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=DK-ZaH +./xmlchange PTS_LON=-20.550293 +./xmlchange PTS_LAT=74.473282 +./xmlchange START_DATE=2000-01-01 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=14 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands new file mode 100644 index 0000000000..9e46ef5b9d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=ES-ES1 +./xmlchange PTS_LON=-0.318817 +./xmlchange PTS_LAT=39.34597 +./xmlchange START_DATE=1998-12-31 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands new file mode 100644 index 0000000000..9b972c10df --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=ES-ES2 +./xmlchange PTS_LON=-0.315277 +./xmlchange PTS_LAT=39.275558 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands new file mode 100644 index 0000000000..200ba0627a --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=ES-LMa +./xmlchange PTS_LON=-5.773346 +./xmlchange PTS_LAT=39.941502 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands new file mode 100644 index 0000000000..3861977e7b --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=ES-LgS +./xmlchange PTS_LON=-2.96582 +./xmlchange PTS_LAT=37.097935 +./xmlchange START_DATE=2006-12-31 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_END=2007 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2007.nc'" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + echo "stream_year_last_lai=2007" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands new file mode 100644 index 0000000000..a9278beefd --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=ES-VDA +./xmlchange PTS_LON=1.4485 +./xmlchange PTS_LAT=42.15218 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands new file mode 100644 index 0000000000..de7ccbc451 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FI-Hyy +./xmlchange PTS_LON=24.295 +./xmlchange PTS_LAT=61.8475 +./xmlchange START_DATE=1995-12-31 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=79200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=19 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands new file mode 100644 index 0000000000..f37605f293 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=FI-Kaa +./xmlchange PTS_LON=27.295031 +./xmlchange PTS_LAT=69.140694 +./xmlchange START_DATE=1999-12-31 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2002 +./xmlchange START_TOD=79200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2002" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands new file mode 100644 index 0000000000..26320486d7 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=FI-Lom +./xmlchange PTS_LON=24.209181 +./xmlchange PTS_LAT=67.9972 +./xmlchange START_DATE=2006-12-31 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_END=2009 +./xmlchange START_TOD=79200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2009.nc'" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + echo "stream_year_last_lai=2009" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands new file mode 100644 index 0000000000..abaa1ef79a --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FI-Sod +./xmlchange PTS_LON=26.637831 +./xmlchange PTS_LAT=67.361862 +./xmlchange START_DATE=2007-12-31 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=79200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands new file mode 100644 index 0000000000..3ff0409c9d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FR-Fon +./xmlchange PTS_LON=2.78014 +./xmlchange PTS_LAT=48.476398 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=9 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands new file mode 100644 index 0000000000..3ab75f5383 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FR-Gri +./xmlchange PTS_LON=1.95191 +./xmlchange PTS_LAT=48.844219 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=9 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands new file mode 100644 index 0000000000..85842c2287 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FR-Hes +./xmlchange PTS_LON=7.06556 +./xmlchange PTS_LAT=48.67416 +./xmlchange START_DATE=1996-12-31 +./xmlchange DATM_YR_ALIGN=1997 +./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands new file mode 100644 index 0000000000..27897aa975 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FR-LBr +./xmlchange PTS_LON=-0.769287 +./xmlchange PTS_LAT=44.71711 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2008 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2008.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2008" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands new file mode 100644 index 0000000000..293b7588bf --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FR-Lq1 +./xmlchange PTS_LON=2.73583 +./xmlchange PTS_LAT=45.643059 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands new file mode 100644 index 0000000000..ecf5c09675 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FR-Lq2 +./xmlchange PTS_LON=2.73703 +./xmlchange PTS_LAT=45.639191 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands new file mode 100644 index 0000000000..f445e7f58d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=FR-Pue +./xmlchange PTS_LON=3.59583 +./xmlchange PTS_LAT=43.74139 +./xmlchange START_DATE=1999-12-31 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=15 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands new file mode 100644 index 0000000000..a59f0ce8f8 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=GF-Guy +./xmlchange PTS_LON=-52.924866 +./xmlchange PTS_LAT=5.278772 +./xmlchange START_DATE=2004-01-01 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=10800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands new file mode 100644 index 0000000000..7862339b67 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=HU-Bug +./xmlchange PTS_LON=19.601299 +./xmlchange PTS_LAT=46.691101 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands new file mode 100644 index 0000000000..9482f9938b --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=ID-Pag +./xmlchange PTS_LON=114.036392 +./xmlchange PTS_LAT=-2.345 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2003 +./xmlchange START_TOD=61200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2003" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands new file mode 100644 index 0000000000..680f36ecc0 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IE-Ca1 +./xmlchange PTS_LON=-6.918152 +./xmlchange PTS_LAT=52.858791 +./xmlchange START_DATE=2004-01-01 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands new file mode 100644 index 0000000000..b1e392ee7b --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IE-Dri +./xmlchange PTS_LON=-8.751801 +./xmlchange PTS_LAT=51.986691 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands new file mode 100644 index 0000000000..a3f97378b7 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Amp +./xmlchange PTS_LON=13.60516 +./xmlchange PTS_LAT=41.904099 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands new file mode 100644 index 0000000000..d1a47c6417 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-BCi +./xmlchange PTS_LON=14.95744 +./xmlchange PTS_LAT=40.5238 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2010 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2010.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2010" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands new file mode 100644 index 0000000000..646945912e --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-CA1 +./xmlchange PTS_LON=12.02656 +./xmlchange PTS_LAT=42.380409 +./xmlchange START_DATE=2011-12-31 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands new file mode 100644 index 0000000000..a129176c9c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-CA2 +./xmlchange PTS_LON=12.02604 +./xmlchange PTS_LAT=42.37722 +./xmlchange START_DATE=2011-12-31 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands new file mode 100644 index 0000000000..56bfbb6c68 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-CA3 +./xmlchange PTS_LON=12.0222 +./xmlchange PTS_LAT=42.380001 +./xmlchange START_DATE=2011-12-31 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Col/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands new file mode 100644 index 0000000000..37a404cb8d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Col +./xmlchange PTS_LON=13.58814 +./xmlchange PTS_LAT=41.849361 +./xmlchange START_DATE=2006-12-31 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands new file mode 100644 index 0000000000..d621b7f598 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Cpz +./xmlchange PTS_LON=12.37611 +./xmlchange PTS_LAT=41.70525 +./xmlchange START_DATE=2000-12-31 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 +./xmlchange DATM_YR_END=2008 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2008.nc'" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + echo "stream_year_last_lai=2008" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands new file mode 100644 index 0000000000..624d96ffb6 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Isp +./xmlchange PTS_LON=8.63358 +./xmlchange PTS_LAT=45.812641 +./xmlchange START_DATE=2012-12-31 +./xmlchange DATM_YR_ALIGN=2013 +./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2013" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands new file mode 100644 index 0000000000..b76e6a32d1 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-LMa +./xmlchange PTS_LON=7.58259 +./xmlchange PTS_LAT=45.15258 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands new file mode 100644 index 0000000000..a4cf5eb041 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Lav +./xmlchange PTS_LON=11.28132 +./xmlchange PTS_LAT=45.9562 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands new file mode 100644 index 0000000000..dbc19ac1c2 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-MBo +./xmlchange PTS_LON=11.04583 +./xmlchange PTS_LAT=46.014679 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands new file mode 100644 index 0000000000..daa356cfa8 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Mal +./xmlchange PTS_LON=11.70334 +./xmlchange PTS_LAT=46.114021 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2003 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2003" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands new file mode 100644 index 0000000000..ab32e2a0bd --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Noe +./xmlchange PTS_LON=8.15117 +./xmlchange PTS_LAT=40.606178 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Non/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands new file mode 100644 index 0000000000..ed151e9f03 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Non +./xmlchange PTS_LON=11.09109 +./xmlchange PTS_LAT=44.690189 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2002 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2002.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2002" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands new file mode 100644 index 0000000000..7ea35fe3e7 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-PT1 +./xmlchange PTS_LON=9.06104 +./xmlchange PTS_LAT=45.200871 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands new file mode 100644 index 0000000000..7e35ba308a --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Ren +./xmlchange PTS_LON=11.43369 +./xmlchange PTS_LAT=46.586861 +./xmlchange START_DATE=2009-12-31 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands new file mode 100644 index 0000000000..40c1c45d97 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Ro1 +./xmlchange PTS_LON=11.93001 +./xmlchange PTS_LAT=42.408119 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands new file mode 100644 index 0000000000..e83378380e --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-Ro2 +./xmlchange PTS_LON=11.92093 +./xmlchange PTS_LAT=42.390259 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2008 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2008" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands new file mode 100644 index 0000000000..b728b3cf6b --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-SR2 +./xmlchange PTS_LON=10.29095 +./xmlchange PTS_LAT=43.732029 +./xmlchange START_DATE=2012-12-31 +./xmlchange DATM_YR_ALIGN=2013 +./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2013" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands new file mode 100644 index 0000000000..c178e2d33d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=IT-SRo +./xmlchange PTS_LON=10.28444 +./xmlchange PTS_LAT=43.727859 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands new file mode 100644 index 0000000000..30b92542e6 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=JP-SMF +./xmlchange PTS_LON=137.078796 +./xmlchange PTS_LAT=35.2617 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=54000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands new file mode 100644 index 0000000000..30b3e51366 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=NL-Ca1 +./xmlchange PTS_LON=4.927 +./xmlchange PTS_LAT=51.971001 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands new file mode 100644 index 0000000000..7d7e131827 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=NL-Hor +./xmlchange PTS_LON=5.0713 +./xmlchange PTS_LAT=52.240349 +./xmlchange START_DATE=2007-12-31 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_END=2011 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2011.nc'" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + echo "stream_year_last_lai=2011" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands new file mode 100644 index 0000000000..8ab25a0f81 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=NL-Loo +./xmlchange PTS_LON=5.74356 +./xmlchange PTS_LAT=52.16658 +./xmlchange START_DATE=1996-12-31 +./xmlchange DATM_YR_ALIGN=1997 +./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=17 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/PL-wet/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands new file mode 100644 index 0000000000..012d2edcb3 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=PL-wet +./xmlchange PTS_LON=16.309401 +./xmlchange PTS_LAT=52.762199 +./xmlchange START_DATE=2003-12-31 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands new file mode 100644 index 0000000000..581eb90888 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=PT-Esp +./xmlchange PTS_LON=-8.601807 +./xmlchange PTS_LAT=38.6394 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands new file mode 100644 index 0000000000..319576a402 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=PT-Mi1 +./xmlchange PTS_LON=-8.000061 +./xmlchange PTS_LAT=38.540642 +./xmlchange START_DATE=2005-01-01 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands new file mode 100644 index 0000000000..11c158db66 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=PT-Mi2 +./xmlchange PTS_LON=-8.024536 +./xmlchange PTS_LAT=38.476501 +./xmlchange START_DATE=2005-01-01 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/RU-Che/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands new file mode 100644 index 0000000000..d4ead88c72 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=RU-Che +./xmlchange PTS_LON=161.341431 +./xmlchange PTS_LAT=68.613037 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=46800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands new file mode 100644 index 0000000000..35905c508c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=RU-Fyo +./xmlchange PTS_LON=32.922081 +./xmlchange PTS_LAT=56.461529 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=75600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=12 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands new file mode 100644 index 0000000000..65f28b27f1 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=RU-Zot +./xmlchange PTS_LON=89.3508 +./xmlchange PTS_LAT=60.8008 +./xmlchange START_DATE=2002-12-31 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2003 +./xmlchange START_TOD=61200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2003" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands new file mode 100644 index 0000000000..fb6f580958 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=SD-Dem +./xmlchange PTS_LON=30.4783 +./xmlchange PTS_LAT=13.2829 +./xmlchange START_DATE=2004-12-31 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2009 +./xmlchange START_TOD=75600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2009.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2009" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands new file mode 100644 index 0000000000..80806cc75a --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=SE-Deg +./xmlchange PTS_LON=19.55669 +./xmlchange PTS_LAT=64.181969 +./xmlchange START_DATE=2001-12-31 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=82800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands new file mode 100644 index 0000000000..cbb54f1977 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=UK-Gri +./xmlchange PTS_LON=-3.798065 +./xmlchange PTS_LAT=56.60722 +./xmlchange START_DATE=2000-01-01 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2001 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2001.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2001" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands new file mode 100644 index 0000000000..626eae06b4 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=UK-Ham +./xmlchange PTS_LON=-0.858307 +./xmlchange PTS_LAT=51.15353 +./xmlchange START_DATE=2004-01-01 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands new file mode 100644 index 0000000000..5d8da975a4 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=UK-PL3 +./xmlchange PTS_LON=-1.266663 +./xmlchange PTS_LAT=51.450001 +./xmlchange START_DATE=2005-01-01 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=0 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-AR1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands new file mode 100644 index 0000000000..fc25145620 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-AR1 +./xmlchange PTS_LON=-99.419983 +./xmlchange PTS_LAT=36.426701 +./xmlchange START_DATE=2010-01-01 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-AR2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands new file mode 100644 index 0000000000..4f6a0ceae7 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-AR2 +./xmlchange PTS_LON=-99.597504 +./xmlchange PTS_LAT=36.635799 +./xmlchange START_DATE=2010-01-01 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2011 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2011.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2011" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-ARM/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands new file mode 100644 index 0000000000..0a62724bfd --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-ARM +./xmlchange PTS_LON=-97.4888 +./xmlchange PTS_LAT=36.605801 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Aud/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands new file mode 100644 index 0000000000..9409ab15d1 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Aud +./xmlchange PTS_LON=-110.509201 +./xmlchange PTS_LAT=31.5907 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Bar/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands new file mode 100644 index 0000000000..0603f6ef1c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Bar +./xmlchange PTS_LON=-71.288086 +./xmlchange PTS_LAT=44.06464 +./xmlchange START_DATE=2005-01-01 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands new file mode 100644 index 0000000000..00ef8125e5 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Bkg +./xmlchange PTS_LON=-96.836182 +./xmlchange PTS_LAT=44.345291 +./xmlchange START_DATE=2005-01-01 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Blo/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands new file mode 100644 index 0000000000..92eccaafae --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Blo +./xmlchange PTS_LON=-120.632751 +./xmlchange PTS_LAT=38.895302 +./xmlchange START_DATE=2000-01-01 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands new file mode 100644 index 0000000000..038b667c4c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Bo1 +./xmlchange PTS_LON=-88.290405 +./xmlchange PTS_LAT=40.006199 +./xmlchange START_DATE=1997-01-01 +./xmlchange DATM_YR_ALIGN=1997 +./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Cop/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands new file mode 100644 index 0000000000..71d9626d11 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Cop +./xmlchange PTS_LON=-109.389999 +./xmlchange PTS_LAT=38.09 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2003 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2003" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-FPe/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands new file mode 100644 index 0000000000..c0abce31a9 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-FPe +./xmlchange PTS_LON=-105.101898 +./xmlchange PTS_LAT=48.307701 +./xmlchange START_DATE=2000-01-01 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-GLE/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands new file mode 100644 index 0000000000..a1c3b2a541 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-GLE +./xmlchange PTS_LON=-106.239899 +./xmlchange PTS_LAT=41.366501 +./xmlchange START_DATE=2009-01-01 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Goo/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands new file mode 100644 index 0000000000..b9f5b993e0 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Goo +./xmlchange PTS_LON=-89.873505 +./xmlchange PTS_LAT=34.2547 +./xmlchange START_DATE=2004-01-01 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands new file mode 100644 index 0000000000..3b200e309e --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Ha1 +./xmlchange PTS_LON=-72.171509 +./xmlchange PTS_LAT=42.5378 +./xmlchange START_DATE=1992-01-01 +./xmlchange DATM_YR_ALIGN=1992 +./xmlchange DATM_YR_START=1992 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=21 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1992-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=1992" >> user_nl_clm + echo "stream_year_first_lai=1992" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands new file mode 100644 index 0000000000..8edfb2bc2e --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Ho1 +./xmlchange PTS_LON=-68.740204 +./xmlchange PTS_LAT=45.204102 +./xmlchange START_DATE=1996-01-01 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=9 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-KS2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands new file mode 100644 index 0000000000..e11f891802 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-KS2 +./xmlchange PTS_LON=-80.671539 +./xmlchange PTS_LAT=28.608578 +./xmlchange START_DATE=2003-01-01 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Los/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands new file mode 100644 index 0000000000..3560c46ad2 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=US-Los +./xmlchange PTS_LON=-89.979187 +./xmlchange PTS_LAT=46.082699 +./xmlchange START_DATE=2000-01-01 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2008 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=9 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2008.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2008" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-MMS/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands new file mode 100644 index 0000000000..32e625152d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-MMS +./xmlchange PTS_LON=-86.413086 +./xmlchange PTS_LAT=39.3232 +./xmlchange START_DATE=1999-01-01 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=16 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-MOz/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands new file mode 100644 index 0000000000..9c0797f798 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-MOz +./xmlchange PTS_LON=-92.200012 +./xmlchange PTS_LAT=38.74411 +./xmlchange START_DATE=2005-01-01 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=2 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Me2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands new file mode 100644 index 0000000000..db039a3b89 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Me2 +./xmlchange PTS_LON=-121.557404 +./xmlchange PTS_LAT=44.452301 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=13 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Me4/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands new file mode 100644 index 0000000000..61b98e5134 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Me4 +./xmlchange PTS_LON=-121.622406 +./xmlchange PTS_LAT=44.499199 +./xmlchange START_DATE=1996-01-01 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 +./xmlchange DATM_YR_END=2000 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2000.nc'" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + echo "stream_year_last_lai=2000" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Me6/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands new file mode 100644 index 0000000000..4239839381 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Me6 +./xmlchange PTS_LON=-121.607803 +./xmlchange PTS_LAT=44.323299 +./xmlchange START_DATE=2011-01-01 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Myb/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands new file mode 100644 index 0000000000..634d8a7fc9 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=US-Myb +./xmlchange PTS_LON=-121.765106 +./xmlchange PTS_LAT=38.049801 +./xmlchange START_DATE=2011-01-01 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=4 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-NR1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands new file mode 100644 index 0000000000..cca52b3eb2 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-NR1 +./xmlchange PTS_LON=-105.546402 +./xmlchange PTS_LAT=40.032902 +./xmlchange START_DATE=1999-01-01 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=16 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands new file mode 100644 index 0000000000..a2d47f4ac0 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Ne1 +./xmlchange PTS_LON=-96.476593 +./xmlchange PTS_LAT=41.1651 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands new file mode 100644 index 0000000000..f60694c8cd --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Ne2 +./xmlchange PTS_LON=-96.470093 +./xmlchange PTS_LAT=41.164902 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands new file mode 100644 index 0000000000..67dd08275f --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Ne3 +./xmlchange PTS_LON=-96.439697 +./xmlchange PTS_LAT=41.179699 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2012 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2012" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-PFa/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands new file mode 100644 index 0000000000..6bc45f3c6d --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-PFa +./xmlchange PTS_LON=-90.272308 +./xmlchange PTS_LAT=45.9459 +./xmlchange START_DATE=1995-01-01 +./xmlchange DATM_YR_ALIGN=1995 +./xmlchange DATM_YR_START=1995 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=20 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1995-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=1995" >> user_nl_clm + echo "stream_year_first_lai=1995" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Prr/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands new file mode 100644 index 0000000000..97834180a1 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Prr +./xmlchange PTS_LON=-147.487595 +./xmlchange PTS_LAT=65.123703 +./xmlchange START_DATE=2011-01-01 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_END=2013 +./xmlchange START_TOD=32400 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2013.nc'" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + echo "stream_year_last_lai=2013" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SP1/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands new file mode 100644 index 0000000000..25ecd112ab --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-SP1 +./xmlchange PTS_LON=-82.218781 +./xmlchange PTS_LAT=29.73807 +./xmlchange START_DATE=2005-01-01 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2005 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2005" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SP2/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands new file mode 100644 index 0000000000..c8368cf7a4 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-SP2 +./xmlchange PTS_LON=-82.244812 +./xmlchange PTS_LAT=29.764799 +./xmlchange START_DATE=2000-01-01 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SP3/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands new file mode 100644 index 0000000000..cb7e3a7727 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-SP3 +./xmlchange PTS_LON=-82.163269 +./xmlchange PTS_LAT=29.75477 +./xmlchange START_DATE=1999-01-01 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 +./xmlchange DATM_YR_END=2004 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2004.nc'" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + echo "stream_year_last_lai=2004" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SRG/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands new file mode 100644 index 0000000000..a8fdff8016 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-SRG +./xmlchange PTS_LON=-110.827698 +./xmlchange PTS_LAT=31.7894 +./xmlchange START_DATE=2009-01-01 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=6 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-SRM/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands new file mode 100644 index 0000000000..032f1a6000 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-SRM +./xmlchange PTS_LON=-110.865997 +./xmlchange PTS_LAT=31.8214 +./xmlchange START_DATE=2004-01-01 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=11 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Syv/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands new file mode 100644 index 0000000000..bf3eb8d5ea --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Syv +./xmlchange PTS_LON=-89.347717 +./xmlchange PTS_LAT=46.242001 +./xmlchange START_DATE=2002-01-01 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_END=2008 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + echo "stream_year_last_lai=2008" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Ton/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands new file mode 100644 index 0000000000..28c684d028 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Ton +./xmlchange PTS_LON=-120.966003 +./xmlchange PTS_LAT=38.431599 +./xmlchange START_DATE=2001-01-01 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=14 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands new file mode 100644 index 0000000000..f993a210f3 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -0,0 +1,32 @@ +./xmlchange PLUMBER2SITE=US-Tw4 +./xmlchange PTS_LON=-121.641403 +./xmlchange PTS_LAT=38.103001 +./xmlchange START_DATE=2014-01-01 +./xmlchange DATM_YR_ALIGN=2014 +./xmlchange DATM_YR_START=2014 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2014" >> user_nl_clm + echo "stream_year_first_lai=2014" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi + +# set baseflow scalar to zero for wetland site +echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Twt/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands new file mode 100644 index 0000000000..dbadf55e42 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Twt +./xmlchange PTS_LON=-121.653107 +./xmlchange PTS_LAT=38.1087 +./xmlchange START_DATE=2010-01-01 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=5 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-UMB/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands new file mode 100644 index 0000000000..c1b7911533 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-UMB +./xmlchange PTS_LON=-84.713806 +./xmlchange PTS_LAT=45.559799 +./xmlchange START_DATE=2000-01-01 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=18000 +./xmlchange ATM_NCPL=24 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=15 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Var/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands new file mode 100644 index 0000000000..6cc9c94b40 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Var +./xmlchange PTS_LON=-120.950729 +./xmlchange PTS_LAT=38.4133 +./xmlchange START_DATE=2001-01-01 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=28800 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=14 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-WCr/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands new file mode 100644 index 0000000000..b6d0a8e5e1 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-WCr +./xmlchange PTS_LON=-90.079895 +./xmlchange PTS_LAT=45.805901 +./xmlchange START_DATE=1999-01-01 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 +./xmlchange DATM_YR_END=2006 +./xmlchange START_TOD=21600 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=8 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + echo "stream_year_last_lai=2006" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Whs/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands new file mode 100644 index 0000000000..3b4dded4d4 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Whs +./xmlchange PTS_LON=-110.0522 +./xmlchange PTS_LAT=31.743799 +./xmlchange START_DATE=2008-01-01 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=7 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands new file mode 100644 index 0000000000..8a3a2ae530 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=US-Wkg +./xmlchange PTS_LON=-109.941895 +./xmlchange PTS_LAT=31.7365 +./xmlchange START_DATE=2005-01-01 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_END=2014 +./xmlchange START_TOD=25200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=10 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + echo "stream_year_last_lai=2014" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands new file mode 100644 index 0000000000..413ffdc4b2 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=ZA-Kru +./xmlchange PTS_LON=31.496901 +./xmlchange PTS_LAT=-25.019699 +./xmlchange START_DATE=1999-12-31 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_END=2002 +./xmlchange START_TOD=79200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=3 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + echo "stream_year_last_lai=2002" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/include_user_mods b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/include_user_mods new file mode 100644 index 0000000000..37aebd7a8c --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/include_user_mods @@ -0,0 +1 @@ +../defaults \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands new file mode 100644 index 0000000000..a457ea8a64 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -0,0 +1,29 @@ +./xmlchange PLUMBER2SITE=ZM-Mon +./xmlchange PTS_LON=23.252781 +./xmlchange PTS_LAT=-15.437778 +./xmlchange START_DATE=2007-12-31 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_END=2008 +./xmlchange START_TOD=79200 +./xmlchange ATM_NCPL=48 + +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and do not cycle +if [[ $compset =~ ^HIST ]]; then + # Number of years that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_N=1 + fi +fi + +# Turn on LAI streams for a SP case +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc'" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + echo "stream_year_last_lai=2008" >> user_nl_clm +fi diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands new file mode 100644 index 0000000000..65bbda7aee --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -0,0 +1,37 @@ +#!/bin/bash +./xmlchange CLM_USRDAT_NAME=PLUMBER2 +# Set data forcing data to future scenario so will have data from 2018 to present-day +./xmlchange DATM_PRESAERO=SSP3-7.0 +# Explicitly set the MPI library to mpi-serial so won't have the build/run complexity of a full MPI library +./xmlchange MPILIB=mpi-serial +# Explicitly set PIO Type to NETCDF since this is a single processor case (should already be set this way) +./xmlchange PIO_TYPENAME=netcdf + +# +compset=`./xmlquery COMPSET --value` +CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` +TEST=`./xmlquery TEST --value` + +# For a transient case run the whole length and don't cycle +if [[ $compset =~ ^HIST ]]; then + # Number of months that can be run for the full transient case + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_OPTION="nyears" + fi + # TODO, makde this accurate for plumber2 + ./xmlchange CLM_NML_USE_CASE="2018-PD_transient" +else + ./xmlchange CLM_NML_USE_CASE="2000_control" +fi + +# If needed for SP simulations: & set history file variables +if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + if [[ $TEST != "TRUE" ]]; then + ./xmlchange STOP_OPTION=nyears + fi + ./xmlchange CLM_FORCE_COLDSTART=on + echo "use_lai_streams = .true." >> user_nl_clm + echo "lai_mapalgo = 'nn'" >> user_nl_clm + echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC','QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE','SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT','TLAI','WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRAN','TV','RSSUN','RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SUB_SNOW','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm +fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm new file mode 100644 index 0000000000..90e7a0a656 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -0,0 +1,40 @@ +!---------------------------------------------------------------------------------- +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! +! EXCEPTIONS: +! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting +! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting +! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting +! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting +! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting +! Set co2_ppmv with CCSM_CO2_PPMV option +! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options +! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases +! (includes $inst_string for multi-ensemble cases) +! or with CLM_FORCE_COLDSTART to do a cold start +! or set it with an explicit filename here. +! Set maxpatch_glcmec with GLC_NEC option +! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable +!---------------------------------------------------------------------------------- + +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/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c231004.nc" +! For testing only +fsurdat = "/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c231004.nc" + +! this allows for large h1 data files, regardless or run length +hist_nhtfrq = 0,1 +hist_mfilt = 1,438000 + +! h1 output stream +hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI', + 'HR','SNOW_DEPTH','TBOT','TSOI','SOILC_vr','FV','NET_NMIN_vr','EFLX_LH_TOT', + 'FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI', + 'FSNO','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC', + 'QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE', + 'SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT', + 'TLAI','WIND','FIRE','FSM','COSZEN','BTRAN','TV','RSSUN','RSSHA','FSH_G','RHAF', + 'RH_LEAF','RH','T10','TG','SABG','SABV','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SUB_SNOW', + 'QFLX_SNOW_DRAIN','H2OSFC' + diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl new file mode 100644 index 0000000000..e7f6c90a86 --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl @@ -0,0 +1,20 @@ +!------------------------------------------------------------------------ +! Users should ONLY USE user_nl_cpl to change namelists variables +! for namelist variables in drv_in (except for the ones below) and +! any keyword/values in seq_maps.rc +! Users should add ALL user specific namelist and seq_maps.rc changes below +! using the following syntax +! namelist_var = new_namelist_value +! or +! mapname = new_map_name +! For example to change the default value of ocn2atm_fmapname to 'foo' use +! ocn2atm_fmapname = 'foo' +! +! Note that some namelist variables MAY NOT be changed in user_nl_cpl - +! they are defined in a $CASEROOT xml file and must be changed with +! xmlchange. +! +! For example, rather than set username to 'foo' in user_nl_cpl, call +! ./xmlchange USER=foo +!------------------------------------------------------------------------ +orb_iyear = 2018 diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams new file mode 100644 index 0000000000..20803f40ca --- /dev/null +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -0,0 +1,51 @@ +!------------------------------------------------------------------------ +! This file is used to modify datm.streams.xml generated in $RUNDIR +! Entries should have the form +! :<= new stream_value> +! The following are accepted values for an assume streamname of foo +! foo:meshfile = character string +! foo:datafiles = comma separated string of full pathnames (e.g. file1,file2,file3...) +! foo:datavars = comma separated string of field pairs (e.g. foo foobar,foo2 foobar2...) +! foo:taxmode = one of [cycle, extend, limit] +! foo:tintalgo = one of [lower,upper,nearest,linear,coszen] +! foo:readmode = single (only suported mode right now) +! foo:mapalgo = one of [bilinear,redist,nn,consf,consd,none] +! foo:dtlimit = real (1.5 is default) +! foo:year_first = integer +! foo:year_last = integer +! foo:year_align = integer +! foo:vectors = one of [none,u:v] +! foo:lev_dimname: = one of [null,name of level dimenion name] +! foo:offset = integer +! As an example: +! foo:year_first = 1950 +! would change the stream year_first stream_entry to 1950 for the foo stream block +!------------------------------------------------------------------------ +CLM_USRDAT.CLM_USRDAT:datavars = ZBOT z, \ + TBOT tbot, \ + QBOT shum, \ + WIND wind, \ + PRECTmms precn, \ + FSDS swdn, \ + PSRF pbot, \ + FLDS lwdn + +! TODO, get right first and last years. + +presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2018-2030_monthly_0.9x1.25_c210826.nc +presaero.SSP3-7.0:year_first=2018 +presaero.SSP3-7.0:year_last=2022 +presaero.SSP3-7.0:year_align=2018 +presaero.SSP3-7.0:dtlimit=30 + +presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_2018-2030_monthly_c210826.nc +presndep.SSP3-7.0:year_first=2018 +presndep.SSP3-7.0:year_last=2022 +presndep.SSP3-7.0:year_align=2018 +presndep.SSP3-7.0:dtlimit=30 + +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 + diff --git a/python/ctsm/site_and_regional/single_point_case.py b/python/ctsm/site_and_regional/single_point_case.py index 96544ff9c1..f47bc603db 100644 --- a/python/ctsm/site_and_regional/single_point_case.py +++ b/python/ctsm/site_and_regional/single_point_case.py @@ -18,8 +18,9 @@ logger = logging.getLogger(__name__) -NAT_PFT = 15 -MAX_PFT = 78 +NAT_PFT = 15 # natural pfts +NUM_PFT = 17 # for runs with generic crops +MAX_PFT = 78 # for runs with explicit crops # -- constants to represent months of year FIRST_MONTH = 1 @@ -54,6 +55,10 @@ class SinglePointCase(BaseCase): dominant pft type for this single point (None if not specified) pct_pft : list weight or percentage of each pft. + cth : list + canopy top height (m) + cbh : list + canopy bottom height (m) num_pft : list total number of pfts for surface dataset (if crop 78 pft, else 16 pft) uni_snow : bool @@ -107,6 +112,8 @@ def __init__( dom_pft, pct_pft, num_pft, + cth, + cbh, include_nonveg, uni_snow, cap_saturation, @@ -127,6 +134,8 @@ def __init__( self.dom_pft = dom_pft self.pct_pft = pct_pft self.num_pft = num_pft + self.cth = cth + self.cbh = cbh self.include_nonveg = include_nonveg self.uni_snow = uni_snow self.cap_saturation = cap_saturation @@ -162,7 +171,7 @@ def check_dom_pft(self): - 0 - NAT_PFT-1 range or - NAT_PFT - MAX_PFT range - - give an error : mixed land units not possible. + - give a warning: mixed land units should be checked ------------- Raises: @@ -170,7 +179,7 @@ def check_dom_pft(self): If any dom_pft is bigger than MAX_PFT. Error (ArgumentTypeError): If any dom_pft is less than 1. - Error (ArgumentTypeError): + Warning: If mixed land units are chosen. dom_pft values are both in range of (0 - NAT_PFT-1) and (NAT_PFT - MAX_PFT). @@ -192,23 +201,18 @@ def check_dom_pft(self): raise argparse.ArgumentTypeError(err_msg) # -- check dom_pft vs num_pft - if self.num_pft - 1 < max_dom_pft < MAX_PFT: - err_msg = "Please use --crop flag when --dompft is above 15." + if max_dom_pft > self.num_pft: + err_msg = "Please use --crop flag when --dompft is above 16." raise argparse.ArgumentTypeError(err_msg) + # -- check dom_pft vs MAX_pft + if self.num_pft - 1 < max_dom_pft < NUM_PFT: + logger.info("WARNING, you trying to run with generic crops (16 PFT surface dataset)") + #raise argparse.ArgumentTypeError(err_msg) + # -- check if all dom_pft are in the same range: if min_dom_pft < NAT_PFT <= max_dom_pft: - err_msg = """ - \n - Subsetting using mixed land units is not possible. - Please make sure all --dompft values are in only - one of these ranges: - - 0-{} natural pfts - - {}-{} crop pfts (cfts) - """.format( - NAT_PFT - 1, NAT_PFT, MAX_PFT - ) - raise argparse.ArgumentTypeError(err_msg) + logger.info("WARNING, you are subsetting using mixed land units that have both natural pfts and crop cfts. Check that your surface dataset looks correct.") def check_nonveg(self): """ @@ -402,8 +406,11 @@ def modify_surfdata_atpoint(self, f_orig): # f_mod["PCT_CROP"][:, :] = 0 # -- loop over all dom_pft and pct_pft - zip_pfts = zip(self.dom_pft, self.pct_pft) - for dom_pft, pct_pft in zip_pfts: + zip_pfts = zip(self.dom_pft, self.pct_pft, self.cth, self.cbh) + for dom_pft, pct_pft,cth,cbh in zip_pfts: + if cth is not None: + f_mod["MONTHLY_HEIGHT_TOP"][:,:,:,dom_pft] = cth + f_mod["MONTHLY_HEIGHT_BOT"][:,:,:,dom_pft] = cbh if dom_pft < NAT_PFT: f_mod["PCT_NAT_PFT"][:, :, dom_pft] = pct_pft else: diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py index 4a3a5801f1..5b1d3942d5 100644 --- a/python/ctsm/subset_data.py +++ b/python/ctsm/subset_data.py @@ -168,6 +168,25 @@ def get_parser(): default=None, nargs="*", ) + pt_parser.add_argument( + "--cth", + help="canopy top height for pft", + action="store", + dest="cth", + type=float, + default=None, + nargs="*", + ) + pt_parser.add_argument( + "--cbh", + help="canopy bottom height for pft", + action="store", + dest="cbh", + type=float, + default=None, + nargs="*", + ) + # -- region-specific parser options rg_parser.add_argument( "--lat1", @@ -553,6 +572,8 @@ def subset_point(args, file_dict: dict): dom_pft=args.dom_pft, pct_pft=args.pct_pft, num_pft=num_pft, + cth=args.cth, + cbh=args.cbh, include_nonveg=args.include_nonveg, uni_snow=args.uni_snow, cap_saturation=args.cap_saturation, diff --git a/tools/site_and_regional/PLUMBER2_sites.csv b/tools/site_and_regional/PLUMBER2_sites.csv new file mode 100644 index 0000000000..f252fa1d61 --- /dev/null +++ b/tools/site_and_regional/PLUMBER2_sites.csv @@ -0,0 +1,175 @@ +#pftX-cth and pftX-cbh are the site=specific canopy top and bottom heights +#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears. +#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight. +#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data. +,Site,Lat,Lon,pft1,pft1-%,pft1-cth,pft1-cbh,pft2,pft2-%,pft2-cth,pft2-cbh,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL +1,AR-SLu,-33.464802,-66.459808,5,50.00, 4.50, 0.13,7,50.00, 4.50, 2.59,2010,2010,2010-01-01,10800,48 +2,AT-Neu,47.116669,11.317500,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2001-12-31,82800,48 +3,AU-ASM,-22.283001,133.248993,1,100.00, 6.50, 3.25,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,54000,48 +4,AU-Cow,-16.238190,145.427155,4,100.00,22.00, 0.63,-999,-999.00,-999.00,-999.00,2010,2015,2009-12-31,50400,48 +5,AU-Cpr,-34.002060,140.589127,7,30.00, 4.00, 2.30,14,70.00, 0.50, 0.01,2011,2017,2010-12-31,46800,48 +6,AU-Ctr,-16.103279,145.446854,4,100.00,25.00, 0.71,-999,-999.00,-999.00,-999.00,2010,2017,2009-12-31,50400,48 +7,AU-Cum,-33.613297,150.722473,5,100.00,23.00, 0.66,-999,-999.00,-999.00,-999.00,2013,2018,2012-12-31,46800,48 +8,AU-DaP,-14.063300,131.318100,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2012,2008-12-31,54000,48 +9,AU-DaS,-14.159283,131.388000,6,30.00,16.40, 9.11,14,70.00, 0.50, 0.01,2010,2017,2009-12-31,54000,48 +10,AU-Dry,-15.258800,132.370605,6,30.00,12.30, 6.83,14,70.00, 0.50, 0.01,2011,2015,2010-12-31,54000,48 +11,AU-Emr,-23.858700,148.474594,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,50400,48 +12,AU-Gin,-31.375000,115.650002,7,70.00, 7.00, 4.02,14,30.00, 0.50, 0.01,2012,2017,2011-12-31,57600,48 +13,AU-GWW,-30.191299,120.654099,7,30.00,18.00,10.35,14,70.00, 0.50, 0.01,2013,2017,2012-12-31,57600,48 +14,AU-How,-12.495200,131.149994,6,70.00,16.00, 8.89,14,30.00, 0.50, 0.01,2003,2017,2002-12-31,54000,48 +15,AU-Lit,-13.179040,130.794495,6,70.00,20.00,11.11,14,30.00, 0.50, 0.01,2016,2017,2015-12-31,54000,48 +16,AU-Otw,-38.532341,142.816803,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2010,2008-12-31,46800,24 +17,AU-Rig,-36.649899,145.575897,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2016,2010-12-31,46800,48 +18,AU-Rob,-17.117500,145.630096,4,100.00,44.00, 1.26,-999,-999.00,-999.00,-999.00,2014,2017,2013-12-31,50400,48 +19,AU-Sam,-27.388100,152.877808,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,50400,48 +20,AU-Stp,-17.150700,133.350204,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2017,2009-12-31,54000,48 +21,AU-TTE,-22.287001,133.639999,10,30.00, 4.85, 0.97,14,70.00, 0.50, 0.01,2013,2017,2012-12-31,54000,48 +22,AU-Tum,-35.656601,148.151703,5,100.00,40.00, 1.14,-999,-999.00,-999.00,-999.00,2002,2017,2001-12-31,46800,24 +23,AU-Whr,-36.673199,145.029404,5,100.00,28.00, 0.80,-999,-999.00,-999.00,-999.00,2015,2016,2014-12-31,46800,48 +24,AU-Wrr,-43.095020,146.654495,5,100.00,90.00, 2.57,-999,-999.00,-999.00,-999.00,2016,2017,2015-12-31,46800,48 +25,AU-Ync,-34.989300,146.290695,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2017,2010-12-31,46800,48 +26,BE-Bra,51.309166, 4.520560,1,19.22,21.00,10.50,7,80.78,21.00,12.08,2004,2014,2003-12-31,82800,48 +27,BE-Lon,50.551590, 4.746130,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 +28,BE-Vie,50.305069, 5.998050,1,25.93,35.00,17.50,7,74.07,35.00,20.13,1997,2014,1996-12-31,82800,48 +29,BR-Sa3,-3.018029,-54.971436,4,100.00,40.00, 1.14,-999,-999.00,-999.00,-999.00,2001,2003,2001-01-01,14400,48 +30,BW-Ma1,-19.916500,23.560329,6,30.00, 8.00, 4.44,14,70.00, 0.50, 0.01,2000,2000,1999-12-31,79200,48 +31,CA-NS1,55.879200,-98.483887,2,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2003,2003,2003-01-01,21600,48 +32,CA-NS2,55.905800,-98.524689,2,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2002,2004,2002-01-01,21600,48 +33,CA-NS4,55.914398,-98.380615,2,100.00, 7.00, 3.50,-999,-999.00,-999.00,-999.00,2003,2004,2003-01-01,21600,48 +34,CA-NS5,55.863098,-98.484985,2,100.00, 5.00, 2.50,-999,-999.00,-999.00,-999.00,2003,2004,2003-01-01,21600,48 +35,CA-NS6,55.916698,-98.964417,10,30.00, 4.00, 0.80,13,70.00, 0.50, 0.01,2002,2004,2002-01-01,21600,48 +36,CA-NS7,56.635799,-99.948303,10,30.00, 0.25, 0.05,13,70.00, 0.50, 0.01,2003,2004,2003-01-01,21600,48 +37,CA-Qcu,49.267078,-74.036530,1,100.00, 5.50, 2.75,-999,-999.00,-999.00,-999.00,2002,2006,2002-01-01,18000,48 +38,CA-Qfo,49.692501,-74.342102,1,100.00,14.00, 7.00,-999,-999.00,-999.00,-999.00,2004,2010,2004-01-01,18000,48 +39,CA-SF1,54.485001,-105.817596,1,100.00, 6.00, 3.00,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,21600,48 +40,CA-SF2,54.253899,-105.877502,2,100.00, 4.00, 2.00,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,21600,48 +41,CA-SF3,54.091599,-106.005310,10,30.00, 1.00, 0.20,13,70.00, 0.50, 0.01,2003,2005,2003-01-01,21600,48 +42,CH-Cha,47.210220, 8.410440,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2006,2014,2005-12-31,82800,48 +43,CH-Dav,46.815334, 9.855920,1,100.00,25.00,12.50,-999,-999.00,-999.00,-999.00,1997,2014,1996-12-31,82800,48 +44,CH-Fru,47.115833, 8.537780,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 +45,CH-Oe1,47.285831, 7.731940,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2008,2001-12-31,82800,48 +46,CN-Cha,42.402500,128.095795,1, 8.79,28.00,14.00,7,91.21,28.00,16.10,2003,2005,2002-12-31,57600,48 +47,CN-Cng,44.593399,123.509201,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2009,2007-12-31,57600,48 +48,CN-Dan,30.497801,91.066399,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,57600,48 +49,CN-Din,23.173300,112.536102,5,100.00,30.00, 0.86,-999,-999.00,-999.00,-999.00,2003,2005,2002-12-31,57600,48 +50,CN-Du2,42.046700,116.283600,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2008,2006-12-31,57600,48 +51,CN-HaM,37.369999,101.180000,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2003,2001-12-31,57600,48 +52,CN-Qia,26.741400,115.058098,1,100.00,13.00, 6.50,-999,-999.00,-999.00,-999.00,2003,2005,2002-12-31,57600,48 +53,CZ-wet,49.024651,14.770350,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 +54,DE-Bay,50.141941,11.866940,1,100.00,25.00,12.50,-999,-999.00,-999.00,-999.00,1997,1999,1996-12-31,82800,48 +55,DE-Geb,51.100101,10.914300,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2001,2014,2000-12-31,82800,48 +56,DE-Gri,50.949471,13.512530,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2014,2003-12-31,82800,48 +57,DE-Hai,51.079166,10.453000,7,100.00,33.00,18.97,-999,-999.00,-999.00,-999.00,2000,2012,1999-12-31,82800,48 +58,DE-Kli,50.893059,13.522380,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 +59,DE-Meh,51.275311,10.655470,1, 1.27, 1.00, 0.50,7,98.73, 1.00, 0.58,2004,2006,2003-12-31,82800,48 +60,DE-Obe,50.786659,13.721290,1,100.00,19.00, 9.50,-999,-999.00,-999.00,-999.00,2008,2014,2007-12-31,82800,48 +61,DE-Seh,50.870625, 6.449650,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2010,2007-12-31,82800,48 +62,DE-SfN,47.806389,11.327500,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 +63,DE-Tha,50.963612,13.566940,1,100.00,26.50,13.25,-999,-999.00,-999.00,-999.00,1998,2014,1997-12-31,82800,48 +64,DE-Wet,50.453499,11.457530,1,100.00,22.00,11.00,-999,-999.00,-999.00,-999.00,2002,2006,2001-12-31,82800,48 +65,DK-Fou,56.484200, 9.587220,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2005,2004-12-31,82800,48 +66,DK-Lva,55.683300,12.083300,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2004-12-31,82800,48 +67,DK-Ris,55.530281,12.097220,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,82800,48 +68,DK-Sor,55.485870,11.644640,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,1997,2014,1996-12-31,82800,48 +69,DK-ZaH,74.473282,-20.550293,12,100.00, 0.47, 0.01,-999,-999.00,-999.00,-999.00,2000,2013,2000-01-01,0,48 +70,ES-ES1,39.345970,-0.318817,1,100.00, 7.50, 3.75,-999,-999.00,-999.00,-999.00,1999,2006,1998-12-31,82800,48 +71,ES-ES2,39.275558,-0.315277,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2005,2006,2004-12-31,82800,48 +72,ES-LgS,37.097935,-2.965820,10,30.00, 0.20, 0.04,13,70.00, 0.50, 0.01,2007,2007,2006-12-31,82800,48 +73,ES-LMa,39.941502,-5.773346,7,30.00, 8.00, 4.60,14,70.00, 0.50, 0.01,2004,2006,2003-12-31,82800,48 +74,ES-VDA,42.152180, 1.448500,7,30.00, 0.50, 0.29,13,70.00, 0.50, 0.01,2004,2004,2003-12-31,82800,48 +75,FI-Hyy,61.847500,24.295000,1,100.00,14.00, 7.00,-999,-999.00,-999.00,-999.00,1996,2014,1995-12-31,79200,48 +76,FI-Kaa,69.140694,27.295031,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2002,1999-12-31,79200,48 +77,FI-Lom,67.997200,24.209181,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2007,2009,2006-12-31,79200,48 +78,FI-Sod,67.361862,26.637831,1,100.00,12.70, 6.35,-999,-999.00,-999.00,-999.00,2008,2014,2007-12-31,79200,48 +79,FR-Fon,48.476398, 2.780140,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,2005,2013,2004-12-31,82800,48 +80,FR-Gri,48.844219, 1.951910,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2013,2004-12-31,82800,48 +81,FR-Hes,48.674160, 7.065560,7,100.00,13.00, 7.47,-999,-999.00,-999.00,-999.00,1997,2006,1996-12-31,82800,48 +82,FR-LBr,44.717110,-0.769287,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,2003,2008,2002-12-31,82800,48 +83,FR-Lq1,45.643059, 2.735830,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2003-12-31,82800,48 +84,FR-Lq2,45.639191, 2.737030,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2003-12-31,82800,48 +85,FR-Pue,43.741390, 3.595830,5,100.00, 6.50, 0.19,-999,-999.00,-999.00,-999.00,2000,2014,1999-12-31,82800,48 +86,GF-Guy, 5.278772,-52.924866,4,100.00,35.00, 1.00,-999,-999.00,-999.00,-999.00,2004,2014,2004-01-01,10800,48 +87,HU-Bug,46.691101,19.601299,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 +88,ID-Pag,-2.345000,114.036392,4,100.00,26.00, 0.74,-999,-999.00,-999.00,-999.00,2002,2003,2001-12-31,61200,48 +89,IE-Ca1,52.858791,-6.918152,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,0,48 +90,IE-Dri,51.986691,-8.751801,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,0,48 +91,IT-Amp,41.904099,13.605160,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 +92,IT-BCi,40.523800,14.957440,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2005,2010,2004-12-31,82800,48 +93,IT-CA1,42.380409,12.026560,7,100.00, 5.50, 3.16,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 +94,IT-CA2,42.377220,12.026040,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 +95,IT-CA3,42.380001,12.022200,7,100.00, 3.50, 2.01,-999,-999.00,-999.00,-999.00,2012,2013,2011-12-31,82800,48 +96,IT-Col,41.849361,13.588140,7,100.00,13.00, 7.47,-999,-999.00,-999.00,-999.00,2007,2014,2006-12-31,82800,48 +97,IT-Cpz,41.705250,12.376110,5,100.00,13.00, 0.37,-999,-999.00,-999.00,-999.00,2001,2008,2000-12-31,82800,48 +98,IT-Isp,45.812641, 8.633580,7,100.00,19.00,10.93,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 +99,IT-Lav,45.956200,11.281320,1,100.00,28.00,14.00,-999,-999.00,-999.00,-999.00,2005,2014,2004-12-31,82800,48 +100,IT-LMa,45.152580, 7.582590,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,82800,48 +101,IT-Mal,46.114021,11.703340,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2003,2002-12-31,82800,48 +102,IT-MBo,46.014679,11.045830,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2012,2002-12-31,82800,48 +103,IT-Noe,40.606178, 8.151170,10,70.00, 1.20, 0.24,14,30.00, 0.50, 0.01,2004,2014,2003-12-31,82800,48 +104,IT-Non,44.690189,11.091090,7,100.00, 7.00, 4.03,-999,-999.00,-999.00,-999.00,2002,2002,2001-12-31,82800,48 +105,IT-PT1,45.200871, 9.061040,7,100.00,26.00,14.95,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,82800,48 +106,IT-Ren,46.586861,11.433690,1,100.00,28.00,14.00,-999,-999.00,-999.00,-999.00,2010,2013,2009-12-31,82800,48 +107,IT-Ro1,42.408119,11.930010,7,100.00,15.00, 8.62,-999,-999.00,-999.00,-999.00,2002,2006,2001-12-31,82800,48 +108,IT-Ro2,42.390259,11.920930,7,100.00,15.00, 8.62,-999,-999.00,-999.00,-999.00,2002,2008,2001-12-31,82800,48 +109,IT-SR2,43.732029,10.290950,1,100.00,19.00, 9.50,-999,-999.00,-999.00,-999.00,2013,2014,2012-12-31,82800,48 +110,IT-SRo,43.727859,10.284440,1,100.00,16.00, 8.00,-999,-999.00,-999.00,-999.00,2003,2012,2002-12-31,82800,48 +111,JP-SMF,35.261700,137.078796,1,29.81, 8.10, 4.05,7,70.19, 8.10, 4.66,2003,2006,2002-12-31,54000,48 +112,NL-Ca1,51.971001, 4.927000,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2006,2002-12-31,82800,48 +113,NL-Hor,52.240349, 5.071300,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2008,2011,2007-12-31,82800,48 +114,NL-Loo,52.166580, 5.743560,1,100.00,15.50, 7.75,-999,-999.00,-999.00,-999.00,1997,2013,1996-12-31,82800,48 +115,PL-wet,52.762199,16.309401,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2005,2003-12-31,82800,48 +116,PT-Esp,38.639400,-8.601807,5,100.00,20.00, 0.57,-999,-999.00,-999.00,-999.00,2002,2004,2002-01-01,0,48 +117,PT-Mi1,38.540642,-8.000061,5,100.00, 7.30, 0.21,-999,-999.00,-999.00,-999.00,2005,2005,2005-01-01,0,48 +118,PT-Mi2,38.476501,-8.024536,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,0,48 +119,RU-Che,68.613037,161.341431,12,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2004,2002-12-31,46800,48 +120,RU-Fyo,56.461529,32.922081,1,100.00,21.00,10.50,-999,-999.00,-999.00,-999.00,2003,2014,2002-12-31,75600,48 +121,RU-Zot,60.800800,89.350800,2,70.00,12.00, 6.00,13,30.00, 0.50, 0.01,2003,2003,2002-12-31,61200,48 +122,SD-Dem,13.282900,30.478300,6,30.00, 1.50, 0.83,14,70.00, 0.50, 0.01,2005,2009,2004-12-31,75600,48 +123,SE-Deg,64.181969,19.556690,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2005,2001-12-31,82800,48 +124,UK-Gri,56.607220,-3.798065,1,100.00,10.00, 5.00,-999,-999.00,-999.00,-999.00,2000,2001,2000-01-01,0,48 +125,UK-Ham,51.153530,-0.858307,7,100.00,22.00,12.65,-999,-999.00,-999.00,-999.00,2004,2004,2004-01-01,0,48 +126,UK-PL3,51.450001,-1.266663,1, 8.33,22.00,11.00,7,91.67,22.00,12.65,2005,2006,2005-01-01,0,48 +127,US-AR1,36.426701,-99.419983,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2012,2010-01-01,21600,48 +128,US-AR2,36.635799,-99.597504,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2010,2011,2010-01-01,21600,48 +129,US-ARM,36.605801,-97.488800,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2012,2003-01-01,21600,48 +130,US-Aud,31.590700,-110.509201,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2003,2005,2003-01-01,25200,48 +131,US-Bar,44.064640,-71.288086,1, 8.43,21.00,10.50,7,91.57,21.00,12.07,2005,2005,2005-01-01,18000,48 +132,US-Bkg,44.345291,-96.836182,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,21600,48 +133,US-Blo,38.895302,-120.632751,1,100.00, 4.70, 2.35,-999,-999.00,-999.00,-999.00,2000,2006,2000-01-01,28800,48 +134,US-Bo1,40.006199,-88.290405,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,1997,2006,1997-01-01,21600,48 +135,US-Cop,38.090000,-109.389999,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2003,2002-01-01,25200,24 +136,US-FPe,48.307701,-105.101898,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2006,2000-01-01,25200,48 +137,US-GLE,41.366501,-106.239899,1,100.00,10.00, 5.00,-999,-999.00,-999.00,-999.00,2009,2014,2009-01-01,25200,48 +138,US-Goo,34.254700,-89.873505,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2004,2006,2004-01-01,21600,48 +139,US-Ha1,42.537800,-72.171509,7,100.00,25.00,14.37,-999,-999.00,-999.00,-999.00,1992,2012,1992-01-01,18000,24 +140,US-Ho1,45.204102,-68.740204,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,1996,2004,1996-01-01,18000,48 +141,US-KS2,28.608578,-80.671539,10,70.00, 2.00, 0.40,14,30.00, 0.50, 0.01,2003,2006,2003-01-01,18000,48 +142,US-Los,46.082699,-89.979187,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2000,2008,2000-01-01,21600,48 +143,US-Me2,44.452301,-121.557404,1,100.00,16.00, 8.00,-999,-999.00,-999.00,-999.00,2002,2014,2002-01-01,28800,48 +144,US-Me4,44.499199,-121.622406,1,100.00,20.00,10.00,-999,-999.00,-999.00,-999.00,1996,2000,1996-01-01,28800,48 +145,US-Me6,44.323299,-121.607803,1,100.00, 5.20, 2.60,-999,-999.00,-999.00,-999.00,2011,2014,2011-01-01,28800,48 +146,US-MMS,39.323200,-86.413086,7,100.00,27.00,15.52,-999,-999.00,-999.00,-999.00,1999,2014,1999-01-01,18000,24 +147,US-MOz,38.744110,-92.200012,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,2005,2006,2005-01-01,21600,48 +148,US-Myb,38.049801,-121.765106,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2011,2014,2011-01-01,28800,48 +149,US-Ne1,41.165100,-96.476593,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2002,2012,2002-01-01,21600,24 +150,US-Ne2,41.164902,-96.470093,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2002,2012,2002-01-01,21600,24 +151,US-Ne3,41.179699,-96.439697,15,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2002,2012,2002-01-01,21600,24 +152,US-NR1,40.032902,-105.546402,1,100.00,12.00, 6.00,-999,-999.00,-999.00,-999.00,1999,2014,1999-01-01,25200,48 +153,US-PFa,45.945900,-90.272308,1, 8.18,30.00,15.00,7,91.82,30.00,17.25,1995,2014,1995-01-01,21600,24 +154,US-Prr,65.123703,-147.487595,2,100.00, 7.00, 3.50,-999,-999.00,-999.00,-999.00,2011,2013,2011-01-01,32400,48 +155,US-SP1,29.738070,-82.218781,1,100.00,22.00,11.00,-999,-999.00,-999.00,-999.00,2005,2005,2005-01-01,18000,48 +156,US-SP2,29.764799,-82.244812,1,100.00, 1.00, 0.50,-999,-999.00,-999.00,-999.00,2000,2004,2000-01-01,18000,48 +157,US-SP3,29.754770,-82.163269,5,100.00,10.00, 0.29,-999,-999.00,-999.00,-999.00,1999,2004,1999-01-01,18000,48 +158,US-SRG,31.789400,-110.827698,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2009,2014,2009-01-01,25200,48 +159,US-SRM,31.821400,-110.865997,7,70.00, 2.50, 1.44,14,30.00, 0.50, 0.01,2004,2014,2004-01-01,25200,48 +160,US-Syv,46.242001,-89.347717,1, 4.91,27.00,13.50,7,95.09,27.00,15.53,2002,2008,2002-01-01,21600,48 +161,US-Ton,38.431599,-120.966003,7,70.00, 7.10, 4.08,14,30.00, 0.50, 0.01,2001,2014,2001-01-01,28800,48 +162,US-Tw4,38.103001,-121.641403,13,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2014,2014,2014-01-01,28800,48 +163,US-Twt,38.108700,-121.653107,-999,-999.00,-999.00,-999.00,16,100.00, 0.50, 0.01,2010,2014,2010-01-01,28800,48 +164,US-UMB,45.559799,-84.713806,7,100.00,20.00,11.50,-999,-999.00,-999.00,-999.00,2000,2014,2000-01-01,18000,24 +165,US-Var,38.413300,-120.950729,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2001,2014,2001-01-01,28800,48 +166,US-WCr,45.805901,-90.079895,7,100.00,24.00,13.80,-999,-999.00,-999.00,-999.00,1999,2006,1999-01-01,21600,48 +167,US-Whs,31.743799,-110.052200,10,30.00, 0.50, 0.10,14,70.00, 0.50, 0.01,2008,2014,2008-01-01,25200,48 +168,US-Wkg,31.736500,-109.941895,14,100.00, 0.50, 0.01,-999,-999.00,-999.00,-999.00,2005,2014,2005-01-01,25200,48 +169,ZA-Kru,-25.019699,31.496901,6,30.00,12.00, 6.67,14,70.00, 0.50, 0.01,2000,2002,1999-12-31,79200,48 +170,ZM-Mon,-15.437778,23.252781,6,100.00,12.00, 6.67,-999,-999.00,-999.00,-999.00,2008,2008,2007-12-31,79200,48 diff --git a/tools/site_and_regional/plumber2_surf_wrapper.py b/tools/site_and_regional/plumber2_surf_wrapper.py new file mode 100755 index 0000000000..8962f37217 --- /dev/null +++ b/tools/site_and_regional/plumber2_surf_wrapper.py @@ -0,0 +1,149 @@ +#! /usr/bin/env python3 +""" +|------------------------------------------------------------------| +|--------------------- Instructions -----------------------------| +|------------------------------------------------------------------| +This script is a simple wrapper for neon sites that performs the +following: + 1) For neon sites, subset surface dataset from global dataset + (i.e. ./subset_data.py ) + 2) Download neon and update the created surface dataset + based on the downloaded neon data. + (i.e. modify_singlept_site_neon.py) + +Instructions for running using conda python environments: + +../../py_env_create +conda activate ctsm_py + +""" +# TODO +# Automatic downloading of missing files if they are missing +#-[ ] Download neon sites and dom pft file +#-[ ] Make sure verbose works for printing out commands running + +# Import libraries +from __future__ import print_function + +import os +import sys +import tqdm +import logging +import argparse +import subprocess + +import pandas as pd + + + + +def get_parser(): + """ + Get parser object for this script. + """ + parser = argparse.ArgumentParser(description=__doc__, + formatter_class=argparse.RawDescriptionHelpFormatter) + + parser.print_usage = parser.print_help + + parser.add_argument('-v','--verbose', + help='Verbose mode will print more information. ', + action="store_true", + dest="verbose", + default=False) + + parser.add_argument('--16pft', + help='Create and/or modify 16-PFT surface datasets (e.g. for a FATES run) ', + action="store_true", + dest="pft_16", + default=True) + + return parser + + +def execute(command): + """ + Function for running a command on shell. + Args: + command (str): + command that we want to run. + Raises: + Error with the return code from shell. + """ + print ('\n',' >> ',*command,'\n') + + try: + subprocess.check_call(command, stdout=open(os.devnull, "w"), stderr=subprocess.STDOUT) + + except subprocess.CalledProcessError as e: + #raise RuntimeError("command '{}' return with error (code {}): {}".format(e.cmd, e.returncode, e.output)) + #print (e.ouput) + print (e) + + + + + + +def main(): + + args = get_parser().parse_args() + + if args.verbose: + logging.basicConfig(level=logging.DEBUG) + + + plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4) + + + for i, row in tqdm.tqdm(plumber2_sites.iterrows()): + lat = row['Lat'] + lon = row['Lon'] + site = row['Site'] + pft1 = row['pft1'] + pctpft1 = row['pft1-%'] + cth1=row['pft1-cth'] + cbh1=row['pft1-cbh'] + pft2 = row['pft2'] + pctpft2 = row['pft2-%'] + cth2=row['pft2-cth'] + cbh2=row['pft2-cbh'] + # overwrite missing values from .csv file + if pft1 == -999: + pft1 = 0 + pctpft1 = 0 + cth1 = 0 + cbh1 = 0 + if pft2 == -999: + pft2 = 0 + pctpft2 = 0 + cth2 = 0 + cbh2 = 0 + clmsite = "1x1_PLUMBER2_"+site + print ("Now processing site :", site) + + if args.pft_16: + # use surface dataset with 16 pfts, but overwrite to 100% 1 dominant PFT + # don't set crop flag + # set dominant pft + subset_command = ['./subset_data','point','--lat',str(lat),'--lon',str(lon), + '--site',clmsite,'--dompft',str(pft1),str(pft2), + '--pctpft', str(pctpft1),str(pctpft2), + '--cth', str(cth1),str(cth2), + '--cbh', str(cbh1),str(cbh2), + '--create-surface', + '--uniform-snowpack','--cap-saturation','--verbose','--overwrite'] + else: + # use surface dataset with 78 pfts, and overwrite to 100% 1 dominant PFT + # NOTE: FATES will currently not run with a 78-PFT surface dataset + # set crop flag + # set dominant pft + subset_command = ['./subset_data', 'point', '--lat', str(lat), '--lon', str(lon), + '--site', clmsite,'--crop', '--dompft', str(pft1),str(pft2), + '--pctpft', str(pctpft1),str(pctpft2), '--create-surface', + '--uniform-snowpack', '--cap-saturation', '--verbose', '--overwrite'] + execute(subset_command) + +if __name__ == "__main__": + main() + diff --git a/tools/site_and_regional/plumber2_usermods.ipynb b/tools/site_and_regional/plumber2_usermods.ipynb new file mode 100644 index 0000000000..996c993e0e --- /dev/null +++ b/tools/site_and_regional/plumber2_usermods.ipynb @@ -0,0 +1,598 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 1, + "id": "8627d889-c2ca-45e0-834b-e87a0b0885b2", + "metadata": {}, + "outputs": [], + "source": [ + "#! /usr/bin/env python3\n", + "\"\"\"\n", + "\n", + "Creates individual usermod_dirs for each PLUMBER2 site with shell_commands\n", + "\n", + "\"\"\"\n", + "\n", + "# Import libraries\n", + "from __future__ import print_function\n", + "\n", + "import os\n", + "import sys\n", + "import tqdm\n", + "import logging\n", + "import argparse\n", + "import subprocess\n", + "\n", + "import pandas as pd" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "id": "accc895d-111f-4daf-8f4c-df564222e90e", + "metadata": {}, + "outputs": [], + "source": [ + "def get_parser(): \n", + " \"\"\"\n", + " Get parser object for this script.\n", + " \"\"\"\n", + " parser = argparse.ArgumentParser(description=__doc__,\n", + " formatter_class=argparse.RawDescriptionHelpFormatter)\n", + "\n", + " parser.print_usage = parser.print_help\n", + "\n", + " parser.add_argument('-o','--overwrite', \n", + " help='Overwrite existing usermod_dirs ', \n", + " action=\"store_true\", \n", + " dest=\"overwrite\", \n", + " default=False)\n", + " \n", + "def execute(command):\n", + " \"\"\"\n", + " Function for running a command on shell.\n", + " Args:\n", + " command (str):\n", + " command that we want to run.\n", + " Raises:\n", + " Error with the return code from shell.\n", + " \"\"\"\n", + " print ('\\n',' >> ',*command,'\\n')\n", + "\n", + " try:\n", + " subprocess.check_call(command, stdout=open(os.devnull, \"w\"), stderr=subprocess.STDOUT)\n", + "\n", + " except subprocess.CalledProcessError as e:\n", + " #raise RuntimeError(\"command '{}' return with error (code {}): {}\".format(e.cmd, e.returncode, e.output))\n", + " #print (e.ouput)\n", + " print (e)" + ] + }, + { + "cell_type": "code", + "execution_count": 3, + "id": "531e34ff-838a-435f-b947-55c4bf2a33da", + "metadata": {}, + "outputs": [ + { + "ename": "AttributeError", + "evalue": "'NoneType' object has no attribute 'parse_args'", + "output_type": "error", + "traceback": [ + "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", + "\u001b[0;31mAttributeError\u001b[0m Traceback (most recent call last)", + "Input \u001b[0;32mIn [3]\u001b[0m, in \u001b[0;36m\u001b[0;34m()\u001b[0m\n\u001b[1;32m 15\u001b[0m site \u001b[38;5;241m=\u001b[39m row[\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mSite\u001b[39m\u001b[38;5;124m'\u001b[39m]\n\u001b[1;32m 18\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;18m__name__\u001b[39m \u001b[38;5;241m==\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m__main__\u001b[39m\u001b[38;5;124m\"\u001b[39m: \n\u001b[0;32m---> 19\u001b[0m \u001b[43mmain\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\n", + "Input \u001b[0;32mIn [3]\u001b[0m, in \u001b[0;36mmain\u001b[0;34m()\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[38;5;28;01mdef\u001b[39;00m \u001b[38;5;21mmain\u001b[39m():\n\u001b[0;32m----> 3\u001b[0m args \u001b[38;5;241m=\u001b[39m \u001b[43mget_parser\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mparse_args\u001b[49m()\n\u001b[1;32m 5\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m args\u001b[38;5;241m.\u001b[39mverbose:\n\u001b[1;32m 6\u001b[0m logging\u001b[38;5;241m.\u001b[39mbasicConfig(level\u001b[38;5;241m=\u001b[39mlogging\u001b[38;5;241m.\u001b[39mDEBUG)\n", + "\u001b[0;31mAttributeError\u001b[0m: 'NoneType' object has no attribute 'parse_args'" + ] + } + ], + "source": [ + "def main():\n", + "\n", + " args = get_parser().parse_args()\n", + "\n", + " if args.verbose:\n", + " logging.basicConfig(level=logging.DEBUG)\n", + "\n", + "\n", + " plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=3) \n", + "\n", + "\n", + " for i, row in tqdm.tqdm(plumber2_sites.iterrows()):\n", + " lat = row['Lat']\n", + " lon = row['Lon']\n", + " site = row['Site']\n", + " \n", + " \n", + "if __name__ == \"__main__\": \n", + " main()\n" + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "id": "3130ac78-36a6-4262-a7f7-98722cdc7498", + "metadata": {}, + "outputs": [], + "source": [ + "# Big ugly function to create usermod_dirs for each site\n", + "def write_usermods(lat,lon,site,start_year,end_year,\n", + " start_date,start_tod,atm_ncpl,stop_n): \n", + "\n", + " site_dir = os.path.join('../../cime_config/usermods_dirs/PLUMBER2/',site)\n", + " #TODO add overwrite option here\n", + "\n", + " if not os.path.isdir(site_dir):\n", + " os.makedirs(site_dir, exist_ok=True) \n", + " \n", + " # create files in each directory\n", + " include = os.path.join(site_dir,'include_user_mods')\n", + " iFile = open(include, 'w') # or 'a' to add text instead of truncate\n", + " iFile.write('../defaults')\n", + " iFile.close()\n", + " \n", + " LAIstream = '/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \\\n", + " str(start_year)+'-'+str(end_year)+'.nc'\n", + " shell = os.path.join(site_dir,'shell_commands')\n", + " sFile = open(shell, 'w') # or 'a' to add text instead of truncate\n", + " sFile.write(\n", + " './xmlchange PLUMBER2SITE='+site + '\\n' \\\n", + " './xmlchange PTS_LON='+str(lon) + '\\n' \\\n", + " './xmlchange PTS_LAT='+str(lat) + '\\n' \\\n", + " './xmlchange START_DATE='+str(start_date) + '\\n' \\\n", + " './xmlchange DATM_YR_ALIGN='+str(start_year) + '\\n' \\\n", + " './xmlchange DATM_YR_START='+str(start_year) + '\\n' \\\n", + " './xmlchange DATM_YR_END='+str(end_year) + '\\n' \\\n", + " './xmlchange START_TOD='+str(start_tod) + '\\n' \\\n", + " './xmlchange ATM_NCPL='+str(atm_ncpl) + '\\n' \\\n", + " '\\n' \\\n", + "\n", + " 'compset=`./xmlquery COMPSET --value` \\n' \\\n", + " 'CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` \\n' \\\n", + " 'TEST=`./xmlquery TEST --value` \\n' \\\n", + " '\\n' \\\n", + "\n", + " '# For a transient case run the whole length and do not cycle \\n' \\\n", + " 'if [[ $compset =~ ^HIST ]]; then \\n' \\\n", + " ' # Number of years that can be run for the full transient case \\n' \\\n", + " ' if [[ $TEST != \"TRUE\" ]]; then \\n' \\\n", + " ' ./xmlchange STOP_N='+str(stop_n) + '\\n' \\\n", + " ' fi \\n' \\\n", + " 'fi \\n' \\\n", + " '\\n' \\\n", + "\n", + " '# Turn on LAI streams for a SP case \\n' \\\n", + " 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \\n' \\\n", + " ' echo \"stream_fldfilename_lai=\\''+LAIstream+'\\'\" >> user_nl_clm \\n' \\\n", + " ' echo \"model_year_align_lai='+str(start_year) + '\" >> user_nl_clm \\n' \\\n", + " ' echo \"stream_year_first_lai='+str(start_year) + '\" >> user_nl_clm \\n' \\\n", + " ' echo \"stream_year_last_lai='+str(end_year) + '\" >> user_nl_clm \\n' \\\n", + " 'fi \\n' \n", + " )\n", + "\n", + " sFile.close()\n", + " \n", + " # add baseflow_scalar = 0 to user_nl_clm for wetland sites\n", + " wetland = [\"CZ-wet\",\"DE-SfN\",\"FI-Kaa\",\"FI-Lom\",\"RU-Che\",\\\n", + " \"SE-Deg\",\"US-Los\",\"US-Myb\",\"US-Tw4\",\"PL-wet\"]\n", + " if any(x == site for x in wetland):\n", + " print('wetland '+site)\n", + " sFile = open(shell, 'a') # or 'a' to add text instead of truncate\n", + " sFile.write(\n", + " '\\n' \\\n", + " '# set baseflow scalar to zero for wetland site \\n' \\\n", + " 'echo \"baseflow_scalar = 0\" >> user_nl_clm'\n", + " )\n", + " sFile.close()\n", + " #print(site_dir)" + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "id": "87926fed-711c-4133-b61e-2f820ed0cae1", + "metadata": {}, + "outputs": [], + "source": [ + "# For now we can just run this as a loop" + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "id": "aead8b4e-d304-4f85-b411-5a90db2b0835", + "metadata": {}, + "outputs": [ + { + "name": "stderr", + "output_type": "stream", + "text": [ + "170it [00:00, 3130.42it/s]" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland CZ-wet\n", + "wetland DE-SfN\n", + "wetland FI-Kaa\n", + "wetland FI-Lom\n", + "wetland PL-wet\n", + "wetland RU-Che\n", + "wetland SE-Deg\n", + "wetland US-Los\n", + "wetland US-Myb\n", + "wetland US-Tw4\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "\n" + ] + }, + { + "ename": "NameError", + "evalue": "name 'site_dir' is not defined", + "output_type": "error", + "traceback": [ + "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", + "\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)", + "Input \u001b[0;32mIn [6]\u001b[0m, in \u001b[0;36m\u001b[0;34m()\u001b[0m\n\u001b[1;32m 12\u001b[0m stop_n \u001b[38;5;241m=\u001b[39m \u001b[38;5;241m1\u001b[39m\u001b[38;5;241m+\u001b[39mend_year\u001b[38;5;241m-\u001b[39mstart_year\n\u001b[1;32m 14\u001b[0m write_usermods(lat,lon,site,start_year,end_year,\n\u001b[1;32m 15\u001b[0m start_date,start_tod,atm_ncpl,stop_n)\n\u001b[0;32m---> 16\u001b[0m \u001b[38;5;28mprint\u001b[39m(\u001b[43msite_dir\u001b[49m)\n", + "\u001b[0;31mNameError\u001b[0m: name 'site_dir' is not defined" + ] + } + ], + "source": [ + "plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4) \n", + "\n", + "for i, row in tqdm.tqdm(plumber2_sites.iterrows()):\n", + " lat = row['Lat']\n", + " lon = row['Lon']\n", + " site = row['Site']\n", + " start_year = row['start_year']\n", + " end_year = row['end_year']\n", + " start_date = row['RUN_STARTDATE']\n", + " start_tod = row['START_TOD']\n", + " atm_ncpl = row['ATM_NCPL']\n", + " stop_n = 1+end_year-start_year\n", + " \n", + " write_usermods(lat,lon,site,start_year,end_year,\n", + " start_date,start_tod,atm_ncpl,stop_n)" + ] + }, + { + "cell_type": "code", + "execution_count": 79, + "id": "6e1e0768-ca84-4851-93c7-31fda9c403c7", + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "'../../cime_config/usermods_dirs/PLUMBER2/ZM-Mon'" + ] + }, + "execution_count": 79, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "site_dir" + ] + }, + { + "cell_type": "code", + "execution_count": 69, + "id": "73df4d5a-311f-4bb8-ae04-d839199ca754", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "../../cime_config/usermods_dirs/PLUMBER2/ZM-Mon\n" + ] + } + ], + "source": [ + "write_usermods(lat,lon,site,start_year,end_year,\n", + " start_date,start_tod,atm_ncpl,stop_n)\n" + ] + }, + { + "cell_type": "code", + "execution_count": 60, + "id": "6b1e52ac-3f39-451f-abc8-28de37d5520f", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "none\n" + ] + } + ], + "source": [ + "\n", + "\n", + "if any(x == site for x in wetland):\n", + " print(site)\n", + "else:\n", + " print('none')" + ] + }, + { + "cell_type": "code", + "execution_count": 7, + "id": "a8268518-5a08-4a85-98a5-f9d7d3505605", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "./xmlchange PLUMBER2SITE=ZM-Mon\n", + "./xmlchange PTS_LON=23.252781\n", + "./xmlchange PTS_LAT=-15.437778\n", + "./xmlchange START_DATE=2007-12-31\n", + "./xmlchange DATM_YR_ALIGN=2008\n", + "./xmlchange DATM_YR_START=2008\n", + "./xmlchange DATM_YR_END=2008\n", + "./xmlchange START_TOD=79200\n", + "./xmlchange ATM_NCPL=48\n", + "\n", + "compset=`./xmlquery COMPSET --value` \n", + "CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` \n", + "TEST=`./xmlquery TEST --value` \n", + "\n", + "# For a transient case run the whole length and do not cycle \n", + "if [[ $compset =~ ^HIST ]]; then \n", + " # Number of years that can be run for the full transient case \n", + " if [[ $TEST != \"TRUE\" ]]; then \n", + " ./xmlchange STOP_N=1\n", + " fi \n", + "fi \n", + "\n", + "# Turn on LAI streams for a SP case \n", + "if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n", + " echo \"stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc'\" >> user_nl_clm \n", + " echo \"model_year_align_lai=2008\" >> user_nl_clm \n", + " echo \"stream_year_first_lai=2008\" >> user_nl_clm \n", + " echo \"stream_year_last_lai=2008\" >> user_nl_clm \n", + "fi \n" + ] + } + ], + "source": [ + "cat ../../cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands" + ] + }, + { + "cell_type": "code", + "execution_count": 21, + "id": "467276f5-d472-42f2-8b71-7ad8b1e0bfb5", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.\n", + "#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight.\n", + "#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data.\n", + ",Site,Lat,Lon,pft1,pft1-%,pft2,pft2-%,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL\n", + "1,AR-SLu,-33.464802,-66.459808,5,50.00,7,50.00,2010,2010,2010-01-01,10800,48 \n", + "2,AT-Neu,47.116669,11.317500,13,100.00,-999,-999.00,2002,2012,2001-12-31,82800,48 \n", + "3,AU-ASM,-22.283001,133.248993,1,100.00,-999,-999.00,2011,2017,2010-12-31,54000,48 \n", + "4,AU-Cow,-16.238190,145.427155,4,100.00,-999,-999.00,2010,2015,2009-12-31,50400,48 \n", + "5,AU-Cpr,-34.002060,140.589127,7,30.00,14,70.00,2011,2017,2010-12-31,46800,48 \n", + "6,AU-Ctr,-16.103279,145.446854,4,100.00,-999,-999.00,2010,2017,2009-12-31,50400,48 \n", + "7,AU-Cum,-33.613297,150.722473,5,100.00,-999,-999.00,2013,2018,2012-12-31,46800,48 \n", + "8,AU-DaP,-14.063300,131.318100,14,100.00,-999,-999.00,2009,2012,2008-12-31,54000,48 \n", + "9,AU-DaS,-14.159283,131.388000,6,30.00,14,70.00,2010,2017,2009-12-31,54000,48 \n", + "10,AU-Dry,-15.258800,132.370605,6,30.00,14,70.00,2011,2015,2010-12-31,54000,48 \n", + "11,AU-Emr,-23.858700,148.474594,14,100.00,-999,-999.00,2012,2013,2011-12-31,50400,48 \n", + "12,AU-Gin,-31.375000,115.650002,7,70.00,14,30.00,2012,2017,2011-12-31,57600,48 \n", + "13,AU-GWW,-30.191299,120.654099,7,30.00,14,70.00,2013,2017,2012-12-31,57600,48 \n", + "14,AU-How,-12.495200,131.149994,6,70.00,14,30.00,2003,2017,2002-12-31,54000,48 \n", + "15,AU-Lit,-13.179040,130.794495,6,70.00,14,30.00,2016,2017,2015-12-31,54000,48 \n", + "16,AU-Otw,-38.532341,142.816803,13,100.00,-999,-999.00,2009,2010,2008-12-31,46800,24 \n", + "17,AU-Rig,-36.649899,145.575897,14,100.00,-999,-999.00,2011,2016,2010-12-31,46800,48 \n", + "18,AU-Rob,-17.117500,145.630096,4,100.00,-999,-999.00,2014,2017,2013-12-31,50400,48 \n", + "19,AU-Sam,-27.388100,152.877808,14,100.00,-999,-999.00,2011,2017,2010-12-31,50400,48 \n", + "20,AU-Stp,-17.150700,133.350204,14,100.00,-999,-999.00,2010,2017,2009-12-31,54000,48 \n", + "21,AU-TTE,-22.287001,133.639999,10,30.00,14,70.00,2013,2017,2012-12-31,54000,48 \n", + "22,AU-Tum,-35.656601,148.151703,5,100.00,-999,-999.00,2002,2017,2001-12-31,46800,24 \n", + "23,AU-Whr,-36.673199,145.029404,5,100.00,-999,-999.00,2015,2016,2014-12-31,46800,48 \n", + "24,AU-Wrr,-43.095020,146.654495,5,100.00,-999,-999.00,2016,2017,2015-12-31,46800,48 \n", + "25,AU-Ync,-34.989300,146.290695,14,100.00,-999,-999.00,2011,2017,2010-12-31,46800,48 \n", + "26,BE-Bra,51.309166, 4.520560,1,19.22,7,80.78,2004,2014,2003-12-31,82800,48 \n", + "27,BE-Lon,50.551590, 4.746130,15,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 \n", + "28,BE-Vie,50.305069, 5.998050,1,25.93,7,74.07,1997,2014,1996-12-31,82800,48 \n", + "29,BR-Sa3,-3.018029,-54.971436,4,100.00,-999,-999.00,2001,2003,2001-01-01,14400,48 \n", + "30,BW-Ma1,-19.916500,23.560329,6,30.00,14,70.00,2000,2000,1999-12-31,79200,48 \n", + "31,CA-NS1,55.879200,-98.483887,2,100.00,-999,-999.00,2003,2003,2003-01-01,21600,48 \n", + "32,CA-NS2,55.905800,-98.524689,2,100.00,-999,-999.00,2002,2004,2002-01-01,21600,48 \n", + "33,CA-NS4,55.914398,-98.380615,2,100.00,-999,-999.00,2003,2004,2003-01-01,21600,48 \n", + "34,CA-NS5,55.863098,-98.484985,2,100.00,-999,-999.00,2003,2004,2003-01-01,21600,48 \n", + "35,CA-NS6,55.916698,-98.964417,10,30.00,13,70.00,2002,2004,2002-01-01,21600,48 \n", + "36,CA-NS7,56.635799,-99.948303,10,30.00,13,70.00,2003,2004,2003-01-01,21600,48 \n", + "37,CA-Qcu,49.267078,-74.036530,1,100.00,-999,-999.00,2002,2006,2002-01-01,18000,48 \n", + "38,CA-Qfo,49.692501,-74.342102,1,100.00,-999,-999.00,2004,2010,2004-01-01,18000,48 \n", + "39,CA-SF1,54.485001,-105.817596,1,100.00,-999,-999.00,2004,2006,2004-01-01,21600,48 \n", + "40,CA-SF2,54.253899,-105.877502,2,100.00,-999,-999.00,2003,2005,2003-01-01,21600,48 \n", + "41,CA-SF3,54.091599,-106.005310,10,30.00,13,70.00,2003,2005,2003-01-01,21600,48 \n", + "42,CH-Cha,47.210220, 8.410440,13,100.00,-999,-999.00,2006,2014,2005-12-31,82800,48 \n", + "43,CH-Dav,46.815334, 9.855920,1,100.00,-999,-999.00,1997,2014,1996-12-31,82800,48 \n", + "44,CH-Fru,47.115833, 8.537780,13,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 \n", + "45,CH-Oe1,47.285831, 7.731940,13,100.00,-999,-999.00,2002,2008,2001-12-31,82800,48 \n", + "46,CN-Cha,42.402500,128.095795,1, 8.79,7,91.21,2003,2005,2002-12-31,57600,48 \n", + "47,CN-Cng,44.593399,123.509201,14,100.00,-999,-999.00,2008,2009,2007-12-31,57600,48 \n", + "48,CN-Dan,30.497801,91.066399,12,100.00,-999,-999.00,2004,2005,2003-12-31,57600,48 \n", + "49,CN-Din,23.173300,112.536102,5,100.00,-999,-999.00,2003,2005,2002-12-31,57600,48 \n", + "50,CN-Du2,42.046700,116.283600,13,100.00,-999,-999.00,2007,2008,2006-12-31,57600,48 \n", + "51,CN-HaM,37.369999,101.180000,12,100.00,-999,-999.00,2002,2003,2001-12-31,57600,48 \n", + "52,CN-Qia,26.741400,115.058098,1,100.00,-999,-999.00,2003,2005,2002-12-31,57600,48 \n", + "53,CZ-wet,49.024651,14.770350,13,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 \n", + "54,DE-Bay,50.141941,11.866940,1,100.00,-999,-999.00,1997,1999,1996-12-31,82800,48 \n", + "55,DE-Geb,51.100101,10.914300,15,100.00,-999,-999.00,2001,2014,2000-12-31,82800,48 \n", + "56,DE-Gri,50.949471,13.512530,13,100.00,-999,-999.00,2004,2014,2003-12-31,82800,48 \n", + "57,DE-Hai,51.079166,10.453000,7,100.00,-999,-999.00,2000,2012,1999-12-31,82800,48 \n", + "58,DE-Kli,50.893059,13.522380,15,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 \n", + "59,DE-Meh,51.275311,10.655470,1, 1.27,7,98.73,2004,2006,2003-12-31,82800,48 \n", + "60,DE-Obe,50.786659,13.721290,1,100.00,-999,-999.00,2008,2014,2007-12-31,82800,48 \n", + "61,DE-Seh,50.870625, 6.449650,15,100.00,-999,-999.00,2008,2010,2007-12-31,82800,48 \n", + "62,DE-SfN,47.806389,11.327500,13,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 \n", + "63,DE-Tha,50.963612,13.566940,1,100.00,-999,-999.00,1998,2014,1997-12-31,82800,48 \n", + "64,DE-Wet,50.453499,11.457530,1,100.00,-999,-999.00,2002,2006,2001-12-31,82800,48 \n", + "65,DK-Fou,56.484200, 9.587220,15,100.00,-999,-999.00,2005,2005,2004-12-31,82800,48 \n", + "66,DK-Lva,55.683300,12.083300,13,100.00,-999,-999.00,2005,2006,2004-12-31,82800,48 \n", + "67,DK-Ris,55.530281,12.097220,15,100.00,-999,-999.00,2004,2005,2003-12-31,82800,48 \n", + "68,DK-Sor,55.485870,11.644640,7,100.00,-999,-999.00,1997,2014,1996-12-31,82800,48 \n", + "69,DK-ZaH,74.473282,-20.550293,12,100.00,-999,-999.00,2000,2013,2000-01-01,0,48 \n", + "70,ES-ES1,39.345970,-0.318817,1,100.00,-999,-999.00,1999,2006,1998-12-31,82800,48 \n", + "71,ES-ES2,39.275558,-0.315277,-999,-999.00,16,100.00,2005,2006,2004-12-31,82800,48 \n", + "72,ES-LgS,37.097935,-2.965820,10,30.00,13,70.00,2007,2007,2006-12-31,82800,48 \n", + "73,ES-LMa,39.941502,-5.773346,7,30.00,14,70.00,2004,2006,2003-12-31,82800,48 \n", + "74,ES-VDA,42.152180, 1.448500,7,30.00,13,70.00,2004,2004,2003-12-31,82800,48 \n", + "75,FI-Hyy,61.847500,24.295000,1,100.00,-999,-999.00,1996,2014,1995-12-31,79200,48 \n", + "76,FI-Kaa,69.140694,27.295031,12,100.00,-999,-999.00,2000,2002,1999-12-31,79200,48 \n", + "77,FI-Lom,67.997200,24.209181,12,100.00,-999,-999.00,2007,2009,2006-12-31,79200,48 \n", + "78,FI-Sod,67.361862,26.637831,1,100.00,-999,-999.00,2008,2014,2007-12-31,79200,48 \n", + "79,FR-Fon,48.476398, 2.780140,7,100.00,-999,-999.00,2005,2013,2004-12-31,82800,48 \n", + "80,FR-Gri,48.844219, 1.951910,15,100.00,-999,-999.00,2005,2013,2004-12-31,82800,48 \n", + "81,FR-Hes,48.674160, 7.065560,7,100.00,-999,-999.00,1997,2006,1996-12-31,82800,48 \n", + "82,FR-LBr,44.717110,-0.769287,1,100.00,-999,-999.00,2003,2008,2002-12-31,82800,48 \n", + "83,FR-Lq1,45.643059, 2.735830,13,100.00,-999,-999.00,2004,2006,2003-12-31,82800,48 \n", + "84,FR-Lq2,45.639191, 2.737030,13,100.00,-999,-999.00,2004,2006,2003-12-31,82800,48 \n", + "85,FR-Pue,43.741390, 3.595830,5,100.00,-999,-999.00,2000,2014,1999-12-31,82800,48 \n", + "86,GF-Guy, 5.278772,-52.924866,4,100.00,-999,-999.00,2004,2014,2004-01-01,10800,48 \n", + "87,HU-Bug,46.691101,19.601299,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 \n", + "88,ID-Pag,-2.345000,114.036392,4,100.00,-999,-999.00,2002,2003,2001-12-31,61200,48 \n", + "89,IE-Ca1,52.858791,-6.918152,15,100.00,-999,-999.00,2004,2006,2004-01-01,0,48 \n", + "90,IE-Dri,51.986691,-8.751801,13,100.00,-999,-999.00,2003,2005,2003-01-01,0,48 \n", + "91,IT-Amp,41.904099,13.605160,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 \n", + "92,IT-BCi,40.523800,14.957440,-999,-999.00,16,100.00,2005,2010,2004-12-31,82800,48 \n", + "93,IT-CA1,42.380409,12.026560,7,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 \n", + "94,IT-CA2,42.377220,12.026040,15,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 \n", + "95,IT-CA3,42.380001,12.022200,7,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 \n", + "96,IT-Col,41.849361,13.588140,7,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 \n", + "97,IT-Cpz,41.705250,12.376110,5,100.00,-999,-999.00,2001,2008,2000-12-31,82800,48 \n", + "98,IT-Isp,45.812641, 8.633580,7,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 \n", + "99,IT-Lav,45.956200,11.281320,1,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 \n", + "100,IT-LMa,45.152580, 7.582590,7,100.00,-999,-999.00,2003,2004,2002-12-31,82800,48 \n", + "101,IT-Mal,46.114021,11.703340,13,100.00,-999,-999.00,2003,2003,2002-12-31,82800,48 \n", + "102,IT-MBo,46.014679,11.045830,13,100.00,-999,-999.00,2003,2012,2002-12-31,82800,48 \n", + "103,IT-Noe,40.606178, 8.151170,10,70.00,14,30.00,2004,2014,2003-12-31,82800,48 \n", + "104,IT-Non,44.690189,11.091090,7,100.00,-999,-999.00,2002,2002,2001-12-31,82800,48 \n", + "105,IT-PT1,45.200871, 9.061040,7,100.00,-999,-999.00,2003,2004,2002-12-31,82800,48 \n", + "106,IT-Ren,46.586861,11.433690,1,100.00,-999,-999.00,2010,2013,2009-12-31,82800,48 \n", + "107,IT-Ro1,42.408119,11.930010,7,100.00,-999,-999.00,2002,2006,2001-12-31,82800,48 \n", + "108,IT-Ro2,42.390259,11.920930,7,100.00,-999,-999.00,2002,2008,2001-12-31,82800,48 \n", + "109,IT-SR2,43.732029,10.290950,1,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 \n", + "110,IT-SRo,43.727859,10.284440,1,100.00,-999,-999.00,2003,2012,2002-12-31,82800,48 \n", + "111,JP-SMF,35.261700,137.078796,1,29.81,7,70.19,2003,2006,2002-12-31,54000,48 \n", + "112,NL-Ca1,51.971001, 4.927000,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 \n", + "113,NL-Hor,52.240349, 5.071300,13,100.00,-999,-999.00,2008,2011,2007-12-31,82800,48 \n", + "114,NL-Loo,52.166580, 5.743560,1,100.00,-999,-999.00,1997,2013,1996-12-31,82800,48 \n", + "115,PL-wet,52.762199,16.309401,13,100.00,-999,-999.00,2004,2005,2003-12-31,82800,48 \n", + "116,PT-Esp,38.639400,-8.601807,5,100.00,-999,-999.00,2002,2004,2002-01-01,0,48 \n", + "117,PT-Mi1,38.540642,-8.000061,5,100.00,-999,-999.00,2005,2005,2005-01-01,0,48 \n", + "118,PT-Mi2,38.476501,-8.024536,14,100.00,-999,-999.00,2005,2006,2005-01-01,0,48 \n", + "119,RU-Che,68.613037,161.341431,12,100.00,-999,-999.00,2003,2004,2002-12-31,46800,48 \n", + "120,RU-Fyo,56.461529,32.922081,1,100.00,-999,-999.00,2003,2014,2002-12-31,75600,48 \n", + "121,RU-Zot,60.800800,89.350800,2,70.00,13,30.00,2003,2003,2002-12-31,61200,48 \n", + "122,SD-Dem,13.282900,30.478300,6,30.00,14,70.00,2005,2009,2004-12-31,75600,48 \n", + "123,SE-Deg,64.181969,19.556690,13,100.00,-999,-999.00,2002,2005,2001-12-31,82800,48 \n", + "124,UK-Gri,56.607220,-3.798065,1,100.00,-999,-999.00,2000,2001,2000-01-01,0,48 \n", + "125,UK-Ham,51.153530,-0.858307,7,100.00,-999,-999.00,2004,2004,2004-01-01,0,48 \n", + "126,UK-PL3,51.450001,-1.266663,1, 8.33,7,91.67,2005,2006,2005-01-01,0,48 \n", + "127,US-AR1,36.426701,-99.419983,14,100.00,-999,-999.00,2010,2012,2010-01-01,21600,48 \n", + "128,US-AR2,36.635799,-99.597504,14,100.00,-999,-999.00,2010,2011,2010-01-01,21600,48 \n", + "129,US-ARM,36.605801,-97.488800,15,100.00,-999,-999.00,2003,2012,2003-01-01,21600,48 \n", + "130,US-Aud,31.590700,-110.509201,14,100.00,-999,-999.00,2003,2005,2003-01-01,25200,48 \n", + "131,US-Bar,44.064640,-71.288086,1, 8.43,7,91.57,2005,2005,2005-01-01,18000,48 \n", + "132,US-Bkg,44.345291,-96.836182,14,100.00,-999,-999.00,2005,2006,2005-01-01,21600,48 \n", + "133,US-Blo,38.895302,-120.632751,1,100.00,-999,-999.00,2000,2006,2000-01-01,28800,48 \n", + "134,US-Bo1,40.006199,-88.290405,15,100.00,-999,-999.00,1997,2006,1997-01-01,21600,48 \n", + "135,US-Cop,38.090000,-109.389999,14,100.00,-999,-999.00,2002,2003,2002-01-01,25200,24 \n", + "136,US-FPe,48.307701,-105.101898,14,100.00,-999,-999.00,2000,2006,2000-01-01,25200,48 \n", + "137,US-GLE,41.366501,-106.239899,1,100.00,-999,-999.00,2009,2014,2009-01-01,25200,48 \n", + "138,US-Goo,34.254700,-89.873505,14,100.00,-999,-999.00,2004,2006,2004-01-01,21600,48 \n", + "139,US-Ha1,42.537800,-72.171509,7,100.00,-999,-999.00,1992,2012,1992-01-01,18000,24 \n", + "140,US-Ho1,45.204102,-68.740204,1,100.00,-999,-999.00,1996,2004,1996-01-01,18000,48 \n", + "141,US-KS2,28.608578,-80.671539,10,70.00,14,30.00,2003,2006,2003-01-01,18000,48 \n", + "142,US-Los,46.082699,-89.979187,13,100.00,-999,-999.00,2000,2008,2000-01-01,21600,48 \n", + "143,US-Me2,44.452301,-121.557404,1,100.00,-999,-999.00,2002,2014,2002-01-01,28800,48 \n", + "144,US-Me4,44.499199,-121.622406,1,100.00,-999,-999.00,1996,2000,1996-01-01,28800,48 \n", + "145,US-Me6,44.323299,-121.607803,1,100.00,-999,-999.00,2011,2014,2011-01-01,28800,48 \n", + "146,US-MMS,39.323200,-86.413086,7,100.00,-999,-999.00,1999,2014,1999-01-01,18000,24 \n", + "147,US-MOz,38.744110,-92.200012,7,100.00,-999,-999.00,2005,2006,2005-01-01,21600,48 \n", + "148,US-Myb,38.049801,-121.765106,13,100.00,-999,-999.00,2011,2014,2011-01-01,28800,48 \n", + "149,US-Ne1,41.165100,-96.476593,-999,-999.00,16,100.00,2002,2012,2002-01-01,21600,24 \n", + "150,US-Ne2,41.164902,-96.470093,-999,-999.00,16,100.00,2002,2012,2002-01-01,21600,24 \n", + "151,US-Ne3,41.179699,-96.439697,15,100.00,-999,-999.00,2002,2012,2002-01-01,21600,24 \n", + "152,US-NR1,40.032902,-105.546402,1,100.00,-999,-999.00,1999,2014,1999-01-01,25200,48 \n", + "153,US-PFa,45.945900,-90.272308,1, 8.18,7,91.82,1995,2014,1995-01-01,21600,24 \n", + "154,US-Prr,65.123703,-147.487595,2,100.00,-999,-999.00,2011,2013,2011-01-01,32400,48 \n", + "155,US-SP1,29.738070,-82.218781,1,100.00,-999,-999.00,2005,2005,2005-01-01,18000,48 \n", + "156,US-SP2,29.764799,-82.244812,1,100.00,-999,-999.00,2000,2004,2000-01-01,18000,48 \n", + "157,US-SP3,29.754770,-82.163269,5,100.00,-999,-999.00,1999,2004,1999-01-01,18000,48 \n", + "158,US-SRG,31.789400,-110.827698,14,100.00,-999,-999.00,2009,2014,2009-01-01,25200,48 \n", + "159,US-SRM,31.821400,-110.865997,7,70.00,14,30.00,2004,2014,2004-01-01,25200,48 \n", + "160,US-Syv,46.242001,-89.347717,1, 4.91,7,95.09,2002,2008,2002-01-01,21600,48 \n", + "161,US-Ton,38.431599,-120.966003,7,70.00,14,30.00,2001,2014,2001-01-01,28800,48 \n", + "162,US-Tw4,38.103001,-121.641403,13,100.00,-999,-999.00,2014,2014,2014-01-01,28800,48 \n", + "163,US-Twt,38.108700,-121.653107,-999,-999.00,16,100.00,2010,2014,2010-01-01,28800,48 \n", + "164,US-UMB,45.559799,-84.713806,7,100.00,-999,-999.00,2000,2014,2000-01-01,18000,24 \n", + "165,US-Var,38.413300,-120.950729,14,100.00,-999,-999.00,2001,2014,2001-01-01,28800,48 \n", + "166,US-WCr,45.805901,-90.079895,7,100.00,-999,-999.00,1999,2006,1999-01-01,21600,48 \n", + "167,US-Whs,31.743799,-110.052200,10,30.00,14,70.00,2008,2014,2008-01-01,25200,48 \n", + "168,US-Wkg,31.736500,-109.941895,14,100.00,-999,-999.00,2005,2014,2005-01-01,25200,48 \n", + "169,ZA-Kru,-25.019699,31.496901,6,30.00,14,70.00,2000,2002,1999-12-31,79200,48 \n", + "170,ZM-Mon,-15.437778,23.252781,6,100.00,-999,-999.00,2008,2008,2007-12-31,79200,48 \n" + ] + } + ], + "source": [ + "cat PLUMBER2_sites.csv" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "785b8c94-fd63-4067-be45-fe93b9244e77", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.12" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} From b87b3597c8a07044ed95596845c37f6e5b6aa66f Mon Sep 17 00:00:00 2001 From: wwieder Date: Thu, 5 Oct 2023 11:22:31 -0600 Subject: [PATCH 07/43] updaed shell commands --- .../PLUMBER2/AR-SLu/shell_commands | 2 +- .../PLUMBER2/AT-Neu/shell_commands | 2 +- .../PLUMBER2/AU-ASM/shell_commands | 2 +- .../PLUMBER2/AU-Cow/shell_commands | 2 +- .../PLUMBER2/AU-Cpr/shell_commands | 2 +- .../PLUMBER2/AU-Ctr/shell_commands | 2 +- .../PLUMBER2/AU-Cum/shell_commands | 2 +- .../PLUMBER2/AU-DaP/shell_commands | 2 +- .../PLUMBER2/AU-DaS/shell_commands | 2 +- .../PLUMBER2/AU-Dry/shell_commands | 2 +- .../PLUMBER2/AU-Emr/shell_commands | 2 +- .../PLUMBER2/AU-GWW/shell_commands | 2 +- .../PLUMBER2/AU-Gin/shell_commands | 2 +- .../PLUMBER2/AU-How/shell_commands | 2 +- .../PLUMBER2/AU-Lit/shell_commands | 2 +- .../PLUMBER2/AU-Otw/shell_commands | 2 +- .../PLUMBER2/AU-Rig/shell_commands | 2 +- .../PLUMBER2/AU-Rob/shell_commands | 2 +- .../PLUMBER2/AU-Sam/shell_commands | 2 +- .../PLUMBER2/AU-Stp/shell_commands | 2 +- .../PLUMBER2/AU-TTE/shell_commands | 2 +- .../PLUMBER2/AU-Tum/shell_commands | 2 +- .../PLUMBER2/AU-Whr/shell_commands | 2 +- .../PLUMBER2/AU-Wrr/shell_commands | 2 +- .../PLUMBER2/AU-Ync/shell_commands | 2 +- .../PLUMBER2/BE-Bra/shell_commands | 2 +- .../PLUMBER2/BE-Lon/shell_commands | 2 +- .../PLUMBER2/BE-Vie/shell_commands | 2 +- .../PLUMBER2/BR-Sa3/shell_commands | 2 +- .../PLUMBER2/BW-Ma1/shell_commands | 2 +- .../PLUMBER2/CA-NS1/shell_commands | 2 +- .../PLUMBER2/CA-NS2/shell_commands | 2 +- .../PLUMBER2/CA-NS4/shell_commands | 2 +- .../PLUMBER2/CA-NS5/shell_commands | 2 +- .../PLUMBER2/CA-NS6/shell_commands | 2 +- .../PLUMBER2/CA-NS7/shell_commands | 2 +- .../PLUMBER2/CA-Qcu/shell_commands | 2 +- .../PLUMBER2/CA-Qfo/shell_commands | 2 +- .../PLUMBER2/CA-SF1/shell_commands | 2 +- .../PLUMBER2/CA-SF2/shell_commands | 2 +- .../PLUMBER2/CA-SF3/shell_commands | 2 +- .../PLUMBER2/CH-Cha/shell_commands | 2 +- .../PLUMBER2/CH-Dav/shell_commands | 2 +- .../PLUMBER2/CH-Fru/shell_commands | 2 +- .../PLUMBER2/CH-Oe1/shell_commands | 2 +- .../PLUMBER2/CN-Cha/shell_commands | 2 +- .../PLUMBER2/CN-Cng/shell_commands | 2 +- .../PLUMBER2/CN-Dan/shell_commands | 2 +- .../PLUMBER2/CN-Din/shell_commands | 2 +- .../PLUMBER2/CN-Du2/shell_commands | 2 +- .../PLUMBER2/CN-HaM/shell_commands | 2 +- .../PLUMBER2/CN-Qia/shell_commands | 2 +- .../PLUMBER2/CZ-wet/shell_commands | 2 +- .../PLUMBER2/DE-Bay/shell_commands | 2 +- .../PLUMBER2/DE-Geb/shell_commands | 2 +- .../PLUMBER2/DE-Gri/shell_commands | 2 +- .../PLUMBER2/DE-Hai/shell_commands | 2 +- .../PLUMBER2/DE-Kli/shell_commands | 2 +- .../PLUMBER2/DE-Meh/shell_commands | 2 +- .../PLUMBER2/DE-Obe/shell_commands | 2 +- .../PLUMBER2/DE-Seh/shell_commands | 2 +- .../PLUMBER2/DE-SfN/shell_commands | 2 +- .../PLUMBER2/DE-Tha/shell_commands | 2 +- .../PLUMBER2/DE-Wet/shell_commands | 2 +- .../PLUMBER2/DK-Fou/shell_commands | 2 +- .../PLUMBER2/DK-Lva/shell_commands | 2 +- .../PLUMBER2/DK-Ris/shell_commands | 2 +- .../PLUMBER2/DK-Sor/shell_commands | 2 +- .../PLUMBER2/DK-ZaH/shell_commands | 2 +- .../PLUMBER2/ES-ES1/shell_commands | 2 +- .../PLUMBER2/ES-ES2/shell_commands | 2 +- .../PLUMBER2/ES-LMa/shell_commands | 2 +- .../PLUMBER2/ES-LgS/shell_commands | 2 +- .../PLUMBER2/ES-VDA/shell_commands | 2 +- .../PLUMBER2/FI-Hyy/shell_commands | 2 +- .../PLUMBER2/FI-Kaa/shell_commands | 2 +- .../PLUMBER2/FI-Lom/shell_commands | 2 +- .../PLUMBER2/FI-Sod/shell_commands | 2 +- .../PLUMBER2/FR-Fon/shell_commands | 2 +- .../PLUMBER2/FR-Gri/shell_commands | 2 +- .../PLUMBER2/FR-Hes/shell_commands | 2 +- .../PLUMBER2/FR-LBr/shell_commands | 2 +- .../PLUMBER2/FR-Lq1/shell_commands | 2 +- .../PLUMBER2/FR-Lq2/shell_commands | 2 +- .../PLUMBER2/FR-Pue/shell_commands | 2 +- .../PLUMBER2/GF-Guy/shell_commands | 2 +- .../PLUMBER2/HU-Bug/shell_commands | 2 +- .../PLUMBER2/ID-Pag/shell_commands | 2 +- .../PLUMBER2/IE-Ca1/shell_commands | 2 +- .../PLUMBER2/IE-Dri/shell_commands | 2 +- .../PLUMBER2/IT-Amp/shell_commands | 2 +- .../PLUMBER2/IT-BCi/shell_commands | 2 +- .../PLUMBER2/IT-CA1/shell_commands | 2 +- .../PLUMBER2/IT-CA2/shell_commands | 2 +- .../PLUMBER2/IT-CA3/shell_commands | 2 +- .../PLUMBER2/IT-Col/shell_commands | 2 +- .../PLUMBER2/IT-Cpz/shell_commands | 2 +- .../PLUMBER2/IT-Isp/shell_commands | 2 +- .../PLUMBER2/IT-LMa/shell_commands | 2 +- .../PLUMBER2/IT-Lav/shell_commands | 2 +- .../PLUMBER2/IT-MBo/shell_commands | 2 +- .../PLUMBER2/IT-Mal/shell_commands | 2 +- .../PLUMBER2/IT-Noe/shell_commands | 2 +- .../PLUMBER2/IT-Non/shell_commands | 2 +- .../PLUMBER2/IT-PT1/shell_commands | 2 +- .../PLUMBER2/IT-Ren/shell_commands | 2 +- .../PLUMBER2/IT-Ro1/shell_commands | 2 +- .../PLUMBER2/IT-Ro2/shell_commands | 2 +- .../PLUMBER2/IT-SR2/shell_commands | 2 +- .../PLUMBER2/IT-SRo/shell_commands | 2 +- .../PLUMBER2/JP-SMF/shell_commands | 2 +- .../PLUMBER2/NL-Ca1/shell_commands | 2 +- .../PLUMBER2/NL-Hor/shell_commands | 2 +- .../PLUMBER2/NL-Loo/shell_commands | 2 +- .../PLUMBER2/PL-wet/shell_commands | 2 +- .../PLUMBER2/PT-Esp/shell_commands | 2 +- .../PLUMBER2/PT-Mi1/shell_commands | 2 +- .../PLUMBER2/PT-Mi2/shell_commands | 2 +- .../PLUMBER2/RU-Che/shell_commands | 2 +- .../PLUMBER2/RU-Fyo/shell_commands | 2 +- .../PLUMBER2/RU-Zot/shell_commands | 2 +- .../PLUMBER2/SD-Dem/shell_commands | 2 +- .../PLUMBER2/SE-Deg/shell_commands | 2 +- .../PLUMBER2/UK-Gri/shell_commands | 2 +- .../PLUMBER2/UK-Ham/shell_commands | 2 +- .../PLUMBER2/UK-PL3/shell_commands | 2 +- .../PLUMBER2/US-AR1/shell_commands | 2 +- .../PLUMBER2/US-AR2/shell_commands | 2 +- .../PLUMBER2/US-ARM/shell_commands | 2 +- .../PLUMBER2/US-Aud/shell_commands | 2 +- .../PLUMBER2/US-Bar/shell_commands | 2 +- .../PLUMBER2/US-Bkg/shell_commands | 2 +- .../PLUMBER2/US-Blo/shell_commands | 2 +- .../PLUMBER2/US-Bo1/shell_commands | 2 +- .../PLUMBER2/US-Cop/shell_commands | 2 +- .../PLUMBER2/US-FPe/shell_commands | 2 +- .../PLUMBER2/US-GLE/shell_commands | 2 +- .../PLUMBER2/US-Goo/shell_commands | 2 +- .../PLUMBER2/US-Ha1/shell_commands | 2 +- .../PLUMBER2/US-Ho1/shell_commands | 2 +- .../PLUMBER2/US-KS2/shell_commands | 2 +- .../PLUMBER2/US-Los/shell_commands | 2 +- .../PLUMBER2/US-MMS/shell_commands | 2 +- .../PLUMBER2/US-MOz/shell_commands | 2 +- .../PLUMBER2/US-Me2/shell_commands | 2 +- .../PLUMBER2/US-Me4/shell_commands | 2 +- .../PLUMBER2/US-Me6/shell_commands | 2 +- .../PLUMBER2/US-Myb/shell_commands | 2 +- .../PLUMBER2/US-NR1/shell_commands | 2 +- .../PLUMBER2/US-Ne1/shell_commands | 2 +- .../PLUMBER2/US-Ne2/shell_commands | 2 +- .../PLUMBER2/US-Ne3/shell_commands | 2 +- .../PLUMBER2/US-PFa/shell_commands | 2 +- .../PLUMBER2/US-Prr/shell_commands | 2 +- .../PLUMBER2/US-SP1/shell_commands | 2 +- .../PLUMBER2/US-SP2/shell_commands | 2 +- .../PLUMBER2/US-SP3/shell_commands | 2 +- .../PLUMBER2/US-SRG/shell_commands | 2 +- .../PLUMBER2/US-SRM/shell_commands | 2 +- .../PLUMBER2/US-Syv/shell_commands | 2 +- .../PLUMBER2/US-Ton/shell_commands | 2 +- .../PLUMBER2/US-Tw4/shell_commands | 2 +- .../PLUMBER2/US-Twt/shell_commands | 2 +- .../PLUMBER2/US-UMB/shell_commands | 2 +- .../PLUMBER2/US-Var/shell_commands | 2 +- .../PLUMBER2/US-WCr/shell_commands | 2 +- .../PLUMBER2/US-Whs/shell_commands | 2 +- .../PLUMBER2/US-Wkg/shell_commands | 2 +- .../PLUMBER2/ZA-Kru/shell_commands | 2 +- .../PLUMBER2/ZM-Mon/shell_commands | 2 +- .../PLUMBER2/defaults/user_nl_clm | 4 +- .../site_and_regional/plumber2_usermods.ipynb | 279 +++++++----------- 172 files changed, 285 insertions(+), 338 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index e46607f7b6..ae7b1ae8d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AR-SLu ./xmlchange PTS_LON=-66.459808 ./xmlchange PTS_LAT=-33.464802 -./xmlchange START_DATE=2010-01-01 +./xmlchange RUN_STARTDATE=2010-01-01 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2010 diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 0d8c681987..22efea9754 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AT-Neu ./xmlchange PTS_LON=11.3175 ./xmlchange PTS_LAT=47.116669 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 446e7804e5..d14a32e125 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-ASM ./xmlchange PTS_LON=133.248993 ./xmlchange PTS_LAT=-22.283001 -./xmlchange START_DATE=2010-12-31 +./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 4ca0ae280e..97f937ab16 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Cow ./xmlchange PTS_LON=145.427155 ./xmlchange PTS_LAT=-16.23819 -./xmlchange START_DATE=2009-12-31 +./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2015 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index a1c1601db2..6da2c2b681 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Cpr ./xmlchange PTS_LON=140.589127 ./xmlchange PTS_LAT=-34.00206 -./xmlchange START_DATE=2010-12-31 +./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index d1f51f5842..c51effd440 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Ctr ./xmlchange PTS_LON=145.446854 ./xmlchange PTS_LAT=-16.103279 -./xmlchange START_DATE=2009-12-31 +./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 947867cdca..e38e2782d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Cum ./xmlchange PTS_LON=150.722473 ./xmlchange PTS_LAT=-33.613297 -./xmlchange START_DATE=2012-12-31 +./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2018 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 73ac24ed07..4b0f61dc08 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-DaP ./xmlchange PTS_LON=131.3181 ./xmlchange PTS_LAT=-14.0633 -./xmlchange START_DATE=2008-12-31 +./xmlchange RUN_STARTDATE=2008-12-31 ./xmlchange DATM_YR_ALIGN=2009 ./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 86226737f3..aa89d3c9ec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-DaS ./xmlchange PTS_LON=131.388 ./xmlchange PTS_LAT=-14.159283 -./xmlchange START_DATE=2009-12-31 +./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 5cc12d9fcb..23e3496205 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Dry ./xmlchange PTS_LON=132.370605 ./xmlchange PTS_LAT=-15.2588 -./xmlchange START_DATE=2010-12-31 +./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2015 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index f6770166a6..3a3bff9917 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Emr ./xmlchange PTS_LON=148.474594 ./xmlchange PTS_LAT=-23.8587 -./xmlchange START_DATE=2011-12-31 +./xmlchange RUN_STARTDATE=2011-12-31 ./xmlchange DATM_YR_ALIGN=2012 ./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index a956b4be68..54975307eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-GWW ./xmlchange PTS_LON=120.654099 ./xmlchange PTS_LAT=-30.191299 -./xmlchange START_DATE=2012-12-31 +./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index abfa3831ab..757dee64b6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Gin ./xmlchange PTS_LON=115.650002 ./xmlchange PTS_LAT=-31.375 -./xmlchange START_DATE=2011-12-31 +./xmlchange RUN_STARTDATE=2011-12-31 ./xmlchange DATM_YR_ALIGN=2012 ./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 6a68112521..a642da8ccc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-How ./xmlchange PTS_LON=131.149994 ./xmlchange PTS_LAT=-12.4952 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index a2f3d127e8..58df3067bd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Lit ./xmlchange PTS_LON=130.794495 ./xmlchange PTS_LAT=-13.17904 -./xmlchange START_DATE=2015-12-31 +./xmlchange RUN_STARTDATE=2015-12-31 ./xmlchange DATM_YR_ALIGN=2016 ./xmlchange DATM_YR_START=2016 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index edebd299fa..0ea8ac8218 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Otw ./xmlchange PTS_LON=142.816803 ./xmlchange PTS_LAT=-38.532341 -./xmlchange START_DATE=2008-12-31 +./xmlchange RUN_STARTDATE=2008-12-31 ./xmlchange DATM_YR_ALIGN=2009 ./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2010 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index ac2489a873..c41efd9a52 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Rig ./xmlchange PTS_LON=145.575897 ./xmlchange PTS_LAT=-36.649899 -./xmlchange START_DATE=2010-12-31 +./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2016 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 2e5bf5f605..6ce1d44c07 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Rob ./xmlchange PTS_LON=145.630096 ./xmlchange PTS_LAT=-17.1175 -./xmlchange START_DATE=2013-12-31 +./xmlchange RUN_STARTDATE=2013-12-31 ./xmlchange DATM_YR_ALIGN=2014 ./xmlchange DATM_YR_START=2014 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 958fef041c..d4144b98cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Sam ./xmlchange PTS_LON=152.877808 ./xmlchange PTS_LAT=-27.3881 -./xmlchange START_DATE=2010-12-31 +./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 2c520ca96a..2f16980e1c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Stp ./xmlchange PTS_LON=133.350204 ./xmlchange PTS_LAT=-17.1507 -./xmlchange START_DATE=2009-12-31 +./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 8cce8890af..9bd94247b8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-TTE ./xmlchange PTS_LON=133.639999 ./xmlchange PTS_LAT=-22.287001 -./xmlchange START_DATE=2012-12-31 +./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 8bd0af3874..eb809b34dc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Tum ./xmlchange PTS_LON=148.151703 ./xmlchange PTS_LAT=-35.656601 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index b29bb9fbde..504a4cb214 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Whr ./xmlchange PTS_LON=145.029404 ./xmlchange PTS_LAT=-36.673199 -./xmlchange START_DATE=2014-12-31 +./xmlchange RUN_STARTDATE=2014-12-31 ./xmlchange DATM_YR_ALIGN=2015 ./xmlchange DATM_YR_START=2015 ./xmlchange DATM_YR_END=2016 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 39707cec37..49902ca678 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Wrr ./xmlchange PTS_LON=146.654495 ./xmlchange PTS_LAT=-43.09502 -./xmlchange START_DATE=2015-12-31 +./xmlchange RUN_STARTDATE=2015-12-31 ./xmlchange DATM_YR_ALIGN=2016 ./xmlchange DATM_YR_START=2016 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index e4944892f0..13badd0c3a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=AU-Ync ./xmlchange PTS_LON=146.290695 ./xmlchange PTS_LAT=-34.9893 -./xmlchange START_DATE=2010-12-31 +./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 7906b2fe25..2cde54531f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=BE-Bra ./xmlchange PTS_LON=4.52056 ./xmlchange PTS_LAT=51.309166 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 67fdd93545..cdf26eba97 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=BE-Lon ./xmlchange PTS_LON=4.74613 ./xmlchange PTS_LAT=50.55159 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index f8d426a808..585bf564a6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=BE-Vie ./xmlchange PTS_LON=5.99805 ./xmlchange PTS_LAT=50.305069 -./xmlchange START_DATE=1996-12-31 +./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 32a92e42c7..f53825a647 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=BR-Sa3 ./xmlchange PTS_LON=-54.971436 ./xmlchange PTS_LAT=-3.018029 -./xmlchange START_DATE=2001-01-01 +./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 21498b6f7c..909528fc5d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=BW-Ma1 ./xmlchange PTS_LON=23.560329 ./xmlchange PTS_LAT=-19.9165 -./xmlchange START_DATE=1999-12-31 +./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2000 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 66aaf53925..6b2bb1590f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-NS1 ./xmlchange PTS_LON=-98.483887 ./xmlchange PTS_LAT=55.8792 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index ed95a230e2..91cc30b0d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-NS2 ./xmlchange PTS_LON=-98.524689 ./xmlchange PTS_LAT=55.9058 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index 849138abd6..b426493c4c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-NS4 ./xmlchange PTS_LON=-98.380615 ./xmlchange PTS_LAT=55.914398 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index cfd757503c..5499e963e4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-NS5 ./xmlchange PTS_LON=-98.484985 ./xmlchange PTS_LAT=55.863098 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index dbf2c20feb..7058e92627 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-NS6 ./xmlchange PTS_LON=-98.964417 ./xmlchange PTS_LAT=55.916698 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 49ef2b6612..06573a3768 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-NS7 ./xmlchange PTS_LON=-99.948303 ./xmlchange PTS_LAT=56.635799 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index f21cbc078d..aff78d3020 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-Qcu ./xmlchange PTS_LON=-74.03653 ./xmlchange PTS_LAT=49.267078 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index 1e1dfb15ec..890fac7393 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-Qfo ./xmlchange PTS_LON=-74.342102 ./xmlchange PTS_LAT=49.692501 -./xmlchange START_DATE=2004-01-01 +./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2010 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index 09bf748b74..c91c935292 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-SF1 ./xmlchange PTS_LON=-105.817596 ./xmlchange PTS_LAT=54.485001 -./xmlchange START_DATE=2004-01-01 +./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index a2dd50beaa..64833cb673 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-SF2 ./xmlchange PTS_LON=-105.877502 ./xmlchange PTS_LAT=54.253899 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index 8b176bcf83..6b440c3d5b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CA-SF3 ./xmlchange PTS_LON=-106.00531 ./xmlchange PTS_LAT=54.091599 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index 56f41db087..8c5ff78b08 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CH-Cha ./xmlchange PTS_LON=8.41044 ./xmlchange PTS_LAT=47.21022 -./xmlchange START_DATE=2005-12-31 +./xmlchange RUN_STARTDATE=2005-12-31 ./xmlchange DATM_YR_ALIGN=2006 ./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index f0ea7c37af..b2f22609ad 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CH-Dav ./xmlchange PTS_LON=9.85592 ./xmlchange PTS_LAT=46.815334 -./xmlchange START_DATE=1996-12-31 +./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 8615418ada..962b39f7db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CH-Fru ./xmlchange PTS_LON=8.53778 ./xmlchange PTS_LAT=47.115833 -./xmlchange START_DATE=2006-12-31 +./xmlchange RUN_STARTDATE=2006-12-31 ./xmlchange DATM_YR_ALIGN=2007 ./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index fde20d74b6..88ba34a99c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CH-Oe1 ./xmlchange PTS_LON=7.73194 ./xmlchange PTS_LAT=47.285831 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index b34158211c..52f784b0ff 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CN-Cha ./xmlchange PTS_LON=128.095795 ./xmlchange PTS_LAT=42.4025 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 981ff073a7..94da166bad 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CN-Cng ./xmlchange PTS_LON=123.509201 ./xmlchange PTS_LAT=44.593399 -./xmlchange START_DATE=2007-12-31 +./xmlchange RUN_STARTDATE=2007-12-31 ./xmlchange DATM_YR_ALIGN=2008 ./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2009 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 3b4c41f2f4..ddcbab3bc2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CN-Dan ./xmlchange PTS_LON=91.066399 ./xmlchange PTS_LAT=30.497801 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index 587eabcd6b..d35bebd115 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CN-Din ./xmlchange PTS_LON=112.536102 ./xmlchange PTS_LAT=23.1733 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index cab3a19e5a..1a8f8f37e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CN-Du2 ./xmlchange PTS_LON=116.2836 ./xmlchange PTS_LAT=42.0467 -./xmlchange START_DATE=2006-12-31 +./xmlchange RUN_STARTDATE=2006-12-31 ./xmlchange DATM_YR_ALIGN=2007 ./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2008 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 925fe17299..5145ddd88e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CN-HaM ./xmlchange PTS_LON=101.18 ./xmlchange PTS_LAT=37.369999 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index bc9403e5d9..a440108612 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CN-Qia ./xmlchange PTS_LON=115.058098 ./xmlchange PTS_LAT=26.7414 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 5ccf2e6d65..8256a2f505 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=CZ-wet ./xmlchange PTS_LON=14.77035 ./xmlchange PTS_LAT=49.024651 -./xmlchange START_DATE=2006-12-31 +./xmlchange RUN_STARTDATE=2006-12-31 ./xmlchange DATM_YR_ALIGN=2007 ./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 80d73be9e2..9dc97416b4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Bay ./xmlchange PTS_LON=11.86694 ./xmlchange PTS_LAT=50.141941 -./xmlchange START_DATE=1996-12-31 +./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=1999 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 338fab3a7a..1eabb09c55 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Geb ./xmlchange PTS_LON=10.9143 ./xmlchange PTS_LAT=51.100101 -./xmlchange START_DATE=2000-12-31 +./xmlchange RUN_STARTDATE=2000-12-31 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index fbcf2ca27c..27634efc7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Gri ./xmlchange PTS_LON=13.51253 ./xmlchange PTS_LAT=50.949471 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 1c46068e79..62de7a27f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Hai ./xmlchange PTS_LON=10.453 ./xmlchange PTS_LAT=51.079166 -./xmlchange START_DATE=1999-12-31 +./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index ffbf433bca..5d3091c6e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Kli ./xmlchange PTS_LON=13.52238 ./xmlchange PTS_LAT=50.893059 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 721341909d..522ed84273 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Meh ./xmlchange PTS_LON=10.65547 ./xmlchange PTS_LAT=51.275311 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index 1904bd6356..e8a587a03f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Obe ./xmlchange PTS_LON=13.72129 ./xmlchange PTS_LAT=50.786659 -./xmlchange START_DATE=2007-12-31 +./xmlchange RUN_STARTDATE=2007-12-31 ./xmlchange DATM_YR_ALIGN=2008 ./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 9dd6d550be..7c399a3f2e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Seh ./xmlchange PTS_LON=6.44965 ./xmlchange PTS_LAT=50.870625 -./xmlchange START_DATE=2007-12-31 +./xmlchange RUN_STARTDATE=2007-12-31 ./xmlchange DATM_YR_ALIGN=2008 ./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2010 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index e335e275cb..fa88ad2282 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-SfN ./xmlchange PTS_LON=11.3275 ./xmlchange PTS_LAT=47.806389 -./xmlchange START_DATE=2012-12-31 +./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index e44066e6e9..7dc9ebe579 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Tha ./xmlchange PTS_LON=13.56694 ./xmlchange PTS_LAT=50.963612 -./xmlchange START_DATE=1997-12-31 +./xmlchange RUN_STARTDATE=1997-12-31 ./xmlchange DATM_YR_ALIGN=1998 ./xmlchange DATM_YR_START=1998 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 12456bf371..12ea28894b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DE-Wet ./xmlchange PTS_LON=11.45753 ./xmlchange PTS_LAT=50.453499 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index 3acbee86a5..1b26559723 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DK-Fou ./xmlchange PTS_LON=9.58722 ./xmlchange PTS_LAT=56.4842 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index cc857a8c4d..6e98d13f87 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DK-Lva ./xmlchange PTS_LON=12.0833 ./xmlchange PTS_LAT=55.6833 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index 2c56f619df..a7cf75dfec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DK-Ris ./xmlchange PTS_LON=12.09722 ./xmlchange PTS_LAT=55.530281 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 9fac964f8d..8bc162b762 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DK-Sor ./xmlchange PTS_LON=11.64464 ./xmlchange PTS_LAT=55.48587 -./xmlchange START_DATE=1996-12-31 +./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 7044daed5c..8ebd841ee4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=DK-ZaH ./xmlchange PTS_LON=-20.550293 ./xmlchange PTS_LAT=74.473282 -./xmlchange START_DATE=2000-01-01 +./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 9e46ef5b9d..a1e247e976 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=ES-ES1 ./xmlchange PTS_LON=-0.318817 ./xmlchange PTS_LAT=39.34597 -./xmlchange START_DATE=1998-12-31 +./xmlchange RUN_STARTDATE=1998-12-31 ./xmlchange DATM_YR_ALIGN=1999 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 9b972c10df..f2942cb381 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=ES-ES2 ./xmlchange PTS_LON=-0.315277 ./xmlchange PTS_LAT=39.275558 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 200ba0627a..74b8d62b64 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=ES-LMa ./xmlchange PTS_LON=-5.773346 ./xmlchange PTS_LAT=39.941502 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 3861977e7b..4aa00dc2a6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=ES-LgS ./xmlchange PTS_LON=-2.96582 ./xmlchange PTS_LAT=37.097935 -./xmlchange START_DATE=2006-12-31 +./xmlchange RUN_STARTDATE=2006-12-31 ./xmlchange DATM_YR_ALIGN=2007 ./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2007 diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index a9278beefd..2f3b2fbbe0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=ES-VDA ./xmlchange PTS_LON=1.4485 ./xmlchange PTS_LAT=42.15218 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index de7ccbc451..c5da160f9e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FI-Hyy ./xmlchange PTS_LON=24.295 ./xmlchange PTS_LAT=61.8475 -./xmlchange START_DATE=1995-12-31 +./xmlchange RUN_STARTDATE=1995-12-31 ./xmlchange DATM_YR_ALIGN=1996 ./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index f37605f293..91a1e1477c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FI-Kaa ./xmlchange PTS_LON=27.295031 ./xmlchange PTS_LAT=69.140694 -./xmlchange START_DATE=1999-12-31 +./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 26320486d7..174e225c2c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FI-Lom ./xmlchange PTS_LON=24.209181 ./xmlchange PTS_LAT=67.9972 -./xmlchange START_DATE=2006-12-31 +./xmlchange RUN_STARTDATE=2006-12-31 ./xmlchange DATM_YR_ALIGN=2007 ./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2009 diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index abaa1ef79a..b4a19d9e90 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FI-Sod ./xmlchange PTS_LON=26.637831 ./xmlchange PTS_LAT=67.361862 -./xmlchange START_DATE=2007-12-31 +./xmlchange RUN_STARTDATE=2007-12-31 ./xmlchange DATM_YR_ALIGN=2008 ./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 3ff0409c9d..cd6a877f5f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FR-Fon ./xmlchange PTS_LON=2.78014 ./xmlchange PTS_LAT=48.476398 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index 3ab75f5383..d158db7235 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FR-Gri ./xmlchange PTS_LON=1.95191 ./xmlchange PTS_LAT=48.844219 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index 85842c2287..afbf7d183d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FR-Hes ./xmlchange PTS_LON=7.06556 ./xmlchange PTS_LAT=48.67416 -./xmlchange START_DATE=1996-12-31 +./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 27897aa975..4fc977b229 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FR-LBr ./xmlchange PTS_LON=-0.769287 ./xmlchange PTS_LAT=44.71711 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2008 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 293b7588bf..271081e903 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FR-Lq1 ./xmlchange PTS_LON=2.73583 ./xmlchange PTS_LAT=45.643059 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index ecf5c09675..5390ab8b12 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FR-Lq2 ./xmlchange PTS_LON=2.73703 ./xmlchange PTS_LAT=45.639191 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index f445e7f58d..c3dc9f8dfc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=FR-Pue ./xmlchange PTS_LON=3.59583 ./xmlchange PTS_LAT=43.74139 -./xmlchange START_DATE=1999-12-31 +./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index a59f0ce8f8..2e5f9b4701 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=GF-Guy ./xmlchange PTS_LON=-52.924866 ./xmlchange PTS_LAT=5.278772 -./xmlchange START_DATE=2004-01-01 +./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 7862339b67..ef1d8f9b25 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=HU-Bug ./xmlchange PTS_LON=19.601299 ./xmlchange PTS_LAT=46.691101 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 9482f9938b..747b87be0d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=ID-Pag ./xmlchange PTS_LON=114.036392 ./xmlchange PTS_LAT=-2.345 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 680f36ecc0..0cf88c10f2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IE-Ca1 ./xmlchange PTS_LON=-6.918152 ./xmlchange PTS_LAT=52.858791 -./xmlchange START_DATE=2004-01-01 +./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index b1e392ee7b..7426177edf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IE-Dri ./xmlchange PTS_LON=-8.751801 ./xmlchange PTS_LAT=51.986691 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index a3f97378b7..9f1ac5a079 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Amp ./xmlchange PTS_LON=13.60516 ./xmlchange PTS_LAT=41.904099 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index d1a47c6417..78ad47f3ee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-BCi ./xmlchange PTS_LON=14.95744 ./xmlchange PTS_LAT=40.5238 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2010 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 646945912e..cf32fc2f64 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-CA1 ./xmlchange PTS_LON=12.02656 ./xmlchange PTS_LAT=42.380409 -./xmlchange START_DATE=2011-12-31 +./xmlchange RUN_STARTDATE=2011-12-31 ./xmlchange DATM_YR_ALIGN=2012 ./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index a129176c9c..6b45fefeb7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-CA2 ./xmlchange PTS_LON=12.02604 ./xmlchange PTS_LAT=42.37722 -./xmlchange START_DATE=2011-12-31 +./xmlchange RUN_STARTDATE=2011-12-31 ./xmlchange DATM_YR_ALIGN=2012 ./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 56bfbb6c68..6490991d3e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-CA3 ./xmlchange PTS_LON=12.0222 ./xmlchange PTS_LAT=42.380001 -./xmlchange START_DATE=2011-12-31 +./xmlchange RUN_STARTDATE=2011-12-31 ./xmlchange DATM_YR_ALIGN=2012 ./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index 37a404cb8d..c1533c70a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Col ./xmlchange PTS_LON=13.58814 ./xmlchange PTS_LAT=41.849361 -./xmlchange START_DATE=2006-12-31 +./xmlchange RUN_STARTDATE=2006-12-31 ./xmlchange DATM_YR_ALIGN=2007 ./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index d621b7f598..1442fcbaf1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Cpz ./xmlchange PTS_LON=12.37611 ./xmlchange PTS_LAT=41.70525 -./xmlchange START_DATE=2000-12-31 +./xmlchange RUN_STARTDATE=2000-12-31 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2008 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 624d96ffb6..673a3f3135 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Isp ./xmlchange PTS_LON=8.63358 ./xmlchange PTS_LAT=45.812641 -./xmlchange START_DATE=2012-12-31 +./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index b76e6a32d1..30487ddfe2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-LMa ./xmlchange PTS_LON=7.58259 ./xmlchange PTS_LAT=45.15258 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index a4cf5eb041..50aad2142a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Lav ./xmlchange PTS_LON=11.28132 ./xmlchange PTS_LAT=45.9562 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index dbc19ac1c2..e480a224b0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-MBo ./xmlchange PTS_LON=11.04583 ./xmlchange PTS_LAT=46.014679 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index daa356cfa8..30f453aae9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Mal ./xmlchange PTS_LON=11.70334 ./xmlchange PTS_LAT=46.114021 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index ab32e2a0bd..6d35714bb3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Noe ./xmlchange PTS_LON=8.15117 ./xmlchange PTS_LAT=40.606178 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index ed151e9f03..e8b5044db4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Non ./xmlchange PTS_LON=11.09109 ./xmlchange PTS_LAT=44.690189 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index 7ea35fe3e7..2018d86736 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-PT1 ./xmlchange PTS_LON=9.06104 ./xmlchange PTS_LAT=45.200871 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 7e35ba308a..fc920c415d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Ren ./xmlchange PTS_LON=11.43369 ./xmlchange PTS_LAT=46.586861 -./xmlchange START_DATE=2009-12-31 +./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index 40c1c45d97..b12d9f36b0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Ro1 ./xmlchange PTS_LON=11.93001 ./xmlchange PTS_LAT=42.408119 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index e83378380e..c954893c2f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-Ro2 ./xmlchange PTS_LON=11.92093 ./xmlchange PTS_LAT=42.390259 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index b728b3cf6b..d3ba1e0b00 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-SR2 ./xmlchange PTS_LON=10.29095 ./xmlchange PTS_LAT=43.732029 -./xmlchange START_DATE=2012-12-31 +./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index c178e2d33d..f71fd3b73a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=IT-SRo ./xmlchange PTS_LON=10.28444 ./xmlchange PTS_LAT=43.727859 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 30b92542e6..944751af3b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=JP-SMF ./xmlchange PTS_LON=137.078796 ./xmlchange PTS_LAT=35.2617 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 30b3e51366..6d660b14af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=NL-Ca1 ./xmlchange PTS_LON=4.927 ./xmlchange PTS_LAT=51.971001 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 7d7e131827..2f80e68fe2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=NL-Hor ./xmlchange PTS_LON=5.0713 ./xmlchange PTS_LAT=52.240349 -./xmlchange START_DATE=2007-12-31 +./xmlchange RUN_STARTDATE=2007-12-31 ./xmlchange DATM_YR_ALIGN=2008 ./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2011 diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 8ab25a0f81..2da1a1e5c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=NL-Loo ./xmlchange PTS_LON=5.74356 ./xmlchange PTS_LAT=52.16658 -./xmlchange START_DATE=1996-12-31 +./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 012d2edcb3..f41cbbd83f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=PL-wet ./xmlchange PTS_LON=16.309401 ./xmlchange PTS_LAT=52.762199 -./xmlchange START_DATE=2003-12-31 +./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 581eb90888..f742f8d080 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=PT-Esp ./xmlchange PTS_LON=-8.601807 ./xmlchange PTS_LAT=38.6394 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 319576a402..ef8e353887 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=PT-Mi1 ./xmlchange PTS_LON=-8.000061 ./xmlchange PTS_LAT=38.540642 -./xmlchange START_DATE=2005-01-01 +./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index 11c158db66..d4e1c70b8e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=PT-Mi2 ./xmlchange PTS_LON=-8.024536 ./xmlchange PTS_LAT=38.476501 -./xmlchange START_DATE=2005-01-01 +./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index d4ead88c72..27f2458a3d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=RU-Che ./xmlchange PTS_LON=161.341431 ./xmlchange PTS_LAT=68.613037 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 35905c508c..b034a117d6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=RU-Fyo ./xmlchange PTS_LON=32.922081 ./xmlchange PTS_LAT=56.461529 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index 65f28b27f1..a9fe270736 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=RU-Zot ./xmlchange PTS_LON=89.3508 ./xmlchange PTS_LAT=60.8008 -./xmlchange START_DATE=2002-12-31 +./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index fb6f580958..7e1eadacd0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=SD-Dem ./xmlchange PTS_LON=30.4783 ./xmlchange PTS_LAT=13.2829 -./xmlchange START_DATE=2004-12-31 +./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2009 diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index 80806cc75a..d9489285a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=SE-Deg ./xmlchange PTS_LON=19.55669 ./xmlchange PTS_LAT=64.181969 -./xmlchange START_DATE=2001-12-31 +./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index cbb54f1977..198f0ba201 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=UK-Gri ./xmlchange PTS_LON=-3.798065 ./xmlchange PTS_LAT=56.60722 -./xmlchange START_DATE=2000-01-01 +./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2001 diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 626eae06b4..2fad48a8fb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=UK-Ham ./xmlchange PTS_LON=-0.858307 ./xmlchange PTS_LAT=51.15353 -./xmlchange START_DATE=2004-01-01 +./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index 5d8da975a4..acd2ea1a6b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=UK-PL3 ./xmlchange PTS_LON=-1.266663 ./xmlchange PTS_LAT=51.450001 -./xmlchange START_DATE=2005-01-01 +./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index fc25145620..99b76ece82 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-AR1 ./xmlchange PTS_LON=-99.419983 ./xmlchange PTS_LAT=36.426701 -./xmlchange START_DATE=2010-01-01 +./xmlchange RUN_STARTDATE=2010-01-01 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 4f6a0ceae7..9bc79cfc4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-AR2 ./xmlchange PTS_LON=-99.597504 ./xmlchange PTS_LAT=36.635799 -./xmlchange START_DATE=2010-01-01 +./xmlchange RUN_STARTDATE=2010-01-01 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2011 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index 0a62724bfd..44f88aa85e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-ARM ./xmlchange PTS_LON=-97.4888 ./xmlchange PTS_LAT=36.605801 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 9409ab15d1..91967253a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Aud ./xmlchange PTS_LON=-110.509201 ./xmlchange PTS_LAT=31.5907 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 0603f6ef1c..a1aabf068c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Bar ./xmlchange PTS_LON=-71.288086 ./xmlchange PTS_LAT=44.06464 -./xmlchange START_DATE=2005-01-01 +./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 00ef8125e5..0da0463da2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Bkg ./xmlchange PTS_LON=-96.836182 ./xmlchange PTS_LAT=44.345291 -./xmlchange START_DATE=2005-01-01 +./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 92eccaafae..1d93de37f3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Blo ./xmlchange PTS_LON=-120.632751 ./xmlchange PTS_LAT=38.895302 -./xmlchange START_DATE=2000-01-01 +./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 038b667c4c..3300769018 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Bo1 ./xmlchange PTS_LON=-88.290405 ./xmlchange PTS_LAT=40.006199 -./xmlchange START_DATE=1997-01-01 +./xmlchange RUN_STARTDATE=1997-01-01 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index 71d9626d11..7e5c07df85 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Cop ./xmlchange PTS_LON=-109.389999 ./xmlchange PTS_LAT=38.09 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index c0abce31a9..bbf9402e6d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-FPe ./xmlchange PTS_LON=-105.101898 ./xmlchange PTS_LAT=48.307701 -./xmlchange START_DATE=2000-01-01 +./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index a1c3b2a541..50eed57ec9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-GLE ./xmlchange PTS_LON=-106.239899 ./xmlchange PTS_LAT=41.366501 -./xmlchange START_DATE=2009-01-01 +./xmlchange RUN_STARTDATE=2009-01-01 ./xmlchange DATM_YR_ALIGN=2009 ./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index b9f5b993e0..880953826c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Goo ./xmlchange PTS_LON=-89.873505 ./xmlchange PTS_LAT=34.2547 -./xmlchange START_DATE=2004-01-01 +./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 3b200e309e..2f65c91eeb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Ha1 ./xmlchange PTS_LON=-72.171509 ./xmlchange PTS_LAT=42.5378 -./xmlchange START_DATE=1992-01-01 +./xmlchange RUN_STARTDATE=1992-01-01 ./xmlchange DATM_YR_ALIGN=1992 ./xmlchange DATM_YR_START=1992 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 8edfb2bc2e..9093f1f2ea 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Ho1 ./xmlchange PTS_LON=-68.740204 ./xmlchange PTS_LAT=45.204102 -./xmlchange START_DATE=1996-01-01 +./xmlchange RUN_STARTDATE=1996-01-01 ./xmlchange DATM_YR_ALIGN=1996 ./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index e11f891802..29eadcaef9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-KS2 ./xmlchange PTS_LON=-80.671539 ./xmlchange PTS_LAT=28.608578 -./xmlchange START_DATE=2003-01-01 +./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index 3560c46ad2..bc52fa3f28 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Los ./xmlchange PTS_LON=-89.979187 ./xmlchange PTS_LAT=46.082699 -./xmlchange START_DATE=2000-01-01 +./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2008 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 32e625152d..67b7254037 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-MMS ./xmlchange PTS_LON=-86.413086 ./xmlchange PTS_LAT=39.3232 -./xmlchange START_DATE=1999-01-01 +./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index 9c0797f798..9956932203 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-MOz ./xmlchange PTS_LON=-92.200012 ./xmlchange PTS_LAT=38.74411 -./xmlchange START_DATE=2005-01-01 +./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index db039a3b89..e93d78600f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Me2 ./xmlchange PTS_LON=-121.557404 ./xmlchange PTS_LAT=44.452301 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 61b98e5134..e99bc51d33 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Me4 ./xmlchange PTS_LON=-121.622406 ./xmlchange PTS_LAT=44.499199 -./xmlchange START_DATE=1996-01-01 +./xmlchange RUN_STARTDATE=1996-01-01 ./xmlchange DATM_YR_ALIGN=1996 ./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2000 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index 4239839381..c1f212be8f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Me6 ./xmlchange PTS_LON=-121.607803 ./xmlchange PTS_LAT=44.323299 -./xmlchange START_DATE=2011-01-01 +./xmlchange RUN_STARTDATE=2011-01-01 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 634d8a7fc9..db659663d3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Myb ./xmlchange PTS_LON=-121.765106 ./xmlchange PTS_LAT=38.049801 -./xmlchange START_DATE=2011-01-01 +./xmlchange RUN_STARTDATE=2011-01-01 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index cca52b3eb2..fef51c7cbb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-NR1 ./xmlchange PTS_LON=-105.546402 ./xmlchange PTS_LAT=40.032902 -./xmlchange START_DATE=1999-01-01 +./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index a2d47f4ac0..6d5016df0e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Ne1 ./xmlchange PTS_LON=-96.476593 ./xmlchange PTS_LAT=41.1651 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index f60694c8cd..1fc8ef2e8e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Ne2 ./xmlchange PTS_LON=-96.470093 ./xmlchange PTS_LAT=41.164902 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index 67dd08275f..b45a85c9f6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Ne3 ./xmlchange PTS_LON=-96.439697 ./xmlchange PTS_LAT=41.179699 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 6bc45f3c6d..9bc6366d7f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-PFa ./xmlchange PTS_LON=-90.272308 ./xmlchange PTS_LAT=45.9459 -./xmlchange START_DATE=1995-01-01 +./xmlchange RUN_STARTDATE=1995-01-01 ./xmlchange DATM_YR_ALIGN=1995 ./xmlchange DATM_YR_START=1995 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 97834180a1..5426500cdf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Prr ./xmlchange PTS_LON=-147.487595 ./xmlchange PTS_LAT=65.123703 -./xmlchange START_DATE=2011-01-01 +./xmlchange RUN_STARTDATE=2011-01-01 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index 25ecd112ab..932ce22624 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-SP1 ./xmlchange PTS_LON=-82.218781 ./xmlchange PTS_LAT=29.73807 -./xmlchange START_DATE=2005-01-01 +./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index c8368cf7a4..014950e6f0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-SP2 ./xmlchange PTS_LON=-82.244812 ./xmlchange PTS_LAT=29.764799 -./xmlchange START_DATE=2000-01-01 +./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index cb7e3a7727..d98f095d76 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-SP3 ./xmlchange PTS_LON=-82.163269 ./xmlchange PTS_LAT=29.75477 -./xmlchange START_DATE=1999-01-01 +./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index a8fdff8016..55c56c0c72 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-SRG ./xmlchange PTS_LON=-110.827698 ./xmlchange PTS_LAT=31.7894 -./xmlchange START_DATE=2009-01-01 +./xmlchange RUN_STARTDATE=2009-01-01 ./xmlchange DATM_YR_ALIGN=2009 ./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 032f1a6000..5f8102b9e8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-SRM ./xmlchange PTS_LON=-110.865997 ./xmlchange PTS_LAT=31.8214 -./xmlchange START_DATE=2004-01-01 +./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index bf3eb8d5ea..38847ccf38 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Syv ./xmlchange PTS_LON=-89.347717 ./xmlchange PTS_LAT=46.242001 -./xmlchange START_DATE=2002-01-01 +./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 28c684d028..df49b75d7e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Ton ./xmlchange PTS_LON=-120.966003 ./xmlchange PTS_LAT=38.431599 -./xmlchange START_DATE=2001-01-01 +./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index f993a210f3..7e5addafa1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Tw4 ./xmlchange PTS_LON=-121.641403 ./xmlchange PTS_LAT=38.103001 -./xmlchange START_DATE=2014-01-01 +./xmlchange RUN_STARTDATE=2014-01-01 ./xmlchange DATM_YR_ALIGN=2014 ./xmlchange DATM_YR_START=2014 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index dbadf55e42..affe637024 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Twt ./xmlchange PTS_LON=-121.653107 ./xmlchange PTS_LAT=38.1087 -./xmlchange START_DATE=2010-01-01 +./xmlchange RUN_STARTDATE=2010-01-01 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index c1b7911533..224ad21254 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-UMB ./xmlchange PTS_LON=-84.713806 ./xmlchange PTS_LAT=45.559799 -./xmlchange START_DATE=2000-01-01 +./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 6cc9c94b40..5e1bb5ba06 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Var ./xmlchange PTS_LON=-120.950729 ./xmlchange PTS_LAT=38.4133 -./xmlchange START_DATE=2001-01-01 +./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index b6d0a8e5e1..4079225888 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-WCr ./xmlchange PTS_LON=-90.079895 ./xmlchange PTS_LAT=45.805901 -./xmlchange START_DATE=1999-01-01 +./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2006 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 3b4dded4d4..f79617b792 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Whs ./xmlchange PTS_LON=-110.0522 ./xmlchange PTS_LAT=31.743799 -./xmlchange START_DATE=2008-01-01 +./xmlchange RUN_STARTDATE=2008-01-01 ./xmlchange DATM_YR_ALIGN=2008 ./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 8a3a2ae530..670457ef7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=US-Wkg ./xmlchange PTS_LON=-109.941895 ./xmlchange PTS_LAT=31.7365 -./xmlchange START_DATE=2005-01-01 +./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 413ffdc4b2..7d9a7b99b5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=ZA-Kru ./xmlchange PTS_LON=31.496901 ./xmlchange PTS_LAT=-25.019699 -./xmlchange START_DATE=1999-12-31 +./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index a457ea8a64..87a0e92777 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PLUMBER2SITE=ZM-Mon ./xmlchange PTS_LON=23.252781 ./xmlchange PTS_LAT=-15.437778 -./xmlchange START_DATE=2007-12-31 +./xmlchange RUN_STARTDATE=2007-12-31 ./xmlchange DATM_YR_ALIGN=2008 ./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2008 diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm index 90e7a0a656..c910b47a1c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -19,9 +19,9 @@ !---------------------------------------------------------------------------------- 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/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c231004.nc" +!fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_map/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c231005.nc" ! For testing only -fsurdat = "/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c231004.nc" +fsurdat = "/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c231005.nc" ! this allows for large h1 data files, regardless or run length hist_nhtfrq = 0,1 diff --git a/tools/site_and_regional/plumber2_usermods.ipynb b/tools/site_and_regional/plumber2_usermods.ipynb index 996c993e0e..1baee602ba 100644 --- a/tools/site_and_regional/plumber2_usermods.ipynb +++ b/tools/site_and_regional/plumber2_usermods.ipynb @@ -27,89 +27,6 @@ "import pandas as pd" ] }, - { - "cell_type": "code", - "execution_count": 2, - "id": "accc895d-111f-4daf-8f4c-df564222e90e", - "metadata": {}, - "outputs": [], - "source": [ - "def get_parser(): \n", - " \"\"\"\n", - " Get parser object for this script.\n", - " \"\"\"\n", - " parser = argparse.ArgumentParser(description=__doc__,\n", - " formatter_class=argparse.RawDescriptionHelpFormatter)\n", - "\n", - " parser.print_usage = parser.print_help\n", - "\n", - " parser.add_argument('-o','--overwrite', \n", - " help='Overwrite existing usermod_dirs ', \n", - " action=\"store_true\", \n", - " dest=\"overwrite\", \n", - " default=False)\n", - " \n", - "def execute(command):\n", - " \"\"\"\n", - " Function for running a command on shell.\n", - " Args:\n", - " command (str):\n", - " command that we want to run.\n", - " Raises:\n", - " Error with the return code from shell.\n", - " \"\"\"\n", - " print ('\\n',' >> ',*command,'\\n')\n", - "\n", - " try:\n", - " subprocess.check_call(command, stdout=open(os.devnull, \"w\"), stderr=subprocess.STDOUT)\n", - "\n", - " except subprocess.CalledProcessError as e:\n", - " #raise RuntimeError(\"command '{}' return with error (code {}): {}\".format(e.cmd, e.returncode, e.output))\n", - " #print (e.ouput)\n", - " print (e)" - ] - }, - { - "cell_type": "code", - "execution_count": 3, - "id": "531e34ff-838a-435f-b947-55c4bf2a33da", - "metadata": {}, - "outputs": [ - { - "ename": "AttributeError", - "evalue": "'NoneType' object has no attribute 'parse_args'", - "output_type": "error", - "traceback": [ - "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[0;31mAttributeError\u001b[0m Traceback (most recent call last)", - "Input \u001b[0;32mIn [3]\u001b[0m, in \u001b[0;36m\u001b[0;34m()\u001b[0m\n\u001b[1;32m 15\u001b[0m site \u001b[38;5;241m=\u001b[39m row[\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mSite\u001b[39m\u001b[38;5;124m'\u001b[39m]\n\u001b[1;32m 18\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;18m__name__\u001b[39m \u001b[38;5;241m==\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m__main__\u001b[39m\u001b[38;5;124m\"\u001b[39m: \n\u001b[0;32m---> 19\u001b[0m \u001b[43mmain\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\n", - "Input \u001b[0;32mIn [3]\u001b[0m, in \u001b[0;36mmain\u001b[0;34m()\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[38;5;28;01mdef\u001b[39;00m \u001b[38;5;21mmain\u001b[39m():\n\u001b[0;32m----> 3\u001b[0m args \u001b[38;5;241m=\u001b[39m \u001b[43mget_parser\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mparse_args\u001b[49m()\n\u001b[1;32m 5\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m args\u001b[38;5;241m.\u001b[39mverbose:\n\u001b[1;32m 6\u001b[0m logging\u001b[38;5;241m.\u001b[39mbasicConfig(level\u001b[38;5;241m=\u001b[39mlogging\u001b[38;5;241m.\u001b[39mDEBUG)\n", - "\u001b[0;31mAttributeError\u001b[0m: 'NoneType' object has no attribute 'parse_args'" - ] - } - ], - "source": [ - "def main():\n", - "\n", - " args = get_parser().parse_args()\n", - "\n", - " if args.verbose:\n", - " logging.basicConfig(level=logging.DEBUG)\n", - "\n", - "\n", - " plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=3) \n", - "\n", - "\n", - " for i, row in tqdm.tqdm(plumber2_sites.iterrows()):\n", - " lat = row['Lat']\n", - " lon = row['Lon']\n", - " site = row['Site']\n", - " \n", - " \n", - "if __name__ == \"__main__\": \n", - " main()\n" - ] - }, { "cell_type": "code", "execution_count": 4, @@ -141,7 +58,7 @@ " './xmlchange PLUMBER2SITE='+site + '\\n' \\\n", " './xmlchange PTS_LON='+str(lon) + '\\n' \\\n", " './xmlchange PTS_LAT='+str(lat) + '\\n' \\\n", - " './xmlchange START_DATE='+str(start_date) + '\\n' \\\n", + " './xmlchange RUN_STARTDATE='+str(start_date) + '\\n' \\\n", " './xmlchange DATM_YR_ALIGN='+str(start_year) + '\\n' \\\n", " './xmlchange DATM_YR_START='+str(start_year) + '\\n' \\\n", " './xmlchange DATM_YR_END='+str(end_year) + '\\n' \\\n", @@ -209,41 +126,134 @@ "name": "stderr", "output_type": "stream", "text": [ - "170it [00:00, 3130.42it/s]" + "57it [00:04, 15.17it/s]" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland CZ-wet\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "65it [00:04, 17.19it/s]" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland DE-SfN\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "78it [00:05, 29.02it/s]" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "wetland CZ-wet\n", - "wetland DE-SfN\n", "wetland FI-Kaa\n", - "wetland FI-Lom\n", - "wetland PL-wet\n", - "wetland RU-Che\n", - "wetland SE-Deg\n", - "wetland US-Los\n", - "wetland US-Myb\n", - "wetland US-Tw4\n" + "wetland FI-Lom\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "116it [00:07, 22.57it/s]" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland PL-wet\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "119it [00:07, 23.59it/s]" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland RU-Che\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "125it [00:07, 19.61it/s]" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland SE-Deg\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "143it [00:08, 20.45it/s]" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland US-Los\n" ] }, { "name": "stderr", "output_type": "stream", "text": [ - "\n" + "148it [00:09, 12.16it/s]" ] }, { - "ename": "NameError", - "evalue": "name 'site_dir' is not defined", - "output_type": "error", - "traceback": [ - "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)", - "Input \u001b[0;32mIn [6]\u001b[0m, in \u001b[0;36m\u001b[0;34m()\u001b[0m\n\u001b[1;32m 12\u001b[0m stop_n \u001b[38;5;241m=\u001b[39m \u001b[38;5;241m1\u001b[39m\u001b[38;5;241m+\u001b[39mend_year\u001b[38;5;241m-\u001b[39mstart_year\n\u001b[1;32m 14\u001b[0m write_usermods(lat,lon,site,start_year,end_year,\n\u001b[1;32m 15\u001b[0m start_date,start_tod,atm_ncpl,stop_n)\n\u001b[0;32m---> 16\u001b[0m \u001b[38;5;28mprint\u001b[39m(\u001b[43msite_dir\u001b[49m)\n", - "\u001b[0;31mNameError\u001b[0m: name 'site_dir' is not defined" + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland US-Myb\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "165it [00:10, 24.01it/s]" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "wetland US-Tw4\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "170it [00:10, 16.50it/s]\n" ] } ], @@ -265,69 +275,6 @@ " start_date,start_tod,atm_ncpl,stop_n)" ] }, - { - "cell_type": "code", - "execution_count": 79, - "id": "6e1e0768-ca84-4851-93c7-31fda9c403c7", - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "'../../cime_config/usermods_dirs/PLUMBER2/ZM-Mon'" - ] - }, - "execution_count": 79, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "site_dir" - ] - }, - { - "cell_type": "code", - "execution_count": 69, - "id": "73df4d5a-311f-4bb8-ae04-d839199ca754", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "../../cime_config/usermods_dirs/PLUMBER2/ZM-Mon\n" - ] - } - ], - "source": [ - "write_usermods(lat,lon,site,start_year,end_year,\n", - " start_date,start_tod,atm_ncpl,stop_n)\n" - ] - }, - { - "cell_type": "code", - "execution_count": 60, - "id": "6b1e52ac-3f39-451f-abc8-28de37d5520f", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "none\n" - ] - } - ], - "source": [ - "\n", - "\n", - "if any(x == site for x in wetland):\n", - " print(site)\n", - "else:\n", - " print('none')" - ] - }, { "cell_type": "code", "execution_count": 7, From 1ef7bb48219c7c7181f611702cb99bc1eeeb1cb6 Mon Sep 17 00:00:00 2001 From: wwieder Date: Thu, 5 Oct 2023 11:57:31 -0600 Subject: [PATCH 08/43] py script for creating usermods --- .../site_and_regional/plumber2_usermods.ipynb | 213 +----------------- tools/site_and_regional/plumber2_usermods.py | 107 +++++++++ 2 files changed, 113 insertions(+), 207 deletions(-) create mode 100644 tools/site_and_regional/plumber2_usermods.py diff --git a/tools/site_and_regional/plumber2_usermods.ipynb b/tools/site_and_regional/plumber2_usermods.ipynb index 1baee602ba..c37228217c 100644 --- a/tools/site_and_regional/plumber2_usermods.ipynb +++ b/tools/site_and_regional/plumber2_usermods.ipynb @@ -10,6 +10,7 @@ "#! /usr/bin/env python3\n", "\"\"\"\n", "\n", + "Reads in .csv files with PLUMBER2 site information\n", "Creates individual usermod_dirs for each PLUMBER2 site with shell_commands\n", "\n", "\"\"\"\n", @@ -21,7 +22,6 @@ "import sys\n", "import tqdm\n", "import logging\n", - "import argparse\n", "import subprocess\n", "\n", "import pandas as pd" @@ -39,7 +39,6 @@ " start_date,start_tod,atm_ncpl,stop_n): \n", "\n", " site_dir = os.path.join('../../cime_config/usermods_dirs/PLUMBER2/',site)\n", - " #TODO add overwrite option here\n", "\n", " if not os.path.isdir(site_dir):\n", " os.makedirs(site_dir, exist_ok=True) \n", @@ -50,6 +49,7 @@ " iFile.write('../defaults')\n", " iFile.close()\n", " \n", + " #TODO, move these input files do a different directory and update script\n", " LAIstream = '/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \\\n", " str(start_year)+'-'+str(end_year)+'.nc'\n", " shell = os.path.join(site_dir,'shell_commands')\n", @@ -95,25 +95,13 @@ " wetland = [\"CZ-wet\",\"DE-SfN\",\"FI-Kaa\",\"FI-Lom\",\"RU-Che\",\\\n", " \"SE-Deg\",\"US-Los\",\"US-Myb\",\"US-Tw4\",\"PL-wet\"]\n", " if any(x == site for x in wetland):\n", - " print('wetland '+site)\n", " sFile = open(shell, 'a') # or 'a' to add text instead of truncate\n", " sFile.write(\n", " '\\n' \\\n", " '# set baseflow scalar to zero for wetland site \\n' \\\n", " 'echo \"baseflow_scalar = 0\" >> user_nl_clm'\n", " )\n", - " sFile.close()\n", - " #print(site_dir)" - ] - }, - { - "cell_type": "code", - "execution_count": 5, - "id": "87926fed-711c-4133-b61e-2f820ed0cae1", - "metadata": {}, - "outputs": [], - "source": [ - "# For now we can just run this as a loop" + " sFile.close()\n" ] }, { @@ -258,6 +246,8 @@ } ], "source": [ + "# For now we can just run the 'main' program as a loop\n", + "\n", "plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4) \n", "\n", "for i, row in tqdm.tqdm(plumber2_sites.iterrows()):\n", @@ -288,7 +278,7 @@ "./xmlchange PLUMBER2SITE=ZM-Mon\n", "./xmlchange PTS_LON=23.252781\n", "./xmlchange PTS_LAT=-15.437778\n", - "./xmlchange START_DATE=2007-12-31\n", + "./xmlchange RUN_STARTDATE=2007-12-31\n", "./xmlchange DATM_YR_ALIGN=2008\n", "./xmlchange DATM_YR_START=2008\n", "./xmlchange DATM_YR_END=2008\n", @@ -321,197 +311,6 @@ "cat ../../cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands" ] }, - { - "cell_type": "code", - "execution_count": 21, - "id": "467276f5-d472-42f2-8b71-7ad8b1e0bfb5", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.\n", - "#RUN_STARTDATE and START_TOD are specified because we are starting at GMT corresponding to local midnight.\n", - "#ATM_NCPL is specified so that the time step of the model matches the time interval specified by the atm forcing data.\n", - ",Site,Lat,Lon,pft1,pft1-%,pft2,pft2-%,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL\n", - "1,AR-SLu,-33.464802,-66.459808,5,50.00,7,50.00,2010,2010,2010-01-01,10800,48 \n", - "2,AT-Neu,47.116669,11.317500,13,100.00,-999,-999.00,2002,2012,2001-12-31,82800,48 \n", - "3,AU-ASM,-22.283001,133.248993,1,100.00,-999,-999.00,2011,2017,2010-12-31,54000,48 \n", - "4,AU-Cow,-16.238190,145.427155,4,100.00,-999,-999.00,2010,2015,2009-12-31,50400,48 \n", - "5,AU-Cpr,-34.002060,140.589127,7,30.00,14,70.00,2011,2017,2010-12-31,46800,48 \n", - "6,AU-Ctr,-16.103279,145.446854,4,100.00,-999,-999.00,2010,2017,2009-12-31,50400,48 \n", - "7,AU-Cum,-33.613297,150.722473,5,100.00,-999,-999.00,2013,2018,2012-12-31,46800,48 \n", - "8,AU-DaP,-14.063300,131.318100,14,100.00,-999,-999.00,2009,2012,2008-12-31,54000,48 \n", - "9,AU-DaS,-14.159283,131.388000,6,30.00,14,70.00,2010,2017,2009-12-31,54000,48 \n", - "10,AU-Dry,-15.258800,132.370605,6,30.00,14,70.00,2011,2015,2010-12-31,54000,48 \n", - "11,AU-Emr,-23.858700,148.474594,14,100.00,-999,-999.00,2012,2013,2011-12-31,50400,48 \n", - "12,AU-Gin,-31.375000,115.650002,7,70.00,14,30.00,2012,2017,2011-12-31,57600,48 \n", - "13,AU-GWW,-30.191299,120.654099,7,30.00,14,70.00,2013,2017,2012-12-31,57600,48 \n", - "14,AU-How,-12.495200,131.149994,6,70.00,14,30.00,2003,2017,2002-12-31,54000,48 \n", - "15,AU-Lit,-13.179040,130.794495,6,70.00,14,30.00,2016,2017,2015-12-31,54000,48 \n", - "16,AU-Otw,-38.532341,142.816803,13,100.00,-999,-999.00,2009,2010,2008-12-31,46800,24 \n", - "17,AU-Rig,-36.649899,145.575897,14,100.00,-999,-999.00,2011,2016,2010-12-31,46800,48 \n", - "18,AU-Rob,-17.117500,145.630096,4,100.00,-999,-999.00,2014,2017,2013-12-31,50400,48 \n", - "19,AU-Sam,-27.388100,152.877808,14,100.00,-999,-999.00,2011,2017,2010-12-31,50400,48 \n", - "20,AU-Stp,-17.150700,133.350204,14,100.00,-999,-999.00,2010,2017,2009-12-31,54000,48 \n", - "21,AU-TTE,-22.287001,133.639999,10,30.00,14,70.00,2013,2017,2012-12-31,54000,48 \n", - "22,AU-Tum,-35.656601,148.151703,5,100.00,-999,-999.00,2002,2017,2001-12-31,46800,24 \n", - "23,AU-Whr,-36.673199,145.029404,5,100.00,-999,-999.00,2015,2016,2014-12-31,46800,48 \n", - "24,AU-Wrr,-43.095020,146.654495,5,100.00,-999,-999.00,2016,2017,2015-12-31,46800,48 \n", - "25,AU-Ync,-34.989300,146.290695,14,100.00,-999,-999.00,2011,2017,2010-12-31,46800,48 \n", - "26,BE-Bra,51.309166, 4.520560,1,19.22,7,80.78,2004,2014,2003-12-31,82800,48 \n", - "27,BE-Lon,50.551590, 4.746130,15,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 \n", - "28,BE-Vie,50.305069, 5.998050,1,25.93,7,74.07,1997,2014,1996-12-31,82800,48 \n", - "29,BR-Sa3,-3.018029,-54.971436,4,100.00,-999,-999.00,2001,2003,2001-01-01,14400,48 \n", - "30,BW-Ma1,-19.916500,23.560329,6,30.00,14,70.00,2000,2000,1999-12-31,79200,48 \n", - "31,CA-NS1,55.879200,-98.483887,2,100.00,-999,-999.00,2003,2003,2003-01-01,21600,48 \n", - "32,CA-NS2,55.905800,-98.524689,2,100.00,-999,-999.00,2002,2004,2002-01-01,21600,48 \n", - "33,CA-NS4,55.914398,-98.380615,2,100.00,-999,-999.00,2003,2004,2003-01-01,21600,48 \n", - "34,CA-NS5,55.863098,-98.484985,2,100.00,-999,-999.00,2003,2004,2003-01-01,21600,48 \n", - "35,CA-NS6,55.916698,-98.964417,10,30.00,13,70.00,2002,2004,2002-01-01,21600,48 \n", - "36,CA-NS7,56.635799,-99.948303,10,30.00,13,70.00,2003,2004,2003-01-01,21600,48 \n", - "37,CA-Qcu,49.267078,-74.036530,1,100.00,-999,-999.00,2002,2006,2002-01-01,18000,48 \n", - "38,CA-Qfo,49.692501,-74.342102,1,100.00,-999,-999.00,2004,2010,2004-01-01,18000,48 \n", - "39,CA-SF1,54.485001,-105.817596,1,100.00,-999,-999.00,2004,2006,2004-01-01,21600,48 \n", - "40,CA-SF2,54.253899,-105.877502,2,100.00,-999,-999.00,2003,2005,2003-01-01,21600,48 \n", - "41,CA-SF3,54.091599,-106.005310,10,30.00,13,70.00,2003,2005,2003-01-01,21600,48 \n", - "42,CH-Cha,47.210220, 8.410440,13,100.00,-999,-999.00,2006,2014,2005-12-31,82800,48 \n", - "43,CH-Dav,46.815334, 9.855920,1,100.00,-999,-999.00,1997,2014,1996-12-31,82800,48 \n", - "44,CH-Fru,47.115833, 8.537780,13,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 \n", - "45,CH-Oe1,47.285831, 7.731940,13,100.00,-999,-999.00,2002,2008,2001-12-31,82800,48 \n", - "46,CN-Cha,42.402500,128.095795,1, 8.79,7,91.21,2003,2005,2002-12-31,57600,48 \n", - "47,CN-Cng,44.593399,123.509201,14,100.00,-999,-999.00,2008,2009,2007-12-31,57600,48 \n", - "48,CN-Dan,30.497801,91.066399,12,100.00,-999,-999.00,2004,2005,2003-12-31,57600,48 \n", - "49,CN-Din,23.173300,112.536102,5,100.00,-999,-999.00,2003,2005,2002-12-31,57600,48 \n", - "50,CN-Du2,42.046700,116.283600,13,100.00,-999,-999.00,2007,2008,2006-12-31,57600,48 \n", - "51,CN-HaM,37.369999,101.180000,12,100.00,-999,-999.00,2002,2003,2001-12-31,57600,48 \n", - "52,CN-Qia,26.741400,115.058098,1,100.00,-999,-999.00,2003,2005,2002-12-31,57600,48 \n", - "53,CZ-wet,49.024651,14.770350,13,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 \n", - "54,DE-Bay,50.141941,11.866940,1,100.00,-999,-999.00,1997,1999,1996-12-31,82800,48 \n", - "55,DE-Geb,51.100101,10.914300,15,100.00,-999,-999.00,2001,2014,2000-12-31,82800,48 \n", - "56,DE-Gri,50.949471,13.512530,13,100.00,-999,-999.00,2004,2014,2003-12-31,82800,48 \n", - "57,DE-Hai,51.079166,10.453000,7,100.00,-999,-999.00,2000,2012,1999-12-31,82800,48 \n", - "58,DE-Kli,50.893059,13.522380,15,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 \n", - "59,DE-Meh,51.275311,10.655470,1, 1.27,7,98.73,2004,2006,2003-12-31,82800,48 \n", - "60,DE-Obe,50.786659,13.721290,1,100.00,-999,-999.00,2008,2014,2007-12-31,82800,48 \n", - "61,DE-Seh,50.870625, 6.449650,15,100.00,-999,-999.00,2008,2010,2007-12-31,82800,48 \n", - "62,DE-SfN,47.806389,11.327500,13,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 \n", - "63,DE-Tha,50.963612,13.566940,1,100.00,-999,-999.00,1998,2014,1997-12-31,82800,48 \n", - "64,DE-Wet,50.453499,11.457530,1,100.00,-999,-999.00,2002,2006,2001-12-31,82800,48 \n", - "65,DK-Fou,56.484200, 9.587220,15,100.00,-999,-999.00,2005,2005,2004-12-31,82800,48 \n", - "66,DK-Lva,55.683300,12.083300,13,100.00,-999,-999.00,2005,2006,2004-12-31,82800,48 \n", - "67,DK-Ris,55.530281,12.097220,15,100.00,-999,-999.00,2004,2005,2003-12-31,82800,48 \n", - "68,DK-Sor,55.485870,11.644640,7,100.00,-999,-999.00,1997,2014,1996-12-31,82800,48 \n", - "69,DK-ZaH,74.473282,-20.550293,12,100.00,-999,-999.00,2000,2013,2000-01-01,0,48 \n", - "70,ES-ES1,39.345970,-0.318817,1,100.00,-999,-999.00,1999,2006,1998-12-31,82800,48 \n", - "71,ES-ES2,39.275558,-0.315277,-999,-999.00,16,100.00,2005,2006,2004-12-31,82800,48 \n", - "72,ES-LgS,37.097935,-2.965820,10,30.00,13,70.00,2007,2007,2006-12-31,82800,48 \n", - "73,ES-LMa,39.941502,-5.773346,7,30.00,14,70.00,2004,2006,2003-12-31,82800,48 \n", - "74,ES-VDA,42.152180, 1.448500,7,30.00,13,70.00,2004,2004,2003-12-31,82800,48 \n", - "75,FI-Hyy,61.847500,24.295000,1,100.00,-999,-999.00,1996,2014,1995-12-31,79200,48 \n", - "76,FI-Kaa,69.140694,27.295031,12,100.00,-999,-999.00,2000,2002,1999-12-31,79200,48 \n", - "77,FI-Lom,67.997200,24.209181,12,100.00,-999,-999.00,2007,2009,2006-12-31,79200,48 \n", - "78,FI-Sod,67.361862,26.637831,1,100.00,-999,-999.00,2008,2014,2007-12-31,79200,48 \n", - "79,FR-Fon,48.476398, 2.780140,7,100.00,-999,-999.00,2005,2013,2004-12-31,82800,48 \n", - "80,FR-Gri,48.844219, 1.951910,15,100.00,-999,-999.00,2005,2013,2004-12-31,82800,48 \n", - "81,FR-Hes,48.674160, 7.065560,7,100.00,-999,-999.00,1997,2006,1996-12-31,82800,48 \n", - "82,FR-LBr,44.717110,-0.769287,1,100.00,-999,-999.00,2003,2008,2002-12-31,82800,48 \n", - "83,FR-Lq1,45.643059, 2.735830,13,100.00,-999,-999.00,2004,2006,2003-12-31,82800,48 \n", - "84,FR-Lq2,45.639191, 2.737030,13,100.00,-999,-999.00,2004,2006,2003-12-31,82800,48 \n", - "85,FR-Pue,43.741390, 3.595830,5,100.00,-999,-999.00,2000,2014,1999-12-31,82800,48 \n", - "86,GF-Guy, 5.278772,-52.924866,4,100.00,-999,-999.00,2004,2014,2004-01-01,10800,48 \n", - "87,HU-Bug,46.691101,19.601299,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 \n", - "88,ID-Pag,-2.345000,114.036392,4,100.00,-999,-999.00,2002,2003,2001-12-31,61200,48 \n", - "89,IE-Ca1,52.858791,-6.918152,15,100.00,-999,-999.00,2004,2006,2004-01-01,0,48 \n", - "90,IE-Dri,51.986691,-8.751801,13,100.00,-999,-999.00,2003,2005,2003-01-01,0,48 \n", - "91,IT-Amp,41.904099,13.605160,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 \n", - "92,IT-BCi,40.523800,14.957440,-999,-999.00,16,100.00,2005,2010,2004-12-31,82800,48 \n", - "93,IT-CA1,42.380409,12.026560,7,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 \n", - "94,IT-CA2,42.377220,12.026040,15,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 \n", - "95,IT-CA3,42.380001,12.022200,7,100.00,-999,-999.00,2012,2013,2011-12-31,82800,48 \n", - "96,IT-Col,41.849361,13.588140,7,100.00,-999,-999.00,2007,2014,2006-12-31,82800,48 \n", - "97,IT-Cpz,41.705250,12.376110,5,100.00,-999,-999.00,2001,2008,2000-12-31,82800,48 \n", - "98,IT-Isp,45.812641, 8.633580,7,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 \n", - "99,IT-Lav,45.956200,11.281320,1,100.00,-999,-999.00,2005,2014,2004-12-31,82800,48 \n", - "100,IT-LMa,45.152580, 7.582590,7,100.00,-999,-999.00,2003,2004,2002-12-31,82800,48 \n", - "101,IT-Mal,46.114021,11.703340,13,100.00,-999,-999.00,2003,2003,2002-12-31,82800,48 \n", - "102,IT-MBo,46.014679,11.045830,13,100.00,-999,-999.00,2003,2012,2002-12-31,82800,48 \n", - "103,IT-Noe,40.606178, 8.151170,10,70.00,14,30.00,2004,2014,2003-12-31,82800,48 \n", - "104,IT-Non,44.690189,11.091090,7,100.00,-999,-999.00,2002,2002,2001-12-31,82800,48 \n", - "105,IT-PT1,45.200871, 9.061040,7,100.00,-999,-999.00,2003,2004,2002-12-31,82800,48 \n", - "106,IT-Ren,46.586861,11.433690,1,100.00,-999,-999.00,2010,2013,2009-12-31,82800,48 \n", - "107,IT-Ro1,42.408119,11.930010,7,100.00,-999,-999.00,2002,2006,2001-12-31,82800,48 \n", - "108,IT-Ro2,42.390259,11.920930,7,100.00,-999,-999.00,2002,2008,2001-12-31,82800,48 \n", - "109,IT-SR2,43.732029,10.290950,1,100.00,-999,-999.00,2013,2014,2012-12-31,82800,48 \n", - "110,IT-SRo,43.727859,10.284440,1,100.00,-999,-999.00,2003,2012,2002-12-31,82800,48 \n", - "111,JP-SMF,35.261700,137.078796,1,29.81,7,70.19,2003,2006,2002-12-31,54000,48 \n", - "112,NL-Ca1,51.971001, 4.927000,13,100.00,-999,-999.00,2003,2006,2002-12-31,82800,48 \n", - "113,NL-Hor,52.240349, 5.071300,13,100.00,-999,-999.00,2008,2011,2007-12-31,82800,48 \n", - "114,NL-Loo,52.166580, 5.743560,1,100.00,-999,-999.00,1997,2013,1996-12-31,82800,48 \n", - "115,PL-wet,52.762199,16.309401,13,100.00,-999,-999.00,2004,2005,2003-12-31,82800,48 \n", - "116,PT-Esp,38.639400,-8.601807,5,100.00,-999,-999.00,2002,2004,2002-01-01,0,48 \n", - "117,PT-Mi1,38.540642,-8.000061,5,100.00,-999,-999.00,2005,2005,2005-01-01,0,48 \n", - "118,PT-Mi2,38.476501,-8.024536,14,100.00,-999,-999.00,2005,2006,2005-01-01,0,48 \n", - "119,RU-Che,68.613037,161.341431,12,100.00,-999,-999.00,2003,2004,2002-12-31,46800,48 \n", - "120,RU-Fyo,56.461529,32.922081,1,100.00,-999,-999.00,2003,2014,2002-12-31,75600,48 \n", - "121,RU-Zot,60.800800,89.350800,2,70.00,13,30.00,2003,2003,2002-12-31,61200,48 \n", - "122,SD-Dem,13.282900,30.478300,6,30.00,14,70.00,2005,2009,2004-12-31,75600,48 \n", - "123,SE-Deg,64.181969,19.556690,13,100.00,-999,-999.00,2002,2005,2001-12-31,82800,48 \n", - "124,UK-Gri,56.607220,-3.798065,1,100.00,-999,-999.00,2000,2001,2000-01-01,0,48 \n", - "125,UK-Ham,51.153530,-0.858307,7,100.00,-999,-999.00,2004,2004,2004-01-01,0,48 \n", - "126,UK-PL3,51.450001,-1.266663,1, 8.33,7,91.67,2005,2006,2005-01-01,0,48 \n", - "127,US-AR1,36.426701,-99.419983,14,100.00,-999,-999.00,2010,2012,2010-01-01,21600,48 \n", - "128,US-AR2,36.635799,-99.597504,14,100.00,-999,-999.00,2010,2011,2010-01-01,21600,48 \n", - "129,US-ARM,36.605801,-97.488800,15,100.00,-999,-999.00,2003,2012,2003-01-01,21600,48 \n", - "130,US-Aud,31.590700,-110.509201,14,100.00,-999,-999.00,2003,2005,2003-01-01,25200,48 \n", - "131,US-Bar,44.064640,-71.288086,1, 8.43,7,91.57,2005,2005,2005-01-01,18000,48 \n", - "132,US-Bkg,44.345291,-96.836182,14,100.00,-999,-999.00,2005,2006,2005-01-01,21600,48 \n", - "133,US-Blo,38.895302,-120.632751,1,100.00,-999,-999.00,2000,2006,2000-01-01,28800,48 \n", - "134,US-Bo1,40.006199,-88.290405,15,100.00,-999,-999.00,1997,2006,1997-01-01,21600,48 \n", - "135,US-Cop,38.090000,-109.389999,14,100.00,-999,-999.00,2002,2003,2002-01-01,25200,24 \n", - "136,US-FPe,48.307701,-105.101898,14,100.00,-999,-999.00,2000,2006,2000-01-01,25200,48 \n", - "137,US-GLE,41.366501,-106.239899,1,100.00,-999,-999.00,2009,2014,2009-01-01,25200,48 \n", - "138,US-Goo,34.254700,-89.873505,14,100.00,-999,-999.00,2004,2006,2004-01-01,21600,48 \n", - "139,US-Ha1,42.537800,-72.171509,7,100.00,-999,-999.00,1992,2012,1992-01-01,18000,24 \n", - "140,US-Ho1,45.204102,-68.740204,1,100.00,-999,-999.00,1996,2004,1996-01-01,18000,48 \n", - "141,US-KS2,28.608578,-80.671539,10,70.00,14,30.00,2003,2006,2003-01-01,18000,48 \n", - "142,US-Los,46.082699,-89.979187,13,100.00,-999,-999.00,2000,2008,2000-01-01,21600,48 \n", - "143,US-Me2,44.452301,-121.557404,1,100.00,-999,-999.00,2002,2014,2002-01-01,28800,48 \n", - "144,US-Me4,44.499199,-121.622406,1,100.00,-999,-999.00,1996,2000,1996-01-01,28800,48 \n", - "145,US-Me6,44.323299,-121.607803,1,100.00,-999,-999.00,2011,2014,2011-01-01,28800,48 \n", - "146,US-MMS,39.323200,-86.413086,7,100.00,-999,-999.00,1999,2014,1999-01-01,18000,24 \n", - "147,US-MOz,38.744110,-92.200012,7,100.00,-999,-999.00,2005,2006,2005-01-01,21600,48 \n", - "148,US-Myb,38.049801,-121.765106,13,100.00,-999,-999.00,2011,2014,2011-01-01,28800,48 \n", - "149,US-Ne1,41.165100,-96.476593,-999,-999.00,16,100.00,2002,2012,2002-01-01,21600,24 \n", - "150,US-Ne2,41.164902,-96.470093,-999,-999.00,16,100.00,2002,2012,2002-01-01,21600,24 \n", - "151,US-Ne3,41.179699,-96.439697,15,100.00,-999,-999.00,2002,2012,2002-01-01,21600,24 \n", - "152,US-NR1,40.032902,-105.546402,1,100.00,-999,-999.00,1999,2014,1999-01-01,25200,48 \n", - "153,US-PFa,45.945900,-90.272308,1, 8.18,7,91.82,1995,2014,1995-01-01,21600,24 \n", - "154,US-Prr,65.123703,-147.487595,2,100.00,-999,-999.00,2011,2013,2011-01-01,32400,48 \n", - "155,US-SP1,29.738070,-82.218781,1,100.00,-999,-999.00,2005,2005,2005-01-01,18000,48 \n", - "156,US-SP2,29.764799,-82.244812,1,100.00,-999,-999.00,2000,2004,2000-01-01,18000,48 \n", - "157,US-SP3,29.754770,-82.163269,5,100.00,-999,-999.00,1999,2004,1999-01-01,18000,48 \n", - "158,US-SRG,31.789400,-110.827698,14,100.00,-999,-999.00,2009,2014,2009-01-01,25200,48 \n", - "159,US-SRM,31.821400,-110.865997,7,70.00,14,30.00,2004,2014,2004-01-01,25200,48 \n", - "160,US-Syv,46.242001,-89.347717,1, 4.91,7,95.09,2002,2008,2002-01-01,21600,48 \n", - "161,US-Ton,38.431599,-120.966003,7,70.00,14,30.00,2001,2014,2001-01-01,28800,48 \n", - "162,US-Tw4,38.103001,-121.641403,13,100.00,-999,-999.00,2014,2014,2014-01-01,28800,48 \n", - "163,US-Twt,38.108700,-121.653107,-999,-999.00,16,100.00,2010,2014,2010-01-01,28800,48 \n", - "164,US-UMB,45.559799,-84.713806,7,100.00,-999,-999.00,2000,2014,2000-01-01,18000,24 \n", - "165,US-Var,38.413300,-120.950729,14,100.00,-999,-999.00,2001,2014,2001-01-01,28800,48 \n", - "166,US-WCr,45.805901,-90.079895,7,100.00,-999,-999.00,1999,2006,1999-01-01,21600,48 \n", - "167,US-Whs,31.743799,-110.052200,10,30.00,14,70.00,2008,2014,2008-01-01,25200,48 \n", - "168,US-Wkg,31.736500,-109.941895,14,100.00,-999,-999.00,2005,2014,2005-01-01,25200,48 \n", - "169,ZA-Kru,-25.019699,31.496901,6,30.00,14,70.00,2000,2002,1999-12-31,79200,48 \n", - "170,ZM-Mon,-15.437778,23.252781,6,100.00,-999,-999.00,2008,2008,2007-12-31,79200,48 \n" - ] - } - ], - "source": [ - "cat PLUMBER2_sites.csv" - ] - }, { "cell_type": "code", "execution_count": null, diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py new file mode 100644 index 0000000000..d93e9486f4 --- /dev/null +++ b/tools/site_and_regional/plumber2_usermods.py @@ -0,0 +1,107 @@ +#! /usr/bin/env python3 +""" + +Reads in .csv files with PLUMBER2 site information +Creates individual usermod_dirs for each PLUMBER2 site with shell_commands + +""" + +# Import libraries +from __future__ import print_function + +import os +import sys +import tqdm +import logging +import subprocess + +import pandas as pd + + +# Big ugly function to create usermod_dirs for each site +def write_usermods(lat,lon,site,start_year,end_year, + start_date,start_tod,atm_ncpl,stop_n): + + site_dir = os.path.join('../../cime_config/usermods_dirs/PLUMBER2/',site) + + if not os.path.isdir(site_dir): + os.makedirs(site_dir, exist_ok=True) + + # create files in each directory + include = os.path.join(site_dir,'include_user_mods') + iFile = open(include, 'w') # or 'a' to add text instead of truncate + iFile.write('../defaults') + iFile.close() + + #TODO, move these input files do a different directory and update script + LAIstream = '/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ + str(start_year)+'-'+str(end_year)+'.nc' + shell = os.path.join(site_dir,'shell_commands') + sFile = open(shell, 'w') # or 'a' to add text instead of truncate + sFile.write( + './xmlchange PLUMBER2SITE='+site + '\n' \ + './xmlchange PTS_LON='+str(lon) + '\n' \ + './xmlchange PTS_LAT='+str(lat) + '\n' \ + './xmlchange RUN_STARTDATE='+str(start_date) + '\n' \ + './xmlchange DATM_YR_ALIGN='+str(start_year) + '\n' \ + './xmlchange DATM_YR_START='+str(start_year) + '\n' \ + './xmlchange DATM_YR_END='+str(end_year) + '\n' \ + './xmlchange START_TOD='+str(start_tod) + '\n' \ + './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ + '\n' \ + + 'compset=`./xmlquery COMPSET --value` \n' \ + 'CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` \n' \ + 'TEST=`./xmlquery TEST --value` \n' \ + '\n' \ + + '# For a transient case run the whole length and do not cycle \n' \ + 'if [[ $compset =~ ^HIST ]]; then \n' \ + ' # Number of years that can be run for the full transient case \n' \ + ' if [[ $TEST != "TRUE" ]]; then \n' \ + ' ./xmlchange STOP_N='+str(stop_n) + '\n' \ + ' fi \n' \ + 'fi \n' \ + '\n' \ + + '# Turn on LAI streams for a SP case \n' \ + 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n' \ + ' echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ + ' echo "model_year_align_lai='+str(start_year) + '" >> user_nl_clm \n' \ + ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ + ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ + 'fi \n' + ) + + sFile.close() + + # add baseflow_scalar = 0 to user_nl_clm for wetland sites + wetland = ["CZ-wet","DE-SfN","FI-Kaa","FI-Lom","RU-Che", \ + "SE-Deg","US-Los","US-Myb","US-Tw4","PL-wet"] + if any(x == site for x in wetland): + sFile = open(shell, 'a') # or 'a' to add text instead of truncate + sFile.write( + '\n' \ + '# set baseflow scalar to zero for wetland site \n' \ + 'echo "baseflow_scalar = 0" >> user_nl_clm' + ) + sFile.close() + +# End write_usermods function + +# For now we can just run the 'main' program as a loop +plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4) + +for i, row in tqdm.tqdm(plumber2_sites.iterrows()): + lat = row['Lat'] + lon = row['Lon'] + site = row['Site'] + start_year = row['start_year'] + end_year = row['end_year'] + start_date = row['RUN_STARTDATE'] + start_tod = row['START_TOD'] + atm_ncpl = row['ATM_NCPL'] + stop_n = 1+end_year-start_year + + write_usermods(lat,lon,site,start_year,end_year, + start_date,start_tod,atm_ncpl,stop_n) \ No newline at end of file From e8c15245e95e889293403327c800d1ecc7440330 Mon Sep 17 00:00:00 2001 From: wwieder Date: Thu, 5 Oct 2023 16:27:43 -0600 Subject: [PATCH 09/43] corrected surfdat filename --- .../PLUMBER2/AU-ASM/shell_commands | 4 +-- .../PLUMBER2/AU-Cum/shell_commands | 2 +- .../PLUMBER2/AU-DaS/shell_commands | 2 +- .../PLUMBER2/AU-Lit/shell_commands | 4 +-- .../PLUMBER2/AU-Otw/shell_commands | 2 +- .../PLUMBER2/AU-Sam/shell_commands | 2 +- .../PLUMBER2/BE-Lon/shell_commands | 2 +- .../PLUMBER2/BR-Sa3/shell_commands | 2 +- .../PLUMBER2/CA-NS7/shell_commands | 2 +- .../PLUMBER2/CA-Qcu/shell_commands | 2 +- .../PLUMBER2/CA-SF1/shell_commands | 2 +- .../PLUMBER2/CA-SF3/shell_commands | 2 +- .../PLUMBER2/CN-Cha/shell_commands | 2 +- .../PLUMBER2/CN-Dan/shell_commands | 2 +- .../PLUMBER2/DE-Bay/shell_commands | 2 +- .../PLUMBER2/DE-Gri/shell_commands | 2 +- .../PLUMBER2/DE-Kli/shell_commands | 2 +- .../PLUMBER2/DE-Tha/shell_commands | 2 +- .../PLUMBER2/DK-Sor/shell_commands | 2 +- .../PLUMBER2/ES-ES2/shell_commands | 2 +- .../PLUMBER2/FI-Kaa/shell_commands | 2 +- .../PLUMBER2/FR-Fon/shell_commands | 4 +-- .../PLUMBER2/FR-Gri/shell_commands | 2 +- .../PLUMBER2/FR-Hes/shell_commands | 2 +- .../PLUMBER2/FR-LBr/shell_commands | 2 +- .../PLUMBER2/FR-Pue/shell_commands | 2 +- .../PLUMBER2/HU-Bug/shell_commands | 2 +- .../PLUMBER2/ID-Pag/shell_commands | 2 +- .../PLUMBER2/IE-Ca1/shell_commands | 2 +- .../PLUMBER2/IE-Dri/shell_commands | 2 +- .../PLUMBER2/IT-Mal/shell_commands | 2 +- .../PLUMBER2/IT-Non/shell_commands | 2 +- .../PLUMBER2/IT-Ren/shell_commands | 2 +- .../PLUMBER2/IT-Ro1/shell_commands | 2 +- .../PLUMBER2/JP-SMF/shell_commands | 2 +- .../PLUMBER2/NL-Loo/shell_commands | 4 +-- .../PLUMBER2/RU-Fyo/shell_commands | 2 +- .../PLUMBER2/UK-Gri/shell_commands | 2 +- .../PLUMBER2/UK-Ham/shell_commands | 4 +-- .../PLUMBER2/UK-PL3/shell_commands | 2 +- .../PLUMBER2/US-Bar/shell_commands | 4 +-- .../PLUMBER2/US-Bkg/shell_commands | 2 +- .../PLUMBER2/US-FPe/shell_commands | 2 +- .../PLUMBER2/US-Goo/shell_commands | 2 +- .../PLUMBER2/US-MMS/shell_commands | 2 +- .../PLUMBER2/US-Me4/shell_commands | 2 +- .../PLUMBER2/US-Ne1/shell_commands | 2 +- .../PLUMBER2/US-Ne2/shell_commands | 2 +- .../PLUMBER2/US-Var/shell_commands | 2 +- .../PLUMBER2/defaults/shell_commands | 2 +- .../PLUMBER2/defaults/user_nl_clm | 6 ++-- tools/site_and_regional/plumber2_usermods.py | 36 +++++++++++-------- 52 files changed, 80 insertions(+), 74 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index d14a32e125..8df3f30c70 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-ASM -./xmlchange PTS_LON=133.248993 -./xmlchange PTS_LAT=-22.283001 +./xmlchange PTS_LON=133.24899299999998 +./xmlchange PTS_LAT=-22.283001000000002 ./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index e38e2782d1..bd6f8b3c04 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Cum ./xmlchange PTS_LON=150.722473 -./xmlchange PTS_LAT=-33.613297 +./xmlchange PTS_LAT=-33.613296999999996 ./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index aa89d3c9ec..4c76a05e4c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-DaS ./xmlchange PTS_LON=131.388 -./xmlchange PTS_LAT=-14.159283 +./xmlchange PTS_LAT=-14.159282999999999 ./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 58df3067bd..be1f41ef14 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Lit -./xmlchange PTS_LON=130.794495 -./xmlchange PTS_LAT=-13.17904 +./xmlchange PTS_LON=130.79449499999998 +./xmlchange PTS_LAT=-13.179039999999999 ./xmlchange RUN_STARTDATE=2015-12-31 ./xmlchange DATM_YR_ALIGN=2016 ./xmlchange DATM_YR_START=2016 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 0ea8ac8218..e3c61c74a1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Otw ./xmlchange PTS_LON=142.816803 -./xmlchange PTS_LAT=-38.532341 +./xmlchange PTS_LAT=-38.532340999999995 ./xmlchange RUN_STARTDATE=2008-12-31 ./xmlchange DATM_YR_ALIGN=2009 ./xmlchange DATM_YR_START=2009 diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index d4144b98cf..e4319a5226 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=AU-Sam -./xmlchange PTS_LON=152.877808 +./xmlchange PTS_LON=152.87780800000002 ./xmlchange PTS_LAT=-27.3881 ./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index cdf26eba97..1302671bea 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=BE-Lon ./xmlchange PTS_LON=4.74613 -./xmlchange PTS_LAT=50.55159 +./xmlchange PTS_LAT=50.551590000000004 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index f53825a647..2a1074fb89 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=BR-Sa3 ./xmlchange PTS_LON=-54.971436 -./xmlchange PTS_LAT=-3.018029 +./xmlchange PTS_LAT=-3.0180290000000003 ./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 06573a3768..ef9d9e2b8f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CA-NS7 -./xmlchange PTS_LON=-99.948303 +./xmlchange PTS_LON=-99.94830300000001 ./xmlchange PTS_LAT=56.635799 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index aff78d3020..eb7946fe9e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CA-Qcu ./xmlchange PTS_LON=-74.03653 -./xmlchange PTS_LAT=49.267078 +./xmlchange PTS_LAT=49.267078000000005 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index c91c935292..c9605d670d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CA-SF1 ./xmlchange PTS_LON=-105.817596 -./xmlchange PTS_LAT=54.485001 +./xmlchange PTS_LAT=54.485001000000004 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index 6b440c3d5b..b47c5006af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CA-SF3 -./xmlchange PTS_LON=-106.00531 +./xmlchange PTS_LON=-106.00531000000001 ./xmlchange PTS_LAT=54.091599 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index 52f784b0ff..13e398426b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CN-Cha -./xmlchange PTS_LON=128.095795 +./xmlchange PTS_LON=128.09579499999998 ./xmlchange PTS_LAT=42.4025 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index ddcbab3bc2..5112860c92 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CN-Dan ./xmlchange PTS_LON=91.066399 -./xmlchange PTS_LAT=30.497801 +./xmlchange PTS_LAT=30.497801000000003 ./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 9dc97416b4..43b0d1a196 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=DE-Bay ./xmlchange PTS_LON=11.86694 -./xmlchange PTS_LAT=50.141941 +./xmlchange PTS_LAT=50.141940999999996 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 27634efc7d..e1c98270a9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Gri -./xmlchange PTS_LON=13.51253 +./xmlchange PTS_LON=13.512529999999998 ./xmlchange PTS_LAT=50.949471 ./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 5d3091c6e0..83b543b09e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Kli -./xmlchange PTS_LON=13.52238 +./xmlchange PTS_LON=13.522379999999998 ./xmlchange PTS_LAT=50.893059 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index 7dc9ebe579..3df90063f1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Tha -./xmlchange PTS_LON=13.56694 +./xmlchange PTS_LON=13.566939999999999 ./xmlchange PTS_LAT=50.963612 ./xmlchange RUN_STARTDATE=1997-12-31 ./xmlchange DATM_YR_ALIGN=1998 diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 8bc162b762..332aafa873 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DK-Sor -./xmlchange PTS_LON=11.64464 +./xmlchange PTS_LON=11.644639999999999 ./xmlchange PTS_LAT=55.48587 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index f2942cb381..9ad0c8ba6a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=ES-ES2 ./xmlchange PTS_LON=-0.315277 -./xmlchange PTS_LAT=39.275558 +./xmlchange PTS_LAT=39.275558000000004 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 91a1e1477c..b321cad0a1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FI-Kaa -./xmlchange PTS_LON=27.295031 +./xmlchange PTS_LON=27.295030999999998 ./xmlchange PTS_LAT=69.140694 ./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index cd6a877f5f..ebf6a78f1a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=FR-Fon -./xmlchange PTS_LON=2.78014 -./xmlchange PTS_LAT=48.476398 +./xmlchange PTS_LON=2.7801400000000003 +./xmlchange PTS_LAT=48.476397999999996 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index d158db7235..4042cef2a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Gri -./xmlchange PTS_LON=1.95191 +./xmlchange PTS_LON=1.9519099999999998 ./xmlchange PTS_LAT=48.844219 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index afbf7d183d..5c4e3c09a3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Hes -./xmlchange PTS_LON=7.06556 +./xmlchange PTS_LON=7.0655600000000005 ./xmlchange PTS_LAT=48.67416 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 4fc977b229..c4d2294096 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-LBr -./xmlchange PTS_LON=-0.769287 +./xmlchange PTS_LON=-0.7692869999999999 ./xmlchange PTS_LAT=44.71711 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index c3dc9f8dfc..ad7c2cf8f6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Pue -./xmlchange PTS_LON=3.59583 +./xmlchange PTS_LON=3.5958300000000003 ./xmlchange PTS_LAT=43.74139 ./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index ef1d8f9b25..4ce661d6f5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=HU-Bug -./xmlchange PTS_LON=19.601299 +./xmlchange PTS_LON=19.601298999999997 ./xmlchange PTS_LAT=46.691101 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 747b87be0d..3cc8466bc4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=ID-Pag -./xmlchange PTS_LON=114.036392 +./xmlchange PTS_LON=114.03639199999999 ./xmlchange PTS_LAT=-2.345 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 0cf88c10f2..fbbd746ea2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=IE-Ca1 ./xmlchange PTS_LON=-6.918152 -./xmlchange PTS_LAT=52.858791 +./xmlchange PTS_LAT=52.858791000000004 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 7426177edf..a87cb91575 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IE-Dri -./xmlchange PTS_LON=-8.751801 +./xmlchange PTS_LON=-8.751800999999999 ./xmlchange PTS_LAT=51.986691 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 30f453aae9..19247db028 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Mal -./xmlchange PTS_LON=11.70334 +./xmlchange PTS_LON=11.703339999999999 ./xmlchange PTS_LAT=46.114021 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index e8b5044db4..e52f0a86f2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=IT-Non ./xmlchange PTS_LON=11.09109 -./xmlchange PTS_LAT=44.690189 +./xmlchange PTS_LAT=44.690189000000004 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index fc920c415d..2ad66c0140 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Ren -./xmlchange PTS_LON=11.43369 +./xmlchange PTS_LON=11.433689999999999 ./xmlchange PTS_LAT=46.586861 ./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index b12d9f36b0..c11132f5ae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Ro1 -./xmlchange PTS_LON=11.93001 +./xmlchange PTS_LON=11.930010000000001 ./xmlchange PTS_LAT=42.408119 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 944751af3b..29bf921ddf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=JP-SMF -./xmlchange PTS_LON=137.078796 +./xmlchange PTS_LON=137.07879599999998 ./xmlchange PTS_LAT=35.2617 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 2da1a1e5c5..6a53e55d22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=NL-Loo -./xmlchange PTS_LON=5.74356 -./xmlchange PTS_LAT=52.16658 +./xmlchange PTS_LON=5.7435599999999996 +./xmlchange PTS_LAT=52.166579999999996 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index b034a117d6..89627ad3b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=RU-Fyo ./xmlchange PTS_LON=32.922081 -./xmlchange PTS_LAT=56.461529 +./xmlchange PTS_LAT=56.461529000000006 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index 198f0ba201..3efa680d58 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=UK-Gri -./xmlchange PTS_LON=-3.798065 +./xmlchange PTS_LON=-3.7980650000000002 ./xmlchange PTS_LAT=56.60722 ./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 2fad48a8fb..b2a12684c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=UK-Ham -./xmlchange PTS_LON=-0.858307 -./xmlchange PTS_LAT=51.15353 +./xmlchange PTS_LON=-0.8583069999999999 +./xmlchange PTS_LAT=51.153529999999996 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index acd2ea1a6b..eb72f60852 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=UK-PL3 -./xmlchange PTS_LON=-1.266663 +./xmlchange PTS_LON=-1.2666629999999999 ./xmlchange PTS_LAT=51.450001 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index a1aabf068c..169d97f2f1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Bar -./xmlchange PTS_LON=-71.288086 -./xmlchange PTS_LAT=44.06464 +./xmlchange PTS_LON=-71.28808599999999 +./xmlchange PTS_LAT=44.064640000000004 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 0da0463da2..dfbb058864 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Bkg ./xmlchange PTS_LON=-96.836182 -./xmlchange PTS_LAT=44.345291 +./xmlchange PTS_LAT=44.345290999999996 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index bbf9402e6d..59fd10ac8b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-FPe -./xmlchange PTS_LON=-105.101898 +./xmlchange PTS_LON=-105.10189799999999 ./xmlchange PTS_LAT=48.307701 ./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index 880953826c..26e38be7c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Goo -./xmlchange PTS_LON=-89.873505 +./xmlchange PTS_LON=-89.87350500000001 ./xmlchange PTS_LAT=34.2547 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 67b7254037..e4fb713412 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-MMS -./xmlchange PTS_LON=-86.413086 +./xmlchange PTS_LON=-86.41308599999999 ./xmlchange PTS_LAT=39.3232 ./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index e99bc51d33..41552fc5c4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Me4 -./xmlchange PTS_LON=-121.622406 +./xmlchange PTS_LON=-121.62240600000001 ./xmlchange PTS_LAT=44.499199 ./xmlchange RUN_STARTDATE=1996-01-01 ./xmlchange DATM_YR_ALIGN=1996 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index 6d5016df0e..aaced9db2c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Ne1 -./xmlchange PTS_LON=-96.476593 +./xmlchange PTS_LON=-96.47659300000001 ./xmlchange PTS_LAT=41.1651 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 1fc8ef2e8e..f5669b7db0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Ne2 ./xmlchange PTS_LON=-96.470093 -./xmlchange PTS_LAT=41.164902 +./xmlchange PTS_LAT=41.164902000000005 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 5e1bb5ba06..838a7faf60 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Var -./xmlchange PTS_LON=-120.950729 +./xmlchange PTS_LON=-120.95072900000001 ./xmlchange PTS_LAT=38.4133 ./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands index 65bbda7aee..60c2c42f18 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -32,6 +32,6 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then ./xmlchange CLM_FORCE_COLDSTART=on echo "use_lai_streams = .true." >> user_nl_clm echo "lai_mapalgo = 'nn'" >> user_nl_clm - echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC','QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE','SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT','TLAI','WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRAN','TV','RSSUN','RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SUB_SNOW','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm + echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC','QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE','SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT','TLAI','WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SUB_SNOW','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm index c910b47a1c..21342cb391 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -19,9 +19,9 @@ !---------------------------------------------------------------------------------- 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/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c231005.nc" +!fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_map/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc" ! For testing only -fsurdat = "/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_CMIP6_simyr2000_c231005.nc" +fsurdat = "/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc" ! this allows for large h1 data files, regardless or run length hist_nhtfrq = 0,1 @@ -34,7 +34,7 @@ hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI' 'FSNO','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC', 'QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE', 'SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT', - 'TLAI','WIND','FIRE','FSM','COSZEN','BTRAN','TV','RSSUN','RSSHA','FSH_G','RHAF', + 'TLAI','WIND','FIRE','FSM','COSZEN','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF', 'RH_LEAF','RH','T10','TG','SABG','SABV','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SUB_SNOW', 'QFLX_SNOW_DRAIN','H2OSFC' diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index d93e9486f4..3d69eb5e02 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -1,4 +1,5 @@ #! /usr/bin/env python3 + """ Reads in .csv files with PLUMBER2 site information @@ -89,19 +90,24 @@ def write_usermods(lat,lon,site,start_year,end_year, # End write_usermods function -# For now we can just run the 'main' program as a loop -plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4) - -for i, row in tqdm.tqdm(plumber2_sites.iterrows()): - lat = row['Lat'] - lon = row['Lon'] - site = row['Site'] - start_year = row['start_year'] - end_year = row['end_year'] - start_date = row['RUN_STARTDATE'] - start_tod = row['START_TOD'] - atm_ncpl = row['ATM_NCPL'] - stop_n = 1+end_year-start_year +def main(): + # For now we can just run the 'main' program as a loop + plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4) + + for i, row in tqdm.tqdm(plumber2_sites.iterrows()): + lat = row['Lat'] + lon = row['Lon'] + site = row['Site'] + start_year = row['start_year'] + end_year = row['end_year'] + start_date = row['RUN_STARTDATE'] + start_tod = row['START_TOD'] + atm_ncpl = row['ATM_NCPL'] + stop_n = 1+end_year-start_year - write_usermods(lat,lon,site,start_year,end_year, - start_date,start_tod,atm_ncpl,stop_n) \ No newline at end of file + write_usermods(lat,lon,site,start_year,end_year, + start_date,start_tod,atm_ncpl,stop_n) + +if __name__ == "__main__": + main() + From b429b63824e09f82e95d2982f14311cbbd8e4a37 Mon Sep 17 00:00:00 2001 From: wwieder Date: Fri, 6 Oct 2023 08:50:10 -0600 Subject: [PATCH 10/43] black formatting --- .../site_and_regional/single_point_case.py | 26 +++++++++++-------- python/ctsm/subset_data.py | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/python/ctsm/site_and_regional/single_point_case.py b/python/ctsm/site_and_regional/single_point_case.py index f47bc603db..6ff27ccd92 100644 --- a/python/ctsm/site_and_regional/single_point_case.py +++ b/python/ctsm/site_and_regional/single_point_case.py @@ -18,9 +18,9 @@ logger = logging.getLogger(__name__) -NAT_PFT = 15 # natural pfts -NUM_PFT = 17 # for runs with generic crops -MAX_PFT = 78 # for runs with explicit crops +NAT_PFT = 15 # natural pfts +NUM_PFT = 17 # for runs with generic crops +MAX_PFT = 78 # for runs with explicit crops # -- constants to represent months of year FIRST_MONTH = 1 @@ -134,8 +134,8 @@ def __init__( self.dom_pft = dom_pft self.pct_pft = pct_pft self.num_pft = num_pft - self.cth = cth - self.cbh = cbh + self.cth = cth + self.cbh = cbh self.include_nonveg = include_nonveg self.uni_snow = uni_snow self.cap_saturation = cap_saturation @@ -207,12 +207,16 @@ def check_dom_pft(self): # -- check dom_pft vs MAX_pft if self.num_pft - 1 < max_dom_pft < NUM_PFT: - logger.info("WARNING, you trying to run with generic crops (16 PFT surface dataset)") - #raise argparse.ArgumentTypeError(err_msg) + logger.info( + "WARNING, you trying to run with generic crops (16 PFT surface dataset)" + ) + # raise argparse.ArgumentTypeError(err_msg) # -- check if all dom_pft are in the same range: if min_dom_pft < NAT_PFT <= max_dom_pft: - logger.info("WARNING, you are subsetting using mixed land units that have both natural pfts and crop cfts. Check that your surface dataset looks correct.") + logger.info( + "WARNING, you are subsetting using mixed land units that have both natural pfts and crop cfts. Check that your surface dataset looks correct." + ) def check_nonveg(self): """ @@ -407,10 +411,10 @@ def modify_surfdata_atpoint(self, f_orig): # -- loop over all dom_pft and pct_pft zip_pfts = zip(self.dom_pft, self.pct_pft, self.cth, self.cbh) - for dom_pft, pct_pft,cth,cbh in zip_pfts: + for dom_pft, pct_pft, cth, cbh in zip_pfts: if cth is not None: - f_mod["MONTHLY_HEIGHT_TOP"][:,:,:,dom_pft] = cth - f_mod["MONTHLY_HEIGHT_BOT"][:,:,:,dom_pft] = cbh + f_mod["MONTHLY_HEIGHT_TOP"][:, :, :, dom_pft] = cth + f_mod["MONTHLY_HEIGHT_BOT"][:, :, :, dom_pft] = cbh if dom_pft < NAT_PFT: f_mod["PCT_NAT_PFT"][:, :, dom_pft] = pct_pft else: diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py index 5b1d3942d5..0be2abee24 100644 --- a/python/ctsm/subset_data.py +++ b/python/ctsm/subset_data.py @@ -185,7 +185,7 @@ def get_parser(): type=float, default=None, nargs="*", - ) + ) # -- region-specific parser options rg_parser.add_argument( From 38117f9667c04b359022ad883e35bb3f91b85895 Mon Sep 17 00:00:00 2001 From: wwieder Date: Fri, 6 Oct 2023 10:40:34 -0600 Subject: [PATCH 11/43] git ignore black --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9b7cb3c036..8258330d17 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,4 +1,5 @@ # Ran python directory through black python formatter +b429b63824e09f82e95d2982f14311cbbd8e4a37 4cd83cb3ee6d85eb909403487abf5eeaf4d98911 0aa2957c1f8603c63fa30b11295c06cfddff44a5 2cdb380febb274478e84cd90945aee93f29fa2e6 From d53f136ddda81c7e9247b1cd282475b8a801c852 Mon Sep 17 00:00:00 2001 From: wwieder Date: Thu, 26 Oct 2023 14:37:38 -0600 Subject: [PATCH 12/43] remove default history files --- cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm index ec0bed0a48..e18dcea937 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -35,5 +35,4 @@ hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI' 'QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE', 'SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT', 'TLAI','WIND','FIRE','FSM','COSZEN','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF', - 'RH_LEAF','RH','T10','TG','SABG','SABV','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SUB_SNOW', - 'QFLX_SNOW_DRAIN','H2OSFC' + 'RH_LEAF','RH','T10','TG','SABG','SABV','TBOT','TAUX','TAUY','QSNOEVAP','H2OSFC' From d6de294ee05b86b80550a89cd8fe09dde136b553 Mon Sep 17 00:00:00 2001 From: wwieder Date: Fri, 27 Oct 2023 15:17:24 -0600 Subject: [PATCH 13/43] adding datm streams to usermods --- tools/site_and_regional/plumber2_usermods.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index 3d69eb5e02..99fd537909 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -51,6 +51,26 @@ def write_usermods(lat,lon,site,start_year,end_year, './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ '\n' \ + 'echo "presaero.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "presaero.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ + 'echo "presaero.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ + '\n' \ + + 'echo "presndep.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "presndep.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ + 'echo "presndep.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ + '\n' \ + + 'echo "preso3.hist:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "preso3.hist:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ + 'echo "preso3.hist:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ + '\n' \ + + 'echo "co2tseries.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "co2tseries.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ + 'echo "co2tseries.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ + '\n' \ + 'compset=`./xmlquery COMPSET --value` \n' \ 'CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` \n' \ 'TEST=`./xmlquery TEST --value` \n' \ From 7e7a48554d9c1e96e34aef30d4db35c2ed4123d9 Mon Sep 17 00:00:00 2001 From: wwieder Date: Fri, 27 Oct 2023 15:18:04 -0600 Subject: [PATCH 14/43] actual usermod changes --- .../PLUMBER2/AR-SLu/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AT-Neu/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-ASM/shell_commands | 20 +++++++++++++++++-- .../PLUMBER2/AU-Cow/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Cpr/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Ctr/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Cum/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/AU-DaP/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-DaS/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/AU-Dry/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Emr/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-GWW/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Gin/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-How/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Lit/shell_commands | 20 +++++++++++++++++-- .../PLUMBER2/AU-Otw/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/AU-Rig/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Rob/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Sam/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/AU-Stp/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-TTE/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Tum/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Whr/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Wrr/shell_commands | 16 +++++++++++++++ .../PLUMBER2/AU-Ync/shell_commands | 16 +++++++++++++++ .../PLUMBER2/BE-Bra/shell_commands | 16 +++++++++++++++ .../PLUMBER2/BE-Lon/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/BE-Vie/shell_commands | 16 +++++++++++++++ .../PLUMBER2/BR-Sa3/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/BW-Ma1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CA-NS1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CA-NS2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CA-NS4/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CA-NS5/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CA-NS6/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CA-NS7/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/CA-Qcu/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/CA-Qfo/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CA-SF1/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/CA-SF2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CA-SF3/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/CH-Cha/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CH-Dav/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CH-Fru/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CH-Oe1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CN-Cha/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/CN-Cng/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CN-Dan/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/CN-Din/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CN-Du2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CN-HaM/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CN-Qia/shell_commands | 16 +++++++++++++++ .../PLUMBER2/CZ-wet/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DE-Bay/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/DE-Geb/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DE-Gri/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/DE-Hai/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DE-Kli/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/DE-Meh/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DE-Obe/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DE-Seh/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DE-SfN/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DE-Tha/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/DE-Wet/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DK-Fou/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DK-Lva/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DK-Ris/shell_commands | 16 +++++++++++++++ .../PLUMBER2/DK-Sor/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/DK-ZaH/shell_commands | 16 +++++++++++++++ .../PLUMBER2/ES-ES1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/ES-ES2/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/ES-LMa/shell_commands | 16 +++++++++++++++ .../PLUMBER2/ES-LgS/shell_commands | 16 +++++++++++++++ .../PLUMBER2/ES-VDA/shell_commands | 16 +++++++++++++++ .../PLUMBER2/FI-Hyy/shell_commands | 16 +++++++++++++++ .../PLUMBER2/FI-Kaa/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/FI-Lom/shell_commands | 16 +++++++++++++++ .../PLUMBER2/FI-Sod/shell_commands | 16 +++++++++++++++ .../PLUMBER2/FR-Fon/shell_commands | 20 +++++++++++++++++-- .../PLUMBER2/FR-Gri/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/FR-Hes/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/FR-LBr/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/FR-Lq1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/FR-Lq2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/FR-Pue/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/GF-Guy/shell_commands | 16 +++++++++++++++ .../PLUMBER2/HU-Bug/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/ID-Pag/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/IE-Ca1/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/IE-Dri/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/IT-Amp/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-BCi/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-CA1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-CA2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-CA3/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-Col/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-Cpz/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-Isp/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-LMa/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-Lav/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-MBo/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-Mal/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/IT-Noe/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-Non/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/IT-PT1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-Ren/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/IT-Ro1/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/IT-Ro2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-SR2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/IT-SRo/shell_commands | 16 +++++++++++++++ .../PLUMBER2/JP-SMF/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/NL-Ca1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/NL-Hor/shell_commands | 16 +++++++++++++++ .../PLUMBER2/NL-Loo/shell_commands | 20 +++++++++++++++++-- .../PLUMBER2/PL-wet/shell_commands | 16 +++++++++++++++ .../PLUMBER2/PT-Esp/shell_commands | 16 +++++++++++++++ .../PLUMBER2/PT-Mi1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/PT-Mi2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/RU-Che/shell_commands | 16 +++++++++++++++ .../PLUMBER2/RU-Fyo/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/RU-Zot/shell_commands | 16 +++++++++++++++ .../PLUMBER2/SD-Dem/shell_commands | 16 +++++++++++++++ .../PLUMBER2/SE-Deg/shell_commands | 16 +++++++++++++++ .../PLUMBER2/UK-Gri/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/UK-Ham/shell_commands | 20 +++++++++++++++++-- .../PLUMBER2/UK-PL3/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-AR1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-AR2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-ARM/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Aud/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Bar/shell_commands | 20 +++++++++++++++++-- .../PLUMBER2/US-Bkg/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-Blo/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Bo1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Cop/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-FPe/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-GLE/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Goo/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-Ha1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Ho1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-KS2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Los/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-MMS/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-MOz/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Me2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Me4/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-Me6/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Myb/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-NR1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Ne1/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-Ne2/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-Ne3/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-PFa/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Prr/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-SP1/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-SP2/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-SP3/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-SRG/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-SRM/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Syv/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Ton/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Tw4/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Twt/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-UMB/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Var/shell_commands | 18 ++++++++++++++++- .../PLUMBER2/US-WCr/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Whs/shell_commands | 16 +++++++++++++++ .../PLUMBER2/US-Wkg/shell_commands | 16 +++++++++++++++ .../PLUMBER2/ZA-Kru/shell_commands | 16 +++++++++++++++ .../PLUMBER2/ZM-Mon/shell_commands | 16 +++++++++++++++ .../PLUMBER2/defaults/user_nl_datm_streams | 19 ++++++------------ 171 files changed, 2781 insertions(+), 68 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index ae7b1ae8d7..750358dc54 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2010" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 22efea9754..1c671845fc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 8df3f30c70..94f50f6c49 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-ASM -./xmlchange PTS_LON=133.24899299999998 -./xmlchange PTS_LAT=-22.283001000000002 +./xmlchange PTS_LON=133.248993 +./xmlchange PTS_LAT=-22.283001 ./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 97f937ab16..0e22166ed7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2015" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 6da2c2b681..14a59743ed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index c51effd440..81c3840c31 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index bd6f8b3c04..d97af50601 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Cum ./xmlchange PTS_LON=150.722473 -./xmlchange PTS_LAT=-33.613296999999996 +./xmlchange PTS_LAT=-33.613297 ./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2018" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2013" >> user_nl_datm_streams +echo "preso3.hist:year_last=2018" >> user_nl_datm_streams +echo "preso3.hist:year_align=2013" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2018" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 4b0f61dc08..394c7f1b79 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2009" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2009" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 4c76a05e4c..d025a883ea 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-DaS ./xmlchange PTS_LON=131.388 -./xmlchange PTS_LAT=-14.159282999999999 +./xmlchange PTS_LAT=-14.159283 ./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 23e3496205..7c7b445557 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2015" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 3a3bff9917..33f06952ad 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2012" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2012" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 54975307eb..0759c51520 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2013" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2013" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 757dee64b6..9173152a19 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2012" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2012" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index a642da8ccc..000f3e7098 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index be1f41ef14..b14df46fe6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Lit -./xmlchange PTS_LON=130.79449499999998 -./xmlchange PTS_LAT=-13.179039999999999 +./xmlchange PTS_LON=130.794495 +./xmlchange PTS_LAT=-13.17904 ./xmlchange RUN_STARTDATE=2015-12-31 ./xmlchange DATM_YR_ALIGN=2016 ./xmlchange DATM_YR_START=2016 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2016" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2016" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index e3c61c74a1..81064a410c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Otw ./xmlchange PTS_LON=142.816803 -./xmlchange PTS_LAT=-38.532340999999995 +./xmlchange PTS_LAT=-38.532341 ./xmlchange RUN_STARTDATE=2008-12-31 ./xmlchange DATM_YR_ALIGN=2009 ./xmlchange DATM_YR_START=2009 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2009" >> user_nl_datm_streams +echo "preso3.hist:year_last=2010" >> user_nl_datm_streams +echo "preso3.hist:year_align=2009" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index c41efd9a52..438bfac1a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2016" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 6ce1d44c07..84ab9d686d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2014" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2014" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index e4319a5226..620292ebb6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=AU-Sam -./xmlchange PTS_LON=152.87780800000002 +./xmlchange PTS_LON=152.877808 ./xmlchange PTS_LAT=-27.3881 ./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 2f16980e1c..8fc2ecf886 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 9bd94247b8..09e6453c27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2013" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2013" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index eb809b34dc..c3ecd31acf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 504a4cb214..b53e68afed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2015" >> user_nl_datm_streams +echo "preso3.hist:year_last=2016" >> user_nl_datm_streams +echo "preso3.hist:year_align=2015" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 49902ca678..b500d73c02 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2016" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2016" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index 13badd0c3a..e12ac02950 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2017" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 2cde54531f..f8dea9d2c2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 1302671bea..61655ee087 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=BE-Lon ./xmlchange PTS_LON=4.74613 -./xmlchange PTS_LAT=50.551590000000004 +./xmlchange PTS_LAT=50.55159 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 585bf564a6..9ee7c2382c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1997" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=1997" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 2a1074fb89..2d9481bdef 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=BR-Sa3 ./xmlchange PTS_LON=-54.971436 -./xmlchange PTS_LAT=-3.0180290000000003 +./xmlchange PTS_LAT=-3.018029 ./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2001" >> user_nl_datm_streams +echo "preso3.hist:year_last=2003" >> user_nl_datm_streams +echo "preso3.hist:year_align=2001" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 909528fc5d..9c1f319e69 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2000" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 6b2bb1590f..819e8e203f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2003" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index 91cc30b0d1..14d108f857 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index b426493c4c..1f57f53bf3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index 5499e963e4..c208db660c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index 7058e92627..eb7bdd9ac0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index ef9d9e2b8f..c5d4b4fc7b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CA-NS7 -./xmlchange PTS_LON=-99.94830300000001 +./xmlchange PTS_LON=-99.948303 ./xmlchange PTS_LAT=56.635799 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index eb7946fe9e..c14a0ec0b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CA-Qcu ./xmlchange PTS_LON=-74.03653 -./xmlchange PTS_LAT=49.267078000000005 +./xmlchange PTS_LAT=49.267078 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index 890fac7393..6f6412bd22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2010" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index c9605d670d..025e322e7b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CA-SF1 ./xmlchange PTS_LON=-105.817596 -./xmlchange PTS_LAT=54.485001000000004 +./xmlchange PTS_LAT=54.485001 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 64833cb673..2544a9945c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index b47c5006af..35441efc85 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CA-SF3 -./xmlchange PTS_LON=-106.00531000000001 +./xmlchange PTS_LON=-106.00531 ./xmlchange PTS_LAT=54.091599 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index 8c5ff78b08..c7288e5bcb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2006" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2006" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index b2f22609ad..5aa0c36189 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1997" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=1997" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 962b39f7db..67d7f9db58 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2007" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2007" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 88ba34a99c..283d44164e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2008" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index 13e398426b..28587fb3e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CN-Cha -./xmlchange PTS_LON=128.09579499999998 +./xmlchange PTS_LON=128.095795 ./xmlchange PTS_LAT=42.4025 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 94da166bad..6e2010dc79 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2008" >> user_nl_datm_streams +echo "preso3.hist:year_last=2009" >> user_nl_datm_streams +echo "preso3.hist:year_align=2008" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 5112860c92..8c99d449a5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CN-Dan ./xmlchange PTS_LON=91.066399 -./xmlchange PTS_LAT=30.497801000000003 +./xmlchange PTS_LAT=30.497801 ./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index d35bebd115..689f7bc426 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 1a8f8f37e0..a7b35faa5d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2007" >> user_nl_datm_streams +echo "preso3.hist:year_last=2008" >> user_nl_datm_streams +echo "preso3.hist:year_align=2007" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 5145ddd88e..edd983116d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2003" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index a440108612..6ae17d1fac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 8256a2f505..aa79c2572a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2007" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2007" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 43b0d1a196..b3f7bf3ea9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=DE-Bay ./xmlchange PTS_LON=11.86694 -./xmlchange PTS_LAT=50.141940999999996 +./xmlchange PTS_LAT=50.141941 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1997" >> user_nl_datm_streams +echo "preso3.hist:year_last=1999" >> user_nl_datm_streams +echo "preso3.hist:year_align=1997" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 1eabb09c55..b346975097 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2001" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2001" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index e1c98270a9..470ff97bda 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Gri -./xmlchange PTS_LON=13.512529999999998 +./xmlchange PTS_LON=13.51253 ./xmlchange PTS_LAT=50.949471 ./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 62de7a27f8..66b7b5c353 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 83b543b09e..070d184841 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Kli -./xmlchange PTS_LON=13.522379999999998 +./xmlchange PTS_LON=13.52238 ./xmlchange PTS_LAT=50.893059 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 522ed84273..3f2bcb5a41 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index e8a587a03f..b1f812096a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2008" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2008" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 7c399a3f2e..2edbf8e33d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2008" >> user_nl_datm_streams +echo "preso3.hist:year_last=2010" >> user_nl_datm_streams +echo "preso3.hist:year_align=2008" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index fa88ad2282..4a0fa441e4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2013" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2013" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index 3df90063f1..65a14880f2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Tha -./xmlchange PTS_LON=13.566939999999999 +./xmlchange PTS_LON=13.56694 ./xmlchange PTS_LAT=50.963612 ./xmlchange RUN_STARTDATE=1997-12-31 ./xmlchange DATM_YR_ALIGN=1998 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1998" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1998" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=1998" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1998" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 12ea28894b..5324952c86 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index 1b26559723..ca702584cc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index 6e98d13f87..f298887645 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index a7cf75dfec..eecc657618 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 332aafa873..194cabc1b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DK-Sor -./xmlchange PTS_LON=11.644639999999999 +./xmlchange PTS_LON=11.64464 ./xmlchange PTS_LAT=55.48587 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1997" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=1997" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 8ebd841ee4..571960b92c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index a1e247e976..fdd0404407 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1999" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=1999" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 9ad0c8ba6a..1c4ef6a5dc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=ES-ES2 ./xmlchange PTS_LON=-0.315277 -./xmlchange PTS_LAT=39.275558000000004 +./xmlchange PTS_LAT=39.275558 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 74b8d62b64..f0c3363380 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 4aa00dc2a6..f8f547e7f1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2007" >> user_nl_datm_streams +echo "preso3.hist:year_last=2007" >> user_nl_datm_streams +echo "preso3.hist:year_align=2007" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index 2f3b2fbbe0..dc5dcf82be 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index c5da160f9e..9ea62ecc70 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1996" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=1996" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index b321cad0a1..9f91e66bde 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FI-Kaa -./xmlchange PTS_LON=27.295030999999998 +./xmlchange PTS_LON=27.295031 ./xmlchange PTS_LAT=69.140694 ./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2002" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 174e225c2c..7d4d73b33d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2007" >> user_nl_datm_streams +echo "preso3.hist:year_last=2009" >> user_nl_datm_streams +echo "preso3.hist:year_align=2007" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index b4a19d9e90..fc89685987 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2008" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2008" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index ebf6a78f1a..b136d9b645 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=FR-Fon -./xmlchange PTS_LON=2.7801400000000003 -./xmlchange PTS_LAT=48.476397999999996 +./xmlchange PTS_LON=2.78014 +./xmlchange PTS_LAT=48.476398 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index 4042cef2a4..b2e233bfe8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Gri -./xmlchange PTS_LON=1.9519099999999998 +./xmlchange PTS_LON=1.95191 ./xmlchange PTS_LAT=48.844219 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index 5c4e3c09a3..3bac6cc612 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Hes -./xmlchange PTS_LON=7.0655600000000005 +./xmlchange PTS_LON=7.06556 ./xmlchange PTS_LAT=48.67416 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1997" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=1997" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index c4d2294096..dbc797c6bd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-LBr -./xmlchange PTS_LON=-0.7692869999999999 +./xmlchange PTS_LON=-0.769287 ./xmlchange PTS_LAT=44.71711 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2008" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 271081e903..5297f213a5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 5390ab8b12..321ee32e43 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index ad7c2cf8f6..d022727690 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Pue -./xmlchange PTS_LON=3.5958300000000003 +./xmlchange PTS_LON=3.59583 ./xmlchange PTS_LAT=43.74139 ./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index 2e5f9b4701..dabcaf23e7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 4ce661d6f5..454391c3d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=HU-Bug -./xmlchange PTS_LON=19.601298999999997 +./xmlchange PTS_LON=19.601299 ./xmlchange PTS_LAT=46.691101 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 3cc8466bc4..c3f5f69786 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=ID-Pag -./xmlchange PTS_LON=114.03639199999999 +./xmlchange PTS_LON=114.036392 ./xmlchange PTS_LAT=-2.345 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2003" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index fbbd746ea2..2357e8250d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=IE-Ca1 ./xmlchange PTS_LON=-6.918152 -./xmlchange PTS_LAT=52.858791000000004 +./xmlchange PTS_LAT=52.858791 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index a87cb91575..65c64683e1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IE-Dri -./xmlchange PTS_LON=-8.751800999999999 +./xmlchange PTS_LON=-8.751801 ./xmlchange PTS_LAT=51.986691 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index 9f1ac5a079..c6200f0eba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index 78ad47f3ee..a40857defd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2010" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index cf32fc2f64..d3af56eaf9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2012" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2012" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 6b45fefeb7..416c9a4d80 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2012" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2012" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 6490991d3e..388cc3f64b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2012" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2012" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index c1533c70a2..6d7d4a1647 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2007" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2007" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 1442fcbaf1..9c1c9c5799 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2001" >> user_nl_datm_streams +echo "preso3.hist:year_last=2008" >> user_nl_datm_streams +echo "preso3.hist:year_align=2001" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 673a3f3135..bf15b8aa32 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2013" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2013" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index 30487ddfe2..ec2513e0ec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 50aad2142a..1fb28cff83 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index e480a224b0..70cfdcc65c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 19247db028..99818a15e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Mal -./xmlchange PTS_LON=11.703339999999999 +./xmlchange PTS_LON=11.70334 ./xmlchange PTS_LAT=46.114021 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2003" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 6d35714bb3..0b8a8f78ec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index e52f0a86f2..f90268aca7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=IT-Non ./xmlchange PTS_LON=11.09109 -./xmlchange PTS_LAT=44.690189000000004 +./xmlchange PTS_LAT=44.690189 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2002" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index 2018d86736..9df356aee2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 2ad66c0140..9259cd2064 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Ren -./xmlchange PTS_LON=11.433689999999999 +./xmlchange PTS_LON=11.43369 ./xmlchange PTS_LAT=46.586861 ./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index c11132f5ae..ca02900e97 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Ro1 -./xmlchange PTS_LON=11.930010000000001 +./xmlchange PTS_LON=11.93001 ./xmlchange PTS_LAT=42.408119 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index c954893c2f..b7753aa531 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2008" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index d3ba1e0b00..1bdce726b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2013" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2013" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index f71fd3b73a..f482becb21 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 29bf921ddf..66540c1f42 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=JP-SMF -./xmlchange PTS_LON=137.07879599999998 +./xmlchange PTS_LON=137.078796 ./xmlchange PTS_LAT=35.2617 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 6d660b14af..daff9eaa8a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 2f80e68fe2..11c98e2820 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2008" >> user_nl_datm_streams +echo "preso3.hist:year_last=2011" >> user_nl_datm_streams +echo "preso3.hist:year_align=2008" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 6a53e55d22..28d7964b0c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=NL-Loo -./xmlchange PTS_LON=5.7435599999999996 -./xmlchange PTS_LAT=52.166579999999996 +./xmlchange PTS_LON=5.74356 +./xmlchange PTS_LAT=52.16658 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1997" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=1997" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index f41cbbd83f..a419640a26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index f742f8d080..c362f2bb4b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index ef8e353887..976b8e623a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index d4e1c70b8e..10caee0f97 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 27f2458a3d..41a61c9e22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 89627ad3b2..38628b560e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=RU-Fyo ./xmlchange PTS_LON=32.922081 -./xmlchange PTS_LAT=56.461529000000006 +./xmlchange PTS_LAT=56.461529 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index a9fe270736..02bd6bbd5f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2003" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 7e1eadacd0..c480859ada 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2009" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index d9489285a0..d8bba5239d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index 3efa680d58..c894362999 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=UK-Gri -./xmlchange PTS_LON=-3.7980650000000002 +./xmlchange PTS_LON=-3.798065 ./xmlchange PTS_LAT=56.60722 ./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2001" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index b2a12684c9..45273a3b9c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=UK-Ham -./xmlchange PTS_LON=-0.8583069999999999 -./xmlchange PTS_LAT=51.153529999999996 +./xmlchange PTS_LON=-0.858307 +./xmlchange PTS_LAT=51.15353 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index eb72f60852..46e7c2c3e9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=UK-PL3 -./xmlchange PTS_LON=-1.2666629999999999 +./xmlchange PTS_LON=-1.266663 ./xmlchange PTS_LAT=51.450001 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 99b76ece82..ab7569b4e6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 9bc79cfc4a..013d314e60 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2011" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index 44f88aa85e..76bcd8b616 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 91967253a4..662fe7c964 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 169d97f2f1..1afb2e1ab7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Bar -./xmlchange PTS_LON=-71.28808599999999 -./xmlchange PTS_LAT=44.064640000000004 +./xmlchange PTS_LON=-71.288086 +./xmlchange PTS_LAT=44.06464 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index dfbb058864..841deb242d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Bkg ./xmlchange PTS_LON=-96.836182 -./xmlchange PTS_LAT=44.345290999999996 +./xmlchange PTS_LAT=44.345291 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 1d93de37f3..4b275848bf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 3300769018..5ba1eba865 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1997" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=1997" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index 7e5c07df85..dcdaaa5e41 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2003" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 59fd10ac8b..af487580bd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-FPe -./xmlchange PTS_LON=-105.10189799999999 +./xmlchange PTS_LON=-105.101898 ./xmlchange PTS_LAT=48.307701 ./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index 50eed57ec9..de37cfe903 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2009" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2009" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index 26e38be7c3..198e91e68b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Goo -./xmlchange PTS_LON=-89.87350500000001 +./xmlchange PTS_LON=-89.873505 ./xmlchange PTS_LAT=34.2547 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 2f65c91eeb..8c4a28cb07 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1992" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1992" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1992" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1992" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=1992" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1992" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1992" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 9093f1f2ea..c64c14ab30 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1996" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=1996" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 29eadcaef9..6cbc7c9d1b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2003" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2003" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index bc52fa3f28..e4491eaa4b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2008" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index e4fb713412..bd404eb884 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-MMS -./xmlchange PTS_LON=-86.41308599999999 +./xmlchange PTS_LON=-86.413086 ./xmlchange PTS_LAT=39.3232 ./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1999" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=1999" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index 9956932203..362eeed69b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index e93d78600f..f06d88c708 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 41552fc5c4..5979844eaf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Me4 -./xmlchange PTS_LON=-121.62240600000001 +./xmlchange PTS_LON=-121.622406 ./xmlchange PTS_LAT=44.499199 ./xmlchange RUN_STARTDATE=1996-01-01 ./xmlchange DATM_YR_ALIGN=1996 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1996" >> user_nl_datm_streams +echo "preso3.hist:year_last=2000" >> user_nl_datm_streams +echo "preso3.hist:year_align=1996" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index c1f212be8f..445b187df1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index db659663d3..84476e645b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index fef51c7cbb..b2836241fb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1999" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=1999" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index aaced9db2c..5ee6fb5388 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Ne1 -./xmlchange PTS_LON=-96.47659300000001 +./xmlchange PTS_LON=-96.476593 ./xmlchange PTS_LAT=41.1651 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index f5669b7db0..32d77966d5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Ne2 ./xmlchange PTS_LON=-96.470093 -./xmlchange PTS_LAT=41.164902000000005 +./xmlchange PTS_LAT=41.164902 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index b45a85c9f6..b92d7d756e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2012" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 9bc6366d7f..7e358c7203 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1995" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1995" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1995" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=1995" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1995" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1995" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 5426500cdf..9b2c2fbfee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2011" >> user_nl_datm_streams +echo "preso3.hist:year_last=2013" >> user_nl_datm_streams +echo "preso3.hist:year_align=2011" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index 932ce22624..f2c0598af2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2005" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 014950e6f0..270b047ed9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index d98f095d76..7256194443 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1999" >> user_nl_datm_streams +echo "preso3.hist:year_last=2004" >> user_nl_datm_streams +echo "preso3.hist:year_align=1999" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 55c56c0c72..3e44e5bddd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2009" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2009" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 5f8102b9e8..770b5ec89b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2004" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2004" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 38847ccf38..925ed0c3db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2002" >> user_nl_datm_streams +echo "preso3.hist:year_last=2008" >> user_nl_datm_streams +echo "preso3.hist:year_align=2002" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index df49b75d7e..17cbd6da0b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2001" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2001" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index 7e5addafa1..30f1603ae6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2014" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2014" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index affe637024..74b6cef00e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2010" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2010" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 224ad21254..07065d137f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 838a7faf60..978147998f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Var -./xmlchange PTS_LON=-120.95072900000001 +./xmlchange PTS_LON=-120.950729 ./xmlchange PTS_LAT=38.4133 ./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 @@ -8,6 +8,22 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2001" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2001" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 4079225888..0985adbba0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + +echo "preso3.hist:year_first=1999" >> user_nl_datm_streams +echo "preso3.hist:year_last=2006" >> user_nl_datm_streams +echo "preso3.hist:year_align=1999" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index f79617b792..55a0ab9882 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2008" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2008" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 670457ef7d..5ec6189ab8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2005" >> user_nl_datm_streams +echo "preso3.hist:year_last=2014" >> user_nl_datm_streams +echo "preso3.hist:year_align=2005" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 7d9a7b99b5..881b7a078c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2000" >> user_nl_datm_streams +echo "preso3.hist:year_last=2002" >> user_nl_datm_streams +echo "preso3.hist:year_align=2000" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 87a0e92777..a871e046b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -8,6 +8,22 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + +echo "preso3.hist:year_first=2008" >> user_nl_datm_streams +echo "preso3.hist:year_last=2008" >> user_nl_datm_streams +echo "preso3.hist:year_align=2008" >> user_nl_datm_streams + +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams + compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` TEST=`./xmlquery TEST --value` diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams index 20803f40ca..0aef29bc86 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -30,22 +30,15 @@ CLM_USRDAT.CLM_USRDAT:datavars = ZBOT z, \ PSRF pbot, \ FLDS lwdn -! TODO, get right first and last years. - -presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2018-2030_monthly_0.9x1.25_c210826.nc -presaero.SSP3-7.0:year_first=2018 -presaero.SSP3-7.0:year_last=2022 -presaero.SSP3-7.0:year_align=2018 +presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_1849-2101_monthly_0.9x1.25_c201103.nc presaero.SSP3-7.0:dtlimit=30 -presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_2018-2030_monthly_c210826.nc -presndep.SSP3-7.0:year_first=2018 -presndep.SSP3-7.0:year_last=2022 -presndep.SSP3-7.0:year_align=2018 +presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc presndep.SSP3-7.0:dtlimit=30 -preso3.SSP3-7.0:year_first=2018 -preso3.SSP3-7.0:year_last=2022 -preso3.SSP3-7.0:year_align=2018 +!TODO, make this a hist and SSP file +preso3.hist:datafiles = $DIN_LOC_ROOT/O3_surface.f09_g17.CMIP6-historical-WACCM.001.monthly.185001-201412.nc preso3.SSP3-7.0:dtlimit=30 +co2tseries.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_globalSSP3-7.0_simyr_1750-2501_CMIP6_c201101.nc + From 1c3ea1cc33877f22466013c4aaa186cda29a94c2 Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 30 Oct 2023 16:17:40 -0600 Subject: [PATCH 15/43] removing custom O3 years --- tools/site_and_regional/plumber2_usermods.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index 99fd537909..de24a13dd7 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -61,11 +61,6 @@ def write_usermods(lat,lon,site,start_year,end_year, 'echo "presndep.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ '\n' \ - 'echo "preso3.hist:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ - 'echo "preso3.hist:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ - 'echo "preso3.hist:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ - '\n' \ - 'echo "co2tseries.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ 'echo "co2tseries.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ 'echo "co2tseries.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ From 300e83ecca73dfd55643b715e46159b20f5bac5b Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 30 Oct 2023 16:45:41 -0600 Subject: [PATCH 16/43] updating default datm_stream and vars --- .../PLUMBER2/defaults/user_nl_datm_streams | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams index 0aef29bc86..ffc2b140f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -21,14 +21,15 @@ ! foo:year_first = 1950 ! would change the stream year_first stream_entry to 1950 for the foo stream block !------------------------------------------------------------------------ -CLM_USRDAT.CLM_USRDAT:datavars = ZBOT z, \ - TBOT tbot, \ - QBOT shum, \ - WIND wind, \ - PRECTmms precn, \ - FSDS swdn, \ - PSRF pbot, \ - FLDS lwdn +! This will come out when cdeps externals are updated +CLM_USRDAT.PLUMBER2:datavars = ZBOT Sa_z, \ + TBOT Sa_tbot, \ + QBOT Sa_shum, \ + WIND Sa_wind, \ + PRECTmms Sa_precn, \ + FSDS Faxa_swdn, \ + PSRF Sa_pbot, \ + FLDS Faxa_lwdn presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_1849-2101_monthly_0.9x1.25_c201103.nc presaero.SSP3-7.0:dtlimit=30 @@ -36,9 +37,11 @@ presaero.SSP3-7.0:dtlimit=30 presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc presndep.SSP3-7.0:dtlimit=30 -!TODO, make this a hist and SSP file -preso3.hist:datafiles = $DIN_LOC_ROOT/O3_surface.f09_g17.CMIP6-historical-WACCM.001.monthly.185001-201412.nc -preso3.SSP3-7.0:dtlimit=30 +!Arbitrary start year for O3 +preso3.hist:dtlimit=30 +preso3.hist:year_first=2000 +preso3.hist:year_last=2000 +preso3.hist:year_align=2000 co2tseries.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_globalSSP3-7.0_simyr_1750-2501_CMIP6_c201101.nc From aac75229ab74d02f171200fa8b008117074495e2 Mon Sep 17 00:00:00 2001 From: wwieder Date: Thu, 2 Nov 2023 10:35:31 -0600 Subject: [PATCH 17/43] update datm for usermods --- .../usermods_dirs/PLUMBER2/defaults/shell_commands | 4 ++++ cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl | 3 ++- .../usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams | 8 ++++---- tools/site_and_regional/plumber2_usermods.py | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands index dbddf51aa5..a0eb85ef37 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -1,7 +1,11 @@ #!/bin/bash ./xmlchange CLM_USRDAT_NAME=PLUMBER2 +./xlmchange DATM_MODE=1PT # Set data forcing data to future scenario so will have data from 2018 to present-day ./xmlchange DATM_PRESAERO=SSP3-7.0 +./xlmchange DATM_CO2_TSERIES=SSP3-7.0 +./xmlchange DATM_PRESNDEP=SSP3-7.0 + # Explicitly set the MPI library to mpi-serial so won't have the build/run complexity of a full MPI library ./xmlchange MPILIB=mpi-serial # Explicitly set PIO Type to NETCDF since this is a single processor case (should already be set this way) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl index e7f6c90a86..b848027087 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_cpl @@ -17,4 +17,5 @@ ! For example, rather than set username to 'foo' in user_nl_cpl, call ! ./xmlchange USER=foo !------------------------------------------------------------------------ -orb_iyear = 2018 +! average year of all PLUMBER2 170 sites is 2007 +orb_iyear = 2007 diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams index ffc2b140f8..40d1ce2aa1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -37,11 +37,11 @@ presaero.SSP3-7.0:dtlimit=30 presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc presndep.SSP3-7.0:dtlimit=30 -!Arbitrary start year for O3 +!Arbitrary start year for O3,average year of all 170 sites is 2007 preso3.hist:dtlimit=30 -preso3.hist:year_first=2000 -preso3.hist:year_last=2000 -preso3.hist:year_align=2000 +preso3.hist:year_first=2007 +preso3.hist:year_last=2007 +preso3.hist:year_align=2007 co2tseries.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_globalSSP3-7.0_simyr_1750-2501_CMIP6_c201101.nc diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index de24a13dd7..2602ba8a05 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -50,6 +50,8 @@ def write_usermods(lat,lon,site,start_year,end_year, './xmlchange START_TOD='+str(start_tod) + '\n' \ './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ '\n' \ + + 'echo "CLM_USRDAT.PLUMBER2:datafiles=\'/glade/work/oleson/PLUMBER2/datm_files/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc \'" >> user_nl_datm_streams \n' \ 'echo "presaero.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ 'echo "presaero.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ From 8d3468597b0b9bb1db351f755c6662bb500e4b96 Mon Sep 17 00:00:00 2001 From: wwieder Date: Thu, 2 Nov 2023 10:37:17 -0600 Subject: [PATCH 18/43] updates plumber2 usermods --- cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands | 5 +---- cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm | 3 ++- .../usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams | 7 ++++++- 172 files changed, 178 insertions(+), 682 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index 750358dc54..c8149c40ba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2010" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 1c671845fc..4057faccc9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 94f50f6c49..c73fc9a3d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 0e22166ed7..1ca3a72d46 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2015" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 14a59743ed..5bf1fac506 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 81c3840c31..be97e3f98f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index d97af50601..3318b17118 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2018" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "preso3.hist:year_first=2013" >> user_nl_datm_streams -echo "preso3.hist:year_last=2018" >> user_nl_datm_streams -echo "preso3.hist:year_align=2013" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2018" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 394c7f1b79..bf1005d0af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "preso3.hist:year_first=2009" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2009" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index d025a883ea..0f16c04e2e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 7c7b445557..7e578480f6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2015" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 33f06952ad..c167e3cd0d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "preso3.hist:year_first=2012" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2012" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 0759c51520..6b549dfb3e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "preso3.hist:year_first=2013" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2013" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 9173152a19..7cc734d989 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "preso3.hist:year_first=2012" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2012" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 000f3e7098..d9b45e17b6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index b14df46fe6..3526398434 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams -echo "preso3.hist:year_first=2016" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2016" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 81064a410c..8de2f71ac4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "preso3.hist:year_first=2009" >> user_nl_datm_streams -echo "preso3.hist:year_last=2010" >> user_nl_datm_streams -echo "preso3.hist:year_align=2009" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index 438bfac1a7..d45ae0caa8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2016" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 84ab9d686d..a0d01e9cad 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams -echo "preso3.hist:year_first=2014" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2014" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 620292ebb6..86faa98575 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 8fc2ecf886..b6d7b5bc0b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 09e6453c27..09e5c055f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "preso3.hist:year_first=2013" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2013" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index c3ecd31acf..b3c826dc61 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index b53e68afed..de23c7622d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams -echo "preso3.hist:year_first=2015" >> user_nl_datm_streams -echo "preso3.hist:year_last=2016" >> user_nl_datm_streams -echo "preso3.hist:year_align=2015" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index b500d73c02..b088bbe390 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams -echo "preso3.hist:year_first=2016" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2016" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index e12ac02950..20e4f5f213 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2017" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index f8dea9d2c2..e1722c0da5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 61655ee087..1e577cbc61 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 9ee7c2382c..d44eb675d0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "preso3.hist:year_first=1997" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=1997" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 2d9481bdef..8f00769d4c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "preso3.hist:year_first=2001" >> user_nl_datm_streams -echo "preso3.hist:year_last=2003" >> user_nl_datm_streams -echo "preso3.hist:year_align=2001" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 9c1f319e69..969338841c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2000" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 819e8e203f..e0d7e7062a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2003" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index 14d108f857..fae7791d8a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index 1f57f53bf3..eaddfaf01e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index c208db660c..7f11504753 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index eb7bdd9ac0..9106153825 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index c5d4b4fc7b..55fbccde92 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index c14a0ec0b2..347d961a19 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index 6f6412bd22..dc7bfb6be7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2010" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index 025e322e7b..a6179258ee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 2544a9945c..17207f65d5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index 35441efc85..ddc8913b6a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index c7288e5bcb..a20cda2ac5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "preso3.hist:year_first=2006" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2006" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 5aa0c36189..9b9eaea39b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "preso3.hist:year_first=1997" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=1997" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 67d7f9db58..ca52eea93d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "preso3.hist:year_first=2007" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2007" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 283d44164e..f6a74e6fdf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2008" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index 28587fb3e5..d5f8f38236 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 6e2010dc79..51d1556261 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "preso3.hist:year_first=2008" >> user_nl_datm_streams -echo "preso3.hist:year_last=2009" >> user_nl_datm_streams -echo "preso3.hist:year_align=2008" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 8c99d449a5..771e29a5e4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index 689f7bc426..eb8c77306e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index a7b35faa5d..71cc97c6b3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "preso3.hist:year_first=2007" >> user_nl_datm_streams -echo "preso3.hist:year_last=2008" >> user_nl_datm_streams -echo "preso3.hist:year_align=2007" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index edd983116d..0a859ea76f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2003" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index 6ae17d1fac..af0e7d318e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index aa79c2572a..0b0431048c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "preso3.hist:year_first=2007" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2007" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index b3f7bf3ea9..936f3ec40c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "preso3.hist:year_first=1997" >> user_nl_datm_streams -echo "preso3.hist:year_last=1999" >> user_nl_datm_streams -echo "preso3.hist:year_align=1997" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index b346975097..68c5407976 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "preso3.hist:year_first=2001" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2001" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 470ff97bda..4556c5c257 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 66b7b5c353..42a8acc018 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 070d184841..50ce862257 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 3f2bcb5a41..f2798eea24 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index b1f812096a..d95e72be27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "preso3.hist:year_first=2008" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2008" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 2edbf8e33d..eb95868665 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "preso3.hist:year_first=2008" >> user_nl_datm_streams -echo "preso3.hist:year_last=2010" >> user_nl_datm_streams -echo "preso3.hist:year_align=2008" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 4a0fa441e4..73054e6106 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "preso3.hist:year_first=2013" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2013" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index 65a14880f2..d43214ada0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1998" >> user_nl_datm_streams -echo "preso3.hist:year_first=1998" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=1998" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1998" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 5324952c86..d5136aeac5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index ca702584cc..d04913c8de 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index f298887645..67013879b4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index eecc657618..caa24e62c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 194cabc1b2..197309bf84 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "preso3.hist:year_first=1997" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=1997" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 571960b92c..26e2d690d5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index fdd0404407..9dfe5f1c24 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "preso3.hist:year_first=1999" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=1999" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 1c4ef6a5dc..683668d0e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index f0c3363380..33ad7b50fb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index f8f547e7f1..93be547aa5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "preso3.hist:year_first=2007" >> user_nl_datm_streams -echo "preso3.hist:year_last=2007" >> user_nl_datm_streams -echo "preso3.hist:year_align=2007" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index dc5dcf82be..e6794f48f0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 9ea62ecc70..8c488a5ae4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "preso3.hist:year_first=1996" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=1996" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 9f91e66bde..80f90227ff 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2002" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 7d4d73b33d..1f3fd192c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "preso3.hist:year_first=2007" >> user_nl_datm_streams -echo "preso3.hist:year_last=2009" >> user_nl_datm_streams -echo "preso3.hist:year_align=2007" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index fc89685987..e8b079878e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "preso3.hist:year_first=2008" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2008" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index b136d9b645..5ee361c24d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index b2e233bfe8..c5fd20e523 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index 3bac6cc612..a71d105d79 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "preso3.hist:year_first=1997" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=1997" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index dbc797c6bd..71eb832d6e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2008" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 5297f213a5..0addcc16e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 321ee32e43..c2b4559176 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index d022727690..98a662228a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index dabcaf23e7..815b4ce3cc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 454391c3d7..bfa70e78f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index c3f5f69786..42915592ec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2003" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 2357e8250d..b1ef636d2d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 65c64683e1..329f98d349 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index c6200f0eba..69d99b4d41 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index a40857defd..aa1166c949 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2010" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index d3af56eaf9..cb1463aeb2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "preso3.hist:year_first=2012" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2012" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 416c9a4d80..9d30711426 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "preso3.hist:year_first=2012" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2012" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 388cc3f64b..4fca2b04f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "preso3.hist:year_first=2012" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2012" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index 6d7d4a1647..a9d7985286 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "preso3.hist:year_first=2007" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2007" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 9c1c9c5799..b2540b46fc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "preso3.hist:year_first=2001" >> user_nl_datm_streams -echo "preso3.hist:year_last=2008" >> user_nl_datm_streams -echo "preso3.hist:year_align=2001" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index bf15b8aa32..5a6575c33a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "preso3.hist:year_first=2013" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2013" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index ec2513e0ec..cdd90c2471 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 1fb28cff83..3d1ec720a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 70cfdcc65c..d5bd27cafe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 99818a15e5..bc102b1248 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2003" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 0b8a8f78ec..65f5d7f095 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index f90268aca7..29ca9eb047 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2002" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index 9df356aee2..2c9ba27f10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 9259cd2064..d9147fb233 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index ca02900e97..a1a6318d81 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index b7753aa531..6661ae3796 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2008" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 1bdce726b2..f2b6680e66 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "preso3.hist:year_first=2013" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2013" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index f482becb21..66f4a5e7df 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 66540c1f42..82fcacc565 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index daff9eaa8a..039271ffaf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 11c98e2820..435fc3bd8d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "preso3.hist:year_first=2008" >> user_nl_datm_streams -echo "preso3.hist:year_last=2011" >> user_nl_datm_streams -echo "preso3.hist:year_align=2008" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 28d7964b0c..8cf8b99d06 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "preso3.hist:year_first=1997" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=1997" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index a419640a26..2c2ce98a63 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index c362f2bb4b..4fcd4e09d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 976b8e623a..5f1b9aab9d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index 10caee0f97..e804bd9f36 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 41a61c9e22..24f96f6548 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 38628b560e..795cdb4d07 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index 02bd6bbd5f..c931fbf456 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2003" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index c480859ada..32340e6ae8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2009" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index d8bba5239d..b891381e14 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index c894362999..707d68ce43 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2001" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 45273a3b9c..1a74d5eb06 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index 46e7c2c3e9..e790cfa4c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index ab7569b4e6..9c76e5c1b9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 013d314e60..93d6e8c2a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2011" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index 76bcd8b616..bec32053ef 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 662fe7c964..bad42eeda3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 1afb2e1ab7..16685885d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 841deb242d..54fd5189ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 4b275848bf..93efb6d9b4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 5ba1eba865..4e61cc4c5e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "preso3.hist:year_first=1997" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=1997" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index dcdaaa5e41..6b46bf2fd8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2003" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index af487580bd..2def6ebc2a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index de37cfe903..09a04652f2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "preso3.hist:year_first=2009" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2009" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index 198e91e68b..ba77805192 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 8c4a28cb07..ce6f8a7679 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1992" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1992" >> user_nl_datm_streams -echo "preso3.hist:year_first=1992" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=1992" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1992" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index c64c14ab30..59cd9e1331 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "preso3.hist:year_first=1996" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=1996" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 6cbc7c9d1b..271246f48e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "preso3.hist:year_first=2003" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2003" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index e4491eaa4b..dbc061b349 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2008" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index bd404eb884..1c238f1b7e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "preso3.hist:year_first=1999" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=1999" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index 362eeed69b..40ef4b3a77 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index f06d88c708..1972bc4b47 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 5979844eaf..0fbf988e35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "preso3.hist:year_first=1996" >> user_nl_datm_streams -echo "preso3.hist:year_last=2000" >> user_nl_datm_streams -echo "preso3.hist:year_align=1996" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index 445b187df1..5771243380 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 84476e645b..a39f166d31 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index b2836241fb..b8b0797102 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "preso3.hist:year_first=1999" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=1999" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index 5ee6fb5388..f3d9643377 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 32d77966d5..7fb87723bf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index b92d7d756e..a5d01e3d10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2012" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 7e358c7203..3dfc6dd712 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1995" >> user_nl_datm_streams -echo "preso3.hist:year_first=1995" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=1995" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1995" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 9b2c2fbfee..88c25b2553 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "preso3.hist:year_first=2011" >> user_nl_datm_streams -echo "preso3.hist:year_last=2013" >> user_nl_datm_streams -echo "preso3.hist:year_align=2011" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index f2c0598af2..8f59b0acf4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2005" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 270b047ed9..4943fdc3ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 7256194443..3446557c99 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "preso3.hist:year_first=1999" >> user_nl_datm_streams -echo "preso3.hist:year_last=2004" >> user_nl_datm_streams -echo "preso3.hist:year_align=1999" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 3e44e5bddd..c814e0a4a3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "preso3.hist:year_first=2009" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2009" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 770b5ec89b..f36611a1aa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "preso3.hist:year_first=2004" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2004" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 925ed0c3db..87723933ea 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "preso3.hist:year_first=2002" >> user_nl_datm_streams -echo "preso3.hist:year_last=2008" >> user_nl_datm_streams -echo "preso3.hist:year_align=2002" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 17cbd6da0b..3c9923e050 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "preso3.hist:year_first=2001" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2001" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index 30f1603ae6..7410d9f4ed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams -echo "preso3.hist:year_first=2014" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2014" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index 74b6cef00e..f1bb9a6b0b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "preso3.hist:year_first=2010" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2010" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 07065d137f..8328a8124d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 978147998f..cfda272009 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "preso3.hist:year_first=2001" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2001" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 0985adbba0..2d843ef5bf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "preso3.hist:year_first=1999" >> user_nl_datm_streams -echo "preso3.hist:year_last=2006" >> user_nl_datm_streams -echo "preso3.hist:year_align=1999" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 55a0ab9882..0cb83c70e2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "preso3.hist:year_first=2008" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2008" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 5ec6189ab8..abee04fd80 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "preso3.hist:year_first=2005" >> user_nl_datm_streams -echo "preso3.hist:year_last=2014" >> user_nl_datm_streams -echo "preso3.hist:year_align=2005" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 881b7a078c..bfca16af4b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "preso3.hist:year_first=2000" >> user_nl_datm_streams -echo "preso3.hist:year_last=2002" >> user_nl_datm_streams -echo "preso3.hist:year_align=2000" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index a871e046b1..a8c00a01a8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -8,6 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 +echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -16,10 +17,6 @@ echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "preso3.hist:year_first=2008" >> user_nl_datm_streams -echo "preso3.hist:year_last=2008" >> user_nl_datm_streams -echo "preso3.hist:year_align=2008" >> user_nl_datm_streams - echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm index e18dcea937..7828027f64 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -20,9 +20,10 @@ 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/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc" -! For testing only +! For testing only, TODO, ${PLUMBER2SITE} doesn't work as implimented fsurdat = "/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc" +! TODO, this is only needed for transient simulations, not spinup ! this allows for large h1 data files, regardless or run length hist_nhtfrq = 0,1 hist_mfilt = 1,438000 diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams index 40d1ce2aa1..7faa9dfc52 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -26,11 +26,16 @@ CLM_USRDAT.PLUMBER2:datavars = ZBOT Sa_z, \ TBOT Sa_tbot, \ QBOT Sa_shum, \ WIND Sa_wind, \ - PRECTmms Sa_precn, \ + PRECTmms Faxa_precn, \ FSDS Faxa_swdn, \ PSRF Sa_pbot, \ FLDS Faxa_lwdn +!TODO, add $PLUMBER2SITE to this naming string + accurate years after moving files to inputdata +!CLM_USRDAT.PLUMBER2:datafiles = /glade/work/oleson/PLUMBER2/datm_files/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc +CLM_USRDAT.PLUMBER2:taxmode=cycle +CLM_USRDAT.PLUMBER2:dtlimit=30 + presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_1849-2101_monthly_0.9x1.25_c201103.nc presaero.SSP3-7.0:dtlimit=30 From f92d80200ab4c6c4a263dd248ae48d4211fe379a Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Wed, 13 Mar 2024 17:13:16 -0600 Subject: [PATCH 19/43] Changes in response to review and remove print statements --- .../create_PLUMBER2_sites_csv.ncl | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl index 79a140486c..2bcf9915ca 100644 --- a/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl +++ b/tools/site_and_regional/create_PLUMBER2_sites_csv.ncl @@ -36,8 +36,6 @@ begin pftperc = new((/nsim,2/),"double") ; pft % pftcth = new((/nsim,2/),"double") ; pft canopy top height pftcbh = new((/nsim,2/),"double") ; pft canopy bottom height -; pftcth = new((/nsim,npfts_ch/),"double") ; pft canopy top height -; pftcbh = new((/nsim,npfts_ch/),"double") ; pft canopy bottom height pctwet = new(nsim,"double") do sel = 0,nsim - 1 @@ -51,12 +49,9 @@ begin startyear(sel) = systemfunc(command) command = "echo " + f_in_dir + "CTSM_DATM_" + sim(sel) + "_*.nc" + " | cut -c81-84" endyear(sel) = systemfunc(command) - print(fls) datmfile = addfile(fls,"r") time = datmfile->time - printVarSummary(time) atm_ncpl(sel) = tostring(sprinti("%0.2i ",tointeger(86400./(time(1)-time(0))))) - print(atm_ncpl(sel)) if (isint64(time)) then tmp = toint(time) copy_VarCoords(time,tmp) @@ -66,17 +61,11 @@ begin copy_VarCoords(time,tmp) copy_VarAtts(time,tmp) end if - printVarSummary(tmp) utc_date = cd_calendar(tmp(0),0) - print(utc_date) localstartyear(sel) = tostring(tointeger(utc_date(0,0))) - print(localstartyear(sel)) startmonth(sel) = tostring(sprinti("%0.2i ",tointeger(utc_date(0,1)))) - print(startmonth(sel)) startday(sel) = tostring(sprinti("%0.2i ",tointeger(utc_date(0,2)))) - print(startday(sel)) starttod(sel) = tostring(tointeger(utc_date(0,3)/24 * 86400)) - print(starttod(sel)) nsteps(sel) = dimsizes(tmp) latitude(sel) = datmfile->LATIXY(0,0) @@ -90,7 +79,6 @@ begin delete(tmp) delete(utc_date) -; run_startdate(sel) = localstartyear(sel)+"-"+startmonth(sel)+"-"+startday(sel) run_startdate(sel) = tostring(sprinti("%0.4i",tointeger(localstartyear(sel))))+"-"+tostring(sprinti("%0.2i",tointeger(startmonth(sel))))+"-"+tostring(sprinti("%0.2i",tointeger(startday(sel)))) f_in_dir = "/glade/work/oleson/PLUMBER2/input_files/"+sim(sel)+"/" @@ -103,7 +91,6 @@ begin pct_nat_pft = surfdatafile->PCT_NAT_PFT(:,0,0) indx = ind(pct_nat_pft(:) .gt. 0) npfts = dimsizes(indx) - print(npfts) if (npfts .gt. 2) then print((/"Number of pfts is > 2"/)) pfttype(sel,:) = -999 @@ -170,16 +157,10 @@ begin end if end if -; do ch = 0,npfts_ch-1 -; pftcth(sel,ch) = monthly_height_top(ch) -; pftcbh(sel,ch) = monthly_height_bot(ch) -; end do - end do print((/"Done with Loop"/)) -; fname = "/glade/work/oleson/PLUMBER2/NEON_PLUMBER/PLUMBER2_sites.csv" fname = "/glade/work/oleson/ctsm_PLUMBERcsv/tools/site_and_regional/PLUMBER2_sites.csv" header = (/"#pftX-cth and pftX-cbh are the site=specific canopy top and bottom heights", \ "#start_year and end_year will be used to define DATM_YR_ALIGH, DATM_YR_START and DATM_YR_END, and STOP_N in units of nyears.", \ @@ -188,7 +169,6 @@ begin ",Site,Lat,Lon,pft1,pft1-%,pft1-cth,pft1-cbh,pft2,pft2-%,pft2-cth,pft2-cbh,start_year,end_year,RUN_STARTDATE,START_TOD,ATM_NCPL"/) hlist = [/header/] alist = [/site_num, sim, latitude, longitude, pfttype(:,0), pftperc(:,0), pftcth(:,0), pftcbh(:,0), pfttype(:,1), pftperc(:,1), pftcth(:,1), pftcbh(:,1),startyear, endyear, run_startdate, starttod, atm_ncpl/] - print(alist) print((/"Done defining hlist and alist"/)) write_table(fname, "w", hlist, "%s") print((/"Done with header"/)) From 06208225b361ae07d25914d92b92e90aae84f12a Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Thu, 14 Mar 2024 09:55:55 -0600 Subject: [PATCH 20/43] History variable changed from QFLX_SUB_SNOW to QFLX_SOLIDEVAP_FROM_TOP_LAYER --- cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands index a0eb85ef37..ba3d3bb9b7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -36,5 +36,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then ./xmlchange CLM_FORCE_COLDSTART=on echo "use_lai_streams = .true." >> user_nl_clm echo "lai_mapalgo = 'nn'" >> user_nl_clm - echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC','QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE','SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT','TLAI','WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SUB_SNOW','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm + echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC','QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE','SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT','TLAI','WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SOLIDEVAP_FROM_TOP_LAYER','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm fi From 544fffc3ca17f5f6f1c6edce45ed6cda6992d5e2 Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Thu, 14 Mar 2024 10:00:16 -0600 Subject: [PATCH 21/43] Correct instances of xlmchange (should be xmlchange) --- cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands index ba3d3bb9b7..c509f72af5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -1,9 +1,9 @@ #!/bin/bash ./xmlchange CLM_USRDAT_NAME=PLUMBER2 -./xlmchange DATM_MODE=1PT +./xmlchange DATM_MODE=1PT # Set data forcing data to future scenario so will have data from 2018 to present-day ./xmlchange DATM_PRESAERO=SSP3-7.0 -./xlmchange DATM_CO2_TSERIES=SSP3-7.0 +./xmlchange DATM_CO2_TSERIES=SSP3-7.0 ./xmlchange DATM_PRESNDEP=SSP3-7.0 # Explicitly set the MPI library to mpi-serial so won't have the build/run complexity of a full MPI library From a7d26c032e751fb63b3d06118e9b2b888536b124 Mon Sep 17 00:00:00 2001 From: wwieder Date: Fri, 29 Mar 2024 11:08:19 -0600 Subject: [PATCH 22/43] updating input data file paths --- cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands | 8 ++++---- cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands | 8 ++++---- cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands | 8 ++++---- cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands | 8 ++++---- cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands | 8 ++++---- cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands | 8 ++++---- cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands | 6 +++--- cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands | 4 ++-- cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm | 4 +--- tools/site_and_regional/plumber2_usermods.py | 4 ++-- 172 files changed, 398 insertions(+), 400 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index c8149c40ba..a538f058cd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 4057faccc9..88d40403f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index c73fc9a3d4..56432acf68 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-ASM -./xmlchange PTS_LON=133.248993 -./xmlchange PTS_LAT=-22.283001 +./xmlchange PTS_LON=133.24899299999998 +./xmlchange PTS_LAT=-22.283001000000002 ./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 ./xmlchange DATM_YR_START=2011 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 1ca3a72d46..3dda10b9ef 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 5bf1fac506..83815c6cd5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index be97e3f98f..51737de584 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 3318b17118..17ed842530 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Cum ./xmlchange PTS_LON=150.722473 -./xmlchange PTS_LAT=-33.613297 +./xmlchange PTS_LAT=-33.613296999999996 ./xmlchange RUN_STARTDATE=2012-12-31 ./xmlchange DATM_YR_ALIGN=2013 ./xmlchange DATM_YR_START=2013 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2018" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index bf1005d0af..c127f295da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 0f16c04e2e..7b5971f8ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-DaS ./xmlchange PTS_LON=131.388 -./xmlchange PTS_LAT=-14.159283 +./xmlchange PTS_LAT=-14.159282999999999 ./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 ./xmlchange DATM_YR_START=2010 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 7e578480f6..088f1e08e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index c167e3cd0d..6f4709721d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 6b549dfb3e..f5af778c2d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 7cc734d989..f136ea73b3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index d9b45e17b6..08d67f0c85 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 3526398434..8dd5e3f13b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Lit -./xmlchange PTS_LON=130.794495 -./xmlchange PTS_LAT=-13.17904 +./xmlchange PTS_LON=130.79449499999998 +./xmlchange PTS_LAT=-13.179039999999999 ./xmlchange RUN_STARTDATE=2015-12-31 ./xmlchange DATM_YR_ALIGN=2016 ./xmlchange DATM_YR_START=2016 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2016" >> user_nl_clm echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 8de2f71ac4..cc37e5d7c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=AU-Otw ./xmlchange PTS_LON=142.816803 -./xmlchange PTS_LAT=-38.532341 +./xmlchange PTS_LAT=-38.532340999999995 ./xmlchange RUN_STARTDATE=2008-12-31 ./xmlchange DATM_YR_ALIGN=2009 ./xmlchange DATM_YR_START=2009 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index d45ae0caa8..0ca68f8974 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2016.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2016.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index a0d01e9cad..9798f74f76 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2014" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 86faa98575..c40544f097 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=AU-Sam -./xmlchange PTS_LON=152.877808 +./xmlchange PTS_LON=152.87780800000002 ./xmlchange PTS_LAT=-27.3881 ./xmlchange RUN_STARTDATE=2010-12-31 ./xmlchange DATM_YR_ALIGN=2011 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index b6d7b5bc0b..d3cf872947 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 09e5c055f7..1e5bec79ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index b3c826dc61..2fdf74f22a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index de23c7622d..9b0f911bde 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2015-2016.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2015-2016.nc'" >> user_nl_clm echo "model_year_align_lai=2015" >> user_nl_clm echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index b088bbe390..6cedc17140 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2016" >> user_nl_clm echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index 20e4f5f213..930e223804 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index e1722c0da5..ee1e69ad38 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 1e577cbc61..c21d421826 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=BE-Lon ./xmlchange PTS_LON=4.74613 -./xmlchange PTS_LAT=50.55159 +./xmlchange PTS_LAT=50.551590000000004 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index d44eb675d0..53f433305f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 8f00769d4c..42a1877630 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=BR-Sa3 ./xmlchange PTS_LON=-54.971436 -./xmlchange PTS_LAT=-3.018029 +./xmlchange PTS_LAT=-3.0180290000000003 ./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 ./xmlchange DATM_YR_START=2001 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 969338841c..cb39fd0bbe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2000.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2000.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index e0d7e7062a..3ade0068e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index fae7791d8a..5853371998 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index eaddfaf01e..356a4e85cd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index 7f11504753..39b43fed1e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index 9106153825..f17abef471 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 55fbccde92..8aa99c9b37 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CA-NS7 -./xmlchange PTS_LON=-99.948303 +./xmlchange PTS_LON=-99.94830300000001 ./xmlchange PTS_LAT=56.635799 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index 347d961a19..8249be354a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CA-Qcu ./xmlchange PTS_LON=-74.03653 -./xmlchange PTS_LAT=49.267078 +./xmlchange PTS_LAT=49.267078000000005 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index dc7bfb6be7..c830ed4390 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index a6179258ee..c1330be7d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CA-SF1 ./xmlchange PTS_LON=-105.817596 -./xmlchange PTS_LAT=54.485001 +./xmlchange PTS_LAT=54.485001000000004 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 17207f65d5..6269a21d83 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index ddc8913b6a..a55def664a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CA-SF3 -./xmlchange PTS_LON=-106.00531 +./xmlchange PTS_LON=-106.00531000000001 ./xmlchange PTS_LAT=54.091599 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index a20cda2ac5..e2bb2112bd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2006-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2006-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2006" >> user_nl_clm echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 9b9eaea39b..9885677dde 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index ca52eea93d..77430f0145 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index f6a74e6fdf..eeed032971 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index d5f8f38236..b39a67b961 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=CN-Cha -./xmlchange PTS_LON=128.095795 +./xmlchange PTS_LON=128.09579499999998 ./xmlchange PTS_LAT=42.4025 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 51d1556261..02170eec27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 771e29a5e4..0b96abd5f2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=CN-Dan ./xmlchange PTS_LON=91.066399 -./xmlchange PTS_LAT=30.497801 +./xmlchange PTS_LAT=30.497801000000003 ./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index eb8c77306e..b149c2421d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 71cc97c6b3..6770f99db1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 0a859ea76f..093f567ccc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index af0e7d318e..5f21de2c4f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 0b0431048c..627a107b90 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 936f3ec40c..08728c5492 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=DE-Bay ./xmlchange PTS_LON=11.86694 -./xmlchange PTS_LAT=50.141941 +./xmlchange PTS_LAT=50.141940999999996 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-1999.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-1999.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=1999" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 68c5407976..e3dae9e4b5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 4556c5c257..7c0a1c241e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Gri -./xmlchange PTS_LON=13.51253 +./xmlchange PTS_LON=13.512529999999998 ./xmlchange PTS_LAT=50.949471 ./xmlchange RUN_STARTDATE=2003-12-31 ./xmlchange DATM_YR_ALIGN=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 42a8acc018..102e20d702 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 50ce862257..31521f2709 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Kli -./xmlchange PTS_LON=13.52238 +./xmlchange PTS_LON=13.522379999999998 ./xmlchange PTS_LAT=50.893059 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index f2798eea24..87f8abb24f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index d95e72be27..c75984301b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index eb95868665..3b1df2431b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 73054e6106..e044452365 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index d43214ada0..3e21eabc93 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DE-Tha -./xmlchange PTS_LON=13.56694 +./xmlchange PTS_LON=13.566939999999999 ./xmlchange PTS_LAT=50.963612 ./xmlchange RUN_STARTDATE=1997-12-31 ./xmlchange DATM_YR_ALIGN=1998 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1998-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1998-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1998" >> user_nl_clm echo "stream_year_first_lai=1998" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index d5136aeac5..fd5c50cbd0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index d04913c8de..c5a359beb2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index 67013879b4..aca6377f36 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index caa24e62c7..260741053f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 197309bf84..4f32d8bd28 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=DK-Sor -./xmlchange PTS_LON=11.64464 +./xmlchange PTS_LON=11.644639999999999 ./xmlchange PTS_LAT=55.48587 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 26e2d690d5..9140308808 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 9dfe5f1c24..c14e60c81c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 683668d0e0..48c9ed18e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=ES-ES2 ./xmlchange PTS_LON=-0.315277 -./xmlchange PTS_LAT=39.275558 +./xmlchange PTS_LAT=39.275558000000004 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 33ad7b50fb..d25a523072 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 93be547aa5..b0c382f8f4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2007.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2007.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2007" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index e6794f48f0..ba7bc98158 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 8c488a5ae4..7cb35b48c4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 80f90227ff..a30711fbbb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FI-Kaa -./xmlchange PTS_LON=27.295031 +./xmlchange PTS_LON=27.295030999999998 ./xmlchange PTS_LAT=69.140694 ./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 1f3fd192c9..c921ed1f26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index e8b079878e..aaec211a35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 5ee361c24d..353b8bc6b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=FR-Fon -./xmlchange PTS_LON=2.78014 -./xmlchange PTS_LAT=48.476398 +./xmlchange PTS_LON=2.7801400000000003 +./xmlchange PTS_LAT=48.476397999999996 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index c5fd20e523..5d11ce9cc9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Gri -./xmlchange PTS_LON=1.95191 +./xmlchange PTS_LON=1.9519099999999998 ./xmlchange PTS_LAT=48.844219 ./xmlchange RUN_STARTDATE=2004-12-31 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index a71d105d79..19885c3fa3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Hes -./xmlchange PTS_LON=7.06556 +./xmlchange PTS_LON=7.0655600000000005 ./xmlchange PTS_LAT=48.67416 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 71eb832d6e..422024983f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-LBr -./xmlchange PTS_LON=-0.769287 +./xmlchange PTS_LON=-0.7692869999999999 ./xmlchange PTS_LAT=44.71711 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 0addcc16e5..1e56beb8dd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index c2b4559176..67b9af9d10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 98a662228a..91b4d528bc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=FR-Pue -./xmlchange PTS_LON=3.59583 +./xmlchange PTS_LON=3.5958300000000003 ./xmlchange PTS_LAT=43.74139 ./xmlchange RUN_STARTDATE=1999-12-31 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index 815b4ce3cc..cf6f8c35df 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index bfa70e78f7..aad3425acf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=HU-Bug -./xmlchange PTS_LON=19.601299 +./xmlchange PTS_LON=19.601298999999997 ./xmlchange PTS_LAT=46.691101 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 42915592ec..6215eb5908 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=ID-Pag -./xmlchange PTS_LON=114.036392 +./xmlchange PTS_LON=114.03639199999999 ./xmlchange PTS_LAT=-2.345 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index b1ef636d2d..290915db62 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=IE-Ca1 ./xmlchange PTS_LON=-6.918152 -./xmlchange PTS_LAT=52.858791 +./xmlchange PTS_LAT=52.858791000000004 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 329f98d349..34d63172a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IE-Dri -./xmlchange PTS_LON=-8.751801 +./xmlchange PTS_LON=-8.751800999999999 ./xmlchange PTS_LAT=51.986691 ./xmlchange RUN_STARTDATE=2003-01-01 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index 69d99b4d41..cb7faa8078 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index aa1166c949..79225efdd9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index cb1463aeb2..3d4a33b4be 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 9d30711426..148966a7d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 4fca2b04f7..52230b82a8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index a9d7985286..5d4ff78979 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index b2540b46fc..a867863f43 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 5a6575c33a..1577806246 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index cdd90c2471..27ac24ab4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 3d1ec720a0..6d0fa41232 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index d5bd27cafe..2568e2095f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index bc102b1248..1e5cd86a4f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Mal -./xmlchange PTS_LON=11.70334 +./xmlchange PTS_LON=11.703339999999999 ./xmlchange PTS_LAT=46.114021 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 65f5d7f095..e2cb91e3fd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 29ca9eb047..73dd6134db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=IT-Non ./xmlchange PTS_LON=11.09109 -./xmlchange PTS_LAT=44.690189 +./xmlchange PTS_LAT=44.690189000000004 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2002.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index 2c9ba27f10..63e40d9bc7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index d9147fb233..6706f2994e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Ren -./xmlchange PTS_LON=11.43369 +./xmlchange PTS_LON=11.433689999999999 ./xmlchange PTS_LAT=46.586861 ./xmlchange RUN_STARTDATE=2009-12-31 ./xmlchange DATM_YR_ALIGN=2010 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index a1a6318d81..15b4f2b76d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=IT-Ro1 -./xmlchange PTS_LON=11.93001 +./xmlchange PTS_LON=11.930010000000001 ./xmlchange PTS_LAT=42.408119 ./xmlchange RUN_STARTDATE=2001-12-31 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 6661ae3796..e279d6f24f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index f2b6680e66..671a029c5f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index 66f4a5e7df..fc2edc4db5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 82fcacc565..95bc6c7653 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=JP-SMF -./xmlchange PTS_LON=137.078796 +./xmlchange PTS_LON=137.07879599999998 ./xmlchange PTS_LAT=35.2617 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 039271ffaf..b954520249 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 435fc3bd8d..616bb95363 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2011.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2011.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 8cf8b99d06..36606ed491 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=NL-Loo -./xmlchange PTS_LON=5.74356 -./xmlchange PTS_LAT=52.16658 +./xmlchange PTS_LON=5.7435599999999996 +./xmlchange PTS_LAT=52.166579999999996 ./xmlchange RUN_STARTDATE=1996-12-31 ./xmlchange DATM_YR_ALIGN=1997 ./xmlchange DATM_YR_START=1997 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2013.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 2c2ce98a63..94d3c961e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 4fcd4e09d7..be0557eadc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 5f1b9aab9d..eb778886e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index e804bd9f36..29f1a99369 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 24f96f6548..1f8f17001d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 795cdb4d07..beb024b313 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=RU-Fyo ./xmlchange PTS_LON=32.922081 -./xmlchange PTS_LAT=56.461529 +./xmlchange PTS_LAT=56.461529000000006 ./xmlchange RUN_STARTDATE=2002-12-31 ./xmlchange DATM_YR_ALIGN=2003 ./xmlchange DATM_YR_START=2003 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index c931fbf456..869518e592 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 32340e6ae8..4186e50d7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index b891381e14..b972b1bf04 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index 707d68ce43..972392b487 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=UK-Gri -./xmlchange PTS_LON=-3.798065 +./xmlchange PTS_LON=-3.7980650000000002 ./xmlchange PTS_LAT=56.60722 ./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2001.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2001.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2001" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 1a74d5eb06..e4d329e90b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=UK-Ham -./xmlchange PTS_LON=-0.858307 -./xmlchange PTS_LAT=51.15353 +./xmlchange PTS_LON=-0.8583069999999999 +./xmlchange PTS_LAT=51.153529999999996 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 ./xmlchange DATM_YR_START=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index e790cfa4c7..3eaaf117e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=UK-PL3 -./xmlchange PTS_LON=-1.266663 +./xmlchange PTS_LON=-1.2666629999999999 ./xmlchange PTS_LAT=51.450001 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 9c76e5c1b9..0e841714e6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 93d6e8c2a2..a5f30cc7cb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2011.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2011.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index bec32053ef..1f82295556 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index bad42eeda3..80c1a7e224 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 16685885d1..1eafb511c2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Bar -./xmlchange PTS_LON=-71.288086 -./xmlchange PTS_LAT=44.06464 +./xmlchange PTS_LON=-71.28808599999999 +./xmlchange PTS_LAT=44.064640000000004 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 54fd5189ab..5d450c3f26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Bkg ./xmlchange PTS_LON=-96.836182 -./xmlchange PTS_LAT=44.345291 +./xmlchange PTS_LAT=44.345290999999996 ./xmlchange RUN_STARTDATE=2005-01-01 ./xmlchange DATM_YR_ALIGN=2005 ./xmlchange DATM_YR_START=2005 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 93efb6d9b4..c781eae3c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 4e61cc4c5e..f0939ec58d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index 6b46bf2fd8..a1501a9aed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 2def6ebc2a..6e77780236 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-FPe -./xmlchange PTS_LON=-105.101898 +./xmlchange PTS_LON=-105.10189799999999 ./xmlchange PTS_LAT=48.307701 ./xmlchange RUN_STARTDATE=2000-01-01 ./xmlchange DATM_YR_ALIGN=2000 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index 09a04652f2..fd47ccc9fb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index ba77805192..4a982dfa1a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Goo -./xmlchange PTS_LON=-89.873505 +./xmlchange PTS_LON=-89.87350500000001 ./xmlchange PTS_LAT=34.2547 ./xmlchange RUN_STARTDATE=2004-01-01 ./xmlchange DATM_YR_ALIGN=2004 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index ce6f8a7679..8897746e35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1992" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1992-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1992-2012.nc'" >> user_nl_clm echo "model_year_align_lai=1992" >> user_nl_clm echo "stream_year_first_lai=1992" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 59cd9e1331..333c2bc7c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2004.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 271246f48e..8c51eebc47 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index dbc061b349..9c2c04ffc9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 1c238f1b7e..dc236ff9ac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-MMS -./xmlchange PTS_LON=-86.413086 +./xmlchange PTS_LON=-86.41308599999999 ./xmlchange PTS_LAT=39.3232 ./xmlchange RUN_STARTDATE=1999-01-01 ./xmlchange DATM_YR_ALIGN=1999 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index 40ef4b3a77..6388a09932 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index 1972bc4b47..44385b5e3f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 0fbf988e35..aa0299dd06 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Me4 -./xmlchange PTS_LON=-121.622406 +./xmlchange PTS_LON=-121.62240600000001 ./xmlchange PTS_LAT=44.499199 ./xmlchange RUN_STARTDATE=1996-01-01 ./xmlchange DATM_YR_ALIGN=1996 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2000.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2000.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index 5771243380..fd2b6c5726 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index a39f166d31..33be94e9d5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index b8b0797102..e70585ab81 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index f3d9643377..e855f4e455 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Ne1 -./xmlchange PTS_LON=-96.476593 +./xmlchange PTS_LON=-96.47659300000001 ./xmlchange PTS_LAT=41.1651 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 7fb87723bf..420f7a336d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,6 +1,6 @@ ./xmlchange PLUMBER2SITE=US-Ne2 ./xmlchange PTS_LON=-96.470093 -./xmlchange PTS_LAT=41.164902 +./xmlchange PTS_LAT=41.164902000000005 ./xmlchange RUN_STARTDATE=2002-01-01 ./xmlchange DATM_YR_ALIGN=2002 ./xmlchange DATM_YR_START=2002 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index a5d01e3d10..9da10fa36c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 3dfc6dd712..7284f9575b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1995-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1995-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1995" >> user_nl_clm echo "stream_year_first_lai=1995" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 88c25b2553..05ffd8c8a8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index 8f59b0acf4..6af60df601 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 4943fdc3ca..684c7c7303 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 3446557c99..266017ba62 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2004.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index c814e0a4a3..b164988f24 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index f36611a1aa..9b96150a8d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 87723933ea..93435126db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 3c9923e050..a8444513d2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index 7410d9f4ed..ef4d9c143f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2014" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index f1bb9a6b0b..e0f5544c05 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 8328a8124d..f4b7984908 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index cfda272009..00839ea0f3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,5 +1,5 @@ ./xmlchange PLUMBER2SITE=US-Var -./xmlchange PTS_LON=-120.950729 +./xmlchange PTS_LON=-120.95072900000001 ./xmlchange PTS_LAT=38.4133 ./xmlchange RUN_STARTDATE=2001-01-01 ./xmlchange DATM_YR_ALIGN=2001 @@ -8,7 +8,7 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 2d843ef5bf..0b4634b8a5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 0cb83c70e2..d72b1c74ea 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index abee04fd80..79c5e43c6c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index bfca16af4b..b65d130b59 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index a8c00a01a8..44d65e8b1e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -8,7 +8,7 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='/glade/work/oleson/PLUMBER2/datm_files/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc '" >> user_nl_datm_streams +echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc '" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm index 7828027f64..7521a0827c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -19,9 +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/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc" -! For testing only, TODO, ${PLUMBER2SITE} doesn't work as implimented -fsurdat = "/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc" +fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c240326.nc ! TODO, this is only needed for transient simulations, not spinup ! this allows for large h1 data files, regardless or run length diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index 2602ba8a05..c759fa037a 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -35,7 +35,7 @@ def write_usermods(lat,lon,site,start_year,end_year, iFile.close() #TODO, move these input files do a different directory and update script - LAIstream = '/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ + LAIstream = '$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ str(start_year)+'-'+str(end_year)+'.nc' shell = os.path.join(site_dir,'shell_commands') sFile = open(shell, 'w') # or 'a' to add text instead of truncate @@ -51,7 +51,7 @@ def write_usermods(lat,lon,site,start_year,end_year, './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ '\n' \ - 'echo "CLM_USRDAT.PLUMBER2:datafiles=\'/glade/work/oleson/PLUMBER2/datm_files/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc \'" >> user_nl_datm_streams \n' \ + 'echo "CLM_USRDAT.PLUMBER2:datafiles=\'$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc \'" >> user_nl_datm_streams \n' \ 'echo "presaero.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ 'echo "presaero.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ From c261df69942e13d78f4a370448224795ad9fb6ca Mon Sep 17 00:00:00 2001 From: wwieder Date: Fri, 29 Mar 2024 14:56:54 -0600 Subject: [PATCH 23/43] remove unused line --- .../usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams | 2 -- 1 file changed, 2 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams index 7faa9dfc52..4cb9fa21fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -31,8 +31,6 @@ CLM_USRDAT.PLUMBER2:datavars = ZBOT Sa_z, \ PSRF Sa_pbot, \ FLDS Faxa_lwdn -!TODO, add $PLUMBER2SITE to this naming string + accurate years after moving files to inputdata -!CLM_USRDAT.PLUMBER2:datafiles = /glade/work/oleson/PLUMBER2/datm_files/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc CLM_USRDAT.PLUMBER2:taxmode=cycle CLM_USRDAT.PLUMBER2:dtlimit=30 From c06ce103b9df7d6eb389ca8430631d42ca117f88 Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 1 Apr 2024 09:28:39 -0600 Subject: [PATCH 24/43] close quote on fsurdat --- cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm index 7521a0827c..d9e9c08d5c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/PLUMBER2/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_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c240326.nc +fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c240326.nc" ! TODO, this is only needed for transient simulations, not spinup ! this allows for large h1 data files, regardless or run length From 394b0ba2759a68289f4c0ba7f9c70807752d9693 Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 1 Apr 2024 12:10:56 -0600 Subject: [PATCH 25/43] more usermod updates --- .../PLUMBER2/AR-SLu/shell_commands | 6 +- .../PLUMBER2/AT-Neu/shell_commands | 6 +- .../PLUMBER2/AU-ASM/shell_commands | 6 +- .../PLUMBER2/AU-Cow/shell_commands | 6 +- .../PLUMBER2/AU-Cpr/shell_commands | 6 +- .../PLUMBER2/AU-Ctr/shell_commands | 6 +- .../PLUMBER2/AU-Cum/shell_commands | 6 +- .../PLUMBER2/AU-DaP/shell_commands | 6 +- .../PLUMBER2/AU-DaS/shell_commands | 6 +- .../PLUMBER2/AU-Dry/shell_commands | 6 +- .../PLUMBER2/AU-Emr/shell_commands | 6 +- .../PLUMBER2/AU-GWW/shell_commands | 6 +- .../PLUMBER2/AU-Gin/shell_commands | 6 +- .../PLUMBER2/AU-How/shell_commands | 6 +- .../PLUMBER2/AU-Lit/shell_commands | 6 +- .../PLUMBER2/AU-Otw/shell_commands | 6 +- .../PLUMBER2/AU-Rig/shell_commands | 6 +- .../PLUMBER2/AU-Rob/shell_commands | 6 +- .../PLUMBER2/AU-Sam/shell_commands | 6 +- .../PLUMBER2/AU-Stp/shell_commands | 6 +- .../PLUMBER2/AU-TTE/shell_commands | 6 +- .../PLUMBER2/AU-Tum/shell_commands | 6 +- .../PLUMBER2/AU-Whr/shell_commands | 6 +- .../PLUMBER2/AU-Wrr/shell_commands | 6 +- .../PLUMBER2/AU-Ync/shell_commands | 6 +- .../PLUMBER2/BE-Bra/shell_commands | 6 +- .../PLUMBER2/BE-Lon/shell_commands | 6 +- .../PLUMBER2/BE-Vie/shell_commands | 6 +- .../PLUMBER2/BR-Sa3/shell_commands | 6 +- .../PLUMBER2/BW-Ma1/shell_commands | 6 +- .../PLUMBER2/CA-NS1/shell_commands | 6 +- .../PLUMBER2/CA-NS2/shell_commands | 6 +- .../PLUMBER2/CA-NS4/shell_commands | 6 +- .../PLUMBER2/CA-NS5/shell_commands | 6 +- .../PLUMBER2/CA-NS6/shell_commands | 6 +- .../PLUMBER2/CA-NS7/shell_commands | 6 +- .../PLUMBER2/CA-Qcu/shell_commands | 6 +- .../PLUMBER2/CA-Qfo/shell_commands | 6 +- .../PLUMBER2/CA-SF1/shell_commands | 6 +- .../PLUMBER2/CA-SF2/shell_commands | 6 +- .../PLUMBER2/CA-SF3/shell_commands | 6 +- .../PLUMBER2/CH-Cha/shell_commands | 6 +- .../PLUMBER2/CH-Dav/shell_commands | 6 +- .../PLUMBER2/CH-Fru/shell_commands | 6 +- .../PLUMBER2/CH-Oe1/shell_commands | 6 +- .../PLUMBER2/CN-Cha/shell_commands | 6 +- .../PLUMBER2/CN-Cng/shell_commands | 6 +- .../PLUMBER2/CN-Dan/shell_commands | 6 +- .../PLUMBER2/CN-Din/shell_commands | 6 +- .../PLUMBER2/CN-Du2/shell_commands | 6 +- .../PLUMBER2/CN-HaM/shell_commands | 6 +- .../PLUMBER2/CN-Qia/shell_commands | 6 +- .../PLUMBER2/CZ-wet/shell_commands | 6 +- .../PLUMBER2/DE-Bay/shell_commands | 6 +- .../PLUMBER2/DE-Geb/shell_commands | 6 +- .../PLUMBER2/DE-Gri/shell_commands | 6 +- .../PLUMBER2/DE-Hai/shell_commands | 6 +- .../PLUMBER2/DE-Kli/shell_commands | 6 +- .../PLUMBER2/DE-Meh/shell_commands | 6 +- .../PLUMBER2/DE-Obe/shell_commands | 6 +- .../PLUMBER2/DE-Seh/shell_commands | 6 +- .../PLUMBER2/DE-SfN/shell_commands | 6 +- .../PLUMBER2/DE-Tha/shell_commands | 6 +- .../PLUMBER2/DE-Wet/shell_commands | 6 +- .../PLUMBER2/DK-Fou/shell_commands | 6 +- .../PLUMBER2/DK-Lva/shell_commands | 6 +- .../PLUMBER2/DK-Ris/shell_commands | 6 +- .../PLUMBER2/DK-Sor/shell_commands | 6 +- .../PLUMBER2/DK-ZaH/shell_commands | 6 +- .../PLUMBER2/ES-ES1/shell_commands | 6 +- .../PLUMBER2/ES-ES2/shell_commands | 6 +- .../PLUMBER2/ES-LMa/shell_commands | 6 +- .../PLUMBER2/ES-LgS/shell_commands | 6 +- .../PLUMBER2/ES-VDA/shell_commands | 6 +- .../PLUMBER2/FI-Hyy/shell_commands | 6 +- .../PLUMBER2/FI-Kaa/shell_commands | 6 +- .../PLUMBER2/FI-Lom/shell_commands | 6 +- .../PLUMBER2/FI-Sod/shell_commands | 6 +- .../PLUMBER2/FR-Fon/shell_commands | 6 +- .../PLUMBER2/FR-Gri/shell_commands | 6 +- .../PLUMBER2/FR-Hes/shell_commands | 6 +- .../PLUMBER2/FR-LBr/shell_commands | 6 +- .../PLUMBER2/FR-Lq1/shell_commands | 6 +- .../PLUMBER2/FR-Lq2/shell_commands | 6 +- .../PLUMBER2/FR-Pue/shell_commands | 6 +- .../PLUMBER2/GF-Guy/shell_commands | 6 +- .../PLUMBER2/HU-Bug/shell_commands | 6 +- .../PLUMBER2/ID-Pag/shell_commands | 6 +- .../PLUMBER2/IE-Ca1/shell_commands | 6 +- .../PLUMBER2/IE-Dri/shell_commands | 6 +- .../PLUMBER2/IT-Amp/shell_commands | 6 +- .../PLUMBER2/IT-BCi/shell_commands | 6 +- .../PLUMBER2/IT-CA1/shell_commands | 6 +- .../PLUMBER2/IT-CA2/shell_commands | 6 +- .../PLUMBER2/IT-CA3/shell_commands | 6 +- .../PLUMBER2/IT-Col/shell_commands | 6 +- .../PLUMBER2/IT-Cpz/shell_commands | 6 +- .../PLUMBER2/IT-Isp/shell_commands | 6 +- .../PLUMBER2/IT-LMa/shell_commands | 6 +- .../PLUMBER2/IT-Lav/shell_commands | 6 +- .../PLUMBER2/IT-MBo/shell_commands | 6 +- .../PLUMBER2/IT-Mal/shell_commands | 6 +- .../PLUMBER2/IT-Noe/shell_commands | 6 +- .../PLUMBER2/IT-Non/shell_commands | 6 +- .../PLUMBER2/IT-PT1/shell_commands | 6 +- .../PLUMBER2/IT-Ren/shell_commands | 6 +- .../PLUMBER2/IT-Ro1/shell_commands | 6 +- .../PLUMBER2/IT-Ro2/shell_commands | 6 +- .../PLUMBER2/IT-SR2/shell_commands | 6 +- .../PLUMBER2/IT-SRo/shell_commands | 6 +- .../PLUMBER2/JP-SMF/shell_commands | 6 +- .../PLUMBER2/NL-Ca1/shell_commands | 6 +- .../PLUMBER2/NL-Hor/shell_commands | 6 +- .../PLUMBER2/NL-Loo/shell_commands | 6 +- .../PLUMBER2/PL-wet/shell_commands | 6 +- .../PLUMBER2/PT-Esp/shell_commands | 6 +- .../PLUMBER2/PT-Mi1/shell_commands | 6 +- .../PLUMBER2/PT-Mi2/shell_commands | 6 +- .../PLUMBER2/RU-Che/shell_commands | 6 +- .../PLUMBER2/RU-Fyo/shell_commands | 6 +- .../PLUMBER2/RU-Zot/shell_commands | 6 +- .../PLUMBER2/SD-Dem/shell_commands | 6 +- .../PLUMBER2/SE-Deg/shell_commands | 6 +- .../PLUMBER2/UK-Gri/shell_commands | 6 +- .../PLUMBER2/UK-Ham/shell_commands | 6 +- .../PLUMBER2/UK-PL3/shell_commands | 6 +- .../PLUMBER2/US-AR1/shell_commands | 6 +- .../PLUMBER2/US-AR2/shell_commands | 6 +- .../PLUMBER2/US-ARM/shell_commands | 6 +- .../PLUMBER2/US-Aud/shell_commands | 6 +- .../PLUMBER2/US-Bar/shell_commands | 6 +- .../PLUMBER2/US-Bkg/shell_commands | 6 +- .../PLUMBER2/US-Blo/shell_commands | 6 +- .../PLUMBER2/US-Bo1/shell_commands | 6 +- .../PLUMBER2/US-Cop/shell_commands | 6 +- .../PLUMBER2/US-FPe/shell_commands | 6 +- .../PLUMBER2/US-GLE/shell_commands | 6 +- .../PLUMBER2/US-Goo/shell_commands | 6 +- .../PLUMBER2/US-Ha1/shell_commands | 6 +- .../PLUMBER2/US-Ho1/shell_commands | 6 +- .../PLUMBER2/US-KS2/shell_commands | 6 +- .../PLUMBER2/US-Los/shell_commands | 6 +- .../PLUMBER2/US-MMS/shell_commands | 6 +- .../PLUMBER2/US-MOz/shell_commands | 6 +- .../PLUMBER2/US-Me2/shell_commands | 6 +- .../PLUMBER2/US-Me4/shell_commands | 6 +- .../PLUMBER2/US-Me6/shell_commands | 6 +- .../PLUMBER2/US-Myb/shell_commands | 6 +- .../PLUMBER2/US-NR1/shell_commands | 6 +- .../PLUMBER2/US-Ne1/shell_commands | 6 +- .../PLUMBER2/US-Ne2/shell_commands | 6 +- .../PLUMBER2/US-Ne3/shell_commands | 6 +- .../PLUMBER2/US-PFa/shell_commands | 6 +- .../PLUMBER2/US-Prr/shell_commands | 6 +- .../PLUMBER2/US-SP1/shell_commands | 6 +- .../PLUMBER2/US-SP2/shell_commands | 6 +- .../PLUMBER2/US-SP3/shell_commands | 6 +- .../PLUMBER2/US-SRG/shell_commands | 6 +- .../PLUMBER2/US-SRM/shell_commands | 6 +- .../PLUMBER2/US-Syv/shell_commands | 6 +- .../PLUMBER2/US-Ton/shell_commands | 6 +- .../PLUMBER2/US-Tw4/shell_commands | 6 +- .../PLUMBER2/US-Twt/shell_commands | 6 +- .../PLUMBER2/US-UMB/shell_commands | 6 +- .../PLUMBER2/US-Var/shell_commands | 6 +- .../PLUMBER2/US-WCr/shell_commands | 6 +- .../PLUMBER2/US-Whs/shell_commands | 6 +- .../PLUMBER2/US-Wkg/shell_commands | 6 +- .../PLUMBER2/ZA-Kru/shell_commands | 6 +- .../PLUMBER2/ZM-Mon/shell_commands | 6 +- .../plumber2_surf_wrapper.py | 5 - .../site_and_regional/plumber2_usermods.ipynb | 344 ------------------ tools/site_and_regional/plumber2_usermods.py | 13 +- 173 files changed, 518 insertions(+), 864 deletions(-) delete mode 100644 tools/site_and_regional/plumber2_usermods.ipynb diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index a538f058cd..e0fbe3006e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AR-SLu ./xmlchange PTS_LON=-66.459808 ./xmlchange PTS_LAT=-33.464802 ./xmlchange RUN_STARTDATE=2010-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AR-SLu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AR-SLu/CLM1PT_data/CTSM_DATM_AR-SLu_2010-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 88d40403f8..1351451831 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AT-Neu ./xmlchange PTS_LON=11.3175 ./xmlchange PTS_LAT=47.116669 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AT-Neu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 56432acf68..15d2cf8977 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-ASM ./xmlchange PTS_LON=133.24899299999998 ./xmlchange PTS_LAT=-22.283001000000002 ./xmlchange RUN_STARTDATE=2010-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-ASM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 3dda10b9ef..9a0011d275 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Cow ./xmlchange PTS_LON=145.427155 ./xmlchange PTS_LAT=-16.23819 ./xmlchange RUN_STARTDATE=2009-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cow_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 83815c6cd5..2dde9a13b8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Cpr ./xmlchange PTS_LON=140.589127 ./xmlchange PTS_LAT=-34.00206 ./xmlchange RUN_STARTDATE=2010-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cpr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 51737de584..0ad5fa18a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Ctr ./xmlchange PTS_LON=145.446854 ./xmlchange PTS_LAT=-16.103279 ./xmlchange RUN_STARTDATE=2009-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ctr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 17ed842530..7f2efca67b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Cum ./xmlchange PTS_LON=150.722473 ./xmlchange PTS_LAT=-33.613296999999996 ./xmlchange RUN_STARTDATE=2012-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2018" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index c127f295da..98f5c8ba66 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-DaP ./xmlchange PTS_LON=131.3181 ./xmlchange PTS_LAT=-14.0633 ./xmlchange RUN_STARTDATE=2008-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaP_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 7b5971f8ca..18a66d0c6f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-DaS ./xmlchange PTS_LON=131.388 ./xmlchange PTS_LAT=-14.159282999999999 ./xmlchange RUN_STARTDATE=2009-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 088f1e08e5..5ca6da10e7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Dry ./xmlchange PTS_LON=132.370605 ./xmlchange PTS_LAT=-15.2588 ./xmlchange RUN_STARTDATE=2010-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Dry_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 6f4709721d..f52d8c683d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Emr ./xmlchange PTS_LON=148.474594 ./xmlchange PTS_LAT=-23.8587 ./xmlchange RUN_STARTDATE=2011-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Emr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index f5af778c2d..7eb27e4147 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-GWW ./xmlchange PTS_LON=120.654099 ./xmlchange PTS_LAT=-30.191299 ./xmlchange RUN_STARTDATE=2012-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-GWW_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index f136ea73b3..07e7774cf3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Gin ./xmlchange PTS_LON=115.650002 ./xmlchange PTS_LAT=-31.375 ./xmlchange RUN_STARTDATE=2011-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Gin_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 08d67f0c85..178a7d3581 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-How ./xmlchange PTS_LON=131.149994 ./xmlchange PTS_LAT=-12.4952 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-How_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 8dd5e3f13b..bb284fb315 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Lit ./xmlchange PTS_LON=130.79449499999998 ./xmlchange PTS_LAT=-13.179039999999999 ./xmlchange RUN_STARTDATE=2015-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Lit_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc" >> user_nl_clm echo "model_year_align_lai=2016" >> user_nl_clm echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index cc37e5d7c0..95b8044f12 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Otw ./xmlchange PTS_LON=142.816803 ./xmlchange PTS_LAT=-38.532340999999995 ./xmlchange RUN_STARTDATE=2008-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Otw_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.nc" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index 0ca68f8974..4b800758f2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Rig ./xmlchange PTS_LON=145.575897 ./xmlchange PTS_LAT=-36.649899 ./xmlchange RUN_STARTDATE=2010-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rig_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2016.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2016.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 9798f74f76..0f2e14a2da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Rob ./xmlchange PTS_LON=145.630096 ./xmlchange PTS_LAT=-17.1175 ./xmlchange RUN_STARTDATE=2013-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rob_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2017.nc" >> user_nl_clm echo "model_year_align_lai=2014" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index c40544f097..0839b80fdb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Sam ./xmlchange PTS_LON=152.87780800000002 ./xmlchange PTS_LAT=-27.3881 ./xmlchange RUN_STARTDATE=2010-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Sam_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index d3cf872947..710710b06f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Stp ./xmlchange PTS_LON=133.350204 ./xmlchange PTS_LAT=-17.1507 ./xmlchange RUN_STARTDATE=2009-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Stp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 1e5bec79ab..7e646bac5d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-TTE ./xmlchange PTS_LON=133.639999 ./xmlchange PTS_LAT=-22.287001 ./xmlchange RUN_STARTDATE=2012-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-TTE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 2fdf74f22a..1c97c31d13 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Tum ./xmlchange PTS_LON=148.151703 ./xmlchange PTS_LAT=-35.656601 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Tum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2017.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 9b0f911bde..7544645aee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Whr ./xmlchange PTS_LON=145.029404 ./xmlchange PTS_LAT=-36.673199 ./xmlchange RUN_STARTDATE=2014-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Whr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2015-2016.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2015-2016.nc" >> user_nl_clm echo "model_year_align_lai=2015" >> user_nl_clm echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 6cedc17140..8c352f8f59 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Wrr ./xmlchange PTS_LON=146.654495 ./xmlchange PTS_LAT=-43.09502 ./xmlchange RUN_STARTDATE=2015-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Wrr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc" >> user_nl_clm echo "model_year_align_lai=2016" >> user_nl_clm echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index 930e223804..c12b54196f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=AU-Ync ./xmlchange PTS_LON=146.290695 ./xmlchange PTS_LAT=-34.9893 ./xmlchange RUN_STARTDATE=2010-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ync_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index ee1e69ad38..0c03eb5bbb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=BE-Bra ./xmlchange PTS_LON=4.52056 ./xmlchange PTS_LAT=51.309166 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Bra_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index c21d421826..caa71df25f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=BE-Lon ./xmlchange PTS_LON=4.74613 ./xmlchange PTS_LAT=50.551590000000004 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Lon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 53f433305f..d071f9458a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=BE-Vie ./xmlchange PTS_LON=5.99805 ./xmlchange PTS_LAT=50.305069 ./xmlchange RUN_STARTDATE=1996-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Vie_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 42a1877630..0deef21292 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=BR-Sa3 ./xmlchange PTS_LON=-54.971436 ./xmlchange PTS_LAT=-3.0180290000000003 ./xmlchange RUN_STARTDATE=2001-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BR-Sa3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BR-Sa3/CLM1PT_data/CTSM_DATM_BR-Sa3_2001-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2003.nc" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index cb39fd0bbe..9494793cc1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=BW-Ma1 ./xmlchange PTS_LON=23.560329 ./xmlchange PTS_LAT=-19.9165 ./xmlchange RUN_STARTDATE=1999-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BW-Ma1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2000.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2000.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 3ade0068e5..6a65ea1ef5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-NS1 ./xmlchange PTS_LON=-98.483887 ./xmlchange PTS_LAT=55.8792 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS1/CLM1PT_data/CTSM_DATM_CA-NS1_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index 5853371998..c303db50ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-NS2 ./xmlchange PTS_LON=-98.524689 ./xmlchange PTS_LAT=55.9058 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS2/CLM1PT_data/CTSM_DATM_CA-NS2_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index 356a4e85cd..a14dc72425 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-NS4 ./xmlchange PTS_LON=-98.380615 ./xmlchange PTS_LAT=55.914398 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS4/CLM1PT_data/CTSM_DATM_CA-NS4_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index 39b43fed1e..59497267e7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-NS5 ./xmlchange PTS_LON=-98.484985 ./xmlchange PTS_LAT=55.863098 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS5_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS5/CLM1PT_data/CTSM_DATM_CA-NS5_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index f17abef471..d1d0c25bbf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-NS6 ./xmlchange PTS_LON=-98.964417 ./xmlchange PTS_LAT=55.916698 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS6_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS6/CLM1PT_data/CTSM_DATM_CA-NS6_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 8aa99c9b37..fe08e895e8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-NS7 ./xmlchange PTS_LON=-99.94830300000001 ./xmlchange PTS_LAT=56.635799 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-NS7_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-NS7/CLM1PT_data/CTSM_DATM_CA-NS7_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index 8249be354a..e325fb0b25 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-Qcu ./xmlchange PTS_LON=-74.03653 ./xmlchange PTS_LAT=49.267078000000005 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-Qcu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qcu/CLM1PT_data/CTSM_DATM_CA-Qcu_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index c830ed4390..a0097e3fad 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-Qfo ./xmlchange PTS_LON=-74.342102 ./xmlchange PTS_LAT=49.692501 ./xmlchange RUN_STARTDATE=2004-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-Qfo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-Qfo/CLM1PT_data/CTSM_DATM_CA-Qfo_2004-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2010.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index c1330be7d4..9c2d58b88d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-SF1 ./xmlchange PTS_LON=-105.817596 ./xmlchange PTS_LAT=54.485001000000004 ./xmlchange RUN_STARTDATE=2004-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF1/CLM1PT_data/CTSM_DATM_CA-SF1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 6269a21d83..8e5f442715 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-SF2 ./xmlchange PTS_LON=-105.877502 ./xmlchange PTS_LAT=54.253899 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF2/CLM1PT_data/CTSM_DATM_CA-SF2_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index a55def664a..b5cc0e3ec2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CA-SF3 ./xmlchange PTS_LON=-106.00531000000001 ./xmlchange PTS_LAT=54.091599 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CA-SF3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CA-SF3/CLM1PT_data/CTSM_DATM_CA-SF3_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index e2bb2112bd..5def12473d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CH-Cha ./xmlchange PTS_LON=8.41044 ./xmlchange PTS_LAT=47.21022 ./xmlchange RUN_STARTDATE=2005-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2006-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2006-2014.nc" >> user_nl_clm echo "model_year_align_lai=2006" >> user_nl_clm echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 9885677dde..7e82f826da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CH-Dav ./xmlchange PTS_LON=9.85592 ./xmlchange PTS_LAT=46.815334 ./xmlchange RUN_STARTDATE=1996-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Dav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 77430f0145..22db85b06f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CH-Fru ./xmlchange PTS_LON=8.53778 ./xmlchange PTS_LAT=47.115833 ./xmlchange RUN_STARTDATE=2006-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Fru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index eeed032971..3f5390a210 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CH-Oe1 ./xmlchange PTS_LON=7.73194 ./xmlchange PTS_LAT=47.285831 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Oe1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index b39a67b961..973914aaef 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CN-Cha ./xmlchange PTS_LON=128.09579499999998 ./xmlchange PTS_LAT=42.4025 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 02170eec27..183a9f3e53 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CN-Cng ./xmlchange PTS_LON=123.509201 ./xmlchange PTS_LAT=44.593399 ./xmlchange RUN_STARTDATE=2007-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cng_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2009.nc" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 0b96abd5f2..b5fc93cd3c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CN-Dan ./xmlchange PTS_LON=91.066399 ./xmlchange PTS_LAT=30.497801000000003 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Dan_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index b149c2421d..0e64dd70b9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CN-Din ./xmlchange PTS_LON=112.536102 ./xmlchange PTS_LAT=23.1733 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Din_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 6770f99db1..96083e71ad 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CN-Du2 ./xmlchange PTS_LON=116.2836 ./xmlchange PTS_LAT=42.0467 ./xmlchange RUN_STARTDATE=2006-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Du2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2008.nc" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 093f567ccc..050f973117 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CN-HaM ./xmlchange PTS_LON=101.18 ./xmlchange PTS_LAT=37.369999 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-HaM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index 5f21de2c4f..e753be949d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CN-Qia ./xmlchange PTS_LON=115.058098 ./xmlchange PTS_LAT=26.7414 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Qia_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 627a107b90..4c36bdc84c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=CZ-wet ./xmlchange PTS_LON=14.77035 ./xmlchange PTS_LAT=49.024651 ./xmlchange RUN_STARTDATE=2006-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CZ-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 08728c5492..d543bd9b90 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Bay ./xmlchange PTS_LON=11.86694 ./xmlchange PTS_LAT=50.141940999999996 ./xmlchange RUN_STARTDATE=1996-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Bay_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-1999.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-1999.nc" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=1999" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index e3dae9e4b5..1c03e1c107 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Geb ./xmlchange PTS_LON=10.9143 ./xmlchange PTS_LAT=51.100101 ./xmlchange RUN_STARTDATE=2000-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Geb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 7c0a1c241e..bb90bceb68 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Gri ./xmlchange PTS_LON=13.512529999999998 ./xmlchange PTS_LAT=50.949471 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 102e20d702..c0df3d46cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Hai ./xmlchange PTS_LON=10.453 ./xmlchange PTS_LAT=51.079166 ./xmlchange RUN_STARTDATE=1999-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Hai_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2012.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 31521f2709..0141e3c808 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Kli ./xmlchange PTS_LON=13.522379999999998 ./xmlchange PTS_LAT=50.893059 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Kli_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 87f8abb24f..9b34aff782 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Meh ./xmlchange PTS_LON=10.65547 ./xmlchange PTS_LAT=51.275311 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Meh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index c75984301b..ccceb5e532 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Obe ./xmlchange PTS_LON=13.72129 ./xmlchange PTS_LAT=50.786659 ./xmlchange RUN_STARTDATE=2007-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Obe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 3b1df2431b..e314864954 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Seh ./xmlchange PTS_LON=6.44965 ./xmlchange PTS_LAT=50.870625 ./xmlchange RUN_STARTDATE=2007-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Seh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2010.nc" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index e044452365..8241a6dde1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-SfN ./xmlchange PTS_LON=11.3275 ./xmlchange PTS_LAT=47.806389 ./xmlchange RUN_STARTDATE=2012-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-SfN_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index 3e21eabc93..e788f2ce89 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Tha ./xmlchange PTS_LON=13.566939999999999 ./xmlchange PTS_LAT=50.963612 ./xmlchange RUN_STARTDATE=1997-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Tha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1998-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1998-2014.nc" >> user_nl_clm echo "model_year_align_lai=1998" >> user_nl_clm echo "stream_year_first_lai=1998" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index fd5c50cbd0..82d21eabb3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DE-Wet ./xmlchange PTS_LON=11.45753 ./xmlchange PTS_LAT=50.453499 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index c5a359beb2..7217dd6ea7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DK-Fou ./xmlchange PTS_LON=9.58722 ./xmlchange PTS_LAT=56.4842 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Fou_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index aca6377f36..c6527aa706 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DK-Lva ./xmlchange PTS_LON=12.0833 ./xmlchange PTS_LAT=55.6833 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Lva_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index 260741053f..9b5e5b0fd0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DK-Ris ./xmlchange PTS_LON=12.09722 ./xmlchange PTS_LAT=55.530281 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Ris_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 4f32d8bd28..7ea614b787 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DK-Sor ./xmlchange PTS_LON=11.644639999999999 ./xmlchange PTS_LAT=55.48587 ./xmlchange RUN_STARTDATE=1996-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Sor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 9140308808..c9ced51710 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=DK-ZaH ./xmlchange PTS_LON=-20.550293 ./xmlchange PTS_LAT=74.473282 ./xmlchange RUN_STARTDATE=2000-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-ZaH_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-ZaH/CLM1PT_data/CTSM_DATM_DK-ZaH_2000-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2013.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index c14e60c81c..82367ead77 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=ES-ES1 ./xmlchange PTS_LON=-0.318817 ./xmlchange PTS_LAT=39.34597 ./xmlchange RUN_STARTDATE=1998-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 48c9ed18e3..225cd25c98 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=ES-ES2 ./xmlchange PTS_LON=-0.315277 ./xmlchange PTS_LAT=39.275558000000004 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index d25a523072..51845e00cb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=ES-LMa ./xmlchange PTS_LON=-5.773346 ./xmlchange PTS_LAT=39.941502 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index b0c382f8f4..743a68d77d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=ES-LgS ./xmlchange PTS_LON=-2.96582 ./xmlchange PTS_LAT=37.097935 ./xmlchange RUN_STARTDATE=2006-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LgS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2007.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2007.nc" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2007" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index ba7bc98158..3870f8163e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=ES-VDA ./xmlchange PTS_LON=1.4485 ./xmlchange PTS_LAT=42.15218 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-VDA_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 7cb35b48c4..28dce0b519 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FI-Hyy ./xmlchange PTS_LON=24.295 ./xmlchange PTS_LAT=61.8475 ./xmlchange RUN_STARTDATE=1995-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Hyy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2014.nc" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index a30711fbbb..7d8b39a66e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FI-Kaa ./xmlchange PTS_LON=27.295030999999998 ./xmlchange PTS_LAT=69.140694 ./xmlchange RUN_STARTDATE=1999-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Kaa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index c921ed1f26..e80dfee283 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FI-Lom ./xmlchange PTS_LON=24.209181 ./xmlchange PTS_LAT=67.9972 ./xmlchange RUN_STARTDATE=2006-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Lom_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2009.nc" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index aaec211a35..3bf1f43cc5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FI-Sod ./xmlchange PTS_LON=26.637831 ./xmlchange PTS_LAT=67.361862 ./xmlchange RUN_STARTDATE=2007-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Sod_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 353b8bc6b2..6c7646e661 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FR-Fon ./xmlchange PTS_LON=2.7801400000000003 ./xmlchange PTS_LAT=48.476397999999996 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Fon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index 5d11ce9cc9..53281682c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FR-Gri ./xmlchange PTS_LON=1.9519099999999998 ./xmlchange PTS_LAT=48.844219 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index 19885c3fa3..ed218f4c4d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FR-Hes ./xmlchange PTS_LON=7.0655600000000005 ./xmlchange PTS_LAT=48.67416 ./xmlchange RUN_STARTDATE=1996-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Hes_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 422024983f..c2330472bb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FR-LBr ./xmlchange PTS_LON=-0.7692869999999999 ./xmlchange PTS_LAT=44.71711 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-LBr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2008.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 1e56beb8dd..b11e475863 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FR-Lq1 ./xmlchange PTS_LON=2.73583 ./xmlchange PTS_LAT=45.643059 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 67b9af9d10..1bf8fd0208 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FR-Lq2 ./xmlchange PTS_LON=2.73703 ./xmlchange PTS_LAT=45.639191 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 91b4d528bc..870562ba02 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=FR-Pue ./xmlchange PTS_LON=3.5958300000000003 ./xmlchange PTS_LAT=43.74139 ./xmlchange RUN_STARTDATE=1999-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Pue_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index cf6f8c35df..4a33b0b220 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=GF-Guy ./xmlchange PTS_LON=-52.924866 ./xmlchange PTS_LAT=5.278772 ./xmlchange RUN_STARTDATE=2004-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_GF-Guy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/GF-Guy/CLM1PT_data/CTSM_DATM_GF-Guy_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index aad3425acf..c32a6f302a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=HU-Bug ./xmlchange PTS_LON=19.601298999999997 ./xmlchange PTS_LAT=46.691101 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_HU-Bug_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 6215eb5908..b2b8131fbc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=ID-Pag ./xmlchange PTS_LON=114.03639199999999 ./xmlchange PTS_LAT=-2.345 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ID-Pag_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 290915db62..a35c164eb0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IE-Ca1 ./xmlchange PTS_LON=-6.918152 ./xmlchange PTS_LAT=52.858791000000004 ./xmlchange RUN_STARTDATE=2004-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IE-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Ca1/CLM1PT_data/CTSM_DATM_IE-Ca1_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 34d63172a2..f5c9867618 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IE-Dri ./xmlchange PTS_LON=-8.751800999999999 ./xmlchange PTS_LAT=51.986691 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IE-Dri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IE-Dri/CLM1PT_data/CTSM_DATM_IE-Dri_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index cb7faa8078..d3741fc74e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Amp ./xmlchange PTS_LON=13.60516 ./xmlchange PTS_LAT=41.904099 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Amp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index 79225efdd9..e13bdb70b6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-BCi ./xmlchange PTS_LON=14.95744 ./xmlchange PTS_LAT=40.5238 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-BCi_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2010.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2010.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 3d4a33b4be..39d6c6ab39 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-CA1 ./xmlchange PTS_LON=12.02656 ./xmlchange PTS_LAT=42.380409 ./xmlchange RUN_STARTDATE=2011-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 148966a7d7..f57fbd6c6f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-CA2 ./xmlchange PTS_LON=12.02604 ./xmlchange PTS_LAT=42.37722 ./xmlchange RUN_STARTDATE=2011-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 52230b82a8..757643c73c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-CA3 ./xmlchange PTS_LON=12.0222 ./xmlchange PTS_LAT=42.380001 ./xmlchange RUN_STARTDATE=2011-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index 5d4ff78979..4795f051cc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Col ./xmlchange PTS_LON=13.58814 ./xmlchange PTS_LAT=41.849361 ./xmlchange RUN_STARTDATE=2006-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Col_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index a867863f43..13f1dd4908 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Cpz ./xmlchange PTS_LON=12.37611 ./xmlchange PTS_LAT=41.70525 ./xmlchange RUN_STARTDATE=2000-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Cpz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2008.nc" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 1577806246..2f2ab608d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Isp ./xmlchange PTS_LON=8.63358 ./xmlchange PTS_LAT=45.812641 ./xmlchange RUN_STARTDATE=2012-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Isp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index 27ac24ab4a..b9726c1f43 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-LMa ./xmlchange PTS_LON=7.58259 ./xmlchange PTS_LAT=45.15258 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 6d0fa41232..1d0ea94816 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Lav ./xmlchange PTS_LON=11.28132 ./xmlchange PTS_LAT=45.9562 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Lav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 2568e2095f..b5673ac746 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-MBo ./xmlchange PTS_LON=11.04583 ./xmlchange PTS_LAT=46.014679 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-MBo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 1e5cd86a4f..b5c9481cf0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Mal ./xmlchange PTS_LON=11.703339999999999 ./xmlchange PTS_LAT=46.114021 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Mal_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index e2cb91e3fd..3a9c16d5b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Noe ./xmlchange PTS_LON=8.15117 ./xmlchange PTS_LAT=40.606178 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Noe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 73dd6134db..2cef11e176 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Non ./xmlchange PTS_LON=11.09109 ./xmlchange PTS_LAT=44.690189000000004 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Non_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2002.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index 63e40d9bc7..cb60ceba3a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-PT1 ./xmlchange PTS_LON=9.06104 ./xmlchange PTS_LAT=45.200871 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-PT1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 6706f2994e..7dae634dca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Ren ./xmlchange PTS_LON=11.433689999999999 ./xmlchange PTS_LAT=46.586861 ./xmlchange RUN_STARTDATE=2009-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ren_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2013.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index 15b4f2b76d..dce7e660bc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Ro1 ./xmlchange PTS_LON=11.930010000000001 ./xmlchange PTS_LAT=42.408119 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index e279d6f24f..ab6f7f6bdd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-Ro2 ./xmlchange PTS_LON=11.92093 ./xmlchange PTS_LAT=42.390259 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 671a029c5f..00143864d8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-SR2 ./xmlchange PTS_LON=10.29095 ./xmlchange PTS_LAT=43.732029 ./xmlchange RUN_STARTDATE=2012-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index fc2edc4db5..cea54a23f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=IT-SRo ./xmlchange PTS_LON=10.28444 ./xmlchange PTS_LAT=43.727859 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SRo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 95bc6c7653..9197414be2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=JP-SMF ./xmlchange PTS_LON=137.07879599999998 ./xmlchange PTS_LAT=35.2617 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_JP-SMF_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index b954520249..b4f552a454 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=NL-Ca1 ./xmlchange PTS_LON=4.927 ./xmlchange PTS_LAT=51.971001 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 616bb95363..82c9e8d185 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=NL-Hor ./xmlchange PTS_LON=5.0713 ./xmlchange PTS_LAT=52.240349 ./xmlchange RUN_STARTDATE=2007-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Hor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2011.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2011.nc" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 36606ed491..e2f0c56b70 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=NL-Loo ./xmlchange PTS_LON=5.7435599999999996 ./xmlchange PTS_LAT=52.166579999999996 ./xmlchange RUN_STARTDATE=1996-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Loo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2013.nc" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 94d3c961e5..b63949ac6b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=PL-wet ./xmlchange PTS_LON=16.309401 ./xmlchange PTS_LAT=52.762199 ./xmlchange RUN_STARTDATE=2003-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PL-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index be0557eadc..6d4c5bcf54 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=PT-Esp ./xmlchange PTS_LON=-8.601807 ./xmlchange PTS_LAT=38.6394 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Esp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Esp/CLM1PT_data/CTSM_DATM_PT-Esp_2002-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index eb778886e5..53a2ac0ae3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=PT-Mi1 ./xmlchange PTS_LON=-8.000061 ./xmlchange PTS_LAT=38.540642 ./xmlchange RUN_STARTDATE=2005-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Mi1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi1/CLM1PT_data/CTSM_DATM_PT-Mi1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index 29f1a99369..8321e77007 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=PT-Mi2 ./xmlchange PTS_LON=-8.024536 ./xmlchange PTS_LAT=38.476501 ./xmlchange RUN_STARTDATE=2005-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PT-Mi2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PT-Mi2/CLM1PT_data/CTSM_DATM_PT-Mi2_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 1f8f17001d..44f1533f63 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=RU-Che ./xmlchange PTS_LON=161.341431 ./xmlchange PTS_LAT=68.613037 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Che_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index beb024b313..7a22685bee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=RU-Fyo ./xmlchange PTS_LON=32.922081 ./xmlchange PTS_LAT=56.461529000000006 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Fyo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2014.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index 869518e592..e0b964be3a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=RU-Zot ./xmlchange PTS_LON=89.3508 ./xmlchange PTS_LAT=60.8008 ./xmlchange RUN_STARTDATE=2002-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Zot_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 4186e50d7d..d95b94ec2d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=SD-Dem ./xmlchange PTS_LON=30.4783 ./xmlchange PTS_LAT=13.2829 ./xmlchange RUN_STARTDATE=2004-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SD-Dem_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2009.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2009.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index b972b1bf04..f1e4964429 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=SE-Deg ./xmlchange PTS_LON=19.55669 ./xmlchange PTS_LAT=64.181969 ./xmlchange RUN_STARTDATE=2001-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SE-Deg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2005.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index 972392b487..c29a583334 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=UK-Gri ./xmlchange PTS_LON=-3.7980650000000002 ./xmlchange PTS_LAT=56.60722 ./xmlchange RUN_STARTDATE=2000-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Gri/CLM1PT_data/CTSM_DATM_UK-Gri_2000-2001.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2001.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2001.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2001" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index e4d329e90b..114ded1067 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=UK-Ham ./xmlchange PTS_LON=-0.8583069999999999 ./xmlchange PTS_LAT=51.153529999999996 ./xmlchange RUN_STARTDATE=2004-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-Ham_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-Ham/CLM1PT_data/CTSM_DATM_UK-Ham_2004-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index 3eaaf117e0..f464283f9f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=UK-PL3 ./xmlchange PTS_LON=-1.2666629999999999 ./xmlchange PTS_LAT=51.450001 ./xmlchange RUN_STARTDATE=2005-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_UK-PL3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/UK-PL3/CLM1PT_data/CTSM_DATM_UK-PL3_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 0e841714e6..4dacfded3a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-AR1 ./xmlchange PTS_LON=-99.419983 ./xmlchange PTS_LAT=36.426701 ./xmlchange RUN_STARTDATE=2010-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-AR1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR1/CLM1PT_data/CTSM_DATM_US-AR1_2010-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2012.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index a5f30cc7cb..82ac9cfcb4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-AR2 ./xmlchange PTS_LON=-99.597504 ./xmlchange PTS_LAT=36.635799 ./xmlchange RUN_STARTDATE=2010-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-AR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-AR2/CLM1PT_data/CTSM_DATM_US-AR2_2010-2011.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2011.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2011.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index 1f82295556..a3e8b65dee 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-ARM ./xmlchange PTS_LON=-97.4888 ./xmlchange PTS_LAT=36.605801 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-ARM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-ARM/CLM1PT_data/CTSM_DATM_US-ARM_2003-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 80c1a7e224..94d9dd6c6a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Aud ./xmlchange PTS_LON=-110.509201 ./xmlchange PTS_LAT=31.5907 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Aud_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Aud/CLM1PT_data/CTSM_DATM_US-Aud_2003-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 1eafb511c2..1b5e9e3a2b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Bar ./xmlchange PTS_LON=-71.28808599999999 ./xmlchange PTS_LAT=44.064640000000004 ./xmlchange RUN_STARTDATE=2005-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bar_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bar/CLM1PT_data/CTSM_DATM_US-Bar_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 5d450c3f26..f218d3294e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Bkg ./xmlchange PTS_LON=-96.836182 ./xmlchange PTS_LAT=44.345290999999996 ./xmlchange RUN_STARTDATE=2005-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bkg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bkg/CLM1PT_data/CTSM_DATM_US-Bkg_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index c781eae3c3..fcbfa62899 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Blo ./xmlchange PTS_LON=-120.632751 ./xmlchange PTS_LAT=38.895302 ./xmlchange RUN_STARTDATE=2000-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Blo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Blo/CLM1PT_data/CTSM_DATM_US-Blo_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index f0939ec58d..273201827b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Bo1 ./xmlchange PTS_LON=-88.290405 ./xmlchange PTS_LAT=40.006199 ./xmlchange RUN_STARTDATE=1997-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Bo1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Bo1/CLM1PT_data/CTSM_DATM_US-Bo1_1997-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index a1501a9aed..b291dfe747 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Cop ./xmlchange PTS_LON=-109.389999 ./xmlchange PTS_LAT=38.09 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Cop_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Cop/CLM1PT_data/CTSM_DATM_US-Cop_2002-2003.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 6e77780236..992c245dca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-FPe ./xmlchange PTS_LON=-105.10189799999999 ./xmlchange PTS_LAT=48.307701 ./xmlchange RUN_STARTDATE=2000-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-FPe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-FPe/CLM1PT_data/CTSM_DATM_US-FPe_2000-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index fd47ccc9fb..b92a353c95 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-GLE ./xmlchange PTS_LON=-106.239899 ./xmlchange PTS_LAT=41.366501 ./xmlchange RUN_STARTDATE=2009-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-GLE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-GLE/CLM1PT_data/CTSM_DATM_US-GLE_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index 4a982dfa1a..b564a7ea7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Goo ./xmlchange PTS_LON=-89.87350500000001 ./xmlchange PTS_LAT=34.2547 ./xmlchange RUN_STARTDATE=2004-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Goo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Goo/CLM1PT_data/CTSM_DATM_US-Goo_2004-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 8897746e35..1f52f4cb8f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Ha1 ./xmlchange PTS_LON=-72.171509 ./xmlchange PTS_LAT=42.5378 ./xmlchange RUN_STARTDATE=1992-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ha1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ha1/CLM1PT_data/CTSM_DATM_US-Ha1_1992-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1992" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1992" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1992-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1992-2012.nc" >> user_nl_clm echo "model_year_align_lai=1992" >> user_nl_clm echo "stream_year_first_lai=1992" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 333c2bc7c9..5fe2f89f12 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Ho1 ./xmlchange PTS_LON=-68.740204 ./xmlchange PTS_LAT=45.204102 ./xmlchange RUN_STARTDATE=1996-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ho1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ho1/CLM1PT_data/CTSM_DATM_US-Ho1_1996-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2004.nc" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 8c51eebc47..eca15a31c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-KS2 ./xmlchange PTS_LON=-80.671539 ./xmlchange PTS_LAT=28.608578 ./xmlchange RUN_STARTDATE=2003-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-KS2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-KS2/CLM1PT_data/CTSM_DATM_US-KS2_2003-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index 9c2c04ffc9..e93d7a8ae2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Los ./xmlchange PTS_LON=-89.979187 ./xmlchange PTS_LAT=46.082699 ./xmlchange RUN_STARTDATE=2000-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Los_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Los/CLM1PT_data/CTSM_DATM_US-Los_2000-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2008.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index dc236ff9ac..31c1494070 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-MMS ./xmlchange PTS_LON=-86.41308599999999 ./xmlchange PTS_LAT=39.3232 ./xmlchange RUN_STARTDATE=1999-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-MMS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MMS/CLM1PT_data/CTSM_DATM_US-MMS_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index 6388a09932..bc9cb7a4ce 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-MOz ./xmlchange PTS_LON=-92.200012 ./xmlchange PTS_LAT=38.74411 ./xmlchange RUN_STARTDATE=2005-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-MOz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-MOz/CLM1PT_data/CTSM_DATM_US-MOz_2005-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index 44385b5e3f..ac202382d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Me2 ./xmlchange PTS_LON=-121.557404 ./xmlchange PTS_LAT=44.452301 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me2/CLM1PT_data/CTSM_DATM_US-Me2_2002-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2014.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index aa0299dd06..baeb89630a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Me4 ./xmlchange PTS_LON=-121.62240600000001 ./xmlchange PTS_LAT=44.499199 ./xmlchange RUN_STARTDATE=1996-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me4/CLM1PT_data/CTSM_DATM_US-Me4_1996-2000.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2000.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2000.nc" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index fd2b6c5726..f87447e19c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Me6 ./xmlchange PTS_LON=-121.607803 ./xmlchange PTS_LAT=44.323299 ./xmlchange RUN_STARTDATE=2011-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Me6_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Me6/CLM1PT_data/CTSM_DATM_US-Me6_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 33be94e9d5..193b6c3322 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Myb ./xmlchange PTS_LON=-121.765106 ./xmlchange PTS_LAT=38.049801 ./xmlchange RUN_STARTDATE=2011-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Myb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Myb/CLM1PT_data/CTSM_DATM_US-Myb_2011-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index e70585ab81..f214bc092a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-NR1 ./xmlchange PTS_LON=-105.546402 ./xmlchange PTS_LAT=40.032902 ./xmlchange RUN_STARTDATE=1999-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-NR1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-NR1/CLM1PT_data/CTSM_DATM_US-NR1_1999-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index e855f4e455..7667a44750 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Ne1 ./xmlchange PTS_LON=-96.47659300000001 ./xmlchange PTS_LAT=41.1651 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne1/CLM1PT_data/CTSM_DATM_US-Ne1_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 420f7a336d..47450ca4c8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Ne2 ./xmlchange PTS_LON=-96.470093 ./xmlchange PTS_LAT=41.164902000000005 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne2/CLM1PT_data/CTSM_DATM_US-Ne2_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index 9da10fa36c..c68f41322d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Ne3 ./xmlchange PTS_LON=-96.439697 ./xmlchange PTS_LAT=41.179699 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ne3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ne3/CLM1PT_data/CTSM_DATM_US-Ne3_2002-2012.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 7284f9575b..6d04938599 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-PFa ./xmlchange PTS_LON=-90.272308 ./xmlchange PTS_LAT=45.9459 ./xmlchange RUN_STARTDATE=1995-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-PFa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-PFa/CLM1PT_data/CTSM_DATM_US-PFa_1995-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1995-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1995-2014.nc" >> user_nl_clm echo "model_year_align_lai=1995" >> user_nl_clm echo "stream_year_first_lai=1995" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 05ffd8c8a8..1cee11514d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Prr ./xmlchange PTS_LON=-147.487595 ./xmlchange PTS_LAT=65.123703 ./xmlchange RUN_STARTDATE=2011-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Prr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Prr/CLM1PT_data/CTSM_DATM_US-Prr_2011-2013.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2013.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2013.nc" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index 6af60df601..62a22eec56 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-SP1 ./xmlchange PTS_LON=-82.218781 ./xmlchange PTS_LAT=29.73807 ./xmlchange RUN_STARTDATE=2005-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP1/CLM1PT_data/CTSM_DATM_US-SP1_2005-2005.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 684c7c7303..ea6c919762 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-SP2 ./xmlchange PTS_LON=-82.244812 ./xmlchange PTS_LAT=29.764799 ./xmlchange RUN_STARTDATE=2000-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP2/CLM1PT_data/CTSM_DATM_US-SP2_2000-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2004.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 266017ba62..5afd807fb0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-SP3 ./xmlchange PTS_LON=-82.163269 ./xmlchange PTS_LAT=29.75477 ./xmlchange RUN_STARTDATE=1999-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SP3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SP3/CLM1PT_data/CTSM_DATM_US-SP3_1999-2004.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2004.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2004.nc" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index b164988f24..9010fda086 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-SRG ./xmlchange PTS_LON=-110.827698 ./xmlchange PTS_LAT=31.7894 ./xmlchange RUN_STARTDATE=2009-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SRG_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRG/CLM1PT_data/CTSM_DATM_US-SRG_2009-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 9b96150a8d..9231d0943e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-SRM ./xmlchange PTS_LON=-110.865997 ./xmlchange PTS_LAT=31.8214 ./xmlchange RUN_STARTDATE=2004-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-SRM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-SRM/CLM1PT_data/CTSM_DATM_US-SRM_2004-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 93435126db..5919a4d86a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Syv ./xmlchange PTS_LON=-89.347717 ./xmlchange PTS_LAT=46.242001 ./xmlchange RUN_STARTDATE=2002-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Syv_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Syv/CLM1PT_data/CTSM_DATM_US-Syv_2002-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index a8444513d2..644d2e112b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Ton ./xmlchange PTS_LON=-120.966003 ./xmlchange PTS_LAT=38.431599 ./xmlchange RUN_STARTDATE=2001-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Ton_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Ton/CLM1PT_data/CTSM_DATM_US-Ton_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index ef4d9c143f..fe23b8f352 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Tw4 ./xmlchange PTS_LON=-121.641403 ./xmlchange PTS_LAT=38.103001 ./xmlchange RUN_STARTDATE=2014-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Tw4_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Tw4/CLM1PT_data/CTSM_DATM_US-Tw4_2014-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2014.nc" >> user_nl_clm echo "model_year_align_lai=2014" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index e0f5544c05..44ebfcd623 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Twt ./xmlchange PTS_LON=-121.653107 ./xmlchange PTS_LAT=38.1087 ./xmlchange RUN_STARTDATE=2010-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Twt_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Twt/CLM1PT_data/CTSM_DATM_US-Twt_2010-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2014.nc" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index f4b7984908..ee5dd15d2e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-UMB ./xmlchange PTS_LON=-84.713806 ./xmlchange PTS_LAT=45.559799 ./xmlchange RUN_STARTDATE=2000-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-UMB_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-UMB/CLM1PT_data/CTSM_DATM_US-UMB_2000-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 00839ea0f3..a5bab622a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Var ./xmlchange PTS_LON=-120.95072900000001 ./xmlchange PTS_LAT=38.4133 ./xmlchange RUN_STARTDATE=2001-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Var_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Var/CLM1PT_data/CTSM_DATM_US-Var_2001-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 0b4634b8a5..0d407d7c89 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-WCr ./xmlchange PTS_LON=-90.079895 ./xmlchange PTS_LAT=45.805901 ./xmlchange RUN_STARTDATE=1999-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-WCr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-WCr/CLM1PT_data/CTSM_DATM_US-WCr_1999-2006.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index d72b1c74ea..1d3ee2ea11 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Whs ./xmlchange PTS_LON=-110.0522 ./xmlchange PTS_LAT=31.743799 ./xmlchange RUN_STARTDATE=2008-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Whs_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Whs/CLM1PT_data/CTSM_DATM_US-Whs_2008-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 79c5e43c6c..5b7668d9fd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=US-Wkg ./xmlchange PTS_LON=-109.941895 ./xmlchange PTS_LAT=31.7365 ./xmlchange RUN_STARTDATE=2005-01-01 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_US-Wkg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/US-Wkg/CLM1PT_data/CTSM_DATM_US-Wkg_2005-2014.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index b65d130b59..5b45a7625a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=ZA-Kru ./xmlchange PTS_LON=31.496901 ./xmlchange PTS_LAT=-25.019699 ./xmlchange RUN_STARTDATE=1999-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZA-Kru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 44d65e8b1e..90a6426a27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -1,4 +1,3 @@ -./xmlchange PLUMBER2SITE=ZM-Mon ./xmlchange PTS_LON=23.252781 ./xmlchange PTS_LAT=-15.437778 ./xmlchange RUN_STARTDATE=2007-12-31 @@ -8,7 +7,8 @@ ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 -echo "CLM_USRDAT.PLUMBER2:datafiles='$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc '" >> user_nl_datm_streams +echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZM-Mon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm +echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai='$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc'" >> user_nl_clm + echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/tools/site_and_regional/plumber2_surf_wrapper.py b/tools/site_and_regional/plumber2_surf_wrapper.py index 3dd634c4a6..d68875ce6a 100755 --- a/tools/site_and_regional/plumber2_surf_wrapper.py +++ b/tools/site_and_regional/plumber2_surf_wrapper.py @@ -17,11 +17,6 @@ conda activate ctsm_py """ -# TODO -# Automatic downloading of missing files if they are missing -#-[ ] Download neon sites and dom pft file -#-[ ] Make sure verbose works for printing out commands running - # Import libraries from __future__ import print_function diff --git a/tools/site_and_regional/plumber2_usermods.ipynb b/tools/site_and_regional/plumber2_usermods.ipynb deleted file mode 100644 index c37228217c..0000000000 --- a/tools/site_and_regional/plumber2_usermods.ipynb +++ /dev/null @@ -1,344 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "id": "8627d889-c2ca-45e0-834b-e87a0b0885b2", - "metadata": {}, - "outputs": [], - "source": [ - "#! /usr/bin/env python3\n", - "\"\"\"\n", - "\n", - "Reads in .csv files with PLUMBER2 site information\n", - "Creates individual usermod_dirs for each PLUMBER2 site with shell_commands\n", - "\n", - "\"\"\"\n", - "\n", - "# Import libraries\n", - "from __future__ import print_function\n", - "\n", - "import os\n", - "import sys\n", - "import tqdm\n", - "import logging\n", - "import subprocess\n", - "\n", - "import pandas as pd" - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "id": "3130ac78-36a6-4262-a7f7-98722cdc7498", - "metadata": {}, - "outputs": [], - "source": [ - "# Big ugly function to create usermod_dirs for each site\n", - "def write_usermods(lat,lon,site,start_year,end_year,\n", - " start_date,start_tod,atm_ncpl,stop_n): \n", - "\n", - " site_dir = os.path.join('../../cime_config/usermods_dirs/PLUMBER2/',site)\n", - "\n", - " if not os.path.isdir(site_dir):\n", - " os.makedirs(site_dir, exist_ok=True) \n", - " \n", - " # create files in each directory\n", - " include = os.path.join(site_dir,'include_user_mods')\n", - " iFile = open(include, 'w') # or 'a' to add text instead of truncate\n", - " iFile.write('../defaults')\n", - " iFile.close()\n", - " \n", - " #TODO, move these input files do a different directory and update script\n", - " LAIstream = '/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \\\n", - " str(start_year)+'-'+str(end_year)+'.nc'\n", - " shell = os.path.join(site_dir,'shell_commands')\n", - " sFile = open(shell, 'w') # or 'a' to add text instead of truncate\n", - " sFile.write(\n", - " './xmlchange PLUMBER2SITE='+site + '\\n' \\\n", - " './xmlchange PTS_LON='+str(lon) + '\\n' \\\n", - " './xmlchange PTS_LAT='+str(lat) + '\\n' \\\n", - " './xmlchange RUN_STARTDATE='+str(start_date) + '\\n' \\\n", - " './xmlchange DATM_YR_ALIGN='+str(start_year) + '\\n' \\\n", - " './xmlchange DATM_YR_START='+str(start_year) + '\\n' \\\n", - " './xmlchange DATM_YR_END='+str(end_year) + '\\n' \\\n", - " './xmlchange START_TOD='+str(start_tod) + '\\n' \\\n", - " './xmlchange ATM_NCPL='+str(atm_ncpl) + '\\n' \\\n", - " '\\n' \\\n", - "\n", - " 'compset=`./xmlquery COMPSET --value` \\n' \\\n", - " 'CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` \\n' \\\n", - " 'TEST=`./xmlquery TEST --value` \\n' \\\n", - " '\\n' \\\n", - "\n", - " '# For a transient case run the whole length and do not cycle \\n' \\\n", - " 'if [[ $compset =~ ^HIST ]]; then \\n' \\\n", - " ' # Number of years that can be run for the full transient case \\n' \\\n", - " ' if [[ $TEST != \"TRUE\" ]]; then \\n' \\\n", - " ' ./xmlchange STOP_N='+str(stop_n) + '\\n' \\\n", - " ' fi \\n' \\\n", - " 'fi \\n' \\\n", - " '\\n' \\\n", - "\n", - " '# Turn on LAI streams for a SP case \\n' \\\n", - " 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \\n' \\\n", - " ' echo \"stream_fldfilename_lai=\\''+LAIstream+'\\'\" >> user_nl_clm \\n' \\\n", - " ' echo \"model_year_align_lai='+str(start_year) + '\" >> user_nl_clm \\n' \\\n", - " ' echo \"stream_year_first_lai='+str(start_year) + '\" >> user_nl_clm \\n' \\\n", - " ' echo \"stream_year_last_lai='+str(end_year) + '\" >> user_nl_clm \\n' \\\n", - " 'fi \\n' \n", - " )\n", - "\n", - " sFile.close()\n", - " \n", - " # add baseflow_scalar = 0 to user_nl_clm for wetland sites\n", - " wetland = [\"CZ-wet\",\"DE-SfN\",\"FI-Kaa\",\"FI-Lom\",\"RU-Che\",\\\n", - " \"SE-Deg\",\"US-Los\",\"US-Myb\",\"US-Tw4\",\"PL-wet\"]\n", - " if any(x == site for x in wetland):\n", - " sFile = open(shell, 'a') # or 'a' to add text instead of truncate\n", - " sFile.write(\n", - " '\\n' \\\n", - " '# set baseflow scalar to zero for wetland site \\n' \\\n", - " 'echo \"baseflow_scalar = 0\" >> user_nl_clm'\n", - " )\n", - " sFile.close()\n" - ] - }, - { - "cell_type": "code", - "execution_count": 6, - "id": "aead8b4e-d304-4f85-b411-5a90db2b0835", - "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "57it [00:04, 15.17it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland CZ-wet\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "65it [00:04, 17.19it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland DE-SfN\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "78it [00:05, 29.02it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland FI-Kaa\n", - "wetland FI-Lom\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "116it [00:07, 22.57it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland PL-wet\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "119it [00:07, 23.59it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland RU-Che\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "125it [00:07, 19.61it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland SE-Deg\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "143it [00:08, 20.45it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland US-Los\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "148it [00:09, 12.16it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland US-Myb\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "165it [00:10, 24.01it/s]" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "wetland US-Tw4\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "170it [00:10, 16.50it/s]\n" - ] - } - ], - "source": [ - "# For now we can just run the 'main' program as a loop\n", - "\n", - "plumber2_sites = pd.read_csv('PLUMBER2_sites.csv', skiprows=4) \n", - "\n", - "for i, row in tqdm.tqdm(plumber2_sites.iterrows()):\n", - " lat = row['Lat']\n", - " lon = row['Lon']\n", - " site = row['Site']\n", - " start_year = row['start_year']\n", - " end_year = row['end_year']\n", - " start_date = row['RUN_STARTDATE']\n", - " start_tod = row['START_TOD']\n", - " atm_ncpl = row['ATM_NCPL']\n", - " stop_n = 1+end_year-start_year\n", - " \n", - " write_usermods(lat,lon,site,start_year,end_year,\n", - " start_date,start_tod,atm_ncpl,stop_n)" - ] - }, - { - "cell_type": "code", - "execution_count": 7, - "id": "a8268518-5a08-4a85-98a5-f9d7d3505605", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "./xmlchange PLUMBER2SITE=ZM-Mon\n", - "./xmlchange PTS_LON=23.252781\n", - "./xmlchange PTS_LAT=-15.437778\n", - "./xmlchange RUN_STARTDATE=2007-12-31\n", - "./xmlchange DATM_YR_ALIGN=2008\n", - "./xmlchange DATM_YR_START=2008\n", - "./xmlchange DATM_YR_END=2008\n", - "./xmlchange START_TOD=79200\n", - "./xmlchange ATM_NCPL=48\n", - "\n", - "compset=`./xmlquery COMPSET --value` \n", - "CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` \n", - "TEST=`./xmlquery TEST --value` \n", - "\n", - "# For a transient case run the whole length and do not cycle \n", - "if [[ $compset =~ ^HIST ]]; then \n", - " # Number of years that can be run for the full transient case \n", - " if [[ $TEST != \"TRUE\" ]]; then \n", - " ./xmlchange STOP_N=1\n", - " fi \n", - "fi \n", - "\n", - "# Turn on LAI streams for a SP case \n", - "if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n", - " echo \"stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc'\" >> user_nl_clm \n", - " echo \"model_year_align_lai=2008\" >> user_nl_clm \n", - " echo \"stream_year_first_lai=2008\" >> user_nl_clm \n", - " echo \"stream_year_last_lai=2008\" >> user_nl_clm \n", - "fi \n" - ] - } - ], - "source": [ - "cat ../../cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "785b8c94-fd63-4067-be45-fe93b9244e77", - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3 (ipykernel)", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.9.12" - } - }, - "nbformat": 4, - "nbformat_minor": 5 -} diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index c759fa037a..fc6134e711 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -34,13 +34,13 @@ def write_usermods(lat,lon,site,start_year,end_year, iFile.write('../defaults') iFile.close() - #TODO, move these input files do a different directory and update script - LAIstream = '$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ + LAIstream = '\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ str(start_year)+'-'+str(end_year)+'.nc' shell = os.path.join(site_dir,'shell_commands') sFile = open(shell, 'w') # or 'a' to add text instead of truncate sFile.write( - './xmlchange PLUMBER2SITE='+site + '\n' \ + #TODO turn on following line after cdeps changes are added + #'./xmlchange PLUMBER2SITE='+site + '\n' \ './xmlchange PTS_LON='+str(lon) + '\n' \ './xmlchange PTS_LAT='+str(lat) + '\n' \ './xmlchange RUN_STARTDATE='+str(start_date) + '\n' \ @@ -50,8 +50,10 @@ def write_usermods(lat,lon,site,start_year,end_year, './xmlchange START_TOD='+str(start_tod) + '\n' \ './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ '\n' \ + # TODO, get working for CTSM5.1, remove this line as it's redundant after PLUMBER2SITE is added + 'echo "fsurdat=\'/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_'+site+'_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc \' " >> user_nl_clm \n' \ - 'echo "CLM_USRDAT.PLUMBER2:datafiles=\'$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc \'" >> user_nl_datm_streams \n' \ + 'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc " >> user_nl_datm_streams \n' \ 'echo "presaero.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ 'echo "presaero.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ @@ -82,9 +84,10 @@ def write_usermods(lat,lon,site,start_year,end_year, 'fi \n' \ '\n' \ + # TODO, check to see if this works after PLUMBER2SITE is added '# Turn on LAI streams for a SP case \n' \ 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n' \ - ' echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ + ' echo "stream_fldfilename_lai='+LAIstream+'" >> user_nl_clm \n' \ ' echo "model_year_align_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ From 3a0149098644f84ca315b3778ddfa4096694260f Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 1 Apr 2024 15:32:07 -0600 Subject: [PATCH 26/43] updates for LAI streams --- cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands | 2 +- cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands | 2 +- tools/site_and_regional/plumber2_usermods.py | 6 +++--- 171 files changed, 173 insertions(+), 173 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index e0fbe3006e..ce4fcd179d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AR-SLu/LAI_stream_AR-SLu_2010-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 1351451831..bc2b290f5e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AT-Neu/LAI_stream_AT-Neu_2002-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 15d2cf8977..b0bc044696 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-ASM/LAI_stream_AU-ASM_2011-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 9a0011d275..0ba7b3eea5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cow/LAI_stream_AU-Cow_2010-2015.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 2dde9a13b8..f96ee40ad7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cpr/LAI_stream_AU-Cpr_2011-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 0ad5fa18a0..90525cdf13 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ctr/LAI_stream_AU-Ctr_2010-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 7f2efca67b..66907b8134 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cum/LAI_stream_AU-Cum_2013-2018.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2018" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 98f5c8ba66..d06bf06d12 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaP/LAI_stream_AU-DaP_2009-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 18a66d0c6f..89460ba28a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaS/LAI_stream_AU-DaS_2010-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 5ca6da10e7..6961b541ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Dry/LAI_stream_AU-Dry_2011-2015.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index f52d8c683d..74405d1d73 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Emr/LAI_stream_AU-Emr_2012-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 7eb27e4147..206587eb3f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-GWW/LAI_stream_AU-GWW_2013-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 07e7774cf3..78e1d48d5a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Gin/LAI_stream_AU-Gin_2012-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 178a7d3581..6a3e773b4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-How/LAI_stream_AU-How_2003-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index bb284fb315..6458c92bdb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Lit/LAI_stream_AU-Lit_2016-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2016" >> user_nl_clm echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 95b8044f12..f9fdf9da44 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Otw/LAI_stream_AU-Otw_2009-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index 4b800758f2..e627eddb4b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2016.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rig/LAI_stream_AU-Rig_2011-2016.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 0f2e14a2da..d5ca9d0b90 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rob/LAI_stream_AU-Rob_2014-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2014" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 0839b80fdb..4b1658fbd7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Sam/LAI_stream_AU-Sam_2011-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 710710b06f..7cd2d493ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Stp/LAI_stream_AU-Stp_2010-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 7e646bac5d..4613b2b1a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-TTE/LAI_stream_AU-TTE_2013-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 1c97c31d13..327b4afa22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Tum/LAI_stream_AU-Tum_2002-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 7544645aee..c70b8da507 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2015-2016.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Whr/LAI_stream_AU-Whr_2015-2016.nc'" >> user_nl_clm echo "model_year_align_lai=2015" >> user_nl_clm echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 8c352f8f59..862f5c179f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2016-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Wrr/LAI_stream_AU-Wrr_2016-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2016" >> user_nl_clm echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index c12b54196f..f72f0111a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ync/LAI_stream_AU-Ync_2011-2017.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 0c03eb5bbb..42c08114f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Bra/LAI_stream_BE-Bra_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index caa71df25f..3f0e9efcb9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Lon/LAI_stream_BE-Lon_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index d071f9458a..d13a84a9e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Vie/LAI_stream_BE-Vie_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 0deef21292..e656c23f7c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BR-Sa3/LAI_stream_BR-Sa3_2001-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 9494793cc1..ad757f2913 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2000.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BW-Ma1/LAI_stream_BW-Ma1_2000-2000.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 6a65ea1ef5..561f205363 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS1/LAI_stream_CA-NS1_2003-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index c303db50ca..a90b4ab44f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS2/LAI_stream_CA-NS2_2002-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index a14dc72425..a16d1d6adc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS4/LAI_stream_CA-NS4_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index 59497267e7..8d8015463e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS5/LAI_stream_CA-NS5_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index d1d0c25bbf..33bef39a08 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS6/LAI_stream_CA-NS6_2002-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index fe08e895e8..0a065cf80c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS7/LAI_stream_CA-NS7_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index e325fb0b25..6036c9384d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qcu/LAI_stream_CA-Qcu_2002-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index a0097e3fad..8d926b0230 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qfo/LAI_stream_CA-Qfo_2004-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index 9c2d58b88d..5892d13bbb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF1/LAI_stream_CA-SF1_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 8e5f442715..7ac36361d2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF2/LAI_stream_CA-SF2_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index b5cc0e3ec2..0879941ba5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF3/LAI_stream_CA-SF3_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index 5def12473d..ef2b855ff4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2006-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Cha/LAI_stream_CH-Cha_2006-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2006" >> user_nl_clm echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 7e82f826da..9630013084 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Dav/LAI_stream_CH-Dav_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 22db85b06f..3beae58058 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Fru/LAI_stream_CH-Fru_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 3f5390a210..a5923c495b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Oe1/LAI_stream_CH-Oe1_2002-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index 973914aaef..b16ab42a62 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cha/LAI_stream_CN-Cha_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 183a9f3e53..6b5246607f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2009.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cng/LAI_stream_CN-Cng_2008-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index b5fc93cd3c..21b2b06287 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Dan/LAI_stream_CN-Dan_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index 0e64dd70b9..c44d27ecda 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Din/LAI_stream_CN-Din_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 96083e71ad..862913c330 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Du2/LAI_stream_CN-Du2_2007-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 050f973117..9edae96ac8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-HaM/LAI_stream_CN-HaM_2002-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index e753be949d..5d98b7a460 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Qia/LAI_stream_CN-Qia_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 4c36bdc84c..8beef8b15d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CZ-wet/LAI_stream_CZ-wet_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index d543bd9b90..ded51614a9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-1999.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Bay/LAI_stream_DE-Bay_1997-1999.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=1999" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 1c03e1c107..e3622b023c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Geb/LAI_stream_DE-Geb_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index bb90bceb68..671c2b5b57 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Gri/LAI_stream_DE-Gri_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index c0df3d46cf..2992bc0a01 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Hai/LAI_stream_DE-Hai_2000-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 0141e3c808..057e1d303c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Kli/LAI_stream_DE-Kli_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 9b34aff782..b0941e6f2a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Meh/LAI_stream_DE-Meh_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index ccceb5e532..6ebbd21c44 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Obe/LAI_stream_DE-Obe_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index e314864954..ac365d827f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Seh/LAI_stream_DE-Seh_2008-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 8241a6dde1..7567e506e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-SfN/LAI_stream_DE-SfN_2013-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index e788f2ce89..105834ebdc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1998-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Tha/LAI_stream_DE-Tha_1998-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1998" >> user_nl_clm echo "stream_year_first_lai=1998" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 82d21eabb3..af7c5c7f26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Wet/LAI_stream_DE-Wet_2002-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index 7217dd6ea7..98989d3047 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Fou/LAI_stream_DK-Fou_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index c6527aa706..b6cc2a46c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Lva/LAI_stream_DK-Lva_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index 9b5e5b0fd0..a7a319f9fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Ris/LAI_stream_DK-Ris_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 7ea614b787..b2acac8333 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Sor/LAI_stream_DK-Sor_1997-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index c9ced51710..a5c068cb72 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-ZaH/LAI_stream_DK-ZaH_2000-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 82367ead77..3093a5dfd0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES1/LAI_stream_ES-ES1_1999-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 225cd25c98..ccc7d77922 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES2/LAI_stream_ES-ES2_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 51845e00cb..47d92c7422 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LMa/LAI_stream_ES-LMa_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 743a68d77d..3e0d911f82 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2007.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LgS/LAI_stream_ES-LgS_2007-2007.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2007" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index 3870f8163e..24f618a5eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-VDA/LAI_stream_ES-VDA_2004-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 28dce0b519..9f9ddad2ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Hyy/LAI_stream_FI-Hyy_1996-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 7d8b39a66e..7ca89dc807 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Kaa/LAI_stream_FI-Kaa_2000-2002.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index e80dfee283..0abb0de852 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2009.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Lom/LAI_stream_FI-Lom_2007-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index 3bf1f43cc5..9aee1c0892 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Sod/LAI_stream_FI-Sod_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 6c7646e661..156f54c1b3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Fon/LAI_stream_FR-Fon_2005-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index 53281682c5..3c291fc0d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Gri/LAI_stream_FR-Gri_2005-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index ed218f4c4d..62c715f70d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Hes/LAI_stream_FR-Hes_1997-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index c2330472bb..1395b6d8b4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-LBr/LAI_stream_FR-LBr_2003-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index b11e475863..269a1300a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq1/LAI_stream_FR-Lq1_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 1bf8fd0208..511a16c9ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq2/LAI_stream_FR-Lq2_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 870562ba02..52bec0cd37 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Pue/LAI_stream_FR-Pue_2000-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index 4a33b0b220..d36335e8d6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/GF-Guy/LAI_stream_GF-Guy_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index c32a6f302a..1de8af42ae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/HU-Bug/LAI_stream_HU-Bug_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index b2b8131fbc..9d6e9a636c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ID-Pag/LAI_stream_ID-Pag_2002-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index a35c164eb0..520d6398e2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Ca1/LAI_stream_IE-Ca1_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index f5c9867618..de2159762c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Dri/LAI_stream_IE-Dri_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index d3741fc74e..13d05c8f5c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Amp/LAI_stream_IT-Amp_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index e13bdb70b6..949025e4b0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2010.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-BCi/LAI_stream_IT-BCi_2005-2010.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 39d6c6ab39..c382537fbc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA1/LAI_stream_IT-CA1_2012-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index f57fbd6c6f..72a96fef26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA2/LAI_stream_IT-CA2_2012-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 757643c73c..716f026f7a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA3/LAI_stream_IT-CA3_2012-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2012" >> user_nl_clm echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index 4795f051cc..c8cf54e961 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2007-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Col/LAI_stream_IT-Col_2007-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2007" >> user_nl_clm echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 13f1dd4908..8f5462c381 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Cpz/LAI_stream_IT-Cpz_2001-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 2f2ab608d7..c92fc8f8f0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Isp/LAI_stream_IT-Isp_2013-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index b9726c1f43..42a1d8c1dc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-LMa/LAI_stream_IT-LMa_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 1d0ea94816..354f5e96db 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Lav/LAI_stream_IT-Lav_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index b5673ac746..47641dad10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-MBo/LAI_stream_IT-MBo_2003-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index b5c9481cf0..b7abc1c202 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Mal/LAI_stream_IT-Mal_2003-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 3a9c16d5b1..7be6480036 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Noe/LAI_stream_IT-Noe_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 2cef11e176..3aa5fe1b22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2002.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Non/LAI_stream_IT-Non_2002-2002.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index cb60ceba3a..e39698c428 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-PT1/LAI_stream_IT-PT1_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 7dae634dca..a330de1a17 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ren/LAI_stream_IT-Ren_2010-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index dce7e660bc..29e2d23290 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro1/LAI_stream_IT-Ro1_2002-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index ab6f7f6bdd..03a5b3440b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro2/LAI_stream_IT-Ro2_2002-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 00143864d8..572751c8bf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SR2/LAI_stream_IT-SR2_2013-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2013" >> user_nl_clm echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index cea54a23f8..578dacb81a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SRo/LAI_stream_IT-SRo_2003-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 9197414be2..9b0446ac0b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/JP-SMF/LAI_stream_JP-SMF_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index b4f552a454..9f531d81c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Ca1/LAI_stream_NL-Ca1_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 82c9e8d185..725c034516 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2011.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Hor/LAI_stream_NL-Hor_2008-2011.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index e2f0c56b70..3c9999cfbd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Loo/LAI_stream_NL-Loo_1997-2013.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index b63949ac6b..ea9d398769 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PL-wet/LAI_stream_PL-wet_2004-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 6d4c5bcf54..02ffbb6faa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Esp/LAI_stream_PT-Esp_2002-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 53a2ac0ae3..4fca1927c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi1/LAI_stream_PT-Mi1_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index 8321e77007..946be09d3d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi2/LAI_stream_PT-Mi2_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 44f1533f63..ca53d5be69 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Che/LAI_stream_RU-Che_2003-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 7a22685bee..ac23886c1f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Fyo/LAI_stream_RU-Fyo_2003-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index e0b964be3a..aabb6da38d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Zot/LAI_stream_RU-Zot_2003-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index d95b94ec2d..acb137008d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2009.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SD-Dem/LAI_stream_SD-Dem_2005-2009.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index f1e4964429..da2f7ae944 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SE-Deg/LAI_stream_SE-Deg_2002-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index c29a583334..ddba58fc8b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2001.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Gri/LAI_stream_UK-Gri_2000-2001.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2001" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 114ded1067..de471c7a77 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Ham/LAI_stream_UK-Ham_2004-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index f464283f9f..6c0ee39584 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-PL3/LAI_stream_UK-PL3_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 4dacfded3a..16cf9a642f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR1/LAI_stream_US-AR1_2010-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 82ac9cfcb4..edf27903f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2011.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR2/LAI_stream_US-AR2_2010-2011.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index a3e8b65dee..1856fd69b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-ARM/LAI_stream_US-ARM_2003-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 94d9dd6c6a..bf8f45e9be 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Aud/LAI_stream_US-Aud_2003-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 1b5e9e3a2b..d0fc95ca5e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bar/LAI_stream_US-Bar_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index f218d3294e..753597ab3d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bkg/LAI_stream_US-Bkg_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index fcbfa62899..b075baa9c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Blo/LAI_stream_US-Blo_2000-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 273201827b..4e164b98a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1997-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bo1/LAI_stream_US-Bo1_1997-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1997" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index b291dfe747..bccbd7a37b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2003.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Cop/LAI_stream_US-Cop_2002-2003.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 992c245dca..70b78c0c86 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-FPe/LAI_stream_US-FPe_2000-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index b92a353c95..fab2b713d9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-GLE/LAI_stream_US-GLE_2009-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index b564a7ea7d..fd008126d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Goo/LAI_stream_US-Goo_2004-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 1f52f4cb8f..2c4e239763 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1992-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ha1/LAI_stream_US-Ha1_1992-2012.nc'" >> user_nl_clm echo "model_year_align_lai=1992" >> user_nl_clm echo "stream_year_first_lai=1992" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 5fe2f89f12..1d33c85b78 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ho1/LAI_stream_US-Ho1_1996-2004.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index eca15a31c7..a79882b207 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2003-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-KS2/LAI_stream_US-KS2_2003-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2003" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index e93d7a8ae2..c7b41701c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Los/LAI_stream_US-Los_2000-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 31c1494070..29314c7e7d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MMS/LAI_stream_US-MMS_1999-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index bc9cb7a4ce..0e8e837841 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MOz/LAI_stream_US-MOz_2005-2006.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index ac202382d7..12d3fce166 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me2/LAI_stream_US-Me2_2002-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index baeb89630a..37b65e0853 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1996-2000.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me4/LAI_stream_US-Me4_1996-2000.nc'" >> user_nl_clm echo "model_year_align_lai=1996" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index f87447e19c..a11b9d7845 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me6/LAI_stream_US-Me6_2011-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 193b6c3322..7fa2f5a6df 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Myb/LAI_stream_US-Myb_2011-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index f214bc092a..4cb2f1cd84 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-NR1/LAI_stream_US-NR1_1999-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index 7667a44750..26540ef020 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne1/LAI_stream_US-Ne1_2002-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 47450ca4c8..f37f265a6a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne2/LAI_stream_US-Ne2_2002-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index c68f41322d..8fbf964ed0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne3/LAI_stream_US-Ne3_2002-2012.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 6d04938599..533f69237b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1995-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-PFa/LAI_stream_US-PFa_1995-2014.nc'" >> user_nl_clm echo "model_year_align_lai=1995" >> user_nl_clm echo "stream_year_first_lai=1995" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 1cee11514d..682c02c609 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2013.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Prr/LAI_stream_US-Prr_2011-2013.nc'" >> user_nl_clm echo "model_year_align_lai=2011" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index 62a22eec56..f47a97056f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2005.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP1/LAI_stream_US-SP1_2005-2005.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index ea6c919762..9462ca96fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP2/LAI_stream_US-SP2_2000-2004.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 5afd807fb0..151df53a46 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2004.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP3/LAI_stream_US-SP3_1999-2004.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 9010fda086..2bbea39d11 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRG/LAI_stream_US-SRG_2009-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2009" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 9231d0943e..7dc3f83f3c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2004-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRM/LAI_stream_US-SRM_2004-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2004" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 5919a4d86a..09bc42706b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Syv/LAI_stream_US-Syv_2002-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2002" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 644d2e112b..e7d110fa84 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ton/LAI_stream_US-Ton_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index fe23b8f352..6773942aed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2014-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Tw4/LAI_stream_US-Tw4_2014-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2014" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index 44ebfcd623..9bb5e6bfa2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Twt/LAI_stream_US-Twt_2010-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2010" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index ee5dd15d2e..58e3a063c4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-UMB/LAI_stream_US-UMB_2000-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index a5bab622a2..c4f49fe662 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2001-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Var/LAI_stream_US-Var_2001-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2001" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 0d407d7c89..e65ddbc6b5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_1999-2006.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-WCr/LAI_stream_US-WCr_1999-2006.nc'" >> user_nl_clm echo "model_year_align_lai=1999" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 1d3ee2ea11..6fc485d959 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Whs/LAI_stream_US-Whs_2008-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 5b7668d9fd..5357c4dd1b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2005-2014.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Wkg/LAI_stream_US-Wkg_2005-2014.nc'" >> user_nl_clm echo "model_year_align_lai=2005" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 5b45a7625a..959c2e2e2d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2000-2002.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZA-Kru/LAI_stream_ZA-Kru_2000-2002.nc'" >> user_nl_clm echo "model_year_align_lai=2000" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 90a6426a27..a9c0c44b4a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -35,7 +35,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then - echo "stream_fldfilename_lai=\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2008-2008.nc" >> user_nl_clm + echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZM-Mon/LAI_stream_ZM-Mon_2008-2008.nc'" >> user_nl_clm echo "model_year_align_lai=2008" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index fc6134e711..4031442883 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -34,7 +34,7 @@ def write_usermods(lat,lon,site,start_year,end_year, iFile.write('../defaults') iFile.close() - LAIstream = '\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_'+ \ + LAIstream = '\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/'+site+'/LAI_stream_'+site+'_'+ \ str(start_year)+'-'+str(end_year)+'.nc' shell = os.path.join(site_dir,'shell_commands') sFile = open(shell, 'w') # or 'a' to add text instead of truncate @@ -51,6 +51,7 @@ def write_usermods(lat,lon,site,start_year,end_year, './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ '\n' \ # TODO, get working for CTSM5.1, remove this line as it's redundant after PLUMBER2SITE is added + # Alternatively, we can take this out of default/user_nl_clm since doing it this way is works fine TODO for 5.2 'echo "fsurdat=\'/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_'+site+'_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc \' " >> user_nl_clm \n' \ 'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc " >> user_nl_datm_streams \n' \ @@ -84,10 +85,9 @@ def write_usermods(lat,lon,site,start_year,end_year, 'fi \n' \ '\n' \ - # TODO, check to see if this works after PLUMBER2SITE is added '# Turn on LAI streams for a SP case \n' \ 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n' \ - ' echo "stream_fldfilename_lai='+LAIstream+'" >> user_nl_clm \n' \ + ' echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ ' echo "model_year_align_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ From 3591d02104669b2e19b537cb546a7661d464f160 Mon Sep 17 00:00:00 2001 From: wwieder Date: Tue, 9 Apr 2024 11:37:06 -0600 Subject: [PATCH 27/43] update year_start for actual year --- .../PLUMBER2/AT-Neu/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-ASM/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Cow/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Cpr/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Ctr/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Cum/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-DaP/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-DaS/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Dry/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Emr/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-GWW/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Gin/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-How/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Lit/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Otw/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Rig/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Rob/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Sam/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Stp/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-TTE/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Tum/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Whr/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Wrr/shell_commands | 20 +++++++-------- .../PLUMBER2/AU-Ync/shell_commands | 20 +++++++-------- .../PLUMBER2/BE-Bra/shell_commands | 20 +++++++-------- .../PLUMBER2/BE-Lon/shell_commands | 20 +++++++-------- .../PLUMBER2/BE-Vie/shell_commands | 20 +++++++-------- .../PLUMBER2/BW-Ma1/shell_commands | 20 +++++++-------- .../PLUMBER2/CH-Cha/shell_commands | 20 +++++++-------- .../PLUMBER2/CH-Dav/shell_commands | 20 +++++++-------- .../PLUMBER2/CH-Fru/shell_commands | 20 +++++++-------- .../PLUMBER2/CH-Oe1/shell_commands | 20 +++++++-------- .../PLUMBER2/CN-Cha/shell_commands | 20 +++++++-------- .../PLUMBER2/CN-Cng/shell_commands | 20 +++++++-------- .../PLUMBER2/CN-Dan/shell_commands | 20 +++++++-------- .../PLUMBER2/CN-Din/shell_commands | 20 +++++++-------- .../PLUMBER2/CN-Du2/shell_commands | 20 +++++++-------- .../PLUMBER2/CN-HaM/shell_commands | 20 +++++++-------- .../PLUMBER2/CN-Qia/shell_commands | 20 +++++++-------- .../PLUMBER2/CZ-wet/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Bay/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Geb/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Gri/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Hai/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Kli/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Meh/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Obe/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Seh/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-SfN/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Tha/shell_commands | 20 +++++++-------- .../PLUMBER2/DE-Wet/shell_commands | 20 +++++++-------- .../PLUMBER2/DK-Fou/shell_commands | 20 +++++++-------- .../PLUMBER2/DK-Lva/shell_commands | 20 +++++++-------- .../PLUMBER2/DK-Ris/shell_commands | 20 +++++++-------- .../PLUMBER2/DK-Sor/shell_commands | 20 +++++++-------- .../PLUMBER2/ES-ES1/shell_commands | 20 +++++++-------- .../PLUMBER2/ES-ES2/shell_commands | 20 +++++++-------- .../PLUMBER2/ES-LMa/shell_commands | 20 +++++++-------- .../PLUMBER2/ES-LgS/shell_commands | 20 +++++++-------- .../PLUMBER2/ES-VDA/shell_commands | 20 +++++++-------- .../PLUMBER2/FI-Hyy/shell_commands | 20 +++++++-------- .../PLUMBER2/FI-Kaa/shell_commands | 20 +++++++-------- .../PLUMBER2/FI-Lom/shell_commands | 20 +++++++-------- .../PLUMBER2/FI-Sod/shell_commands | 20 +++++++-------- .../PLUMBER2/FR-Fon/shell_commands | 20 +++++++-------- .../PLUMBER2/FR-Gri/shell_commands | 20 +++++++-------- .../PLUMBER2/FR-Hes/shell_commands | 20 +++++++-------- .../PLUMBER2/FR-LBr/shell_commands | 20 +++++++-------- .../PLUMBER2/FR-Lq1/shell_commands | 20 +++++++-------- .../PLUMBER2/FR-Lq2/shell_commands | 20 +++++++-------- .../PLUMBER2/FR-Pue/shell_commands | 20 +++++++-------- .../PLUMBER2/HU-Bug/shell_commands | 20 +++++++-------- .../PLUMBER2/ID-Pag/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Amp/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-BCi/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-CA1/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-CA2/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-CA3/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Col/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Cpz/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Isp/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-LMa/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Lav/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-MBo/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Mal/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Noe/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Non/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-PT1/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Ren/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Ro1/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-Ro2/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-SR2/shell_commands | 20 +++++++-------- .../PLUMBER2/IT-SRo/shell_commands | 20 +++++++-------- .../PLUMBER2/JP-SMF/shell_commands | 20 +++++++-------- .../PLUMBER2/NL-Ca1/shell_commands | 20 +++++++-------- .../PLUMBER2/NL-Hor/shell_commands | 20 +++++++-------- .../PLUMBER2/NL-Loo/shell_commands | 20 +++++++-------- .../PLUMBER2/PL-wet/shell_commands | 20 +++++++-------- .../PLUMBER2/RU-Che/shell_commands | 20 +++++++-------- .../PLUMBER2/RU-Fyo/shell_commands | 20 +++++++-------- .../PLUMBER2/RU-Zot/shell_commands | 20 +++++++-------- .../PLUMBER2/SD-Dem/shell_commands | 20 +++++++-------- .../PLUMBER2/SE-Deg/shell_commands | 20 +++++++-------- .../PLUMBER2/ZA-Kru/shell_commands | 20 +++++++-------- .../PLUMBER2/ZM-Mon/shell_commands | 20 +++++++-------- tools/site_and_regional/plumber2_usermods.py | 25 ++++++++++--------- 106 files changed, 1063 insertions(+), 1062 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index bc2b290f5e..d2f500cc47 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.3175 ./xmlchange PTS_LAT=47.116669 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AT-Neu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AT-Neu/LAI_stream_AT-Neu_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index b0bc044696..6b87df1a81 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=133.24899299999998 ./xmlchange PTS_LAT=-22.283001000000002 ./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-ASM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-ASM/LAI_stream_AU-ASM_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 0ba7b3eea5..17c551e4b0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.427155 ./xmlchange PTS_LAT=-16.23819 ./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2015 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cow_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cow/LAI_stream_AU-Cow_2010-2015.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index f96ee40ad7..73993b8265 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=140.589127 ./xmlchange PTS_LAT=-34.00206 ./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cpr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cpr/LAI_stream_AU-Cpr_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 90525cdf13..dc487f5bc5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.446854 ./xmlchange PTS_LAT=-16.103279 ./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ctr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ctr/LAI_stream_AU-Ctr_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 66907b8134..7caa306690 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=150.722473 ./xmlchange PTS_LAT=-33.613296999999996 ./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2013 -./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2018 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2018" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2018" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cum/LAI_stream_AU-Cum_2013-2018.nc'" >> user_nl_clm - echo "model_year_align_lai=2013" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2018" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index d06bf06d12..30d061aec3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=131.3181 ./xmlchange PTS_LAT=-14.0633 ./xmlchange RUN_STARTDATE=2008-12-31 -./xmlchange DATM_YR_ALIGN=2009 -./xmlchange DATM_YR_START=2009 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaP_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaP/LAI_stream_AU-DaP_2009-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 89460ba28a..7b4369ad9d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=131.388 ./xmlchange PTS_LAT=-14.159282999999999 ./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaS/LAI_stream_AU-DaS_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 6961b541ab..7c724885ad 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=132.370605 ./xmlchange PTS_LAT=-15.2588 ./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2015 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Dry_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Dry/LAI_stream_AU-Dry_2011-2015.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 74405d1d73..347b9ffb73 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=148.474594 ./xmlchange PTS_LAT=-23.8587 ./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Emr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Emr/LAI_stream_AU-Emr_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 206587eb3f..91437bf3e2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=120.654099 ./xmlchange PTS_LAT=-30.191299 ./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2013 -./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-GWW_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-GWW/LAI_stream_AU-GWW_2013-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2013" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 78e1d48d5a..3fb6afc23e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=115.650002 ./xmlchange PTS_LAT=-31.375 ./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Gin_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Gin/LAI_stream_AU-Gin_2012-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 6a3e773b4a..93ff63fae6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=131.149994 ./xmlchange PTS_LAT=-12.4952 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-How_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-How/LAI_stream_AU-How_2003-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 6458c92bdb..a0d32eed4e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=130.79449499999998 ./xmlchange PTS_LAT=-13.179039999999999 ./xmlchange RUN_STARTDATE=2015-12-31 -./xmlchange DATM_YR_ALIGN=2016 -./xmlchange DATM_YR_START=2016 +./xmlchange DATM_YR_ALIGN=2015 +./xmlchange DATM_YR_START=2015 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Lit_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Lit/LAI_stream_AU-Lit_2016-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2016" >> user_nl_clm - echo "stream_year_first_lai=2016" >> user_nl_clm + echo "model_year_align_lai=2015" >> user_nl_clm + echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index f9fdf9da44..15227e11da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=142.816803 ./xmlchange PTS_LAT=-38.532340999999995 ./xmlchange RUN_STARTDATE=2008-12-31 -./xmlchange DATM_YR_ALIGN=2009 -./xmlchange DATM_YR_START=2009 +./xmlchange DATM_YR_ALIGN=2008 +./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Otw_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Otw/LAI_stream_AU-Otw_2009-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index e627eddb4b..3a41d38996 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.575897 ./xmlchange PTS_LAT=-36.649899 ./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rig_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rig/LAI_stream_AU-Rig_2011-2016.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index d5ca9d0b90..7fc3c3f029 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.630096 ./xmlchange PTS_LAT=-17.1175 ./xmlchange RUN_STARTDATE=2013-12-31 -./xmlchange DATM_YR_ALIGN=2014 -./xmlchange DATM_YR_START=2014 +./xmlchange DATM_YR_ALIGN=2013 +./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rob_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rob/LAI_stream_AU-Rob_2014-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2014" >> user_nl_clm - echo "stream_year_first_lai=2014" >> user_nl_clm + echo "model_year_align_lai=2013" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 4b1658fbd7..f60ddd3a42 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=152.87780800000002 ./xmlchange PTS_LAT=-27.3881 ./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Sam_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Sam/LAI_stream_AU-Sam_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 7cd2d493ca..88a1218c02 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=133.350204 ./xmlchange PTS_LAT=-17.1507 ./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Stp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Stp/LAI_stream_AU-Stp_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 4613b2b1a4..2b537a7c68 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=133.639999 ./xmlchange PTS_LAT=-22.287001 ./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2013 -./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-TTE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-TTE/LAI_stream_AU-TTE_2013-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2013" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 327b4afa22..2e373b9b10 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=148.151703 ./xmlchange PTS_LAT=-35.656601 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Tum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Tum/LAI_stream_AU-Tum_2002-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index c70b8da507..2bb62c05ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.029404 ./xmlchange PTS_LAT=-36.673199 ./xmlchange RUN_STARTDATE=2014-12-31 -./xmlchange DATM_YR_ALIGN=2015 -./xmlchange DATM_YR_START=2015 +./xmlchange DATM_YR_ALIGN=2014 +./xmlchange DATM_YR_START=2014 ./xmlchange DATM_YR_END=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Whr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Whr/LAI_stream_AU-Whr_2015-2016.nc'" >> user_nl_clm - echo "model_year_align_lai=2015" >> user_nl_clm - echo "stream_year_first_lai=2015" >> user_nl_clm + echo "model_year_align_lai=2014" >> user_nl_clm + echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 862f5c179f..60e8942f1b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=146.654495 ./xmlchange PTS_LAT=-43.09502 ./xmlchange RUN_STARTDATE=2015-12-31 -./xmlchange DATM_YR_ALIGN=2016 -./xmlchange DATM_YR_START=2016 +./xmlchange DATM_YR_ALIGN=2015 +./xmlchange DATM_YR_START=2015 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Wrr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Wrr/LAI_stream_AU-Wrr_2016-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2016" >> user_nl_clm - echo "stream_year_first_lai=2016" >> user_nl_clm + echo "model_year_align_lai=2015" >> user_nl_clm + echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index f72f0111a7..a48d0204d0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=146.290695 ./xmlchange PTS_LAT=-34.9893 ./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange DATM_YR_ALIGN=2010 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ync_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ync/LAI_stream_AU-Ync_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 42c08114f8..5ec934b266 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=4.52056 ./xmlchange PTS_LAT=51.309166 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Bra_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Bra/LAI_stream_BE-Bra_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 3f0e9efcb9..442f5fdbe1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=4.74613 ./xmlchange PTS_LAT=50.551590000000004 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Lon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Lon/LAI_stream_BE-Lon_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index d13a84a9e0..1c0f0c0165 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=5.99805 ./xmlchange PTS_LAT=50.305069 ./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1997 -./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Vie_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Vie/LAI_stream_BE-Vie_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1997" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index ad757f2913..447b0833ef 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=23.560329 ./xmlchange PTS_LAT=-19.9165 ./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=2000 -./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2000 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BW-Ma1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BW-Ma1/LAI_stream_BW-Ma1_2000-2000.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index ef2b855ff4..bfd3e11e13 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=8.41044 ./xmlchange PTS_LAT=47.21022 ./xmlchange RUN_STARTDATE=2005-12-31 -./xmlchange DATM_YR_ALIGN=2006 -./xmlchange DATM_YR_START=2006 +./xmlchange DATM_YR_ALIGN=2005 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Cha/LAI_stream_CH-Cha_2006-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2006" >> user_nl_clm - echo "stream_year_first_lai=2006" >> user_nl_clm + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index 9630013084..a44cb69bcd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=9.85592 ./xmlchange PTS_LAT=46.815334 ./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1997 -./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Dav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Dav/LAI_stream_CH-Dav_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1997" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 3beae58058..08c2337c71 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=8.53778 ./xmlchange PTS_LAT=47.115833 ./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_ALIGN=2006 +./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Fru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Fru/LAI_stream_CH-Fru_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index a5923c495b..8127d983dd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=7.73194 ./xmlchange PTS_LAT=47.285831 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Oe1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Oe1/LAI_stream_CH-Oe1_2002-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index b16ab42a62..55161d1279 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=128.09579499999998 ./xmlchange PTS_LAT=42.4025 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cha/LAI_stream_CN-Cha_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 6b5246607f..a028639375 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=123.509201 ./xmlchange PTS_LAT=44.593399 ./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2008 -./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cng_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cng/LAI_stream_CN-Cng_2008-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 21b2b06287..5b3ed52cb1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=91.066399 ./xmlchange PTS_LAT=30.497801000000003 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Dan_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Dan/LAI_stream_CN-Dan_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index c44d27ecda..d5640c7063 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=112.536102 ./xmlchange PTS_LAT=23.1733 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Din_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Din/LAI_stream_CN-Din_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 862913c330..323a43e57b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=116.2836 ./xmlchange PTS_LAT=42.0467 ./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_ALIGN=2006 +./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Du2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Du2/LAI_stream_CN-Du2_2007-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 9edae96ac8..7fc037ebe7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=101.18 ./xmlchange PTS_LAT=37.369999 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-HaM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-HaM/LAI_stream_CN-HaM_2002-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index 5d98b7a460..93cb865344 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=115.058098 ./xmlchange PTS_LAT=26.7414 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Qia_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Qia/LAI_stream_CN-Qia_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 8beef8b15d..b4c2205f18 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=14.77035 ./xmlchange PTS_LAT=49.024651 ./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_ALIGN=2006 +./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CZ-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,8 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CZ-wet/LAI_stream_CZ-wet_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index ded51614a9..f27f35cb82 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.86694 ./xmlchange PTS_LAT=50.141940999999996 ./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1997 -./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=1999 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Bay_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=1999" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=1999" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Bay/LAI_stream_DE-Bay_1997-1999.nc'" >> user_nl_clm - echo "model_year_align_lai=1997" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=1999" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index e3622b023c..54c770950d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.9143 ./xmlchange PTS_LAT=51.100101 ./xmlchange RUN_STARTDATE=2000-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Geb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Geb/LAI_stream_DE-Geb_2001-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 671c2b5b57..46e73ad319 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.512529999999998 ./xmlchange PTS_LAT=50.949471 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Gri/LAI_stream_DE-Gri_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 2992bc0a01..19ed46ed6c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.453 ./xmlchange PTS_LAT=51.079166 ./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=2000 -./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Hai_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Hai/LAI_stream_DE-Hai_2000-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 057e1d303c..ebe754b946 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.522379999999998 ./xmlchange PTS_LAT=50.893059 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Kli_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Kli/LAI_stream_DE-Kli_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index b0941e6f2a..4be03e5eba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.65547 ./xmlchange PTS_LAT=51.275311 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Meh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Meh/LAI_stream_DE-Meh_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index 6ebbd21c44..d5c31cc1cc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.72129 ./xmlchange PTS_LAT=50.786659 ./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2008 -./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Obe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Obe/LAI_stream_DE-Obe_2008-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index ac365d827f..451ba8b25f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=6.44965 ./xmlchange PTS_LAT=50.870625 ./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2008 -./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Seh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Seh/LAI_stream_DE-Seh_2008-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 7567e506e3..705aa08d54 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.3275 ./xmlchange PTS_LAT=47.806389 ./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2013 -./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-SfN_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,8 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-SfN/LAI_stream_DE-SfN_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2013" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index 105834ebdc..bf3439aab3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.566939999999999 ./xmlchange PTS_LAT=50.963612 ./xmlchange RUN_STARTDATE=1997-12-31 -./xmlchange DATM_YR_ALIGN=1998 -./xmlchange DATM_YR_START=1998 +./xmlchange DATM_YR_ALIGN=1997 +./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Tha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1998" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1998" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Tha/LAI_stream_DE-Tha_1998-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1998" >> user_nl_clm - echo "stream_year_first_lai=1998" >> user_nl_clm + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index af7c5c7f26..126cc90049 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.45753 ./xmlchange PTS_LAT=50.453499 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Wet/LAI_stream_DE-Wet_2002-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index 98989d3047..6ae7100149 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=9.58722 ./xmlchange PTS_LAT=56.4842 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Fou_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Fou/LAI_stream_DK-Fou_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index b6cc2a46c0..f54002b110 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.0833 ./xmlchange PTS_LAT=55.6833 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Lva_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Lva/LAI_stream_DK-Lva_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index a7a319f9fe..182e554099 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.09722 ./xmlchange PTS_LAT=55.530281 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Ris_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Ris/LAI_stream_DK-Ris_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index b2acac8333..7aa9939b27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.644639999999999 ./xmlchange PTS_LAT=55.48587 ./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1997 -./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Sor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Sor/LAI_stream_DK-Sor_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1997" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 3093a5dfd0..f32a7aab70 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-0.318817 ./xmlchange PTS_LAT=39.34597 ./xmlchange RUN_STARTDATE=1998-12-31 -./xmlchange DATM_YR_ALIGN=1999 -./xmlchange DATM_YR_START=1999 +./xmlchange DATM_YR_ALIGN=1998 +./xmlchange DATM_YR_START=1998 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1998" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1998" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES1/LAI_stream_ES-ES1_1999-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1998" >> user_nl_clm + echo "stream_year_first_lai=1998" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index ccc7d77922..4e18383688 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-0.315277 ./xmlchange PTS_LAT=39.275558000000004 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES2/LAI_stream_ES-ES2_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 47d92c7422..0b43f381ac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-5.773346 ./xmlchange PTS_LAT=39.941502 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LMa/LAI_stream_ES-LMa_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 3e0d911f82..41a196eccb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-2.96582 ./xmlchange PTS_LAT=37.097935 ./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_ALIGN=2006 +./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2007 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LgS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LgS/LAI_stream_ES-LgS_2007-2007.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2007" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index 24f618a5eb..3ef834bbdc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=1.4485 ./xmlchange PTS_LAT=42.15218 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-VDA_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-VDA/LAI_stream_ES-VDA_2004-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 9f9ddad2ca..5ac09d3060 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=24.295 ./xmlchange PTS_LAT=61.8475 ./xmlchange RUN_STARTDATE=1995-12-31 -./xmlchange DATM_YR_ALIGN=1996 -./xmlchange DATM_YR_START=1996 +./xmlchange DATM_YR_ALIGN=1995 +./xmlchange DATM_YR_START=1995 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Hyy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1995" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1995" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1995" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Hyy/LAI_stream_FI-Hyy_1996-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1995" >> user_nl_clm + echo "stream_year_first_lai=1995" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 7ca89dc807..5c8a75d862 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=27.295030999999998 ./xmlchange PTS_LAT=69.140694 ./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=2000 -./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Kaa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,8 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Kaa/LAI_stream_FI-Kaa_2000-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 0abb0de852..5dc0a9c418 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=24.209181 ./xmlchange PTS_LAT=67.9972 ./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_ALIGN=2006 +./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Lom_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,8 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Lom/LAI_stream_FI-Lom_2007-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index 9aee1c0892..910c30bebc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=26.637831 ./xmlchange PTS_LAT=67.361862 ./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2008 -./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Sod_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Sod/LAI_stream_FI-Sod_2008-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 156f54c1b3..e3ab07d105 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=2.7801400000000003 ./xmlchange PTS_LAT=48.476397999999996 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Fon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Fon/LAI_stream_FR-Fon_2005-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index 3c291fc0d1..357adcc64f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=1.9519099999999998 ./xmlchange PTS_LAT=48.844219 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Gri/LAI_stream_FR-Gri_2005-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index 62c715f70d..d5cc67ec0c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=7.0655600000000005 ./xmlchange PTS_LAT=48.67416 ./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1997 -./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Hes_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Hes/LAI_stream_FR-Hes_1997-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1997" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 1395b6d8b4..05ac1f7f14 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-0.7692869999999999 ./xmlchange PTS_LAT=44.71711 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-LBr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-LBr/LAI_stream_FR-LBr_2003-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 269a1300a7..9ec24de885 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=2.73583 ./xmlchange PTS_LAT=45.643059 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq1/LAI_stream_FR-Lq1_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 511a16c9ab..f70e92f858 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=2.73703 ./xmlchange PTS_LAT=45.639191 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq2/LAI_stream_FR-Lq2_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 52bec0cd37..010f7ab4e4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=3.5958300000000003 ./xmlchange PTS_LAT=43.74139 ./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=2000 -./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Pue_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Pue/LAI_stream_FR-Pue_2000-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 1de8af42ae..99a41fb615 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=19.601298999999997 ./xmlchange PTS_LAT=46.691101 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_HU-Bug_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/HU-Bug/LAI_stream_HU-Bug_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 9d6e9a636c..e84a8ff93e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=114.03639199999999 ./xmlchange PTS_LAT=-2.345 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ID-Pag_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ID-Pag/LAI_stream_ID-Pag_2002-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index 13d05c8f5c..ad893d9428 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.60516 ./xmlchange PTS_LAT=41.904099 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Amp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Amp/LAI_stream_IT-Amp_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index 949025e4b0..edc2ebd402 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=14.95744 ./xmlchange PTS_LAT=40.5238 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-BCi_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-BCi/LAI_stream_IT-BCi_2005-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index c382537fbc..c3aa780779 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.02656 ./xmlchange PTS_LAT=42.380409 ./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA1/LAI_stream_IT-CA1_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index 72a96fef26..b5e59f45ab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.02604 ./xmlchange PTS_LAT=42.37722 ./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA2/LAI_stream_IT-CA2_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index 716f026f7a..aaf6c0f5fa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.0222 ./xmlchange PTS_LAT=42.380001 ./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange DATM_YR_ALIGN=2011 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA3/LAI_stream_IT-CA3_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index c8cf54e961..e19ead9cae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.58814 ./xmlchange PTS_LAT=41.849361 ./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange DATM_YR_ALIGN=2006 +./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Col_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Col/LAI_stream_IT-Col_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 8f5462c381..4d9d6f722f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.37611 ./xmlchange PTS_LAT=41.70525 ./xmlchange RUN_STARTDATE=2000-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange DATM_YR_ALIGN=2000 +./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Cpz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Cpz/LAI_stream_IT-Cpz_2001-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index c92fc8f8f0..c35fd9c883 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=8.63358 ./xmlchange PTS_LAT=45.812641 ./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2013 -./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Isp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Isp/LAI_stream_IT-Isp_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2013" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index 42a1d8c1dc..78e4fa7a82 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=7.58259 ./xmlchange PTS_LAT=45.15258 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-LMa/LAI_stream_IT-LMa_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 354f5e96db..dfb6823bf7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.28132 ./xmlchange PTS_LAT=45.9562 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Lav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Lav/LAI_stream_IT-Lav_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 47641dad10..f2fb11c9ae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.04583 ./xmlchange PTS_LAT=46.014679 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-MBo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-MBo/LAI_stream_IT-MBo_2003-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index b7abc1c202..c32c76ccbc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.703339999999999 ./xmlchange PTS_LAT=46.114021 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Mal_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Mal/LAI_stream_IT-Mal_2003-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 7be6480036..1ddd7235aa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=8.15117 ./xmlchange PTS_LAT=40.606178 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Noe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Noe/LAI_stream_IT-Noe_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 3aa5fe1b22..c377de44fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.09109 ./xmlchange PTS_LAT=44.690189000000004 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Non_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Non/LAI_stream_IT-Non_2002-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index e39698c428..c3cbdb43fd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=9.06104 ./xmlchange PTS_LAT=45.200871 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-PT1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-PT1/LAI_stream_IT-PT1_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index a330de1a17..2b44de56de 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.433689999999999 ./xmlchange PTS_LAT=46.586861 ./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange DATM_YR_ALIGN=2009 +./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ren_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ren/LAI_stream_IT-Ren_2010-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index 29e2d23290..d9d7d88a2a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.930010000000001 ./xmlchange PTS_LAT=42.408119 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro1/LAI_stream_IT-Ro1_2002-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 03a5b3440b..acef8fe2d9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.92093 ./xmlchange PTS_LAT=42.390259 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro2/LAI_stream_IT-Ro2_2002-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 572751c8bf..6ccac3b652 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.29095 ./xmlchange PTS_LAT=43.732029 ./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2013 -./xmlchange DATM_YR_START=2013 +./xmlchange DATM_YR_ALIGN=2012 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SR2/LAI_stream_IT-SR2_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2013" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index 578dacb81a..b7f060cb8b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.28444 ./xmlchange PTS_LAT=43.727859 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SRo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SRo/LAI_stream_IT-SRo_2003-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 9b0446ac0b..d4de232ca3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=137.07879599999998 ./xmlchange PTS_LAT=35.2617 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_JP-SMF_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/JP-SMF/LAI_stream_JP-SMF_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 9f531d81c7..b71165016e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=4.927 ./xmlchange PTS_LAT=51.971001 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Ca1/LAI_stream_NL-Ca1_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 725c034516..1ebc982b05 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=5.0713 ./xmlchange PTS_LAT=52.240349 ./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2008 -./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2011 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Hor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Hor/LAI_stream_NL-Hor_2008-2011.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 3c9999cfbd..ced54b70a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=5.7435599999999996 ./xmlchange PTS_LAT=52.166579999999996 ./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1997 -./xmlchange DATM_YR_START=1997 +./xmlchange DATM_YR_ALIGN=1996 +./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Loo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Loo/LAI_stream_NL-Loo_1997-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1997" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index ea9d398769..6218694682 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=16.309401 ./xmlchange PTS_LAT=52.762199 ./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange DATM_YR_ALIGN=2003 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PL-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,8 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PL-wet/LAI_stream_PL-wet_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index ca53d5be69..e87e5aaa48 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=161.341431 ./xmlchange PTS_LAT=68.613037 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Che_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,8 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Che/LAI_stream_RU-Che_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index ac23886c1f..55e3411ccf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=32.922081 ./xmlchange PTS_LAT=56.461529000000006 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Fyo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Fyo/LAI_stream_RU-Fyo_2003-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index aabb6da38d..16c5ffc8eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=89.3508 ./xmlchange PTS_LAT=60.8008 ./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange DATM_YR_ALIGN=2002 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Zot_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Zot/LAI_stream_RU-Zot_2003-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index acb137008d..4ebae41d00 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=30.4783 ./xmlchange PTS_LAT=13.2829 ./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange DATM_YR_ALIGN=2004 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SD-Dem_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SD-Dem/LAI_stream_SD-Dem_2005-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index da2f7ae944..db06592470 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=19.55669 ./xmlchange PTS_LAT=64.181969 ./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange DATM_YR_ALIGN=2001 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SE-Deg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,8 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SE-Deg/LAI_stream_SE-Deg_2002-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 959c2e2e2d..8054e8b9b8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=31.496901 ./xmlchange PTS_LAT=-25.019699 ./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=2000 -./xmlchange DATM_YR_START=2000 +./xmlchange DATM_YR_ALIGN=1999 +./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZA-Kru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZA-Kru/LAI_stream_ZA-Kru_2000-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index a9c0c44b4a..2a4d009d6a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=23.252781 ./xmlchange PTS_LAT=-15.437778 ./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2008 -./xmlchange DATM_YR_START=2008 +./xmlchange DATM_YR_ALIGN=2007 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZM-Mon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,7 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZM-Mon/LAI_stream_ZM-Mon_2008-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm fi diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index 4031442883..2e1df27dc8 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -21,7 +21,7 @@ # Big ugly function to create usermod_dirs for each site def write_usermods(lat,lon,site,start_year,end_year, - start_date,start_tod,atm_ncpl,stop_n): + start_date,start_year_actual,start_tod,atm_ncpl,stop_n): site_dir = os.path.join('../../cime_config/usermods_dirs/PLUMBER2/',site) @@ -44,8 +44,8 @@ def write_usermods(lat,lon,site,start_year,end_year, './xmlchange PTS_LON='+str(lon) + '\n' \ './xmlchange PTS_LAT='+str(lat) + '\n' \ './xmlchange RUN_STARTDATE='+str(start_date) + '\n' \ - './xmlchange DATM_YR_ALIGN='+str(start_year) + '\n' \ - './xmlchange DATM_YR_START='+str(start_year) + '\n' \ + './xmlchange DATM_YR_ALIGN='+str(start_year_actual) + '\n' \ + './xmlchange DATM_YR_START='+str(start_year_actual) + '\n' \ './xmlchange DATM_YR_END='+str(end_year) + '\n' \ './xmlchange START_TOD='+str(start_tod) + '\n' \ './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ @@ -56,19 +56,19 @@ def write_usermods(lat,lon,site,start_year,end_year, 'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc " >> user_nl_datm_streams \n' \ - 'echo "presaero.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "presaero.SSP3-7.0:year_first='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ 'echo "presaero.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ - 'echo "presaero.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "presaero.SSP3-7.0:year_align='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ '\n' \ - 'echo "presndep.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "presndep.SSP3-7.0:year_first='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ 'echo "presndep.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ - 'echo "presndep.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "presndep.SSP3-7.0:year_align='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ '\n' \ - 'echo "co2tseries.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "co2tseries.SSP3-7.0:year_first='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ 'echo "co2tseries.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ - 'echo "co2tseries.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ + 'echo "co2tseries.SSP3-7.0:year_align='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ '\n' \ 'compset=`./xmlquery COMPSET --value` \n' \ @@ -88,8 +88,8 @@ def write_usermods(lat,lon,site,start_year,end_year, '# Turn on LAI streams for a SP case \n' \ 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n' \ ' echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ - ' echo "model_year_align_lai='+str(start_year) + '" >> user_nl_clm \n' \ - ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ + ' echo "model_year_align_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ + ' echo "stream_year_first_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ 'fi \n' ) @@ -121,12 +121,13 @@ def main(): start_year = row['start_year'] end_year = row['end_year'] start_date = row['RUN_STARTDATE'] + start_year_actual = start_date[:4] start_tod = row['START_TOD'] atm_ncpl = row['ATM_NCPL'] stop_n = 1+end_year-start_year write_usermods(lat,lon,site,start_year,end_year, - start_date,start_tod,atm_ncpl,stop_n) + start_date,start_year_actual,start_tod,atm_ncpl,stop_n) if __name__ == "__main__": main() From 142343f8878d3b56f70670ea747793c17e9ffce6 Mon Sep 17 00:00:00 2001 From: wwieder Date: Fri, 12 Apr 2024 13:20:51 -0600 Subject: [PATCH 28/43] inching closer to functional usermods --- .../PLUMBER2/AR-SLu/shell_commands | 7 ++-- .../PLUMBER2/AT-Neu/shell_commands | 23 ++++++------ .../PLUMBER2/AU-ASM/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Cow/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Cpr/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Ctr/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Cum/shell_commands | 23 ++++++------ .../PLUMBER2/AU-DaP/shell_commands | 23 ++++++------ .../PLUMBER2/AU-DaS/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Dry/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Emr/shell_commands | 23 ++++++------ .../PLUMBER2/AU-GWW/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Gin/shell_commands | 23 ++++++------ .../PLUMBER2/AU-How/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Lit/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Otw/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Rig/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Rob/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Sam/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Stp/shell_commands | 23 ++++++------ .../PLUMBER2/AU-TTE/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Tum/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Whr/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Wrr/shell_commands | 23 ++++++------ .../PLUMBER2/AU-Ync/shell_commands | 23 ++++++------ .../PLUMBER2/BE-Bra/shell_commands | 23 ++++++------ .../PLUMBER2/BE-Lon/shell_commands | 23 ++++++------ .../PLUMBER2/BE-Vie/shell_commands | 23 ++++++------ .../PLUMBER2/BR-Sa3/shell_commands | 7 ++-- .../PLUMBER2/BW-Ma1/shell_commands | 23 ++++++------ .../PLUMBER2/CA-NS1/shell_commands | 7 ++-- .../PLUMBER2/CA-NS2/shell_commands | 7 ++-- .../PLUMBER2/CA-NS4/shell_commands | 7 ++-- .../PLUMBER2/CA-NS5/shell_commands | 7 ++-- .../PLUMBER2/CA-NS6/shell_commands | 7 ++-- .../PLUMBER2/CA-NS7/shell_commands | 7 ++-- .../PLUMBER2/CA-Qcu/shell_commands | 7 ++-- .../PLUMBER2/CA-Qfo/shell_commands | 7 ++-- .../PLUMBER2/CA-SF1/shell_commands | 7 ++-- .../PLUMBER2/CA-SF2/shell_commands | 7 ++-- .../PLUMBER2/CA-SF3/shell_commands | 7 ++-- .../PLUMBER2/CH-Cha/shell_commands | 23 ++++++------ .../PLUMBER2/CH-Dav/shell_commands | 23 ++++++------ .../PLUMBER2/CH-Fru/shell_commands | 23 ++++++------ .../PLUMBER2/CH-Oe1/shell_commands | 23 ++++++------ .../PLUMBER2/CN-Cha/shell_commands | 23 ++++++------ .../PLUMBER2/CN-Cng/shell_commands | 23 ++++++------ .../PLUMBER2/CN-Dan/shell_commands | 23 ++++++------ .../PLUMBER2/CN-Din/shell_commands | 23 ++++++------ .../PLUMBER2/CN-Du2/shell_commands | 23 ++++++------ .../PLUMBER2/CN-HaM/shell_commands | 23 ++++++------ .../PLUMBER2/CN-Qia/shell_commands | 23 ++++++------ .../PLUMBER2/CZ-wet/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Bay/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Geb/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Gri/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Hai/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Kli/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Meh/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Obe/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Seh/shell_commands | 23 ++++++------ .../PLUMBER2/DE-SfN/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Tha/shell_commands | 23 ++++++------ .../PLUMBER2/DE-Wet/shell_commands | 23 ++++++------ .../PLUMBER2/DK-Fou/shell_commands | 23 ++++++------ .../PLUMBER2/DK-Lva/shell_commands | 23 ++++++------ .../PLUMBER2/DK-Ris/shell_commands | 23 ++++++------ .../PLUMBER2/DK-Sor/shell_commands | 23 ++++++------ .../PLUMBER2/DK-ZaH/shell_commands | 7 ++-- .../PLUMBER2/ES-ES1/shell_commands | 23 ++++++------ .../PLUMBER2/ES-ES2/shell_commands | 23 ++++++------ .../PLUMBER2/ES-LMa/shell_commands | 23 ++++++------ .../PLUMBER2/ES-LgS/shell_commands | 23 ++++++------ .../PLUMBER2/ES-VDA/shell_commands | 23 ++++++------ .../PLUMBER2/FI-Hyy/shell_commands | 23 ++++++------ .../PLUMBER2/FI-Kaa/shell_commands | 23 ++++++------ .../PLUMBER2/FI-Lom/shell_commands | 23 ++++++------ .../PLUMBER2/FI-Sod/shell_commands | 23 ++++++------ .../PLUMBER2/FR-Fon/shell_commands | 23 ++++++------ .../PLUMBER2/FR-Gri/shell_commands | 23 ++++++------ .../PLUMBER2/FR-Hes/shell_commands | 23 ++++++------ .../PLUMBER2/FR-LBr/shell_commands | 23 ++++++------ .../PLUMBER2/FR-Lq1/shell_commands | 23 ++++++------ .../PLUMBER2/FR-Lq2/shell_commands | 23 ++++++------ .../PLUMBER2/FR-Pue/shell_commands | 23 ++++++------ .../PLUMBER2/GF-Guy/shell_commands | 7 ++-- .../PLUMBER2/HU-Bug/shell_commands | 23 ++++++------ .../PLUMBER2/ID-Pag/shell_commands | 23 ++++++------ .../PLUMBER2/IE-Ca1/shell_commands | 7 ++-- .../PLUMBER2/IE-Dri/shell_commands | 7 ++-- .../PLUMBER2/IT-Amp/shell_commands | 23 ++++++------ .../PLUMBER2/IT-BCi/shell_commands | 23 ++++++------ .../PLUMBER2/IT-CA1/shell_commands | 23 ++++++------ .../PLUMBER2/IT-CA2/shell_commands | 23 ++++++------ .../PLUMBER2/IT-CA3/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Col/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Cpz/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Isp/shell_commands | 23 ++++++------ .../PLUMBER2/IT-LMa/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Lav/shell_commands | 23 ++++++------ .../PLUMBER2/IT-MBo/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Mal/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Noe/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Non/shell_commands | 23 ++++++------ .../PLUMBER2/IT-PT1/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Ren/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Ro1/shell_commands | 23 ++++++------ .../PLUMBER2/IT-Ro2/shell_commands | 23 ++++++------ .../PLUMBER2/IT-SR2/shell_commands | 23 ++++++------ .../PLUMBER2/IT-SRo/shell_commands | 23 ++++++------ .../PLUMBER2/JP-SMF/shell_commands | 23 ++++++------ .../PLUMBER2/NL-Ca1/shell_commands | 23 ++++++------ .../PLUMBER2/NL-Hor/shell_commands | 23 ++++++------ .../PLUMBER2/NL-Loo/shell_commands | 23 ++++++------ .../PLUMBER2/PL-wet/shell_commands | 23 ++++++------ .../PLUMBER2/PT-Esp/shell_commands | 7 ++-- .../PLUMBER2/PT-Mi1/shell_commands | 7 ++-- .../PLUMBER2/PT-Mi2/shell_commands | 7 ++-- .../PLUMBER2/RU-Che/shell_commands | 23 ++++++------ .../PLUMBER2/RU-Fyo/shell_commands | 23 ++++++------ .../PLUMBER2/RU-Zot/shell_commands | 23 ++++++------ .../PLUMBER2/SD-Dem/shell_commands | 23 ++++++------ .../PLUMBER2/SE-Deg/shell_commands | 23 ++++++------ .../PLUMBER2/UK-Gri/shell_commands | 7 ++-- .../PLUMBER2/UK-Ham/shell_commands | 7 ++-- .../PLUMBER2/UK-PL3/shell_commands | 7 ++-- .../PLUMBER2/US-AR1/shell_commands | 7 ++-- .../PLUMBER2/US-AR2/shell_commands | 7 ++-- .../PLUMBER2/US-ARM/shell_commands | 7 ++-- .../PLUMBER2/US-Aud/shell_commands | 7 ++-- .../PLUMBER2/US-Bar/shell_commands | 7 ++-- .../PLUMBER2/US-Bkg/shell_commands | 7 ++-- .../PLUMBER2/US-Blo/shell_commands | 7 ++-- .../PLUMBER2/US-Bo1/shell_commands | 7 ++-- .../PLUMBER2/US-Cop/shell_commands | 7 ++-- .../PLUMBER2/US-FPe/shell_commands | 7 ++-- .../PLUMBER2/US-GLE/shell_commands | 7 ++-- .../PLUMBER2/US-Goo/shell_commands | 7 ++-- .../PLUMBER2/US-Ha1/shell_commands | 7 ++-- .../PLUMBER2/US-Ho1/shell_commands | 7 ++-- .../PLUMBER2/US-KS2/shell_commands | 7 ++-- .../PLUMBER2/US-Los/shell_commands | 7 ++-- .../PLUMBER2/US-MMS/shell_commands | 7 ++-- .../PLUMBER2/US-MOz/shell_commands | 7 ++-- .../PLUMBER2/US-Me2/shell_commands | 7 ++-- .../PLUMBER2/US-Me4/shell_commands | 7 ++-- .../PLUMBER2/US-Me6/shell_commands | 7 ++-- .../PLUMBER2/US-Myb/shell_commands | 7 ++-- .../PLUMBER2/US-NR1/shell_commands | 7 ++-- .../PLUMBER2/US-Ne1/shell_commands | 7 ++-- .../PLUMBER2/US-Ne2/shell_commands | 7 ++-- .../PLUMBER2/US-Ne3/shell_commands | 7 ++-- .../PLUMBER2/US-PFa/shell_commands | 7 ++-- .../PLUMBER2/US-Prr/shell_commands | 7 ++-- .../PLUMBER2/US-SP1/shell_commands | 7 ++-- .../PLUMBER2/US-SP2/shell_commands | 7 ++-- .../PLUMBER2/US-SP3/shell_commands | 7 ++-- .../PLUMBER2/US-SRG/shell_commands | 7 ++-- .../PLUMBER2/US-SRM/shell_commands | 7 ++-- .../PLUMBER2/US-Syv/shell_commands | 7 ++-- .../PLUMBER2/US-Ton/shell_commands | 7 ++-- .../PLUMBER2/US-Tw4/shell_commands | 7 ++-- .../PLUMBER2/US-Twt/shell_commands | 7 ++-- .../PLUMBER2/US-UMB/shell_commands | 7 ++-- .../PLUMBER2/US-Var/shell_commands | 7 ++-- .../PLUMBER2/US-WCr/shell_commands | 7 ++-- .../PLUMBER2/US-Whs/shell_commands | 7 ++-- .../PLUMBER2/US-Wkg/shell_commands | 7 ++-- .../PLUMBER2/ZA-Kru/shell_commands | 23 ++++++------ .../PLUMBER2/ZM-Mon/shell_commands | 23 ++++++------ .../PLUMBER2/defaults/user_nl_datm_streams | 8 +---- tools/site_and_regional/plumber2_usermods.py | 36 ++++++++++++------- 172 files changed, 1545 insertions(+), 1369 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index ce4fcd179d..92ac088203 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-66.459808 ./xmlchange PTS_LAT=-33.464802 -./xmlchange RUN_STARTDATE=2010-01-01 -./xmlchange DATM_YR_ALIGN=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=10800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AR-SLu/LAI_stream_AR-SLu_2010-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index d2f500cc47..205dcc0b77 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.3175 ./xmlchange PTS_LAT=47.116669 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AT-Neu_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AT-Neu/CLM1PT_data/CTSM_DATM_AT-Neu_2002-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AT-Neu/LAI_stream_AT-Neu_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 6b87df1a81..a6cb88617e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=133.24899299999998 ./xmlchange PTS_LAT=-22.283001000000002 -./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-ASM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-ASM/CLM1PT_data/CTSM_DATM_AU-ASM_2011-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-ASM/LAI_stream_AU-ASM_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 17c551e4b0..3ed62c3e1c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.427155 ./xmlchange PTS_LAT=-16.23819 -./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2009 -./xmlchange DATM_YR_START=2009 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2015 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cow_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cow/CLM1PT_data/CTSM_DATM_AU-Cow_2010-2015.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cow/LAI_stream_AU-Cow_2010-2015.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 73993b8265..04d2b30a3f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=140.589127 ./xmlchange PTS_LAT=-34.00206 -./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cpr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cpr/CLM1PT_data/CTSM_DATM_AU-Cpr_2011-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cpr/LAI_stream_AU-Cpr_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index dc487f5bc5..5b608f38ac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.446854 ./xmlchange PTS_LAT=-16.103279 -./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2009 -./xmlchange DATM_YR_START=2009 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ctr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ctr/CLM1PT_data/CTSM_DATM_AU-Ctr_2010-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ctr/LAI_stream_AU-Ctr_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 7caa306690..01c5bc5989 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=150.722473 ./xmlchange PTS_LAT=-33.613296999999996 -./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2018 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Cum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Cum/CLM1PT_data/CTSM_DATM_AU-Cum_2013-2018.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2018" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2018" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2018" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cum/LAI_stream_AU-Cum_2013-2018.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2018" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 30d061aec3..48d267bc18 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=131.3181 ./xmlchange PTS_LAT=-14.0633 -./xmlchange RUN_STARTDATE=2008-12-31 -./xmlchange DATM_YR_ALIGN=2008 -./xmlchange DATM_YR_START=2008 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaP_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaP/CLM1PT_data/CTSM_DATM_AU-DaP_2009-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaP/LAI_stream_AU-DaP_2009-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 7b4369ad9d..64cb89fff9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=131.388 ./xmlchange PTS_LAT=-14.159282999999999 -./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2009 -./xmlchange DATM_YR_START=2009 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-DaS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-DaS/CLM1PT_data/CTSM_DATM_AU-DaS_2010-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaS/LAI_stream_AU-DaS_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 7c724885ad..05d3fb4195 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=132.370605 ./xmlchange PTS_LAT=-15.2588 -./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2015 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Dry_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Dry/CLM1PT_data/CTSM_DATM_AU-Dry_2011-2015.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2015" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Dry/LAI_stream_AU-Dry_2011-2015.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 347b9ffb73..f1169d6e67 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=148.474594 ./xmlchange PTS_LAT=-23.8587 -./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Emr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Emr/CLM1PT_data/CTSM_DATM_AU-Emr_2012-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Emr/LAI_stream_AU-Emr_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 91437bf3e2..17e4b90dc9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=120.654099 ./xmlchange PTS_LAT=-30.191299 -./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-GWW_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-GWW/CLM1PT_data/CTSM_DATM_AU-GWW_2013-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-GWW/LAI_stream_AU-GWW_2013-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 3fb6afc23e..5def2440c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=115.650002 ./xmlchange PTS_LAT=-31.375 -./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Gin_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Gin/CLM1PT_data/CTSM_DATM_AU-Gin_2012-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Gin/LAI_stream_AU-Gin_2012-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 93ff63fae6..925db7c9c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=131.149994 ./xmlchange PTS_LAT=-12.4952 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-How_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-How/CLM1PT_data/CTSM_DATM_AU-How_2003-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-How/LAI_stream_AU-How_2003-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index a0d32eed4e..80faa8d991 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=130.79449499999998 ./xmlchange PTS_LAT=-13.179039999999999 -./xmlchange RUN_STARTDATE=2015-12-31 -./xmlchange DATM_YR_ALIGN=2015 -./xmlchange DATM_YR_START=2015 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2016 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Lit_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Lit/CLM1PT_data/CTSM_DATM_AU-Lit_2016-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Lit/LAI_stream_AU-Lit_2016-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2015" >> user_nl_clm - echo "stream_year_first_lai=2015" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 15227e11da..53963203c2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=142.816803 ./xmlchange PTS_LAT=-38.532340999999995 -./xmlchange RUN_STARTDATE=2008-12-31 -./xmlchange DATM_YR_ALIGN=2008 -./xmlchange DATM_YR_START=2008 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Otw_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Otw/CLM1PT_data/CTSM_DATM_AU-Otw_2009-2010.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Otw/LAI_stream_AU-Otw_2009-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index 3a41d38996..94d3d02656 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.575897 ./xmlchange PTS_LAT=-36.649899 -./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rig_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rig/CLM1PT_data/CTSM_DATM_AU-Rig_2011-2016.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rig/LAI_stream_AU-Rig_2011-2016.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 7fc3c3f029..9a150a17c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.630096 ./xmlchange PTS_LAT=-17.1175 -./xmlchange RUN_STARTDATE=2013-12-31 -./xmlchange DATM_YR_ALIGN=2013 -./xmlchange DATM_YR_START=2013 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2014 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Rob_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Rob/CLM1PT_data/CTSM_DATM_AU-Rob_2014-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rob/LAI_stream_AU-Rob_2014-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2013" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index f60ddd3a42..92b3721f70 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=152.87780800000002 ./xmlchange PTS_LAT=-27.3881 -./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Sam_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Sam/CLM1PT_data/CTSM_DATM_AU-Sam_2011-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Sam/LAI_stream_AU-Sam_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 88a1218c02..454625d1a6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=133.350204 ./xmlchange PTS_LAT=-17.1507 -./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2009 -./xmlchange DATM_YR_START=2009 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Stp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Stp/CLM1PT_data/CTSM_DATM_AU-Stp_2010-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Stp/LAI_stream_AU-Stp_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 2b537a7c68..e2b39e806a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=133.639999 ./xmlchange PTS_LAT=-22.287001 -./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-TTE_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-TTE/CLM1PT_data/CTSM_DATM_AU-TTE_2013-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-TTE/LAI_stream_AU-TTE_2013-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 2e373b9b10..6012652980 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=148.151703 ./xmlchange PTS_LAT=-35.656601 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Tum_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Tum/CLM1PT_data/CTSM_DATM_AU-Tum_2002-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Tum/LAI_stream_AU-Tum_2002-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 2bb62c05ca..622d480b5c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=145.029404 ./xmlchange PTS_LAT=-36.673199 -./xmlchange RUN_STARTDATE=2014-12-31 -./xmlchange DATM_YR_ALIGN=2014 -./xmlchange DATM_YR_START=2014 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2015 ./xmlchange DATM_YR_END=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Whr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Whr/CLM1PT_data/CTSM_DATM_AU-Whr_2015-2016.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2014" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2014" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2016" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2014" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Whr/LAI_stream_AU-Whr_2015-2016.nc'" >> user_nl_clm - echo "model_year_align_lai=2014" >> user_nl_clm - echo "stream_year_first_lai=2014" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 60e8942f1b..a972a081fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=146.654495 ./xmlchange PTS_LAT=-43.09502 -./xmlchange RUN_STARTDATE=2015-12-31 -./xmlchange DATM_YR_ALIGN=2015 -./xmlchange DATM_YR_START=2015 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2016 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Wrr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Wrr/CLM1PT_data/CTSM_DATM_AU-Wrr_2016-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2016" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2016" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2016" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2015" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2016" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Wrr/LAI_stream_AU-Wrr_2016-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2015" >> user_nl_clm - echo "stream_year_first_lai=2015" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index a48d0204d0..d78c043d5a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=146.290695 ./xmlchange PTS_LAT=-34.9893 -./xmlchange RUN_STARTDATE=2010-12-31 -./xmlchange DATM_YR_ALIGN=2010 -./xmlchange DATM_YR_START=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_AU-Ync_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/AU-Ync/CLM1PT_data/CTSM_DATM_AU-Ync_2011-2017.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2017" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ync/LAI_stream_AU-Ync_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 5ec934b266..436ed46eae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=4.52056 ./xmlchange PTS_LAT=51.309166 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Bra_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Bra/CLM1PT_data/CTSM_DATM_BE-Bra_2004-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Bra/LAI_stream_BE-Bra_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 442f5fdbe1..db8de9f04c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=4.74613 ./xmlchange PTS_LAT=50.551590000000004 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Lon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Lon/CLM1PT_data/CTSM_DATM_BE-Lon_2005-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Lon/LAI_stream_BE-Lon_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 1c0f0c0165..29fc4183d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=5.99805 ./xmlchange PTS_LAT=50.305069 -./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1996 -./xmlchange DATM_YR_START=1996 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BE-Vie_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BE-Vie/CLM1PT_data/CTSM_DATM_BE-Vie_1997-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Vie/LAI_stream_BE-Vie_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index e656c23f7c..9af7cb68e9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-54.971436 ./xmlchange PTS_LAT=-3.0180290000000003 -./xmlchange RUN_STARTDATE=2001-01-01 -./xmlchange DATM_YR_ALIGN=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=14400 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BR-Sa3/LAI_stream_BR-Sa3_2001-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 447b0833ef..1c2b1b47bd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=23.560329 ./xmlchange PTS_LAT=-19.9165 -./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=1999 -./xmlchange DATM_YR_START=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2000 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_BW-Ma1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/BW-Ma1/CLM1PT_data/CTSM_DATM_BW-Ma1_2000-2000.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2000" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BW-Ma1/LAI_stream_BW-Ma1_2000-2000.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 561f205363..1aa1e8f2ce 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-98.483887 ./xmlchange PTS_LAT=55.8792 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS1/LAI_stream_CA-NS1_2003-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index a90b4ab44f..0891af09a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-98.524689 ./xmlchange PTS_LAT=55.9058 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS2/LAI_stream_CA-NS2_2002-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index a16d1d6adc..3d414a3715 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-98.380615 ./xmlchange PTS_LAT=55.914398 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS4/LAI_stream_CA-NS4_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index 8d8015463e..c40c076144 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-98.484985 ./xmlchange PTS_LAT=55.863098 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS5/LAI_stream_CA-NS5_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index 33bef39a08..40cd23cd56 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-98.964417 ./xmlchange PTS_LAT=55.916698 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS6/LAI_stream_CA-NS6_2002-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 0a065cf80c..0b86346692 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-99.94830300000001 ./xmlchange PTS_LAT=56.635799 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS7/LAI_stream_CA-NS7_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index 6036c9384d..ee566fb085 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-74.03653 ./xmlchange PTS_LAT=49.267078000000005 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qcu/LAI_stream_CA-Qcu_2002-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index 8d926b0230..97148db9fd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-74.342102 ./xmlchange PTS_LAT=49.692501 -./xmlchange RUN_STARTDATE=2004-01-01 -./xmlchange DATM_YR_ALIGN=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qfo/LAI_stream_CA-Qfo_2004-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index 5892d13bbb..079c6c2860 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-105.817596 ./xmlchange PTS_LAT=54.485001000000004 -./xmlchange RUN_STARTDATE=2004-01-01 -./xmlchange DATM_YR_ALIGN=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF1/LAI_stream_CA-SF1_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 7ac36361d2..6a7010b6cb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-105.877502 ./xmlchange PTS_LAT=54.253899 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF2/LAI_stream_CA-SF2_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index 0879941ba5..b2cb2705c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-106.00531000000001 ./xmlchange PTS_LAT=54.091599 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF3/LAI_stream_CA-SF3_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index bfd3e11e13..4f6dbbf5aa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=8.41044 ./xmlchange PTS_LAT=47.21022 -./xmlchange RUN_STARTDATE=2005-12-31 -./xmlchange DATM_YR_ALIGN=2005 -./xmlchange DATM_YR_START=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Cha/CLM1PT_data/CTSM_DATM_CH-Cha_2006-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Cha/LAI_stream_CH-Cha_2006-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index a44cb69bcd..ef6a6d2026 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=9.85592 ./xmlchange PTS_LAT=46.815334 -./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1996 -./xmlchange DATM_YR_START=1996 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Dav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Dav/CLM1PT_data/CTSM_DATM_CH-Dav_1997-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Dav/LAI_stream_CH-Dav_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 08c2337c71..3732d035ac 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=8.53778 ./xmlchange PTS_LAT=47.115833 -./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2006 -./xmlchange DATM_YR_START=2006 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Fru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Fru/CLM1PT_data/CTSM_DATM_CH-Fru_2007-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Fru/LAI_stream_CH-Fru_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2006" >> user_nl_clm - echo "stream_year_first_lai=2006" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 8127d983dd..329e57f671 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=7.73194 ./xmlchange PTS_LAT=47.285831 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CH-Oe1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CH-Oe1/CLM1PT_data/CTSM_DATM_CH-Oe1_2002-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Oe1/LAI_stream_CH-Oe1_2002-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index 55161d1279..1a3436d7ba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=128.09579499999998 ./xmlchange PTS_LAT=42.4025 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cha/CLM1PT_data/CTSM_DATM_CN-Cha_2003-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cha/LAI_stream_CN-Cha_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index a028639375..0309c8df25 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=123.509201 ./xmlchange PTS_LAT=44.593399 -./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Cng_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Cng/CLM1PT_data/CTSM_DATM_CN-Cng_2008-2009.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cng/LAI_stream_CN-Cng_2008-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 5b3ed52cb1..f234daec80 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=91.066399 ./xmlchange PTS_LAT=30.497801000000003 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Dan_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Dan/CLM1PT_data/CTSM_DATM_CN-Dan_2004-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Dan/LAI_stream_CN-Dan_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index d5640c7063..b320ea1917 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=112.536102 ./xmlchange PTS_LAT=23.1733 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Din_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Din/CLM1PT_data/CTSM_DATM_CN-Din_2003-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Din/LAI_stream_CN-Din_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 323a43e57b..17b64a9e6b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=116.2836 ./xmlchange PTS_LAT=42.0467 -./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2006 -./xmlchange DATM_YR_START=2006 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Du2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Du2/CLM1PT_data/CTSM_DATM_CN-Du2_2007-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Du2/LAI_stream_CN-Du2_2007-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2006" >> user_nl_clm - echo "stream_year_first_lai=2006" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index 7fc037ebe7..adf6739e1f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=101.18 ./xmlchange PTS_LAT=37.369999 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-HaM_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-HaM/CLM1PT_data/CTSM_DATM_CN-HaM_2002-2003.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-HaM/LAI_stream_CN-HaM_2002-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index 93cb865344..dec5a4b5ae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=115.058098 ./xmlchange PTS_LAT=26.7414 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CN-Qia_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CN-Qia/CLM1PT_data/CTSM_DATM_CN-Qia_2003-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Qia/LAI_stream_CN-Qia_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index b4c2205f18..5f37f8cdab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=14.77035 ./xmlchange PTS_LAT=49.024651 -./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2006 -./xmlchange DATM_YR_START=2006 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_CZ-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/CZ-wet/CLM1PT_data/CTSM_DATM_CZ-wet_2007-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CZ-wet/LAI_stream_CZ-wet_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2006" >> user_nl_clm - echo "stream_year_first_lai=2006" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index f27f35cb82..5c4288260b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.86694 ./xmlchange PTS_LAT=50.141940999999996 -./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1996 -./xmlchange DATM_YR_START=1996 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=1999 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Bay_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Bay/CLM1PT_data/CTSM_DATM_DE-Bay_1997-1999.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=1999" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=1999" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=1999" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Bay/LAI_stream_DE-Bay_1997-1999.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=1999" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 54c770950d..ea93d12998 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.9143 ./xmlchange PTS_LAT=51.100101 -./xmlchange RUN_STARTDATE=2000-12-31 -./xmlchange DATM_YR_ALIGN=2000 -./xmlchange DATM_YR_START=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Geb_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Geb/CLM1PT_data/CTSM_DATM_DE-Geb_2001-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Geb/LAI_stream_DE-Geb_2001-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 46e73ad319..4f724bd016 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.512529999999998 ./xmlchange PTS_LAT=50.949471 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Gri/CLM1PT_data/CTSM_DATM_DE-Gri_2004-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Gri/LAI_stream_DE-Gri_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 19ed46ed6c..70c28bd2cc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.453 ./xmlchange PTS_LAT=51.079166 -./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=1999 -./xmlchange DATM_YR_START=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Hai_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Hai/CLM1PT_data/CTSM_DATM_DE-Hai_2000-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Hai/LAI_stream_DE-Hai_2000-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index ebe754b946..72b1ba6708 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.522379999999998 ./xmlchange PTS_LAT=50.893059 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Kli_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Kli/CLM1PT_data/CTSM_DATM_DE-Kli_2005-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Kli/LAI_stream_DE-Kli_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 4be03e5eba..81f06f205f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.65547 ./xmlchange PTS_LAT=51.275311 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Meh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Meh/CLM1PT_data/CTSM_DATM_DE-Meh_2004-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Meh/LAI_stream_DE-Meh_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index d5c31cc1cc..81b1064cde 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.72129 ./xmlchange PTS_LAT=50.786659 -./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Obe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Obe/CLM1PT_data/CTSM_DATM_DE-Obe_2008-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Obe/LAI_stream_DE-Obe_2008-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 451ba8b25f..cda173d8af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=6.44965 ./xmlchange PTS_LAT=50.870625 -./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Seh_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Seh/CLM1PT_data/CTSM_DATM_DE-Seh_2008-2010.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Seh/LAI_stream_DE-Seh_2008-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 705aa08d54..5923181787 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.3275 ./xmlchange PTS_LAT=47.806389 -./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-SfN_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-SfN/CLM1PT_data/CTSM_DATM_DE-SfN_2013-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-SfN/LAI_stream_DE-SfN_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index bf3439aab3..8204ea3c48 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.566939999999999 ./xmlchange PTS_LAT=50.963612 -./xmlchange RUN_STARTDATE=1997-12-31 -./xmlchange DATM_YR_ALIGN=1997 -./xmlchange DATM_YR_START=1997 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1998 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Tha_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Tha/CLM1PT_data/CTSM_DATM_DE-Tha_1998-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1998" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1998" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1998" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Tha/LAI_stream_DE-Tha_1998-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1997" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1998" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 126cc90049..4e599eb61e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.45753 ./xmlchange PTS_LAT=50.453499 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DE-Wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DE-Wet/CLM1PT_data/CTSM_DATM_DE-Wet_2002-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Wet/LAI_stream_DE-Wet_2002-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index 6ae7100149..1754e62ea1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=9.58722 ./xmlchange PTS_LAT=56.4842 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Fou_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Fou/CLM1PT_data/CTSM_DATM_DK-Fou_2005-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Fou/LAI_stream_DK-Fou_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index f54002b110..071a4d38dd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.0833 ./xmlchange PTS_LAT=55.6833 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Lva_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Lva/CLM1PT_data/CTSM_DATM_DK-Lva_2005-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Lva/LAI_stream_DK-Lva_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index 182e554099..383eb92574 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.09722 ./xmlchange PTS_LAT=55.530281 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Ris_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Ris/CLM1PT_data/CTSM_DATM_DK-Ris_2004-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Ris/LAI_stream_DK-Ris_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 7aa9939b27..f4b04a324a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.644639999999999 ./xmlchange PTS_LAT=55.48587 -./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1996 -./xmlchange DATM_YR_START=1996 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_DK-Sor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/DK-Sor/CLM1PT_data/CTSM_DATM_DK-Sor_1997-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Sor/LAI_stream_DK-Sor_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index a5c068cb72..8473e039d2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-20.550293 ./xmlchange PTS_LAT=74.473282 -./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange DATM_YR_ALIGN=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-ZaH/LAI_stream_DK-ZaH_2000-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index f32a7aab70..7bdf7e9a9e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-0.318817 ./xmlchange PTS_LAT=39.34597 -./xmlchange RUN_STARTDATE=1998-12-31 -./xmlchange DATM_YR_ALIGN=1998 -./xmlchange DATM_YR_START=1998 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES1/CLM1PT_data/CTSM_DATM_ES-ES1_1999-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1998" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1998" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1998" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1998" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES1/LAI_stream_ES-ES1_1999-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1998" >> user_nl_clm - echo "stream_year_first_lai=1998" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index 4e18383688..a2ff614476 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-0.315277 ./xmlchange PTS_LAT=39.275558000000004 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-ES2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-ES2/CLM1PT_data/CTSM_DATM_ES-ES2_2005-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES2/LAI_stream_ES-ES2_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index 0b43f381ac..d06fdd20b0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-5.773346 ./xmlchange PTS_LAT=39.941502 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LMa/CLM1PT_data/CTSM_DATM_ES-LMa_2004-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LMa/LAI_stream_ES-LMa_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 41a196eccb..4ceaa978f6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-2.96582 ./xmlchange PTS_LAT=37.097935 -./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2006 -./xmlchange DATM_YR_START=2006 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2007 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-LgS_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-LgS/CLM1PT_data/CTSM_DATM_ES-LgS_2007-2007.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2007" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LgS/LAI_stream_ES-LgS_2007-2007.nc'" >> user_nl_clm - echo "model_year_align_lai=2006" >> user_nl_clm - echo "stream_year_first_lai=2006" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2007" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index 3ef834bbdc..e92b891098 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=1.4485 ./xmlchange PTS_LAT=42.15218 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ES-VDA_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ES-VDA/CLM1PT_data/CTSM_DATM_ES-VDA_2004-2004.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-VDA/LAI_stream_ES-VDA_2004-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 5ac09d3060..3c3f6c04a9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=24.295 ./xmlchange PTS_LAT=61.8475 -./xmlchange RUN_STARTDATE=1995-12-31 -./xmlchange DATM_YR_ALIGN=1995 -./xmlchange DATM_YR_START=1995 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Hyy_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Hyy/CLM1PT_data/CTSM_DATM_FI-Hyy_1996-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1995" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1995" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1995" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1995" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1995" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1995" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Hyy/LAI_stream_FI-Hyy_1996-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1995" >> user_nl_clm - echo "stream_year_first_lai=1995" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index 5c8a75d862..b430267d3c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=27.295030999999998 ./xmlchange PTS_LAT=69.140694 -./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=1999 -./xmlchange DATM_YR_START=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Kaa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Kaa/CLM1PT_data/CTSM_DATM_FI-Kaa_2000-2002.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Kaa/LAI_stream_FI-Kaa_2000-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 5dc0a9c418..4d1521090a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=24.209181 ./xmlchange PTS_LAT=67.9972 -./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2006 -./xmlchange DATM_YR_START=2006 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Lom_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Lom/CLM1PT_data/CTSM_DATM_FI-Lom_2007-2009.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Lom/LAI_stream_FI-Lom_2007-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=2006" >> user_nl_clm - echo "stream_year_first_lai=2006" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index 910c30bebc..05ce17cf42 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=26.637831 ./xmlchange PTS_LAT=67.361862 -./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FI-Sod_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FI-Sod/CLM1PT_data/CTSM_DATM_FI-Sod_2008-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Sod/LAI_stream_FI-Sod_2008-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index e3ab07d105..ac7555a5a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=2.7801400000000003 ./xmlchange PTS_LAT=48.476397999999996 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Fon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Fon/CLM1PT_data/CTSM_DATM_FR-Fon_2005-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Fon/LAI_stream_FR-Fon_2005-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index 357adcc64f..ca5b4b5390 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=1.9519099999999998 ./xmlchange PTS_LAT=48.844219 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Gri_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Gri/CLM1PT_data/CTSM_DATM_FR-Gri_2005-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Gri/LAI_stream_FR-Gri_2005-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index d5cc67ec0c..fd87a11721 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=7.0655600000000005 ./xmlchange PTS_LAT=48.67416 -./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1996 -./xmlchange DATM_YR_START=1996 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Hes_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Hes/CLM1PT_data/CTSM_DATM_FR-Hes_1997-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Hes/LAI_stream_FR-Hes_1997-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index 05ac1f7f14..ce3cda7cf3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=-0.7692869999999999 ./xmlchange PTS_LAT=44.71711 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-LBr_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-LBr/CLM1PT_data/CTSM_DATM_FR-LBr_2003-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-LBr/LAI_stream_FR-LBr_2003-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index 9ec24de885..c917057192 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=2.73583 ./xmlchange PTS_LAT=45.643059 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq1/CLM1PT_data/CTSM_DATM_FR-Lq1_2004-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq1/LAI_stream_FR-Lq1_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index f70e92f858..97be69bb3f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=2.73703 ./xmlchange PTS_LAT=45.639191 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Lq2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Lq2/CLM1PT_data/CTSM_DATM_FR-Lq2_2004-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq2/LAI_stream_FR-Lq2_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index 010f7ab4e4..e3a5da4fab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=3.5958300000000003 ./xmlchange PTS_LAT=43.74139 -./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=1999 -./xmlchange DATM_YR_START=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_FR-Pue_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/FR-Pue/CLM1PT_data/CTSM_DATM_FR-Pue_2000-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Pue/LAI_stream_FR-Pue_2000-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index d36335e8d6..fcca328b44 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-52.924866 ./xmlchange PTS_LAT=5.278772 -./xmlchange RUN_STARTDATE=2004-01-01 -./xmlchange DATM_YR_ALIGN=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=10800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/GF-Guy/LAI_stream_GF-Guy_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 99a41fb615..e2490dc85f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=19.601298999999997 ./xmlchange PTS_LAT=46.691101 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_HU-Bug_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/HU-Bug/CLM1PT_data/CTSM_DATM_HU-Bug_2003-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/HU-Bug/LAI_stream_HU-Bug_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index e84a8ff93e..4f8672fdae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=114.03639199999999 ./xmlchange PTS_LAT=-2.345 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ID-Pag_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ID-Pag/CLM1PT_data/CTSM_DATM_ID-Pag_2002-2003.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ID-Pag/LAI_stream_ID-Pag_2002-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 520d6398e2..03f57ab40f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-6.918152 ./xmlchange PTS_LAT=52.858791000000004 -./xmlchange RUN_STARTDATE=2004-01-01 -./xmlchange DATM_YR_ALIGN=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Ca1/LAI_stream_IE-Ca1_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index de2159762c..0753b11167 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-8.751800999999999 ./xmlchange PTS_LAT=51.986691 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Dri/LAI_stream_IE-Dri_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index ad893d9428..735c86a76b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.60516 ./xmlchange PTS_LAT=41.904099 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Amp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Amp/CLM1PT_data/CTSM_DATM_IT-Amp_2003-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Amp/LAI_stream_IT-Amp_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index edc2ebd402..f541059657 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=14.95744 ./xmlchange PTS_LAT=40.5238 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-BCi_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-BCi/CLM1PT_data/CTSM_DATM_IT-BCi_2005-2010.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-BCi/LAI_stream_IT-BCi_2005-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index c3aa780779..00b15644eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.02656 ./xmlchange PTS_LAT=42.380409 -./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA1/CLM1PT_data/CTSM_DATM_IT-CA1_2012-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA1/LAI_stream_IT-CA1_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index b5e59f45ab..cd3f0c7cca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.02604 ./xmlchange PTS_LAT=42.37722 -./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA2/CLM1PT_data/CTSM_DATM_IT-CA2_2012-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA2/LAI_stream_IT-CA2_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index aaf6c0f5fa..be5727e427 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.0222 ./xmlchange PTS_LAT=42.380001 -./xmlchange RUN_STARTDATE=2011-12-31 -./xmlchange DATM_YR_ALIGN=2011 -./xmlchange DATM_YR_START=2011 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-CA3_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-CA3/CLM1PT_data/CTSM_DATM_IT-CA3_2012-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2011" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA3/LAI_stream_IT-CA3_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index e19ead9cae..50b1d3866e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=13.58814 ./xmlchange PTS_LAT=41.849361 -./xmlchange RUN_STARTDATE=2006-12-31 -./xmlchange DATM_YR_ALIGN=2006 -./xmlchange DATM_YR_START=2006 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Col_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Col/CLM1PT_data/CTSM_DATM_IT-Col_2007-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2006" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Col/LAI_stream_IT-Col_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2006" >> user_nl_clm - echo "stream_year_first_lai=2006" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 4d9d6f722f..5786549845 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=12.37611 ./xmlchange PTS_LAT=41.70525 -./xmlchange RUN_STARTDATE=2000-12-31 -./xmlchange DATM_YR_ALIGN=2000 -./xmlchange DATM_YR_START=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Cpz_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Cpz/CLM1PT_data/CTSM_DATM_IT-Cpz_2001-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Cpz/LAI_stream_IT-Cpz_2001-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index c35fd9c883..12d808ff5c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=8.63358 ./xmlchange PTS_LAT=45.812641 -./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Isp_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Isp/CLM1PT_data/CTSM_DATM_IT-Isp_2013-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Isp/LAI_stream_IT-Isp_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index 78e4fa7a82..697607f3fc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=7.58259 ./xmlchange PTS_LAT=45.15258 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-LMa_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-LMa/CLM1PT_data/CTSM_DATM_IT-LMa_2003-2004.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-LMa/LAI_stream_IT-LMa_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index dfb6823bf7..4de9403ffe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.28132 ./xmlchange PTS_LAT=45.9562 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Lav_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Lav/CLM1PT_data/CTSM_DATM_IT-Lav_2005-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Lav/LAI_stream_IT-Lav_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index f2fb11c9ae..4125bbe2a1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.04583 ./xmlchange PTS_LAT=46.014679 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-MBo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-MBo/CLM1PT_data/CTSM_DATM_IT-MBo_2003-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-MBo/LAI_stream_IT-MBo_2003-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index c32c76ccbc..094dd9935e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.703339999999999 ./xmlchange PTS_LAT=46.114021 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Mal_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Mal/CLM1PT_data/CTSM_DATM_IT-Mal_2003-2003.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Mal/LAI_stream_IT-Mal_2003-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 1ddd7235aa..7ef94572d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=8.15117 ./xmlchange PTS_LAT=40.606178 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Noe_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Noe/CLM1PT_data/CTSM_DATM_IT-Noe_2004-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Noe/LAI_stream_IT-Noe_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index c377de44fe..2c2e138668 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.09109 ./xmlchange PTS_LAT=44.690189000000004 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Non_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Non/CLM1PT_data/CTSM_DATM_IT-Non_2002-2002.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Non/LAI_stream_IT-Non_2002-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index c3cbdb43fd..a130840742 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=9.06104 ./xmlchange PTS_LAT=45.200871 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-PT1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-PT1/CLM1PT_data/CTSM_DATM_IT-PT1_2003-2004.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-PT1/LAI_stream_IT-PT1_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 2b44de56de..d6ca14e26d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.433689999999999 ./xmlchange PTS_LAT=46.586861 -./xmlchange RUN_STARTDATE=2009-12-31 -./xmlchange DATM_YR_ALIGN=2009 -./xmlchange DATM_YR_START=2009 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ren_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ren/CLM1PT_data/CTSM_DATM_IT-Ren_2010-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2010" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2010" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2009" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2010" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ren/LAI_stream_IT-Ren_2010-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index d9d7d88a2a..21ca298119 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.930010000000001 ./xmlchange PTS_LAT=42.408119 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro1/CLM1PT_data/CTSM_DATM_IT-Ro1_2002-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro1/LAI_stream_IT-Ro1_2002-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index acef8fe2d9..7b4a5e0249 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=11.92093 ./xmlchange PTS_LAT=42.390259 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-Ro2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-Ro2/CLM1PT_data/CTSM_DATM_IT-Ro2_2002-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro2/LAI_stream_IT-Ro2_2002-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 6ccac3b652..c03890949e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.29095 ./xmlchange PTS_LAT=43.732029 -./xmlchange RUN_STARTDATE=2012-12-31 -./xmlchange DATM_YR_ALIGN=2012 -./xmlchange DATM_YR_START=2012 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SR2_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SR2/CLM1PT_data/CTSM_DATM_IT-SR2_2013-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2013" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2012" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2013" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SR2/LAI_stream_IT-SR2_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2012" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index b7f060cb8b..86697cf540 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=10.28444 ./xmlchange PTS_LAT=43.727859 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_IT-SRo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/IT-SRo/CLM1PT_data/CTSM_DATM_IT-SRo_2003-2012.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2012" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SRo/LAI_stream_IT-SRo_2003-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index d4de232ca3..18a0c8919c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=137.07879599999998 ./xmlchange PTS_LAT=35.2617 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_JP-SMF_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/JP-SMF/CLM1PT_data/CTSM_DATM_JP-SMF_2003-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/JP-SMF/LAI_stream_JP-SMF_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index b71165016e..128009d8a9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=4.927 ./xmlchange PTS_LAT=51.971001 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Ca1_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Ca1/CLM1PT_data/CTSM_DATM_NL-Ca1_2003-2006.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2006" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Ca1/LAI_stream_NL-Ca1_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index 1ebc982b05..e701f68ae5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=5.0713 ./xmlchange PTS_LAT=52.240349 -./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2011 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Hor_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Hor/CLM1PT_data/CTSM_DATM_NL-Hor_2008-2011.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2011" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2011" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2011" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Hor/LAI_stream_NL-Hor_2008-2011.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index ced54b70a0..c060c5d7c7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=5.7435599999999996 ./xmlchange PTS_LAT=52.166579999999996 -./xmlchange RUN_STARTDATE=1996-12-31 -./xmlchange DATM_YR_ALIGN=1996 -./xmlchange DATM_YR_START=1996 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_NL-Loo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/NL-Loo/CLM1PT_data/CTSM_DATM_NL-Loo_1997-2013.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=1997" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=1997" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2013" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1996" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=1997" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Loo/LAI_stream_NL-Loo_1997-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 6218694682..7d9e092fb9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=16.309401 ./xmlchange PTS_LAT=52.762199 -./xmlchange RUN_STARTDATE=2003-12-31 -./xmlchange DATM_YR_ALIGN=2003 -./xmlchange DATM_YR_START=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_PL-wet_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/PL-wet/CLM1PT_data/CTSM_DATM_PL-wet_2004-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PL-wet/LAI_stream_PL-wet_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 02ffbb6faa..811ae55636 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-8.601807 ./xmlchange PTS_LAT=38.6394 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Esp/LAI_stream_PT-Esp_2002-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 4fca1927c5..86a7709c0d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-8.000061 ./xmlchange PTS_LAT=38.540642 -./xmlchange RUN_STARTDATE=2005-01-01 -./xmlchange DATM_YR_ALIGN=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi1/LAI_stream_PT-Mi1_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index 946be09d3d..a10ca69880 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-8.024536 ./xmlchange PTS_LAT=38.476501 -./xmlchange RUN_STARTDATE=2005-01-01 -./xmlchange DATM_YR_ALIGN=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi2/LAI_stream_PT-Mi2_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index e87e5aaa48..6624021160 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=161.341431 ./xmlchange PTS_LAT=68.613037 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Che_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Che/CLM1PT_data/CTSM_DATM_RU-Che_2003-2004.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2004" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Che/LAI_stream_RU-Che_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 55e3411ccf..158a662c51 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=32.922081 ./xmlchange PTS_LAT=56.461529000000006 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Fyo_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Fyo/CLM1PT_data/CTSM_DATM_RU-Fyo_2003-2014.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2014" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Fyo/LAI_stream_RU-Fyo_2003-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index 16c5ffc8eb..9f6100d6a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=89.3508 ./xmlchange PTS_LAT=60.8008 -./xmlchange RUN_STARTDATE=2002-12-31 -./xmlchange DATM_YR_ALIGN=2002 -./xmlchange DATM_YR_START=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_RU-Zot_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/RU-Zot/CLM1PT_data/CTSM_DATM_RU-Zot_2003-2003.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2003" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2003" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2003" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Zot/LAI_stream_RU-Zot_2003-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 4ebae41d00..4fa2e58d7f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=30.4783 ./xmlchange PTS_LAT=13.2829 -./xmlchange RUN_STARTDATE=2004-12-31 -./xmlchange DATM_YR_ALIGN=2004 -./xmlchange DATM_YR_START=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SD-Dem_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SD-Dem/CLM1PT_data/CTSM_DATM_SD-Dem_2005-2009.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2005" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2009" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2004" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2005" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SD-Dem/LAI_stream_SD-Dem_2005-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index db06592470..93574fd2bb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=19.55669 ./xmlchange PTS_LAT=64.181969 -./xmlchange RUN_STARTDATE=2001-12-31 -./xmlchange DATM_YR_ALIGN=2001 -./xmlchange DATM_YR_START=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_SE-Deg_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/SE-Deg/CLM1PT_data/CTSM_DATM_SE-Deg_2002-2005.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2002" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2005" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2001" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2002" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SE-Deg/LAI_stream_SE-Deg_2002-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index ddba58fc8b..0f5b5c3674 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-3.7980650000000002 ./xmlchange PTS_LAT=56.60722 -./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange DATM_YR_ALIGN=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2001 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Gri/LAI_stream_UK-Gri_2000-2001.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2001" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index de471c7a77..db95c0a5ea 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-0.8583069999999999 ./xmlchange PTS_LAT=51.153529999999996 -./xmlchange RUN_STARTDATE=2004-01-01 -./xmlchange DATM_YR_ALIGN=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Ham/LAI_stream_UK-Ham_2004-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index 6c0ee39584..a63da2840f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-1.2666629999999999 ./xmlchange PTS_LAT=51.450001 -./xmlchange RUN_STARTDATE=2005-01-01 -./xmlchange DATM_YR_ALIGN=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-PL3/LAI_stream_UK-PL3_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 16cf9a642f..b56e395470 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-99.419983 ./xmlchange PTS_LAT=36.426701 -./xmlchange RUN_STARTDATE=2010-01-01 -./xmlchange DATM_YR_ALIGN=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR1/LAI_stream_US-AR1_2010-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index edf27903f7..9ae1a7f709 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-99.597504 ./xmlchange PTS_LAT=36.635799 -./xmlchange RUN_STARTDATE=2010-01-01 -./xmlchange DATM_YR_ALIGN=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2011 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR2/LAI_stream_US-AR2_2010-2011.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index 1856fd69b2..ee9c8173ca 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-97.4888 ./xmlchange PTS_LAT=36.605801 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-ARM/LAI_stream_US-ARM_2003-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index bf8f45e9be..05734d5203 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-110.509201 ./xmlchange PTS_LAT=31.5907 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Aud/LAI_stream_US-Aud_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index d0fc95ca5e..6f715027f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-71.28808599999999 ./xmlchange PTS_LAT=44.064640000000004 -./xmlchange RUN_STARTDATE=2005-01-01 -./xmlchange DATM_YR_ALIGN=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bar/LAI_stream_US-Bar_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 753597ab3d..772c179a24 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-96.836182 ./xmlchange PTS_LAT=44.345290999999996 -./xmlchange RUN_STARTDATE=2005-01-01 -./xmlchange DATM_YR_ALIGN=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bkg/LAI_stream_US-Bkg_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index b075baa9c9..8cf92d9240 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-120.632751 ./xmlchange PTS_LAT=38.895302 -./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange DATM_YR_ALIGN=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=28800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Blo/LAI_stream_US-Blo_2000-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 4e164b98a4..5a66dd943e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-88.290405 ./xmlchange PTS_LAT=40.006199 -./xmlchange RUN_STARTDATE=1997-01-01 -./xmlchange DATM_YR_ALIGN=1997 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bo1/LAI_stream_US-Bo1_1997-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1997" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index bccbd7a37b..b44680fcd7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-109.389999 ./xmlchange PTS_LAT=38.09 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Cop/LAI_stream_US-Cop_2002-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 70b78c0c86..74875f51fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-105.10189799999999 ./xmlchange PTS_LAT=48.307701 -./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange DATM_YR_ALIGN=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-FPe/LAI_stream_US-FPe_2000-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index fab2b713d9..dfadac9c96 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-106.239899 ./xmlchange PTS_LAT=41.366501 -./xmlchange RUN_STARTDATE=2009-01-01 -./xmlchange DATM_YR_ALIGN=2009 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-GLE/LAI_stream_US-GLE_2009-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index fd008126d4..e44934039c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-89.87350500000001 ./xmlchange PTS_LAT=34.2547 -./xmlchange RUN_STARTDATE=2004-01-01 -./xmlchange DATM_YR_ALIGN=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Goo/LAI_stream_US-Goo_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 2c4e239763..b9cc44b617 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-72.171509 ./xmlchange PTS_LAT=42.5378 -./xmlchange RUN_STARTDATE=1992-01-01 -./xmlchange DATM_YR_ALIGN=1992 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1992 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ha1/LAI_stream_US-Ha1_1992-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1992" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1992" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 1d33c85b78..180980f4e5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-68.740204 ./xmlchange PTS_LAT=45.204102 -./xmlchange RUN_STARTDATE=1996-01-01 -./xmlchange DATM_YR_ALIGN=1996 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ho1/LAI_stream_US-Ho1_1996-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index a79882b207..33ad9d74f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-80.671539 ./xmlchange PTS_LAT=28.608578 -./xmlchange RUN_STARTDATE=2003-01-01 -./xmlchange DATM_YR_ALIGN=2003 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-KS2/LAI_stream_US-KS2_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2003" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index c7b41701c7..d8a8202bd6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-89.979187 ./xmlchange PTS_LAT=46.082699 -./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange DATM_YR_ALIGN=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=21600 @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Los/LAI_stream_US-Los_2000-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index 29314c7e7d..d4fe8580fd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-86.41308599999999 ./xmlchange PTS_LAT=39.3232 -./xmlchange RUN_STARTDATE=1999-01-01 -./xmlchange DATM_YR_ALIGN=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MMS/LAI_stream_US-MMS_1999-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index 0e8e837841..d6e146d7a1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-92.200012 ./xmlchange PTS_LAT=38.74411 -./xmlchange RUN_STARTDATE=2005-01-01 -./xmlchange DATM_YR_ALIGN=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MOz/LAI_stream_US-MOz_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index 12d3fce166..182b6338d8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-121.557404 ./xmlchange PTS_LAT=44.452301 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me2/LAI_stream_US-Me2_2002-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 37b65e0853..22b3e42e6c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-121.62240600000001 ./xmlchange PTS_LAT=44.499199 -./xmlchange RUN_STARTDATE=1996-01-01 -./xmlchange DATM_YR_ALIGN=1996 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2000 ./xmlchange START_TOD=28800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me4/LAI_stream_US-Me4_1996-2000.nc'" >> user_nl_clm - echo "model_year_align_lai=1996" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index a11b9d7845..b15e5c0d57 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-121.607803 ./xmlchange PTS_LAT=44.323299 -./xmlchange RUN_STARTDATE=2011-01-01 -./xmlchange DATM_YR_ALIGN=2011 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me6/LAI_stream_US-Me6_2011-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 7fa2f5a6df..87ca55fbed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-121.765106 ./xmlchange PTS_LAT=38.049801 -./xmlchange RUN_STARTDATE=2011-01-01 -./xmlchange DATM_YR_ALIGN=2011 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Myb/LAI_stream_US-Myb_2011-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index 4cb2f1cd84..45be8eabec 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-105.546402 ./xmlchange PTS_LAT=40.032902 -./xmlchange RUN_STARTDATE=1999-01-01 -./xmlchange DATM_YR_ALIGN=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-NR1/LAI_stream_US-NR1_1999-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index 26540ef020..7dbdc8ffc5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-96.47659300000001 ./xmlchange PTS_LAT=41.1651 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne1/LAI_stream_US-Ne1_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index f37f265a6a..b1bfac493b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-96.470093 ./xmlchange PTS_LAT=41.164902000000005 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne2/LAI_stream_US-Ne2_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index 8fbf964ed0..71ad58e1c8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-96.439697 ./xmlchange PTS_LAT=41.179699 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne3/LAI_stream_US-Ne3_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 533f69237b..340199347a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-90.272308 ./xmlchange PTS_LAT=45.9459 -./xmlchange RUN_STARTDATE=1995-01-01 -./xmlchange DATM_YR_ALIGN=1995 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1995 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-PFa/LAI_stream_US-PFa_1995-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1995" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1995" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 682c02c609..13a116f327 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-147.487595 ./xmlchange PTS_LAT=65.123703 -./xmlchange RUN_STARTDATE=2011-01-01 -./xmlchange DATM_YR_ALIGN=2011 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=32400 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Prr/LAI_stream_US-Prr_2011-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=2011" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index f47a97056f..8b297355b3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-82.218781 ./xmlchange PTS_LAT=29.73807 -./xmlchange RUN_STARTDATE=2005-01-01 -./xmlchange DATM_YR_ALIGN=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP1/LAI_stream_US-SP1_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 9462ca96fe..60d77d4402 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-82.244812 ./xmlchange PTS_LAT=29.764799 -./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange DATM_YR_ALIGN=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP2/LAI_stream_US-SP2_2000-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 151df53a46..da8549c78f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-82.163269 ./xmlchange PTS_LAT=29.75477 -./xmlchange RUN_STARTDATE=1999-01-01 -./xmlchange DATM_YR_ALIGN=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP3/LAI_stream_US-SP3_1999-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 2bbea39d11..784285e5d5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-110.827698 ./xmlchange PTS_LAT=31.7894 -./xmlchange RUN_STARTDATE=2009-01-01 -./xmlchange DATM_YR_ALIGN=2009 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRG/LAI_stream_US-SRG_2009-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2009" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 7dc3f83f3c..16e9fdfc40 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-110.865997 ./xmlchange PTS_LAT=31.8214 -./xmlchange RUN_STARTDATE=2004-01-01 -./xmlchange DATM_YR_ALIGN=2004 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRM/LAI_stream_US-SRM_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2004" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 09bc42706b..1ee068bdd2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-89.347717 ./xmlchange PTS_LAT=46.242001 -./xmlchange RUN_STARTDATE=2002-01-01 -./xmlchange DATM_YR_ALIGN=2002 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Syv/LAI_stream_US-Syv_2002-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2002" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index e7d110fa84..731db6438b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-120.966003 ./xmlchange PTS_LAT=38.431599 -./xmlchange RUN_STARTDATE=2001-01-01 -./xmlchange DATM_YR_ALIGN=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ton/LAI_stream_US-Ton_2001-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index 6773942aed..a6f9f26606 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-121.641403 ./xmlchange PTS_LAT=38.103001 -./xmlchange RUN_STARTDATE=2014-01-01 -./xmlchange DATM_YR_ALIGN=2014 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2014 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 @@ -36,9 +36,10 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Tw4/LAI_stream_US-Tw4_2014-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2014" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index 9bb5e6bfa2..bc01e4a711 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-121.653107 ./xmlchange PTS_LAT=38.1087 -./xmlchange RUN_STARTDATE=2010-01-01 -./xmlchange DATM_YR_ALIGN=2010 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Twt/LAI_stream_US-Twt_2010-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2010" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 58e3a063c4..90acaefc28 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-84.713806 ./xmlchange PTS_LAT=45.559799 -./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange DATM_YR_ALIGN=2000 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=18000 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-UMB/LAI_stream_US-UMB_2000-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2000" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index c4f49fe662..74ad798c88 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-120.95072900000001 ./xmlchange PTS_LAT=38.4133 -./xmlchange RUN_STARTDATE=2001-01-01 -./xmlchange DATM_YR_ALIGN=2001 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Var/LAI_stream_US-Var_2001-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2001" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index e65ddbc6b5..367411472e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-90.079895 ./xmlchange PTS_LAT=45.805901 -./xmlchange RUN_STARTDATE=1999-01-01 -./xmlchange DATM_YR_ALIGN=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-WCr/LAI_stream_US-WCr_1999-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 6fc485d959..07e306825e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-110.0522 ./xmlchange PTS_LAT=31.743799 -./xmlchange RUN_STARTDATE=2008-01-01 -./xmlchange DATM_YR_ALIGN=2008 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Whs/LAI_stream_US-Whs_2008-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2008" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index 5357c4dd1b..b3f6674e5d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -1,7 +1,7 @@ ./xmlchange PTS_LON=-109.941895 ./xmlchange PTS_LAT=31.7365 -./xmlchange RUN_STARTDATE=2005-01-01 -./xmlchange DATM_YR_ALIGN=2005 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 ./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Wkg/LAI_stream_US-Wkg_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=2005" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 8054e8b9b8..0954949232 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=31.496901 ./xmlchange PTS_LAT=-25.019699 -./xmlchange RUN_STARTDATE=1999-12-31 -./xmlchange DATM_YR_ALIGN=1999 -./xmlchange DATM_YR_START=1999 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZA-Kru_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZA-Kru/CLM1PT_data/CTSM_DATM_ZA-Kru_2000-2002.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2000" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2000" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2002" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=1999" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2000" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZA-Kru/LAI_stream_ZA-Kru_2000-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=1999" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 2a4d009d6a..40bebd249b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -1,25 +1,25 @@ ./xmlchange PTS_LON=23.252781 ./xmlchange PTS_LAT=-15.437778 -./xmlchange RUN_STARTDATE=2007-12-31 -./xmlchange DATM_YR_ALIGN=2007 -./xmlchange DATM_YR_START=2007 +./xmlchange RUN_STARTDATE=0001-01-01 +./xmlchange DATM_YR_ALIGN=1 +./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 echo "fsurdat='/glade/u/home/wwieder/CTSM/tools/site_and_regional/subset_data_single_point/surfdata_1x1_PLUMBER2_ZM-Mon_hist_16pfts_Irrig_CMIP6_simyr2000_c231005.nc ' " >> user_nl_clm echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/ZM-Mon/CLM1PT_data/CTSM_DATM_ZM-Mon_2008-2008.nc " >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presaero.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presaero.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presaero.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "presndep.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "presndep.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "presndep.SSP3-7.0:year_align=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_first=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_first=2008" >> user_nl_datm_streams echo "co2tseries.SSP3-7.0:year_last=2008" >> user_nl_datm_streams -echo "co2tseries.SSP3-7.0:year_align=2007" >> user_nl_datm_streams +echo "co2tseries.SSP3-7.0:year_align=2008" >> user_nl_datm_streams compset=`./xmlquery COMPSET --value` CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value` @@ -36,7 +36,8 @@ fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZM-Mon/LAI_stream_ZM-Mon_2008-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=2007" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams index 4cb9fa21fe..145ea907d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -32,7 +32,7 @@ CLM_USRDAT.PLUMBER2:datavars = ZBOT Sa_z, \ FLDS Faxa_lwdn CLM_USRDAT.PLUMBER2:taxmode=cycle -CLM_USRDAT.PLUMBER2:dtlimit=30 +CLM_USRDAT.PLUMBER2:dtlimit=50 presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_1849-2101_monthly_0.9x1.25_c201103.nc presaero.SSP3-7.0:dtlimit=30 @@ -40,11 +40,5 @@ presaero.SSP3-7.0:dtlimit=30 presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc presndep.SSP3-7.0:dtlimit=30 -!Arbitrary start year for O3,average year of all 170 sites is 2007 -preso3.hist:dtlimit=30 -preso3.hist:year_first=2007 -preso3.hist:year_last=2007 -preso3.hist:year_align=2007 - co2tseries.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_globalSSP3-7.0_simyr_1750-2501_CMIP6_c201101.nc diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index 2e1df27dc8..579c2d7b8c 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -43,9 +43,13 @@ def write_usermods(lat,lon,site,start_year,end_year, #'./xmlchange PLUMBER2SITE='+site + '\n' \ './xmlchange PTS_LON='+str(lon) + '\n' \ './xmlchange PTS_LAT='+str(lat) + '\n' \ - './xmlchange RUN_STARTDATE='+str(start_date) + '\n' \ - './xmlchange DATM_YR_ALIGN='+str(start_year_actual) + '\n' \ - './xmlchange DATM_YR_START='+str(start_year_actual) + '\n' \ + './xmlchange RUN_STARTDATE=0001-01-01' + '\n' \ + './xmlchange DATM_YR_ALIGN='+str(1) + '\n' \ + './xmlchange DATM_YR_START='+str(start_year) + '\n' \ + # TODO, change this for transient simulations + # './xmlchange RUN_STARTDATE='+str(start_date) + '\n' \ + # './xmlchange DATM_YR_ALIGN='+str(start_year_actual) + '\n' \ + # './xmlchange DATM_YR_START='+str(start_year_actual) + '\n' \ './xmlchange DATM_YR_END='+str(end_year) + '\n' \ './xmlchange START_TOD='+str(start_tod) + '\n' \ './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ @@ -56,19 +60,19 @@ def write_usermods(lat,lon,site,start_year,end_year, 'echo "CLM_USRDAT.PLUMBER2:datafiles= \$DIN_LOC_ROOT/atm/datm7/CLM1PT_data/PLUMBER2/'+site+'/CLM1PT_data/CTSM_DATM_'+site+'_'+str(start_year)+'-'+str(end_year)+'.nc " >> user_nl_datm_streams \n' \ - 'echo "presaero.SSP3-7.0:year_first='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ + 'echo "presaero.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ 'echo "presaero.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ - 'echo "presaero.SSP3-7.0:year_align='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ + 'echo "presaero.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ '\n' \ - 'echo "presndep.SSP3-7.0:year_first='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ + 'echo "presndep.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ 'echo "presndep.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ - 'echo "presndep.SSP3-7.0:year_align='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ + 'echo "presndep.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ '\n' \ - 'echo "co2tseries.SSP3-7.0:year_first='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ + 'echo "co2tseries.SSP3-7.0:year_first='+str(start_year) + '" >> user_nl_datm_streams \n' \ 'echo "co2tseries.SSP3-7.0:year_last='+str(end_year) + '" >> user_nl_datm_streams \n' \ - 'echo "co2tseries.SSP3-7.0:year_align='+str(start_year_actual) + '" >> user_nl_datm_streams \n' \ + 'echo "co2tseries.SSP3-7.0:year_align='+str(start_year) + '" >> user_nl_datm_streams \n' \ '\n' \ 'compset=`./xmlquery COMPSET --value` \n' \ @@ -88,10 +92,18 @@ def write_usermods(lat,lon,site,start_year,end_year, '# Turn on LAI streams for a SP case \n' \ 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n' \ ' echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ - ' echo "model_year_align_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ - ' echo "stream_year_first_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ + ' echo "model_year_align_lai=1" >> user_nl_clm \n' \ + ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ - 'fi \n' + ' echo "stream_meshfile_lai=\'none\'" >> user_nl_clm \n' \ + 'fi \n' + # TODO, change this for transient simulations + #' #echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ + #' #echo "model_year_align_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ + #' #echo "stream_year_first_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ + #' #echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ + #' #echo "stream_meshfile_lai=\'none\' >> user_nl_clm \n' \ + #'fi \n' ) sFile.close() From 61676c02de15939d525eff69c377e45740810eaf Mon Sep 17 00:00:00 2001 From: wwieder Date: Fri, 12 Apr 2024 13:21:24 -0600 Subject: [PATCH 29/43] starting to add dtlimit for lai streams --- bld/namelist_files/namelist_definition_ctsm.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index 8b292294c9..9de99ad188 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -1928,6 +1928,12 @@ Filename of input stream data for LAI Filename of input stream data for LAI + +dtlimit for LAI streams + + + Time interpolation method to use with LAI streams From 6dd3b54f02b42935afa748d9a5578fe2c6909375 Mon Sep 17 00:00:00 2001 From: wwieder Date: Sat, 13 Apr 2024 17:31:32 -0600 Subject: [PATCH 30/43] bring lai_dtlimit to namelist variable --- bld/CLMBuildNamelist.pm | 1 + bld/namelist_files/namelist_defaults_ctsm.xml | 1 + bld/namelist_files/namelist_definition_ctsm.xml | 2 +- src/cpl/share_esmf/laiStreamMod.F90 | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index b4eefd984c..ac6735f1ca 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -4049,6 +4049,7 @@ sub setup_logic_lai_streams { if ( $nl_flags->{'bgc_mode'} eq "sp" || ($nl_flags->{'bgc_mode'} eq "fates" && &value_is_true($nl->get_value('use_fates_sp')) )) { if ( &value_is_true($nl->get_value('use_lai_streams')) ) { add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_lai_streams'); + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'lai_dtlimit'); add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'lai_mapalgo', 'hgrid'=>$nl_flags->{'res'} ); add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_year_first_lai', diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 5c86d230fd..43a907aae6 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -1748,6 +1748,7 @@ use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_mpasa1 2001 2013 2001 +1.5_r8 lnd/clm2/lai_streams/MODISPFTLAI_0.5x0.5_c140711.nc lnd/clm2/lai_streams/MODISPFTLAI_0.5x0_ESMFmesh_cdf5_090621.nc diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index 9de99ad188..d79b337676 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -1928,7 +1928,7 @@ Filename of input stream data for LAI Filename of input stream data for LAI - dtlimit for LAI streams diff --git a/src/cpl/share_esmf/laiStreamMod.F90 b/src/cpl/share_esmf/laiStreamMod.F90 index 3e4074fbde..532e82c0fc 100644 --- a/src/cpl/share_esmf/laiStreamMod.F90 +++ b/src/cpl/share_esmf/laiStreamMod.F90 @@ -62,6 +62,7 @@ subroutine lai_init(bounds) integer :: nml_error ! namelist i/o error flag character(len=CL) :: stream_fldFileName_lai ! lai stream filename to read character(len=CL) :: stream_meshfile_lai ! lai stream meshfile + real(r8) :: lai_dtlimit ! dlimit for lai stream to use character(len=CL) :: lai_mapalgo = 'bilinear' ! Mapping alogrithm character(len=CL) :: lai_tintalgo = 'linear' ! Time interpolation alogrithm integer :: lai_offset = 0 ! Offset in time for dataset (sec) @@ -75,6 +76,7 @@ subroutine lai_init(bounds) stream_year_first_lai, & stream_year_last_lai, & model_year_align_lai, & + lai_dtlimit, & lai_mapalgo, & stream_fldFileName_lai, & stream_meshfile_lai, & @@ -144,7 +146,7 @@ subroutine lai_init(bounds) stream_yearAlign = model_year_align_lai, & stream_offset = lai_offset, & stream_taxmode = 'cycle', & - stream_dtlimit = 1.5_r8, & + stream_dtlimit = lai_dtlimit, & stream_tintalgo = lai_tintalgo, & stream_name = 'LAI data', & rc = rc) From 476218613f39e01b1bdc2520ff615ef00315a162 Mon Sep 17 00:00:00 2001 From: wwieder Date: Sat, 13 Apr 2024 17:32:35 -0600 Subject: [PATCH 31/43] updating usermods for lai_dtlimit --- cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands | 1 + cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands | 1 + tools/site_and_regional/plumber2_usermods.py | 3 +++ 171 files changed, 173 insertions(+) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index 92ac088203..616a106231 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 205dcc0b77..369936316e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index a6cb88617e..4564feceea 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 3ed62c3e1c..9a4b56d4c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 04d2b30a3f..78a21972b3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index 5b608f38ac..fb9c26553a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 01c5bc5989..9013527bfd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2018" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index 48d267bc18..cbd70390b5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 64cb89fff9..895c9b90c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index 05d3fb4195..c3645b4ac0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index f1169d6e67..8cf6535aba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 17e4b90dc9..9d5fe42eab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 5def2440c5..9723a71a2d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 925db7c9c0..474d6eb37d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 80faa8d991..6edd4ff2f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 53963203c2..52a8163206 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index 94d3d02656..33d539f32e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 9a150a17c7..8320ab5589 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index 92b3721f70..c79763c094 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 454625d1a6..7d2aefecf4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index e2b39e806a..546bf7550c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 6012652980..90afa6f54c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index 622d480b5c..f7513792d7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index a972a081fe..50858eceb0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index d78c043d5a..7187101336 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index 436ed46eae..f0940ccfe7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index db8de9f04c..7df43299eb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index 29fc4183d7..ad91523552 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 9af7cb68e9..953bf94ca0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 1c2b1b47bd..93262c1664 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index 1aa1e8f2ce..b0bc176bce 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index 0891af09a4..9e0ba061c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index 3d414a3715..a6116f6907 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index c40c076144..604d9c2099 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index 40cd23cd56..29b34d43da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 0b86346692..421ed53c13 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index ee566fb085..be0dd2a37e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index 97148db9fd..b58d633ede 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index 079c6c2860..0c413cdd5d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 6a7010b6cb..2b68652922 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index b2cb2705c3..8989786585 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index 4f6dbbf5aa..f54ef57aa3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index ef6a6d2026..a7d1ab401e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 3732d035ac..2da6ed4036 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 329e57f671..5d3db8884e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index 1a3436d7ba..fa3c8b36d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index 0309c8df25..a3c6bcc398 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index f234daec80..646cb6ce2c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index b320ea1917..d3473b6917 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index 17b64a9e6b..fff0a84ed5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index adf6739e1f..e442e6afb7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index dec5a4b5ae..98853e55a9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 5f37f8cdab..34751eb058 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index 5c4288260b..de1a8cf1a0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=1999" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index ea93d12998..17b499193e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index 4f724bd016..c19b4d699e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 70c28bd2cc..0fbbe965f5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 72b1ba6708..4783a4c7e9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index 81f06f205f..b3ec7ae1a3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index 81b1064cde..e2c89bf3fa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index cda173d8af..398cb5147e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 5923181787..2644550dae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index 8204ea3c48..d75d5b501a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1998" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 4e599eb61e..7279a3cf84 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index 1754e62ea1..3dfb323645 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index 071a4d38dd..4e3aa28e3b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index 383eb92574..6e439e11e7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index f4b04a324a..4617537101 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 8473e039d2..9a6079abeb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 7bdf7e9a9e..131b526fe4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index a2ff614476..f0b4c28c13 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index d06fdd20b0..edac3832f8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index 4ceaa978f6..e287d5174b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2007" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index e92b891098..33a0dba93c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 3c3f6c04a9..6e16e4f482 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index b430267d3c..b8c13d2c94 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index 4d1521090a..efb37ad254 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index 05ce17cf42..908ba2a1e2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index ac7555a5a4..4c0dc9f5bc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index ca5b4b5390..d3bce9597c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index fd87a11721..fc8960afba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index ce3cda7cf3..fcb6d06fb8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index c917057192..abeacf23b4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 97be69bb3f..3b844a1cf9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index e3a5da4fab..dbe1faef32 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index fcca328b44..a1f8a19d71 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index e2490dc85f..73183de135 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index 4f8672fdae..e2bac7e621 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 03f57ab40f..2f08c4f96c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 0753b11167..3fbc88c46e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index 735c86a76b..a6d527be27 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index f541059657..3ccf9637a5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 00b15644eb..1b8a740df2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index cd3f0c7cca..fed6f3b932 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index be5727e427..a7062c5df6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index 50b1d3866e..5e566dd5d1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 5786549845..63e5072912 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index 12d808ff5c..a10576ad8c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index 697607f3fc..4e27993500 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 4de9403ffe..59dda752cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 4125bbe2a1..1689651c1d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 094dd9935e..60f0148b52 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 7ef94572d7..57d8303ce8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 2c2e138668..3a9a00f2d5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index a130840742..8154bc4570 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index d6ca14e26d..2fdb1286cb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index 21ca298119..6f06a5ca22 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 7b4a5e0249..26d4993b0e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index c03890949e..86f4764e8c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index 86697cf540..5eec0d4fbb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 18a0c8919c..3c1a9cbb1d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 128009d8a9..017ed8a8cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index e701f68ae5..cfc0d06a63 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index c060c5d7c7..55659dad03 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 7d9e092fb9..477c0c6bb8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 811ae55636..5e397cf7d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 86a7709c0d..260adeef25 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index a10ca69880..c2ec60886a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index 6624021160..a8c128ad7c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index 158a662c51..abaffab7e0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index 9f6100d6a2..2569adb19f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 4fa2e58d7f..00e75d9a61 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index 93574fd2bb..ebadea0456 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index 0f5b5c3674..3ff53c7814 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2001" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index db95c0a5ea..37f679cc53 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index a63da2840f..7d773acba0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index b56e395470..58dd53fcf3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index 9ae1a7f709..c524ec44ef 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index ee9c8173ca..c3c9e2e074 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 05734d5203..8337842eab 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 6f715027f7..717c88be16 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 772c179a24..94596cfff2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index 8cf92d9240..e7741e46cd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 5a66dd943e..8f83b94cf4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index b44680fcd7..892bd6ad35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 74875f51fe..5bb62ac7dd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index dfadac9c96..e1ab471181 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index e44934039c..08f09e3e8c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index b9cc44b617..180fd2e20d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1992" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index 180980f4e5..df58222796 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 33ad9d74f7..0176b715e1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index d8a8202bd6..0e3790c3a7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index d4fe8580fd..e878957b64 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index d6e146d7a1..e28f0411c5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index 182b6338d8..8bca07a3e6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 22b3e42e6c..1ffe6f26ce 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index b15e5c0d57..83f047475b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 87ca55fbed..2b9003e770 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index 45be8eabec..6fc1b2fddb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index 7dbdc8ffc5..ee041eb274 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index b1bfac493b..3a66c3c913 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index 71ad58e1c8..36e9047595 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 340199347a..72765799ff 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1995" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 13a116f327..9f1bc882a6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index 8b297355b3..ed26955f9c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index 60d77d4402..f90ff0ab00 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index da8549c78f..12ea8849a3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 784285e5d5..3d0d96baf7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 16e9fdfc40..7a01b74364 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 1ee068bdd2..09d8b8c1a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 731db6438b..342317d831 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index a6f9f26606..fab09c63e4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -40,6 +40,7 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi # set baseflow scalar to zero for wetland site diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index bc01e4a711..a7cf4d481f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 90acaefc28..9acb92be26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 74ad798c88..62a196b40a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 367411472e..6a95ca9c97 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 07e306825e..5e3a7a1549 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index b3f6674e5d..ccddd3e72b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index 0954949232..da148238e8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 40bebd249b..47df9fdc47 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -40,4 +40,5 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm fi diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index 579c2d7b8c..d594c249c9 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -96,7 +96,10 @@ def write_usermods(lat,lon,site,start_year,end_year, ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ ' echo "stream_meshfile_lai=\'none\'" >> user_nl_clm \n' \ + ' echo "lai_dtlimit=30." >> user_nl_clm \n' \ + 'fi \n' + # TODO, change this for transient simulations #' #echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ #' #echo "model_year_align_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ From 6a4dad8d8217227cf83e6ab1cbe0feff1e0e6c53 Mon Sep 17 00:00:00 2001 From: wwieder Date: Sun, 14 Apr 2024 08:41:55 -0600 Subject: [PATCH 32/43] more usermods for SP/BGG + spin/hist --- .../PLUMBER2/AR-SLu/shell_commands | 26 ++++++++---- .../PLUMBER2/AT-Neu/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-ASM/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Cow/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Cpr/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Ctr/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Cum/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-DaP/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-DaS/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Dry/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Emr/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-GWW/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Gin/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-How/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Lit/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Otw/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Rig/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Rob/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Sam/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Stp/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-TTE/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Tum/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Whr/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Wrr/shell_commands | 26 ++++++++---- .../PLUMBER2/AU-Ync/shell_commands | 26 ++++++++---- .../PLUMBER2/BE-Bra/shell_commands | 26 ++++++++---- .../PLUMBER2/BE-Lon/shell_commands | 26 ++++++++---- .../PLUMBER2/BE-Vie/shell_commands | 26 ++++++++---- .../PLUMBER2/BR-Sa3/shell_commands | 26 ++++++++---- .../PLUMBER2/BW-Ma1/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-NS1/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-NS2/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-NS4/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-NS5/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-NS6/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-NS7/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-Qcu/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-Qfo/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-SF1/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-SF2/shell_commands | 26 ++++++++---- .../PLUMBER2/CA-SF3/shell_commands | 26 ++++++++---- .../PLUMBER2/CH-Cha/shell_commands | 26 ++++++++---- .../PLUMBER2/CH-Dav/shell_commands | 26 ++++++++---- .../PLUMBER2/CH-Fru/shell_commands | 26 ++++++++---- .../PLUMBER2/CH-Oe1/shell_commands | 26 ++++++++---- .../PLUMBER2/CN-Cha/shell_commands | 26 ++++++++---- .../PLUMBER2/CN-Cng/shell_commands | 26 ++++++++---- .../PLUMBER2/CN-Dan/shell_commands | 26 ++++++++---- .../PLUMBER2/CN-Din/shell_commands | 26 ++++++++---- .../PLUMBER2/CN-Du2/shell_commands | 26 ++++++++---- .../PLUMBER2/CN-HaM/shell_commands | 26 ++++++++---- .../PLUMBER2/CN-Qia/shell_commands | 26 ++++++++---- .../PLUMBER2/CZ-wet/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Bay/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Geb/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Gri/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Hai/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Kli/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Meh/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Obe/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Seh/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-SfN/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Tha/shell_commands | 26 ++++++++---- .../PLUMBER2/DE-Wet/shell_commands | 26 ++++++++---- .../PLUMBER2/DK-Fou/shell_commands | 26 ++++++++---- .../PLUMBER2/DK-Lva/shell_commands | 26 ++++++++---- .../PLUMBER2/DK-Ris/shell_commands | 26 ++++++++---- .../PLUMBER2/DK-Sor/shell_commands | 26 ++++++++---- .../PLUMBER2/DK-ZaH/shell_commands | 26 ++++++++---- .../PLUMBER2/ES-ES1/shell_commands | 26 ++++++++---- .../PLUMBER2/ES-ES2/shell_commands | 26 ++++++++---- .../PLUMBER2/ES-LMa/shell_commands | 26 ++++++++---- .../PLUMBER2/ES-LgS/shell_commands | 26 ++++++++---- .../PLUMBER2/ES-VDA/shell_commands | 26 ++++++++---- .../PLUMBER2/FI-Hyy/shell_commands | 26 ++++++++---- .../PLUMBER2/FI-Kaa/shell_commands | 26 ++++++++---- .../PLUMBER2/FI-Lom/shell_commands | 26 ++++++++---- .../PLUMBER2/FI-Sod/shell_commands | 26 ++++++++---- .../PLUMBER2/FR-Fon/shell_commands | 26 ++++++++---- .../PLUMBER2/FR-Gri/shell_commands | 26 ++++++++---- .../PLUMBER2/FR-Hes/shell_commands | 26 ++++++++---- .../PLUMBER2/FR-LBr/shell_commands | 26 ++++++++---- .../PLUMBER2/FR-Lq1/shell_commands | 26 ++++++++---- .../PLUMBER2/FR-Lq2/shell_commands | 26 ++++++++---- .../PLUMBER2/FR-Pue/shell_commands | 26 ++++++++---- .../PLUMBER2/GF-Guy/shell_commands | 26 ++++++++---- .../PLUMBER2/HU-Bug/shell_commands | 26 ++++++++---- .../PLUMBER2/ID-Pag/shell_commands | 26 ++++++++---- .../PLUMBER2/IE-Ca1/shell_commands | 26 ++++++++---- .../PLUMBER2/IE-Dri/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Amp/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-BCi/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-CA1/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-CA2/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-CA3/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Col/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Cpz/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Isp/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-LMa/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Lav/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-MBo/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Mal/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Noe/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Non/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-PT1/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Ren/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Ro1/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-Ro2/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-SR2/shell_commands | 26 ++++++++---- .../PLUMBER2/IT-SRo/shell_commands | 26 ++++++++---- .../PLUMBER2/JP-SMF/shell_commands | 26 ++++++++---- .../PLUMBER2/NL-Ca1/shell_commands | 26 ++++++++---- .../PLUMBER2/NL-Hor/shell_commands | 26 ++++++++---- .../PLUMBER2/NL-Loo/shell_commands | 26 ++++++++---- .../PLUMBER2/PL-wet/shell_commands | 26 ++++++++---- .../PLUMBER2/PT-Esp/shell_commands | 26 ++++++++---- .../PLUMBER2/PT-Mi1/shell_commands | 26 ++++++++---- .../PLUMBER2/PT-Mi2/shell_commands | 26 ++++++++---- .../PLUMBER2/RU-Che/shell_commands | 26 ++++++++---- .../PLUMBER2/RU-Fyo/shell_commands | 26 ++++++++---- .../PLUMBER2/RU-Zot/shell_commands | 26 ++++++++---- .../PLUMBER2/SD-Dem/shell_commands | 26 ++++++++---- .../PLUMBER2/SE-Deg/shell_commands | 26 ++++++++---- .../PLUMBER2/UK-Gri/shell_commands | 26 ++++++++---- .../PLUMBER2/UK-Ham/shell_commands | 26 ++++++++---- .../PLUMBER2/UK-PL3/shell_commands | 26 ++++++++---- .../PLUMBER2/US-AR1/shell_commands | 26 ++++++++---- .../PLUMBER2/US-AR2/shell_commands | 26 ++++++++---- .../PLUMBER2/US-ARM/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Aud/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Bar/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Bkg/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Blo/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Bo1/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Cop/shell_commands | 26 ++++++++---- .../PLUMBER2/US-FPe/shell_commands | 26 ++++++++---- .../PLUMBER2/US-GLE/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Goo/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Ha1/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Ho1/shell_commands | 26 ++++++++---- .../PLUMBER2/US-KS2/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Los/shell_commands | 26 ++++++++---- .../PLUMBER2/US-MMS/shell_commands | 26 ++++++++---- .../PLUMBER2/US-MOz/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Me2/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Me4/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Me6/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Myb/shell_commands | 26 ++++++++---- .../PLUMBER2/US-NR1/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Ne1/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Ne2/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Ne3/shell_commands | 26 ++++++++---- .../PLUMBER2/US-PFa/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Prr/shell_commands | 26 ++++++++---- .../PLUMBER2/US-SP1/shell_commands | 26 ++++++++---- .../PLUMBER2/US-SP2/shell_commands | 26 ++++++++---- .../PLUMBER2/US-SP3/shell_commands | 26 ++++++++---- .../PLUMBER2/US-SRG/shell_commands | 26 ++++++++---- .../PLUMBER2/US-SRM/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Syv/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Ton/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Tw4/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Twt/shell_commands | 26 ++++++++---- .../PLUMBER2/US-UMB/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Var/shell_commands | 26 ++++++++---- .../PLUMBER2/US-WCr/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Whs/shell_commands | 26 ++++++++---- .../PLUMBER2/US-Wkg/shell_commands | 26 ++++++++---- .../PLUMBER2/ZA-Kru/shell_commands | 26 ++++++++---- .../PLUMBER2/ZM-Mon/shell_commands | 26 ++++++++---- .../PLUMBER2/defaults/shell_commands | 40 ++++++++++++++++++- .../PLUMBER2/defaults/user_nl_clm | 15 +------ tools/site_and_regional/plumber2_usermods.py | 38 +++++++++--------- 173 files changed, 3288 insertions(+), 1225 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands index 616a106231..f64d8759a2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-66.459808 ./xmlchange PTS_LAT=-33.464802 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-01-01 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AR-SLu/LAI_stream_AR-SLu_2010-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands index 369936316e..b8a54e5644 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.3175 ./xmlchange PTS_LAT=47.116669 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AT-Neu/LAI_stream_AT-Neu_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands index 4564feceea..2d5e0d85fd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=133.24899299999998 ./xmlchange PTS_LAT=-22.283001000000002 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-12-31 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-ASM/LAI_stream_AU-ASM_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands index 9a4b56d4c9..fe84b1e129 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=145.427155 ./xmlchange PTS_LAT=-16.23819 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2015 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2009-12-31 + ./xmlchange DATM_YR_ALIGN=2009 + ./xmlchange DATM_YR_START=2009 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cow/LAI_stream_AU-Cow_2010-2015.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands index 78a21972b3..fcb7375d71 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=140.589127 ./xmlchange PTS_LAT=-34.00206 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-12-31 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cpr/LAI_stream_AU-Cpr_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands index fb9c26553a..8d42bed60a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=145.446854 ./xmlchange PTS_LAT=-16.103279 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2009-12-31 + ./xmlchange DATM_YR_ALIGN=2009 + ./xmlchange DATM_YR_START=2009 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ctr/LAI_stream_AU-Ctr_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands index 9013527bfd..17aed3a1dd 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=150.722473 ./xmlchange PTS_LAT=-33.613296999999996 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2018 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2012-12-31 + ./xmlchange DATM_YR_ALIGN=2012 + ./xmlchange DATM_YR_START=2012 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2013 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Cum/LAI_stream_AU-Cum_2013-2018.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2018" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands index cbd70390b5..816e4c78dc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=131.3181 ./xmlchange PTS_LAT=-14.0633 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2008-12-31 + ./xmlchange DATM_YR_ALIGN=2008 + ./xmlchange DATM_YR_START=2008 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2009 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaP/LAI_stream_AU-DaP_2009-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands index 895c9b90c3..0ea37fd95a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=131.388 ./xmlchange PTS_LAT=-14.159282999999999 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2009-12-31 + ./xmlchange DATM_YR_ALIGN=2009 + ./xmlchange DATM_YR_START=2009 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-DaS/LAI_stream_AU-DaS_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands index c3645b4ac0..3cd8faecd9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=132.370605 ./xmlchange PTS_LAT=-15.2588 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2015 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-12-31 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Dry/LAI_stream_AU-Dry_2011-2015.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2015" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands index 8cf6535aba..7822948582 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=148.474594 ./xmlchange PTS_LAT=-23.8587 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2011-12-31 + ./xmlchange DATM_YR_ALIGN=2011 + ./xmlchange DATM_YR_START=2011 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2012 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Emr/LAI_stream_AU-Emr_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands index 9d5fe42eab..258ee5f12a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-GWW/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=120.654099 ./xmlchange PTS_LAT=-30.191299 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2012-12-31 + ./xmlchange DATM_YR_ALIGN=2012 + ./xmlchange DATM_YR_START=2012 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2013 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-GWW/LAI_stream_AU-GWW_2013-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands index 9723a71a2d..31071a2ebb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Gin/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=115.650002 ./xmlchange PTS_LAT=-31.375 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2011-12-31 + ./xmlchange DATM_YR_ALIGN=2011 + ./xmlchange DATM_YR_START=2011 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2012 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Gin/LAI_stream_AU-Gin_2012-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands index 474d6eb37d..411cec6d9c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-How/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=131.149994 ./xmlchange PTS_LAT=-12.4952 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=15 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-How/LAI_stream_AU-How_2003-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands index 6edd4ff2f8..7fc59ce824 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Lit/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=130.79449499999998 ./xmlchange PTS_LAT=-13.179039999999999 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2016 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2015-12-31 + ./xmlchange DATM_YR_ALIGN=2015 + ./xmlchange DATM_YR_START=2015 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2016 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Lit/LAI_stream_AU-Lit_2016-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2015" >> user_nl_clm + echo "stream_year_first_lai=2015" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2016" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands index 52a8163206..6671c26040 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Otw/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=142.816803 ./xmlchange PTS_LAT=-38.532340999999995 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2008-12-31 + ./xmlchange DATM_YR_ALIGN=2008 + ./xmlchange DATM_YR_START=2008 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2009 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Otw/LAI_stream_AU-Otw_2009-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands index 33d539f32e..db70e72c89 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rig/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=145.575897 ./xmlchange PTS_LAT=-36.649899 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-12-31 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rig/LAI_stream_AU-Rig_2011-2016.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands index 8320ab5589..33e2084f14 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Rob/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=145.630096 ./xmlchange PTS_LAT=-17.1175 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2014 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2013-12-31 + ./xmlchange DATM_YR_ALIGN=2013 + ./xmlchange DATM_YR_START=2013 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2014 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Rob/LAI_stream_AU-Rob_2014-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2013" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2014" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands index c79763c094..561ba257fa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Sam/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=152.87780800000002 ./xmlchange PTS_LAT=-27.3881 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=50400 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-12-31 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Sam/LAI_stream_AU-Sam_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands index 7d2aefecf4..97db87c821 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Stp/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=133.350204 ./xmlchange PTS_LAT=-17.1507 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2009-12-31 + ./xmlchange DATM_YR_ALIGN=2009 + ./xmlchange DATM_YR_START=2009 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Stp/LAI_stream_AU-Stp_2010-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands index 546bf7550c..dee6244ef7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-TTE/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=133.639999 ./xmlchange PTS_LAT=-22.287001 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2012-12-31 + ./xmlchange DATM_YR_ALIGN=2012 + ./xmlchange DATM_YR_START=2012 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2013 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-TTE/LAI_stream_AU-TTE_2013-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands index 90afa6f54c..36cd89bc73 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Tum/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=148.151703 ./xmlchange PTS_LAT=-35.656601 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=16 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Tum/LAI_stream_AU-Tum_2002-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands index f7513792d7..6b5d9415fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Whr/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=145.029404 ./xmlchange PTS_LAT=-36.673199 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2015 ./xmlchange DATM_YR_END=2016 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2014-12-31 + ./xmlchange DATM_YR_ALIGN=2014 + ./xmlchange DATM_YR_START=2014 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2015 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Whr/LAI_stream_AU-Whr_2015-2016.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2015" >> user_nl_clm echo "stream_year_last_lai=2016" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2014" >> user_nl_clm + echo "stream_year_first_lai=2014" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2015" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands index 50858eceb0..e1751b8439 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Wrr/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=146.654495 ./xmlchange PTS_LAT=-43.09502 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2016 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2015-12-31 + ./xmlchange DATM_YR_ALIGN=2015 + ./xmlchange DATM_YR_START=2015 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2016 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Wrr/LAI_stream_AU-Wrr_2016-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2016" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2015" >> user_nl_clm + echo "stream_year_first_lai=2015" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2016" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands index 7187101336..861c844b14 100644 --- a/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/AU-Ync/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=146.290695 ./xmlchange PTS_LAT=-34.9893 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2017 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-12-31 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/AU-Ync/LAI_stream_AU-Ync_2011-2017.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2017" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands index f0940ccfe7..5aeefbc792 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Bra/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=4.52056 ./xmlchange PTS_LAT=51.309166 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Bra/LAI_stream_BE-Bra_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands index 7df43299eb..959a9e88fa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Lon/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=4.74613 ./xmlchange PTS_LAT=50.551590000000004 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Lon/LAI_stream_BE-Lon_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands index ad91523552..008d71407c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BE-Vie/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=5.99805 ./xmlchange PTS_LAT=50.305069 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=18 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1996-12-31 + ./xmlchange DATM_YR_ALIGN=1996 + ./xmlchange DATM_YR_START=1996 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1997 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BE-Vie/LAI_stream_BE-Vie_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands index 953bf94ca0..c1277c1198 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BR-Sa3/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-54.971436 ./xmlchange PTS_LAT=-3.0180290000000003 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=14400 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-01-01 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2001 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BR-Sa3/LAI_stream_BR-Sa3_2001-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands index 93262c1664..b2e5f88222 100644 --- a/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/BW-Ma1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=23.560329 ./xmlchange PTS_LAT=-19.9165 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2000 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-12-31 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/BW-Ma1/LAI_stream_BW-Ma1_2000-2000.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands index b0bc176bce..adb752cea8 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-98.483887 ./xmlchange PTS_LAT=55.8792 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS1/LAI_stream_CA-NS1_2003-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands index 9e0ba061c5..bb25a4ad93 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-98.524689 ./xmlchange PTS_LAT=55.9058 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS2/LAI_stream_CA-NS2_2002-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands index a6116f6907..733537f009 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS4/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-98.380615 ./xmlchange PTS_LAT=55.914398 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS4/LAI_stream_CA-NS4_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands index 604d9c2099..491bc27b99 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS5/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-98.484985 ./xmlchange PTS_LAT=55.863098 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS5/LAI_stream_CA-NS5_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands index 29b34d43da..3a1b6a7b0f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS6/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-98.964417 ./xmlchange PTS_LAT=55.916698 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS6/LAI_stream_CA-NS6_2002-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands index 421ed53c13..735c947bfe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-NS7/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-99.94830300000001 ./xmlchange PTS_LAT=56.635799 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-NS7/LAI_stream_CA-NS7_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands index be0dd2a37e..c7123ae573 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qcu/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-74.03653 ./xmlchange PTS_LAT=49.267078000000005 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qcu/LAI_stream_CA-Qcu_2002-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands index b58d633ede..fb7fc215c9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-Qfo/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-74.342102 ./xmlchange PTS_LAT=49.692501 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-01-01 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-Qfo/LAI_stream_CA-Qfo_2004-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands index 0c413cdd5d..ed6c584b7c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-105.817596 ./xmlchange PTS_LAT=54.485001000000004 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-01-01 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF1/LAI_stream_CA-SF1_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands index 2b68652922..1fffcfdac9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-105.877502 ./xmlchange PTS_LAT=54.253899 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF2/LAI_stream_CA-SF2_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands index 8989786585..03096c96fa 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CA-SF3/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-106.00531000000001 ./xmlchange PTS_LAT=54.091599 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CA-SF3/LAI_stream_CA-SF3_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands index f54ef57aa3..1e2590a7ae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Cha/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=8.41044 ./xmlchange PTS_LAT=47.21022 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2006 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=9 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-12-31 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2006 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Cha/LAI_stream_CH-Cha_2006-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2006" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands index a7d1ab401e..c170c8b840 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Dav/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=9.85592 ./xmlchange PTS_LAT=46.815334 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=18 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1996-12-31 + ./xmlchange DATM_YR_ALIGN=1996 + ./xmlchange DATM_YR_START=1996 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1997 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Dav/LAI_stream_CH-Dav_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands index 2da6ed4036..31e5163045 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Fru/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=8.53778 ./xmlchange PTS_LAT=47.115833 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2006-12-31 + ./xmlchange DATM_YR_ALIGN=2006 + ./xmlchange DATM_YR_START=2006 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2007 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Fru/LAI_stream_CH-Fru_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands index 5d3db8884e..ee091e134e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CH-Oe1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=7.73194 ./xmlchange PTS_LAT=47.285831 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CH-Oe1/LAI_stream_CH-Oe1_2002-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands index fa3c8b36d1..cde3fed3be 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cha/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=128.09579499999998 ./xmlchange PTS_LAT=42.4025 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cha/LAI_stream_CN-Cha_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands index a3c6bcc398..d5ec208a05 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Cng/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=123.509201 ./xmlchange PTS_LAT=44.593399 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2007-12-31 + ./xmlchange DATM_YR_ALIGN=2007 + ./xmlchange DATM_YR_START=2007 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2008 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Cng/LAI_stream_CN-Cng_2008-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands index 646cb6ce2c..674ce4dda4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Dan/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=91.066399 ./xmlchange PTS_LAT=30.497801000000003 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Dan/LAI_stream_CN-Dan_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands index d3473b6917..b9149c7d8a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Din/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=112.536102 ./xmlchange PTS_LAT=23.1733 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Din/LAI_stream_CN-Din_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands index fff0a84ed5..42502b41ce 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Du2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=116.2836 ./xmlchange PTS_LAT=42.0467 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2006-12-31 + ./xmlchange DATM_YR_ALIGN=2006 + ./xmlchange DATM_YR_START=2006 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2007 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Du2/LAI_stream_CN-Du2_2007-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands index e442e6afb7..95c4167bf0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-HaM/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=101.18 ./xmlchange PTS_LAT=37.369999 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-HaM/LAI_stream_CN-HaM_2002-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands index 98853e55a9..401534e487 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CN-Qia/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=115.058098 ./xmlchange PTS_LAT=26.7414 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=57600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CN-Qia/LAI_stream_CN-Qia_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands index 34751eb058..20309cdcb3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/CZ-wet/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=14.77035 ./xmlchange PTS_LAT=49.024651 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2006-12-31 + ./xmlchange DATM_YR_ALIGN=2006 + ./xmlchange DATM_YR_START=2006 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2007 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/CZ-wet/LAI_stream_CZ-wet_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands index de1a8cf1a0..6495d46b57 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Bay/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.86694 ./xmlchange PTS_LAT=50.141940999999996 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=1999 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1996-12-31 + ./xmlchange DATM_YR_ALIGN=1996 + ./xmlchange DATM_YR_START=1996 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1997 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Bay/LAI_stream_DE-Bay_1997-1999.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=1999" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands index 17b499193e..d43c3bd94d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Geb/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=10.9143 ./xmlchange PTS_LAT=51.100101 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=14 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-12-31 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2001 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Geb/LAI_stream_DE-Geb_2001-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands index c19b4d699e..fe165d2bf3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Gri/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=13.512529999999998 ./xmlchange PTS_LAT=50.949471 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Gri/LAI_stream_DE-Gri_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands index 0fbbe965f5..fa5671c663 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Hai/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=10.453 ./xmlchange PTS_LAT=51.079166 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=13 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-12-31 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Hai/LAI_stream_DE-Hai_2000-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands index 4783a4c7e9..28fb89a2d0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Kli/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=13.522379999999998 ./xmlchange PTS_LAT=50.893059 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Kli/LAI_stream_DE-Kli_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands index b3ec7ae1a3..250432bd9f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Meh/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=10.65547 ./xmlchange PTS_LAT=51.275311 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Meh/LAI_stream_DE-Meh_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands index e2c89bf3fa..ef17febde0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Obe/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=13.72129 ./xmlchange PTS_LAT=50.786659 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2007-12-31 + ./xmlchange DATM_YR_ALIGN=2007 + ./xmlchange DATM_YR_START=2007 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2008 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Obe/LAI_stream_DE-Obe_2008-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands index 398cb5147e..db837ac070 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Seh/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=6.44965 ./xmlchange PTS_LAT=50.870625 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2007-12-31 + ./xmlchange DATM_YR_ALIGN=2007 + ./xmlchange DATM_YR_START=2007 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2008 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Seh/LAI_stream_DE-Seh_2008-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands index 2644550dae..bcff32c36a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-SfN/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.3275 ./xmlchange PTS_LAT=47.806389 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2012-12-31 + ./xmlchange DATM_YR_ALIGN=2012 + ./xmlchange DATM_YR_START=2012 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2013 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-SfN/LAI_stream_DE-SfN_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands index d75d5b501a..aa6beb5913 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Tha/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=13.566939999999999 ./xmlchange PTS_LAT=50.963612 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1998 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=17 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1997-12-31 + ./xmlchange DATM_YR_ALIGN=1997 + ./xmlchange DATM_YR_START=1997 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1998 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Tha/LAI_stream_DE-Tha_1998-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1998" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1998" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands index 7279a3cf84..12d6f2024d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DE-Wet/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.45753 ./xmlchange PTS_LAT=50.453499 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DE-Wet/LAI_stream_DE-Wet_2002-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands index 3dfb323645..a4a472424e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Fou/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=9.58722 ./xmlchange PTS_LAT=56.4842 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Fou/LAI_stream_DK-Fou_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands index 4e3aa28e3b..962775613e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Lva/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=12.0833 ./xmlchange PTS_LAT=55.6833 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Lva/LAI_stream_DK-Lva_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands index 6e439e11e7..4c806cea45 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Ris/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=12.09722 ./xmlchange PTS_LAT=55.530281 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Ris/LAI_stream_DK-Ris_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands index 4617537101..1748d52204 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-Sor/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.644639999999999 ./xmlchange PTS_LAT=55.48587 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=18 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1996-12-31 + ./xmlchange DATM_YR_ALIGN=1996 + ./xmlchange DATM_YR_START=1996 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1997 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-Sor/LAI_stream_DK-Sor_1997-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands index 9a6079abeb..ea72cc14c4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/DK-ZaH/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-20.550293 ./xmlchange PTS_LAT=74.473282 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=14 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-01-01 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/DK-ZaH/LAI_stream_DK-ZaH_2000-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands index 131b526fe4..38e841b51c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-0.318817 ./xmlchange PTS_LAT=39.34597 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1998-12-31 + ./xmlchange DATM_YR_ALIGN=1998 + ./xmlchange DATM_YR_START=1998 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1999 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES1/LAI_stream_ES-ES1_1999-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1998" >> user_nl_clm + echo "stream_year_first_lai=1998" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands index f0b4c28c13..47fae079e6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-ES2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-0.315277 ./xmlchange PTS_LAT=39.275558000000004 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-ES2/LAI_stream_ES-ES2_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands index edac3832f8..f8a0283232 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LMa/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-5.773346 ./xmlchange PTS_LAT=39.941502 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LMa/LAI_stream_ES-LMa_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands index e287d5174b..8590e61f79 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-LgS/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-2.96582 ./xmlchange PTS_LAT=37.097935 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2007 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2006-12-31 + ./xmlchange DATM_YR_ALIGN=2006 + ./xmlchange DATM_YR_START=2006 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2007 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-LgS/LAI_stream_ES-LgS_2007-2007.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2007" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands index 33a0dba93c..bec50968d6 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ES-VDA/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=1.4485 ./xmlchange PTS_LAT=42.15218 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ES-VDA/LAI_stream_ES-VDA_2004-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands index 6e16e4f482..46cd461773 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Hyy/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=24.295 ./xmlchange PTS_LAT=61.8475 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=19 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1995-12-31 + ./xmlchange DATM_YR_ALIGN=1995 + ./xmlchange DATM_YR_START=1995 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1996 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Hyy/LAI_stream_FI-Hyy_1996-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1995" >> user_nl_clm + echo "stream_year_first_lai=1995" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands index b8c13d2c94..db4e320ca0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Kaa/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=27.295030999999998 ./xmlchange PTS_LAT=69.140694 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-12-31 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Kaa/LAI_stream_FI-Kaa_2000-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands index efb37ad254..844403dfc4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Lom/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=24.209181 ./xmlchange PTS_LAT=67.9972 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2006-12-31 + ./xmlchange DATM_YR_ALIGN=2006 + ./xmlchange DATM_YR_START=2006 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2007 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Lom/LAI_stream_FI-Lom_2007-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands index 908ba2a1e2..be6e3a2eba 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FI-Sod/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=26.637831 ./xmlchange PTS_LAT=67.361862 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2007-12-31 + ./xmlchange DATM_YR_ALIGN=2007 + ./xmlchange DATM_YR_START=2007 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2008 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FI-Sod/LAI_stream_FI-Sod_2008-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands index 4c0dc9f5bc..946c9b84fc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Fon/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=2.7801400000000003 ./xmlchange PTS_LAT=48.476397999999996 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=9 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Fon/LAI_stream_FR-Fon_2005-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands index d3bce9597c..fd29463244 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Gri/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=1.9519099999999998 ./xmlchange PTS_LAT=48.844219 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=9 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Gri/LAI_stream_FR-Gri_2005-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands index fc8960afba..88900143b1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Hes/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=7.0655600000000005 ./xmlchange PTS_LAT=48.67416 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1996-12-31 + ./xmlchange DATM_YR_ALIGN=1996 + ./xmlchange DATM_YR_START=1996 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1997 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Hes/LAI_stream_FR-Hes_1997-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands index fcb6d06fb8..29c9c95ab7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-LBr/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-0.7692869999999999 ./xmlchange PTS_LAT=44.71711 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-LBr/LAI_stream_FR-LBr_2003-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands index abeacf23b4..676f8af611 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=2.73583 ./xmlchange PTS_LAT=45.643059 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq1/LAI_stream_FR-Lq1_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands index 3b844a1cf9..b407160bb9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Lq2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=2.73703 ./xmlchange PTS_LAT=45.639191 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Lq2/LAI_stream_FR-Lq2_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands index dbe1faef32..b226175943 100644 --- a/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/FR-Pue/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=3.5958300000000003 ./xmlchange PTS_LAT=43.74139 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=15 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-12-31 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/FR-Pue/LAI_stream_FR-Pue_2000-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands index a1f8a19d71..1fef6cf769 100644 --- a/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/GF-Guy/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-52.924866 ./xmlchange PTS_LAT=5.278772 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=10800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-01-01 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/GF-Guy/LAI_stream_GF-Guy_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands index 73183de135..a4cf969235 100644 --- a/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/HU-Bug/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=19.601298999999997 ./xmlchange PTS_LAT=46.691101 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/HU-Bug/LAI_stream_HU-Bug_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands index e2bac7e621..794fdabba3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ID-Pag/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=114.03639199999999 ./xmlchange PTS_LAT=-2.345 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ID-Pag/LAI_stream_ID-Pag_2002-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands index 2f08c4f96c..376f21bf88 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Ca1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-6.918152 ./xmlchange PTS_LAT=52.858791000000004 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-01-01 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Ca1/LAI_stream_IE-Ca1_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands index 3fbc88c46e..34bf806e19 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IE-Dri/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-8.751800999999999 ./xmlchange PTS_LAT=51.986691 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IE-Dri/LAI_stream_IE-Dri_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands index a6d527be27..d0f80bd240 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Amp/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=13.60516 ./xmlchange PTS_LAT=41.904099 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Amp/LAI_stream_IT-Amp_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands index 3ccf9637a5..5c95ebd5cb 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-BCi/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=14.95744 ./xmlchange PTS_LAT=40.5238 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2010 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-BCi/LAI_stream_IT-BCi_2005-2010.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2010" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands index 1b8a740df2..4218939b8e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=12.02656 ./xmlchange PTS_LAT=42.380409 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2011-12-31 + ./xmlchange DATM_YR_ALIGN=2011 + ./xmlchange DATM_YR_START=2011 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2012 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA1/LAI_stream_IT-CA1_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands index fed6f3b932..f3e82597af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=12.02604 ./xmlchange PTS_LAT=42.37722 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2011-12-31 + ./xmlchange DATM_YR_ALIGN=2011 + ./xmlchange DATM_YR_START=2011 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2012 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA2/LAI_stream_IT-CA2_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands index a7062c5df6..de8970f1e3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-CA3/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=12.0222 ./xmlchange PTS_LAT=42.380001 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2012 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2011-12-31 + ./xmlchange DATM_YR_ALIGN=2011 + ./xmlchange DATM_YR_START=2011 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2012 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-CA3/LAI_stream_IT-CA3_2012-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2012" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands index 5e566dd5d1..37ab868476 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Col/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=13.58814 ./xmlchange PTS_LAT=41.849361 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2007 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2006-12-31 + ./xmlchange DATM_YR_ALIGN=2006 + ./xmlchange DATM_YR_START=2006 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2007 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Col/LAI_stream_IT-Col_2007-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2007" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2006" >> user_nl_clm + echo "stream_year_first_lai=2006" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands index 63e5072912..e7bc47b3b0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Cpz/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=12.37611 ./xmlchange PTS_LAT=41.70525 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-12-31 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2001 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Cpz/LAI_stream_IT-Cpz_2001-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands index a10576ad8c..6cf225d172 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Isp/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=8.63358 ./xmlchange PTS_LAT=45.812641 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2012-12-31 + ./xmlchange DATM_YR_ALIGN=2012 + ./xmlchange DATM_YR_START=2012 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2013 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Isp/LAI_stream_IT-Isp_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands index 4e27993500..8b388aedb4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-LMa/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=7.58259 ./xmlchange PTS_LAT=45.15258 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-LMa/LAI_stream_IT-LMa_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands index 59dda752cf..1f7f728803 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Lav/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.28132 ./xmlchange PTS_LAT=45.9562 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Lav/LAI_stream_IT-Lav_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands index 1689651c1d..26ffc80458 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-MBo/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.04583 ./xmlchange PTS_LAT=46.014679 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-MBo/LAI_stream_IT-MBo_2003-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands index 60f0148b52..6559976180 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Mal/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.703339999999999 ./xmlchange PTS_LAT=46.114021 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Mal/LAI_stream_IT-Mal_2003-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands index 57d8303ce8..58be23bcd1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Noe/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=8.15117 ./xmlchange PTS_LAT=40.606178 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Noe/LAI_stream_IT-Noe_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands index 3a9a00f2d5..785443e0f1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Non/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.09109 ./xmlchange PTS_LAT=44.690189000000004 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Non/LAI_stream_IT-Non_2002-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands index 8154bc4570..e7c30a4e36 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-PT1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=9.06104 ./xmlchange PTS_LAT=45.200871 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-PT1/LAI_stream_IT-PT1_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands index 2fdb1286cb..dc1b5630d0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ren/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.433689999999999 ./xmlchange PTS_LAT=46.586861 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2009-12-31 + ./xmlchange DATM_YR_ALIGN=2009 + ./xmlchange DATM_YR_START=2009 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ren/LAI_stream_IT-Ren_2010-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands index 6f06a5ca22..865f76ae9b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.930010000000001 ./xmlchange PTS_LAT=42.408119 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro1/LAI_stream_IT-Ro1_2002-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands index 26d4993b0e..401cfcf30b 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-Ro2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=11.92093 ./xmlchange PTS_LAT=42.390259 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-Ro2/LAI_stream_IT-Ro2_2002-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands index 86f4764e8c..7926235386 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SR2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=10.29095 ./xmlchange PTS_LAT=43.732029 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2013 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2012-12-31 + ./xmlchange DATM_YR_ALIGN=2012 + ./xmlchange DATM_YR_START=2012 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2013 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SR2/LAI_stream_IT-SR2_2013-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2013" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2012" >> user_nl_clm + echo "stream_year_first_lai=2012" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2013" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands index 5eec0d4fbb..8dbeedc751 100644 --- a/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/IT-SRo/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=10.28444 ./xmlchange PTS_LAT=43.727859 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/IT-SRo/LAI_stream_IT-SRo_2003-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands index 3c1a9cbb1d..6af519cf5d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/JP-SMF/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=137.07879599999998 ./xmlchange PTS_LAT=35.2617 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=54000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/JP-SMF/LAI_stream_JP-SMF_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands index 017ed8a8cf..26b6fda5a4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Ca1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=4.927 ./xmlchange PTS_LAT=51.971001 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Ca1/LAI_stream_NL-Ca1_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands index cfc0d06a63..ec509840af 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Hor/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=5.0713 ./xmlchange PTS_LAT=52.240349 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2011 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2007-12-31 + ./xmlchange DATM_YR_ALIGN=2007 + ./xmlchange DATM_YR_START=2007 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2008 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Hor/LAI_stream_NL-Hor_2008-2011.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands index 55659dad03..3bcbfbbc35 100644 --- a/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/NL-Loo/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=5.7435599999999996 ./xmlchange PTS_LAT=52.166579999999996 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=17 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1996-12-31 + ./xmlchange DATM_YR_ALIGN=1996 + ./xmlchange DATM_YR_START=1996 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1997 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/NL-Loo/LAI_stream_NL-Loo_1997-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands index 477c0c6bb8..4eb88c995a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PL-wet/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=16.309401 ./xmlchange PTS_LAT=52.762199 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-12-31 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PL-wet/LAI_stream_PL-wet_2004-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands index 5e397cf7d4..224920cbf7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Esp/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-8.601807 ./xmlchange PTS_LAT=38.6394 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Esp/LAI_stream_PT-Esp_2002-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands index 260adeef25..74413f5f5e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-8.000061 ./xmlchange PTS_LAT=38.540642 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-01-01 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi1/LAI_stream_PT-Mi1_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands index c2ec60886a..f9aa12224c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/PT-Mi2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-8.024536 ./xmlchange PTS_LAT=38.476501 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-01-01 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/PT-Mi2/LAI_stream_PT-Mi2_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands index a8c128ad7c..4abca52cae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Che/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=161.341431 ./xmlchange PTS_LAT=68.613037 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=46800 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Che/LAI_stream_RU-Che_2003-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands index abaffab7e0..74c3693f71 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Fyo/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=32.922081 ./xmlchange PTS_LAT=56.461529000000006 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=12 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Fyo/LAI_stream_RU-Fyo_2003-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands index 2569adb19f..b68d328625 100644 --- a/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/RU-Zot/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=89.3508 ./xmlchange PTS_LAT=60.8008 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=61200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-12-31 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/RU-Zot/LAI_stream_RU-Zot_2003-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands index 00e75d9a61..b2e63de838 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SD-Dem/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=30.4783 ./xmlchange PTS_LAT=13.2829 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2009 ./xmlchange START_TOD=75600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-12-31 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SD-Dem/LAI_stream_SD-Dem_2005-2009.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2009" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands index ebadea0456..dfc8e4b83f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/SE-Deg/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=19.55669 ./xmlchange PTS_LAT=64.181969 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=82800 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-12-31 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/SE-Deg/LAI_stream_SE-Deg_2002-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands index 3ff53c7814..efa3a6f1ae 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Gri/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-3.7980650000000002 ./xmlchange PTS_LAT=56.60722 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2001 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-01-01 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Gri/LAI_stream_UK-Gri_2000-2001.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2001" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands index 37f679cc53..47143973d4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-Ham/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-0.8583069999999999 ./xmlchange PTS_LAT=51.153529999999996 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-01-01 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-Ham/LAI_stream_UK-Ham_2004-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands index 7d773acba0..161de2a08e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/UK-PL3/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-1.2666629999999999 ./xmlchange PTS_LAT=51.450001 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=0 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-01-01 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/UK-PL3/LAI_stream_UK-PL3_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands index 58dd53fcf3..727e21a389 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-99.419983 ./xmlchange PTS_LAT=36.426701 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-01-01 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR1/LAI_stream_US-AR1_2010-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands index c524ec44ef..5de187cd7a 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-AR2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-99.597504 ./xmlchange PTS_LAT=36.635799 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2011 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-01-01 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-AR2/LAI_stream_US-AR2_2010-2011.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2011" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands index c3c9e2e074..da1de52a6e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-ARM/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-97.4888 ./xmlchange PTS_LAT=36.605801 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-ARM/LAI_stream_US-ARM_2003-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands index 8337842eab..47ae3dd4d9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Aud/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-110.509201 ./xmlchange PTS_LAT=31.5907 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Aud/LAI_stream_US-Aud_2003-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands index 717c88be16..2d24f07e53 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bar/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-71.28808599999999 ./xmlchange PTS_LAT=44.064640000000004 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-01-01 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bar/LAI_stream_US-Bar_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands index 94596cfff2..9fb49876da 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bkg/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-96.836182 ./xmlchange PTS_LAT=44.345290999999996 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-01-01 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bkg/LAI_stream_US-Bkg_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands index e7741e46cd..c208c920f7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Blo/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-120.632751 ./xmlchange PTS_LAT=38.895302 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-01-01 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Blo/LAI_stream_US-Blo_2000-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands index 8f83b94cf4..c802acf23c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Bo1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-88.290405 ./xmlchange PTS_LAT=40.006199 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1997 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1997-01-01 + ./xmlchange DATM_YR_ALIGN=1997 + ./xmlchange DATM_YR_START=1997 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1997 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Bo1/LAI_stream_US-Bo1_1997-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1997" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1997" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1997" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands index 892bd6ad35..d66d11a697 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Cop/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-109.389999 ./xmlchange PTS_LAT=38.09 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2003 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Cop/LAI_stream_US-Cop_2002-2003.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2003" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands index 5bb62ac7dd..621e4156ed 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-FPe/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-105.10189799999999 ./xmlchange PTS_LAT=48.307701 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-01-01 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-FPe/LAI_stream_US-FPe_2000-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands index e1ab471181..a7548fbb53 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-GLE/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-106.239899 ./xmlchange PTS_LAT=41.366501 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2009-01-01 + ./xmlchange DATM_YR_ALIGN=2009 + ./xmlchange DATM_YR_START=2009 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2009 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-GLE/LAI_stream_US-GLE_2009-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands index 08f09e3e8c..ee1cf13767 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Goo/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-89.87350500000001 ./xmlchange PTS_LAT=34.2547 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-01-01 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Goo/LAI_stream_US-Goo_2004-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands index 180fd2e20d..43d55bdbd1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ha1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-72.171509 ./xmlchange PTS_LAT=42.5378 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1992 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=21 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1992-01-01 + ./xmlchange DATM_YR_ALIGN=1992 + ./xmlchange DATM_YR_START=1992 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1992 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ha1/LAI_stream_US-Ha1_1992-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1992" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1992" >> user_nl_clm + echo "stream_year_first_lai=1992" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1992" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands index df58222796..7e9bda46b2 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ho1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-68.740204 ./xmlchange PTS_LAT=45.204102 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=9 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1996-01-01 + ./xmlchange DATM_YR_ALIGN=1996 + ./xmlchange DATM_YR_START=1996 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1996 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ho1/LAI_stream_US-Ho1_1996-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands index 0176b715e1..161a377821 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-KS2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-80.671539 ./xmlchange PTS_LAT=28.608578 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2003 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2003-01-01 + ./xmlchange DATM_YR_ALIGN=2003 + ./xmlchange DATM_YR_START=2003 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2003 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-KS2/LAI_stream_US-KS2_2003-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2003" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2003" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2003" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands index 0e3790c3a7..b606ac7e9e 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Los/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-89.979187 ./xmlchange PTS_LAT=46.082699 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=9 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-01-01 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Los/LAI_stream_US-Los_2000-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands index e878957b64..b817bac303 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MMS/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-86.41308599999999 ./xmlchange PTS_LAT=39.3232 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=16 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-01-01 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1999 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MMS/LAI_stream_US-MMS_1999-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands index e28f0411c5..a666ccbaf0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-MOz/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-92.200012 ./xmlchange PTS_LAT=38.74411 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=2 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-01-01 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-MOz/LAI_stream_US-MOz_2005-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands index 8bca07a3e6..e07240f14f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-121.557404 ./xmlchange PTS_LAT=44.452301 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=13 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me2/LAI_stream_US-Me2_2002-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands index 1ffe6f26ce..6b26c589d9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me4/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-121.62240600000001 ./xmlchange PTS_LAT=44.499199 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1996 ./xmlchange DATM_YR_END=2000 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1996-01-01 + ./xmlchange DATM_YR_ALIGN=1996 + ./xmlchange DATM_YR_START=1996 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1996 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me4/LAI_stream_US-Me4_1996-2000.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1996" >> user_nl_clm echo "stream_year_last_lai=2000" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1996" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1996" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands index 83f047475b..6056ec6552 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Me6/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-121.607803 ./xmlchange PTS_LAT=44.323299 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2011-01-01 + ./xmlchange DATM_YR_ALIGN=2011 + ./xmlchange DATM_YR_START=2011 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Me6/LAI_stream_US-Me6_2011-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands index 2b9003e770..89c79b88bc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Myb/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-121.765106 ./xmlchange PTS_LAT=38.049801 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=4 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2011-01-01 + ./xmlchange DATM_YR_ALIGN=2011 + ./xmlchange DATM_YR_START=2011 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Myb/LAI_stream_US-Myb_2011-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands index 6fc1b2fddb..7185333ba0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-NR1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-105.546402 ./xmlchange PTS_LAT=40.032902 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=16 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-01-01 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1999 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-NR1/LAI_stream_US-NR1_1999-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands index ee041eb274..5ec7590921 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-96.47659300000001 ./xmlchange PTS_LAT=41.1651 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne1/LAI_stream_US-Ne1_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands index 3a66c3c913..75d2215e6c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-96.470093 ./xmlchange PTS_LAT=41.164902000000005 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne2/LAI_stream_US-Ne2_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands index 36e9047595..ceb48a35c0 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ne3/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-96.439697 ./xmlchange PTS_LAT=41.179699 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2012 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ne3/LAI_stream_US-Ne3_2002-2012.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2012" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands index 72765799ff..e214fa5d26 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-PFa/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-90.272308 ./xmlchange PTS_LAT=45.9459 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1995 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=20 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1995-01-01 + ./xmlchange DATM_YR_ALIGN=1995 + ./xmlchange DATM_YR_START=1995 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1995 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-PFa/LAI_stream_US-PFa_1995-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1995" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1995" >> user_nl_clm + echo "stream_year_first_lai=1995" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1995" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands index 9f1bc882a6..0be161a3f5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Prr/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-147.487595 ./xmlchange PTS_LAT=65.123703 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2011 ./xmlchange DATM_YR_END=2013 ./xmlchange START_TOD=32400 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2011-01-01 + ./xmlchange DATM_YR_ALIGN=2011 + ./xmlchange DATM_YR_START=2011 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2011 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Prr/LAI_stream_US-Prr_2011-2013.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2011" >> user_nl_clm echo "stream_year_last_lai=2013" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2011" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2011" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands index ed26955f9c..b1944933fe 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP1/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-82.218781 ./xmlchange PTS_LAT=29.73807 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2005 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-01-01 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP1/LAI_stream_US-SP1_2005-2005.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2005" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands index f90ff0ab00..9ec9b25681 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP2/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-82.244812 ./xmlchange PTS_LAT=29.764799 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-01-01 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP2/LAI_stream_US-SP2_2000-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands index 12ea8849a3..72c94ad6a5 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SP3/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-82.163269 ./xmlchange PTS_LAT=29.75477 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2004 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-01-01 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1999 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SP3/LAI_stream_US-SP3_1999-2004.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2004" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands index 3d0d96baf7..53c07383d3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRG/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-110.827698 ./xmlchange PTS_LAT=31.7894 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2009 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=6 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2009-01-01 + ./xmlchange DATM_YR_ALIGN=2009 + ./xmlchange DATM_YR_START=2009 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2009 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRG/LAI_stream_US-SRG_2009-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2009" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2009" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2009" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands index 7a01b74364..f8ab5b5b89 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-SRM/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-110.865997 ./xmlchange PTS_LAT=31.8214 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2004 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=11 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2004-01-01 + ./xmlchange DATM_YR_ALIGN=2004 + ./xmlchange DATM_YR_START=2004 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2004 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-SRM/LAI_stream_US-SRM_2004-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2004" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2004" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2004" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands index 09d8b8c1a2..7bd8324a6d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Syv/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-89.347717 ./xmlchange PTS_LAT=46.242001 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2002 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2002-01-01 + ./xmlchange DATM_YR_ALIGN=2002 + ./xmlchange DATM_YR_START=2002 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2002 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Syv/LAI_stream_US-Syv_2002-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2002" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2002" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2002" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands index 342317d831..2ac988eb2f 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Ton/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-120.966003 ./xmlchange PTS_LAT=38.431599 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=14 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-01-01 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2001 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Ton/LAI_stream_US-Ton_2001-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands index fab09c63e4..0895943d1c 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Tw4/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-121.641403 ./xmlchange PTS_LAT=38.103001 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2014 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,17 +28,32 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2014-01-01 + ./xmlchange DATM_YR_ALIGN=2014 + ./xmlchange DATM_YR_START=2014 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2014 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Tw4/LAI_stream_US-Tw4_2014-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2014" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2014" >> user_nl_clm + echo "stream_year_first_lai=2014" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2014" >> user_nl_clm + fi fi + # set baseflow scalar to zero for wetland site echo "baseflow_scalar = 0" >> user_nl_clm \ No newline at end of file diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands index a7cf4d481f..77649de143 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Twt/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-121.653107 ./xmlchange PTS_LAT=38.1087 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2010 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=5 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2010-01-01 + ./xmlchange DATM_YR_ALIGN=2010 + ./xmlchange DATM_YR_START=2010 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2010 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Twt/LAI_stream_US-Twt_2010-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2010" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2010" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2010" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands index 9acb92be26..511e7e05c3 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-UMB/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-84.713806 ./xmlchange PTS_LAT=45.559799 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=18000 ./xmlchange ATM_NCPL=24 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=15 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2000-01-01 + ./xmlchange DATM_YR_ALIGN=2000 + ./xmlchange DATM_YR_START=2000 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-UMB/LAI_stream_US-UMB_2000-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2000" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands index 62a196b40a..8cbb483737 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Var/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-120.95072900000001 ./xmlchange PTS_LAT=38.4133 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2001 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=28800 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=14 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2001-01-01 + ./xmlchange DATM_YR_ALIGN=2001 + ./xmlchange DATM_YR_START=2001 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2001 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Var/LAI_stream_US-Var_2001-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2001" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2001" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2001" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands index 6a95ca9c97..adcfb2eec4 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-WCr/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-90.079895 ./xmlchange PTS_LAT=45.805901 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=1999 ./xmlchange DATM_YR_END=2006 ./xmlchange START_TOD=21600 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=8 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-01-01 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=1999 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-WCr/LAI_stream_US-WCr_1999-2006.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=1999" >> user_nl_clm echo "stream_year_last_lai=2006" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands index 5e3a7a1549..0f091925f1 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Whs/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-110.0522 ./xmlchange PTS_LAT=31.743799 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=7 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2008-01-01 + ./xmlchange DATM_YR_ALIGN=2008 + ./xmlchange DATM_YR_START=2008 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2008 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Whs/LAI_stream_US-Whs_2008-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2008" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands index ccddd3e72b..da4a18b3f9 100644 --- a/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/US-Wkg/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=-109.941895 ./xmlchange PTS_LAT=31.7365 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2005 ./xmlchange DATM_YR_END=2014 ./xmlchange START_TOD=25200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=10 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2005-01-01 + ./xmlchange DATM_YR_ALIGN=2005 + ./xmlchange DATM_YR_START=2005 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2005 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/US-Wkg/LAI_stream_US-Wkg_2005-2014.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2005" >> user_nl_clm echo "stream_year_last_lai=2014" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2005" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2005" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands index da148238e8..016f4e4038 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZA-Kru/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=31.496901 ./xmlchange PTS_LAT=-25.019699 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2000 ./xmlchange DATM_YR_END=2002 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=3 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=1999-12-31 + ./xmlchange DATM_YR_ALIGN=1999 + ./xmlchange DATM_YR_START=1999 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2000 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZA-Kru/LAI_stream_ZA-Kru_2000-2002.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2000" >> user_nl_clm echo "stream_year_last_lai=2002" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=1999" >> user_nl_clm + echo "stream_year_first_lai=1999" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2000" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands index 47df9fdc47..2729227ecc 100644 --- a/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/ZM-Mon/shell_commands @@ -1,8 +1,5 @@ ./xmlchange PTS_LON=23.252781 ./xmlchange PTS_LAT=-15.437778 -./xmlchange RUN_STARTDATE=0001-01-01 -./xmlchange DATM_YR_ALIGN=1 -./xmlchange DATM_YR_START=2008 ./xmlchange DATM_YR_END=2008 ./xmlchange START_TOD=79200 ./xmlchange ATM_NCPL=48 @@ -31,14 +28,29 @@ if [[ $compset =~ ^HIST ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_N=1 fi + # set start date for transient case with historical compset + ./xmlchange RUN_STARTDATE=2007-12-31 + ./xmlchange DATM_YR_ALIGN=2007 + ./xmlchange DATM_YR_START=2007 +else + # for spinup case with I2000 compset + ./xmlchange RUN_STARTDATE=0001-01-01 + ./xmlchange DATM_YR_ALIGN=1 + ./xmlchange DATM_YR_START=2008 fi # Turn on LAI streams for a SP case if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then echo "stream_fldfilename_lai='\$DIN_LOC_ROOT/lnd/clm2/lai_streams/PLUMBER2/ZM-Mon/LAI_stream_ZM-Mon_2008-2008.nc'" >> user_nl_clm - echo "model_year_align_lai=1" >> user_nl_clm - echo "stream_year_first_lai=2008" >> user_nl_clm echo "stream_year_last_lai=2008" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + # for transient case with a historical compset + echo "model_year_align_lai=2007" >> user_nl_clm + echo "stream_year_first_lai=2007" >> user_nl_clm + else + # for a spinup case with a i2000 compset + echo "model_year_align_lai=1" >> user_nl_clm + echo "stream_year_first_lai=2008" >> user_nl_clm + fi fi + diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands index c509f72af5..310570ccc7 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -24,8 +24,19 @@ if [[ $compset =~ ^HIST ]]; then fi # TODO, makde this accurate for plumber2 ./xmlchange CLM_NML_USE_CASE="2018-PD_transient" + # TODO, modify for postAD runs in tower script? Remove from usermods? + ./xmlchange CLM_FORCE_COLDSTART=off + echo "! this allows for large h1 data files, regardless or run length " >> user_nl_clm + echo "hist_nhtfrq = 0,1" >> user_nl_clm + echo "hist_mfilt = 1,438000" >> user_nl_clm + echo " " >> user_nl_clm + else + # TODO, set this for spinup in BGC and SP cases + ./xmlchange STOP_OPTION="nyears" + ./xmlchange STOP_N=5 ./xmlchange CLM_NML_USE_CASE="2000_control" + ./xmlchange CLM_FORCE_COLDSTART=on fi # If needed for SP simulations: & set history file variables @@ -33,8 +44,33 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_OPTION=nyears fi - ./xmlchange CLM_FORCE_COLDSTART=on + echo "! h1 output stream for SP case" >> user_nl_clm + if [[ $compset =~ ^HIST ]]; then + echo "! h1 output stream for transient SP case" >> user_nl_clm + echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS', + 'SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW', + 'QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC','QDRAI','QDRAI_PERCH', + 'SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE','SOILLIQ', + 'SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT','TLAI', + 'WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRANMN','TV','RSSUN', + 'RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX', + 'TAUY','QSNOEVAP','QFLX_SOLIDEVAP_FROM_TOP_LAYER','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm + fi + echo " " >> user_nl_clm echo "use_lai_streams = .true." >> user_nl_clm echo "lai_mapalgo = 'nn'" >> user_nl_clm - echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC','QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE','SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT','TLAI','WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX','TAUY','QSNOEVAP','QFLX_SOLIDEVAP_FROM_TOP_LAYER','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm + echo "lai_dtlimit=30." >> user_nl_clm +else + if [[ $compset =~ ^HIST ]]; then + echo "! h1 output stream for transient BGC case" >> user_nl_clm + echo "hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI', + 'HR','SNOW_DEPTH','TBOT','TSOI','SOILC_vr','FV','NET_NMIN_vr','EFLX_LH_TOT', + 'FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI', + 'FSNO','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC', + 'QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE', + 'SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT', + 'TLAI','WIND','FIRE','FSM','COSZEN','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF', + 'RH_LEAF','RH','T10','TG','SABG','SABV','TBOT','TAUX','TAUY','QSNOEVAP','H2OSFC'" >> user_nl_clm + fi fi diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm index d9e9c08d5c..fe23065798 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_clm @@ -21,17 +21,4 @@ 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_esmf/PLUMBER2/surfdata_1x1_PLUMBER2_${PLUMBER2SITE}_hist_2000_16pfts_c240326.nc" -! TODO, this is only needed for transient simulations, not spinup -! this allows for large h1 data files, regardless or run length -hist_nhtfrq = 0,1 -hist_mfilt = 1,438000 - -! h1 output stream -hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI', - 'HR','SNOW_DEPTH','TBOT','TSOI','SOILC_vr','FV','NET_NMIN_vr','EFLX_LH_TOT', - 'FGR12','FGR','TSKIN','FSR','FSDS','SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI', - 'FSNO','SNO_T','RAIN','SNOW','QVEGT','QVEGE','QSOIL','QRUNOFF','QOVER','QH2OSFC', - 'QDRAI','QDRAI_PERCH','SNO_EXISTENCE','QSNOMELT','H2OCAN','H2OSNO','SNOCAN','SOILICE', - 'SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT', - 'TLAI','WIND','FIRE','FSM','COSZEN','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF', - 'RH_LEAF','RH','T10','TG','SABG','SABV','TBOT','TAUX','TAUY','QSNOEVAP','H2OSFC' +! custom namelist changes for each site / case diff --git a/tools/site_and_regional/plumber2_usermods.py b/tools/site_and_regional/plumber2_usermods.py index d594c249c9..c12e539c31 100644 --- a/tools/site_and_regional/plumber2_usermods.py +++ b/tools/site_and_regional/plumber2_usermods.py @@ -43,13 +43,6 @@ def write_usermods(lat,lon,site,start_year,end_year, #'./xmlchange PLUMBER2SITE='+site + '\n' \ './xmlchange PTS_LON='+str(lon) + '\n' \ './xmlchange PTS_LAT='+str(lat) + '\n' \ - './xmlchange RUN_STARTDATE=0001-01-01' + '\n' \ - './xmlchange DATM_YR_ALIGN='+str(1) + '\n' \ - './xmlchange DATM_YR_START='+str(start_year) + '\n' \ - # TODO, change this for transient simulations - # './xmlchange RUN_STARTDATE='+str(start_date) + '\n' \ - # './xmlchange DATM_YR_ALIGN='+str(start_year_actual) + '\n' \ - # './xmlchange DATM_YR_START='+str(start_year_actual) + '\n' \ './xmlchange DATM_YR_END='+str(end_year) + '\n' \ './xmlchange START_TOD='+str(start_tod) + '\n' \ './xmlchange ATM_NCPL='+str(atm_ncpl) + '\n' \ @@ -86,27 +79,34 @@ def write_usermods(lat,lon,site,start_year,end_year, ' if [[ $TEST != "TRUE" ]]; then \n' \ ' ./xmlchange STOP_N='+str(stop_n) + '\n' \ ' fi \n' \ + ' # set start date for transient case with historical compset \n' \ + ' ./xmlchange RUN_STARTDATE='+str(start_date) + '\n' \ + ' ./xmlchange DATM_YR_ALIGN='+str(start_year_actual) + '\n' \ + ' ./xmlchange DATM_YR_START='+str(start_year_actual) + '\n' \ + 'else \n' \ + ' # for spinup case with I2000 compset \n' \ + ' ./xmlchange RUN_STARTDATE=0001-01-01' + '\n' \ + ' ./xmlchange DATM_YR_ALIGN='+str(1) + '\n' \ + ' ./xmlchange DATM_YR_START='+str(start_year) + '\n' \ 'fi \n' \ '\n' \ '# Turn on LAI streams for a SP case \n' \ 'if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then \n' \ ' echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ - ' echo "model_year_align_lai=1" >> user_nl_clm \n' \ - ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ ' echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ - ' echo "stream_meshfile_lai=\'none\'" >> user_nl_clm \n' \ - ' echo "lai_dtlimit=30." >> user_nl_clm \n' \ - + ' if [[ $compset =~ ^HIST ]]; then \n' \ + ' # for transient case with a historical compset \n' \ + ' echo "model_year_align_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ + ' echo "stream_year_first_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ + ' else \n' \ + ' # for a spinup case with a i2000 compset \n' \ + ' echo "model_year_align_lai=1" >> user_nl_clm \n' \ + ' echo "stream_year_first_lai='+str(start_year) + '" >> user_nl_clm \n' \ + ' fi \n' \ 'fi \n' + '\n' \ - # TODO, change this for transient simulations - #' #echo "stream_fldfilename_lai=\''+LAIstream+'\'" >> user_nl_clm \n' \ - #' #echo "model_year_align_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ - #' #echo "stream_year_first_lai='+str(start_year_actual) + '" >> user_nl_clm \n' \ - #' #echo "stream_year_last_lai='+str(end_year) + '" >> user_nl_clm \n' \ - #' #echo "stream_meshfile_lai=\'none\' >> user_nl_clm \n' \ - #'fi \n' ) sFile.close() From 149b95e5e24d9234dbc01b512bf2aab282db7144 Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 15 Apr 2024 12:44:52 -0600 Subject: [PATCH 33/43] extend dtlimit for transient runs --- cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands | 4 ++++ .../usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands index 310570ccc7..4e520ffd5d 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -30,6 +30,8 @@ if [[ $compset =~ ^HIST ]]; then echo "hist_nhtfrq = 0,1" >> user_nl_clm echo "hist_mfilt = 1,438000" >> user_nl_clm echo " " >> user_nl_clm + echo "CLM_USRDAT.PLUMBER2:taxmode=extend" >> user_nl_datm_streams + echo "CLM_USRDAT.PLUMBER2:dtlimit=1e30" >> user_nl_datm_streams else # TODO, set this for spinup in BGC and SP cases @@ -37,6 +39,8 @@ else ./xmlchange STOP_N=5 ./xmlchange CLM_NML_USE_CASE="2000_control" ./xmlchange CLM_FORCE_COLDSTART=on + echo "CLM_USRDAT.PLUMBER2:taxmode=cycle" >> user_nl_datm_streams + echo "CLM_USRDAT.PLUMBER2:dtlimit=30" >> user_nl_datm_streams fi # If needed for SP simulations: & set history file variables diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams index 145ea907d4..35071ff415 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams @@ -31,9 +31,6 @@ CLM_USRDAT.PLUMBER2:datavars = ZBOT Sa_z, \ PSRF Sa_pbot, \ FLDS Faxa_lwdn -CLM_USRDAT.PLUMBER2:taxmode=cycle -CLM_USRDAT.PLUMBER2:dtlimit=50 - presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_1849-2101_monthly_0.9x1.25_c201103.nc presaero.SSP3-7.0:dtlimit=30 From ba9b05f2ac027b0308068832a6e689e50f2c33fc Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 15 Apr 2024 13:07:14 -0600 Subject: [PATCH 34/43] setting CALENDAR correctly for spinup and transient cases --- cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands index 4e520ffd5d..0b229d60cf 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -26,6 +26,7 @@ if [[ $compset =~ ^HIST ]]; then ./xmlchange CLM_NML_USE_CASE="2018-PD_transient" # TODO, modify for postAD runs in tower script? Remove from usermods? ./xmlchange CLM_FORCE_COLDSTART=off + ./xmlchange CALENDAR=GREGORIAN echo "! this allows for large h1 data files, regardless or run length " >> user_nl_clm echo "hist_nhtfrq = 0,1" >> user_nl_clm echo "hist_mfilt = 1,438000" >> user_nl_clm @@ -39,8 +40,10 @@ else ./xmlchange STOP_N=5 ./xmlchange CLM_NML_USE_CASE="2000_control" ./xmlchange CLM_FORCE_COLDSTART=on + ./xmlchange CALENDAR=NO_LEAP echo "CLM_USRDAT.PLUMBER2:taxmode=cycle" >> user_nl_datm_streams echo "CLM_USRDAT.PLUMBER2:dtlimit=30" >> user_nl_datm_streams + fi # If needed for SP simulations: & set history file variables From 362d412c859c51ac0334b376d86cf2aaaefc4806 Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 15 Apr 2024 13:08:01 -0600 Subject: [PATCH 35/43] chagnes requested for LAI streams --- bld/CLMBuildNamelist.pm | 1 - bld/namelist_files/namelist_defaults_ctsm.xml | 1 - bld/namelist_files/namelist_definition_ctsm.xml | 2 +- src/cpl/share_esmf/laiStreamMod.F90 | 4 +++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index ac6735f1ca..b4eefd984c 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -4049,7 +4049,6 @@ sub setup_logic_lai_streams { if ( $nl_flags->{'bgc_mode'} eq "sp" || ($nl_flags->{'bgc_mode'} eq "fates" && &value_is_true($nl->get_value('use_fates_sp')) )) { if ( &value_is_true($nl->get_value('use_lai_streams')) ) { add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_lai_streams'); - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'lai_dtlimit'); add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'lai_mapalgo', 'hgrid'=>$nl_flags->{'res'} ); add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_year_first_lai', diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 43a907aae6..5c86d230fd 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -1748,7 +1748,6 @@ use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_mpasa1 2001 2013 2001 -1.5_r8 lnd/clm2/lai_streams/MODISPFTLAI_0.5x0.5_c140711.nc lnd/clm2/lai_streams/MODISPFTLAI_0.5x0_ESMFmesh_cdf5_090621.nc diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index d79b337676..35ab1f1f5f 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -1930,7 +1930,7 @@ Filename of input stream data for LAI -dtlimit for LAI streams +dtlimit (ratio of max/min stream delta times) for LAI streams, which allows for cycling over a year of data diff --git a/src/cpl/share_esmf/laiStreamMod.F90 b/src/cpl/share_esmf/laiStreamMod.F90 index 532e82c0fc..de11a2a353 100644 --- a/src/cpl/share_esmf/laiStreamMod.F90 +++ b/src/cpl/share_esmf/laiStreamMod.F90 @@ -62,7 +62,7 @@ subroutine lai_init(bounds) integer :: nml_error ! namelist i/o error flag character(len=CL) :: stream_fldFileName_lai ! lai stream filename to read character(len=CL) :: stream_meshfile_lai ! lai stream meshfile - real(r8) :: lai_dtlimit ! dlimit for lai stream to use + real(r8) :: lai_dtlimit = 1.5_r8 ! dlimit for lai stream to use character(len=CL) :: lai_mapalgo = 'bilinear' ! Mapping alogrithm character(len=CL) :: lai_tintalgo = 'linear' ! Time interpolation alogrithm integer :: lai_offset = 0 ! Offset in time for dataset (sec) @@ -112,6 +112,8 @@ subroutine lai_init(bounds) call shr_mpi_bcast(stream_fldFileName_lai , mpicom) call shr_mpi_bcast(stream_meshfile_lai , mpicom) call shr_mpi_bcast(lai_tintalgo , mpicom) + call shr_mpi_bcast(lai_dtlimit , mpicom) + call shr_mpi_bcast(lai_mapalgo , mpicom) if (masterproc) then write(iulog,*) From 1548c0b0e0a23911673d2074f98f54559cbeece3 Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 15 Apr 2024 13:17:52 -0600 Subject: [PATCH 36/43] getting lai streams to work for HIST cases --- .../PLUMBER2/defaults/shell_commands | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands index 0b229d60cf..abc9e44127 100644 --- a/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands +++ b/cime_config/usermods_dirs/PLUMBER2/defaults/shell_commands @@ -48,11 +48,17 @@ fi # If needed for SP simulations: & set history file variables if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then + echo "! using LAI streams for SP cases" >> user_nl_clm + echo "use_lai_streams = .true." >> user_nl_clm + echo "lai_mapalgo = 'nn'" >> user_nl_clm + echo "stream_meshfile_lai='none'" >> user_nl_clm if [[ $TEST != "TRUE" ]]; then ./xmlchange STOP_OPTION=nyears fi echo "! h1 output stream for SP case" >> user_nl_clm if [[ $compset =~ ^HIST ]]; then + echo "lai_dtlimit=1e30" >> user_nl_clm + echo "" >> user_nl_clm echo "! h1 output stream for transient SP case" >> user_nl_clm echo "hist_fincl2 = 'FSA','FIRA','EFLX_LH_TOT','FSH','FGR12','FGR','TSKIN','FSR','FSDS', 'SNOFSRVD','SNOFSRND','SNOFSRVI','SNOFSRNI','FSNO','TSOI','SNO_T','RAIN','SNOW', @@ -62,13 +68,12 @@ if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then 'WIND','FIRE','FCTR','FCEV','FGEV','FSM','COSZEN','H2OSOI','BTRANMN','TV','RSSUN', 'RSSHA','FSH_G','RHAF','RH_LEAF','RH','T10','TG','SABG','SABV','FPSN','TBOT','TAUX', 'TAUY','QSNOEVAP','QFLX_SOLIDEVAP_FROM_TOP_LAYER','QFLX_SNOW_DRAIN','H2OSFC','FPSN'" >> user_nl_clm + else + echo "lai_dtlimit=30." >> user_nl_clm + echo "" >> user_nl_clm fi echo " " >> user_nl_clm - echo "use_lai_streams = .true." >> user_nl_clm - echo "lai_mapalgo = 'nn'" >> user_nl_clm - echo "stream_meshfile_lai='none'" >> user_nl_clm - echo "lai_dtlimit=30." >> user_nl_clm -else +else # for BGC cases if [[ $compset =~ ^HIST ]]; then echo "! h1 output stream for transient BGC case" >> user_nl_clm echo "hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI', @@ -79,5 +84,6 @@ else 'SOILLIQ','SOILWATER_10CM','TWS','SNOWLIQ','SNOWDP','RH2M','TSA','FLDS','Q2M','PBOT', 'TLAI','WIND','FIRE','FSM','COSZEN','BTRANMN','TV','RSSUN','RSSHA','FSH_G','RHAF', 'RH_LEAF','RH','T10','TG','SABG','SABV','TBOT','TAUX','TAUY','QSNOEVAP','H2OSFC'" >> user_nl_clm + echo "" >> user_nl_clm fi fi From 7aafb0c8116ff7a5a03338d8426573aa04eec4eb Mon Sep 17 00:00:00 2001 From: wwieder Date: Mon, 15 Apr 2024 15:32:55 -0600 Subject: [PATCH 37/43] adding a bit to log file --- src/cpl/share_esmf/laiStreamMod.F90 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cpl/share_esmf/laiStreamMod.F90 b/src/cpl/share_esmf/laiStreamMod.F90 index de11a2a353..3173a88b54 100644 --- a/src/cpl/share_esmf/laiStreamMod.F90 +++ b/src/cpl/share_esmf/laiStreamMod.F90 @@ -124,6 +124,9 @@ subroutine lai_init(bounds) write(iulog,'(a,a)' ) ' stream_fldFileName_lai = ',trim(stream_fldFileName_lai) write(iulog,'(a,a)' ) ' stream_meshfile_lai = ',trim(stream_meshfile_lai) write(iulog,'(a,a)' ) ' lai_tintalgo = ',trim(lai_tintalgo) + write(iulog,'(a,a)' ) ' lai_mapalgo = ',trim(lai_mapalgo) + write(iulog,'(a,a)' ) ' lai_dtlimit = ',trim(lai_dtlimit) + do n = 1,numLaiFields write(iulog,'(a,a)' ) ' stream_varname = ',trim(stream_varnames(n)) end do From 690caa54ada257e49564ee82e93da2548ce62484 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 18 Apr 2024 10:10:20 -0600 Subject: [PATCH 38/43] Do not handle lai_dtlimit as a string and the code builds again --- src/cpl/share_esmf/laiStreamMod.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpl/share_esmf/laiStreamMod.F90 b/src/cpl/share_esmf/laiStreamMod.F90 index 3173a88b54..d471481c6f 100644 --- a/src/cpl/share_esmf/laiStreamMod.F90 +++ b/src/cpl/share_esmf/laiStreamMod.F90 @@ -125,7 +125,7 @@ subroutine lai_init(bounds) write(iulog,'(a,a)' ) ' stream_meshfile_lai = ',trim(stream_meshfile_lai) write(iulog,'(a,a)' ) ' lai_tintalgo = ',trim(lai_tintalgo) write(iulog,'(a,a)' ) ' lai_mapalgo = ',trim(lai_mapalgo) - write(iulog,'(a,a)' ) ' lai_dtlimit = ',trim(lai_dtlimit) + write(iulog,'(a,a)' ) ' lai_dtlimit = ', lai_dtlimit do n = 1,numLaiFields write(iulog,'(a,a)' ) ' stream_varname = ',trim(stream_varnames(n)) From 7c709711641b38cd0a90133c97cdfc896dacbb91 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 18 Apr 2024 11:09:53 -0600 Subject: [PATCH 39/43] Fix utest error: missing 2 required positional arguments: 'cth' 'cbh' --- .../site_and_regional/single_point_case.py | 7 ++- python/ctsm/test/test_unit_singlept_data.py | 22 +++++++ .../test/test_unit_singlept_data_surfdata.py | 60 +++++++++++++++++++ 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/python/ctsm/site_and_regional/single_point_case.py b/python/ctsm/site_and_regional/single_point_case.py index 80da9da470..33b4dcdbfa 100644 --- a/python/ctsm/site_and_regional/single_point_case.py +++ b/python/ctsm/site_and_regional/single_point_case.py @@ -218,9 +218,12 @@ def check_dom_pft(self): # -- check if all dom_pft are in the same range: if min_dom_pft < NAT_PFT <= max_dom_pft: - logger.info( - "WARNING, you are subsetting using mixed land units that have both natural pfts and crop cfts. Check that your surface dataset looks correct." + err_msg = ( + "WARNING, you are subsetting using mixed land " + + "units that have both natural pfts and crop cfts. Check " + + "that your surface dataset looks correct." ) + logger.info(err_msg) def check_nonveg(self): """ diff --git a/python/ctsm/test/test_unit_singlept_data.py b/python/ctsm/test/test_unit_singlept_data.py index 6fdc3109d9..9cbb67f376 100755 --- a/python/ctsm/test/test_unit_singlept_data.py +++ b/python/ctsm/test/test_unit_singlept_data.py @@ -39,6 +39,8 @@ class TestSinglePointCase(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 16 + cth = 0.9 + cbh = 0.1 include_nonveg = False uni_snow = True cap_saturation = True @@ -62,6 +64,8 @@ def test_create_tag_noname(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -89,6 +93,8 @@ def test_create_tag_name(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -117,6 +123,8 @@ def test_check_dom_pft_too_big(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -145,6 +153,8 @@ def test_check_dom_pft_too_small(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -173,6 +183,8 @@ def test_check_dom_pft_numpft(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -202,6 +214,8 @@ def test_check_dom_pft_mixed_range(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -233,6 +247,8 @@ def test_check_nonveg_nodompft(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -265,6 +281,8 @@ def test_check_pct_pft_notsamenumbers(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -296,6 +314,8 @@ def test_check_pct_pft_sum_not1(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -327,6 +347,8 @@ def test_check_pct_pft_fraction_topct(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, diff --git a/python/ctsm/test/test_unit_singlept_data_surfdata.py b/python/ctsm/test/test_unit_singlept_data_surfdata.py index 0052e796d1..96e99995a5 100755 --- a/python/ctsm/test/test_unit_singlept_data_surfdata.py +++ b/python/ctsm/test/test_unit_singlept_data_surfdata.py @@ -47,6 +47,8 @@ class TestSinglePointCaseSurfaceNoCrop(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 16 + cth = 0.9 + cbh = 0.1 include_nonveg = False uni_snow = True cap_saturation = True @@ -159,6 +161,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_pctnatpft(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -192,6 +196,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_pctnatveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -221,6 +227,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_pctcrop(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -250,6 +258,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_glacier(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -280,6 +290,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_wetland(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -310,6 +322,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_lake(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -340,6 +354,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_unisnow(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -371,6 +387,8 @@ def test_modify_surfdata_atpoint_nocrop_1pft_capsat(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -402,6 +420,8 @@ def test_modify_surfdata_atpoint_nocrop_multipft(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -439,6 +459,8 @@ def test_modify_surfdata_atpoint_nocrop_urban_nononveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -474,6 +496,8 @@ def test_modify_surfdata_atpoint_nocrop_urban_include_nonveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -512,6 +536,8 @@ def test_modify_surfdata_atpoint_nocrop_wetland_include_nonveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -543,6 +569,8 @@ def test_modify_surfdata_atpoint_nocrop_nopft_zero_nonveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -577,6 +605,8 @@ def test_modify_surfdata_atpoint_nocrop_nopft_include_nonveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -612,6 +642,8 @@ class TestSinglePointCaseSurfaceCrop(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 78 + cth = 0.9 + cbh = 0.1 include_nonveg = False uni_snow = False cap_saturation = False @@ -724,6 +756,8 @@ def test_modify_surfdata_atpoint_crop_1pft_pctnatpft(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -757,6 +791,8 @@ def test_modify_surfdata_atpoint_crop_1pft_pctnatveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -786,6 +822,8 @@ def test_modify_surfdata_atpoint_crop_1pft_pctcrop(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -815,6 +853,8 @@ def test_modify_surfdata_atpoint_crop_1pft_glacier(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -845,6 +885,8 @@ def test_modify_surfdata_atpoint_crop_1pft_wetland(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -875,6 +917,8 @@ def test_modify_surfdata_atpoint_crop_1pft_lake(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -905,6 +949,8 @@ def test_modify_surfdata_atpoint_crop_1pft_unisnow(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -935,6 +981,8 @@ def test_modify_surfdata_atpoint_crop_1pft_capsat(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -966,6 +1014,8 @@ def test_modify_surfdata_atpoint_crop_multipft(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -1001,6 +1051,8 @@ def test_modify_surfdata_atpoint_crop_urban_nononveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -1036,6 +1088,8 @@ def test_modify_surfdata_atpoint_crop_urban_include_nonveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -1074,6 +1128,8 @@ def test_modify_surfdata_atpoint_crop_lake_include_nonveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -1105,6 +1161,8 @@ def test_modify_surfdata_atpoint_crop_nopft_zero_nonveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, @@ -1139,6 +1197,8 @@ def test_modify_surfdata_atpoint_crop_nopft_include_nonveg(self): evenly_split_cropland=self.evenly_split_cropland, pct_pft=self.pct_pft, num_pft=self.num_pft, + cth=self.cth, + cbh=self.cbh, include_nonveg=self.include_nonveg, uni_snow=self.uni_snow, cap_saturation=self.cap_saturation, From ba0a3c256515b6aaa872bac84f8fdfa89fd91673 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 18 Apr 2024 11:20:57 -0600 Subject: [PATCH 40/43] Fix utest error: zip argument must support iteration --- python/ctsm/test/test_unit_singlept_data.py | 4 ++-- python/ctsm/test/test_unit_singlept_data_surfdata.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python/ctsm/test/test_unit_singlept_data.py b/python/ctsm/test/test_unit_singlept_data.py index 9cbb67f376..1b058c8a5b 100755 --- a/python/ctsm/test/test_unit_singlept_data.py +++ b/python/ctsm/test/test_unit_singlept_data.py @@ -39,8 +39,8 @@ class TestSinglePointCase(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 16 - cth = 0.9 - cbh = 0.1 + cth = [0.9] + cbh = [0.1] include_nonveg = False uni_snow = True cap_saturation = True diff --git a/python/ctsm/test/test_unit_singlept_data_surfdata.py b/python/ctsm/test/test_unit_singlept_data_surfdata.py index 96e99995a5..b747cb14e0 100755 --- a/python/ctsm/test/test_unit_singlept_data_surfdata.py +++ b/python/ctsm/test/test_unit_singlept_data_surfdata.py @@ -47,8 +47,8 @@ class TestSinglePointCaseSurfaceNoCrop(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 16 - cth = 0.9 - cbh = 0.1 + cth = [0.9] + cbh = [0.1] include_nonveg = False uni_snow = True cap_saturation = True @@ -642,8 +642,8 @@ class TestSinglePointCaseSurfaceCrop(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 78 - cth = 0.9 - cbh = 0.1 + cth = [0.9] + cbh = [0.1] include_nonveg = False uni_snow = False cap_saturation = False From f38a5d67e169786789d99de9af46eb33ef4d9f13 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 18 Apr 2024 12:11:26 -0600 Subject: [PATCH 41/43] Fix utest errors: various and one still remains --- python/ctsm/test/test_unit_singlept_data.py | 4 +- .../test/test_unit_singlept_data_surfdata.py | 48 +++++++++++++++++-- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/python/ctsm/test/test_unit_singlept_data.py b/python/ctsm/test/test_unit_singlept_data.py index 1b058c8a5b..4d2e59aa32 100755 --- a/python/ctsm/test/test_unit_singlept_data.py +++ b/python/ctsm/test/test_unit_singlept_data.py @@ -39,8 +39,8 @@ class TestSinglePointCase(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 16 - cth = [0.9] - cbh = [0.1] + cth = [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9] + cbh = [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] include_nonveg = False uni_snow = True cap_saturation = True diff --git a/python/ctsm/test/test_unit_singlept_data_surfdata.py b/python/ctsm/test/test_unit_singlept_data_surfdata.py index b747cb14e0..05198ab350 100755 --- a/python/ctsm/test/test_unit_singlept_data_surfdata.py +++ b/python/ctsm/test/test_unit_singlept_data_surfdata.py @@ -47,8 +47,8 @@ class TestSinglePointCaseSurfaceNoCrop(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 16 - cth = [0.9] - cbh = [0.1] + cth = [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9] + cbh = [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] include_nonveg = False uni_snow = True cap_saturation = True @@ -58,6 +58,8 @@ class TestSinglePointCaseSurfaceNoCrop(unittest.TestCase): # -- dimensions of xarray dataset lsmlat = [plat] lsmlon = [plon] + months = np.arange(1, 13, 1, dtype=int) + lsmpft = np.arange(0, 79, 1, dtype=int) natpft = np.arange(0, 15, 1, dtype=int) cft = np.arange(15, 17, 1, dtype=int) numurbl = np.arange(0, 3, 1, dtype=int) @@ -139,6 +141,24 @@ class TestSinglePointCaseSurfaceNoCrop(unittest.TestCase): "units": "unitless", }, ), + "MONTHLY_HEIGHT_TOP": xr.DataArray( + data=np.random.rand(1, 1, months[-1], lsmpft[-1] + 1), + dims=["lsmlat", "lsmlon", "time", "lsmpft"], + coords={"lsmlat": lsmlat, "lsmlon": lsmlon, "time": months, "lsmpft": lsmpft}, + attrs={ + "long_name": "monthly height top by pft and month", + "units": "m", + }, + ), + "MONTHLY_HEIGHT_BOT": xr.DataArray( + data=np.random.rand(1, 1, months[-1], lsmpft[-1] + 1), + dims=["lsmlat", "lsmlon", "time", "lsmpft"], + coords={"lsmlat": lsmlat, "lsmlon": lsmlon, "time": months, "lsmpft": lsmpft}, + attrs={ + "long_name": "monthly height bottom by pft and month", + "units": "m", + }, + ), }, attrs={"Conventions": "test data only"}, ) @@ -642,8 +662,8 @@ class TestSinglePointCaseSurfaceCrop(unittest.TestCase): evenly_split_cropland = False pct_pft = None num_pft = 78 - cth = [0.9] - cbh = [0.1] + cth = [0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9] + cbh = [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] include_nonveg = False uni_snow = False cap_saturation = False @@ -653,6 +673,8 @@ class TestSinglePointCaseSurfaceCrop(unittest.TestCase): # -- dimensions of xarray dataset lsmlat = [plat] lsmlon = [plon] + months = np.arange(1, 12, 1, dtype=int) + lsmpft = np.arange(0, 79, 1, dtype=int) natpft = np.arange(0, 15, 1, dtype=int) cft = np.arange(15, 79, 1, dtype=int) numurbl = np.arange(0, 3, 1, dtype=int) @@ -734,6 +756,24 @@ class TestSinglePointCaseSurfaceCrop(unittest.TestCase): "units": "unitless", }, ), + "MONTHLY_HEIGHT_TOP": xr.DataArray( + data=np.random.rand(1, 1, months[-1], lsmpft[-1] + 1), + dims=["lsmlat", "lsmlon", "time", "lsmpft"], + coords={"lsmlat": lsmlat, "lsmlon": lsmlon, "time": months, "lsmpft": lsmpft}, + attrs={ + "long_name": "monthly height top by pft and month", + "units": "m", + }, + ), + "MONTHLY_HEIGHT_BOT": xr.DataArray( + data=np.random.rand(1, 1, months[-1], lsmpft[-1] + 1), + dims=["lsmlat", "lsmlon", "time", "lsmpft"], + coords={"lsmlat": lsmlat, "lsmlon": lsmlon, "time": months, "lsmpft": lsmpft}, + attrs={ + "long_name": "monthly height bottom by pft and month", + "units": "m", + }, + ), }, attrs={"Conventions": "test data only"}, ) From 86fbaf66ab9a9a453204021e61f07da6ef7d3608 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 18 Apr 2024 15:43:29 -0600 Subject: [PATCH 42/43] Fix final utest error; a system test error still fails --- python/ctsm/site_and_regional/single_point_case.py | 6 +++--- python/ctsm/test/test_unit_singlept_data.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/ctsm/site_and_regional/single_point_case.py b/python/ctsm/site_and_regional/single_point_case.py index 33b4dcdbfa..448f9d9229 100644 --- a/python/ctsm/site_and_regional/single_point_case.py +++ b/python/ctsm/site_and_regional/single_point_case.py @@ -220,10 +220,10 @@ def check_dom_pft(self): if min_dom_pft < NAT_PFT <= max_dom_pft: err_msg = ( "WARNING, you are subsetting using mixed land " - + "units that have both natural pfts and crop cfts. Check " - + "that your surface dataset looks correct." + "units that have both natural pfts and crop cfts. Check " + "your surface dataset." ) - logger.info(err_msg) + raise argparse.ArgumentTypeError(err_msg) def check_nonveg(self): """ diff --git a/python/ctsm/test/test_unit_singlept_data.py b/python/ctsm/test/test_unit_singlept_data.py index 4d2e59aa32..7d239c5243 100755 --- a/python/ctsm/test/test_unit_singlept_data.py +++ b/python/ctsm/test/test_unit_singlept_data.py @@ -225,7 +225,7 @@ def test_check_dom_pft_mixed_range(self): single_point.dom_pft = [1, 5, 15] single_point.num_pft = 78 with self.assertRaisesRegex( - argparse.ArgumentTypeError, "mixed land units is not possible*" + argparse.ArgumentTypeError, "WARNING, you are subsetting using mixed land*" ): single_point.check_dom_pft() From ad40afa592f953ee5921db01e572f2edc34da976 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 18 Apr 2024 16:13:25 -0600 Subject: [PATCH 43/43] Corrections regarding WARNING versus ERROR confusion in unit test --- python/ctsm/site_and_regional/single_point_case.py | 10 ++++------ python/ctsm/test/test_unit_singlept_data.py | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/python/ctsm/site_and_regional/single_point_case.py b/python/ctsm/site_and_regional/single_point_case.py index 448f9d9229..fd7e20a4f2 100644 --- a/python/ctsm/site_and_regional/single_point_case.py +++ b/python/ctsm/site_and_regional/single_point_case.py @@ -175,7 +175,7 @@ def check_dom_pft(self): - 0 - NAT_PFT-1 range or - NAT_PFT - MAX_PFT range - - give a warning: mixed land units should be checked + - give an error: mixed land units not possible ------------- Raises: @@ -183,7 +183,7 @@ def check_dom_pft(self): If any dom_pft is bigger than MAX_PFT. Error (ArgumentTypeError): If any dom_pft is less than 1. - Warning: + Error (ArgumentTypeError): If mixed land units are chosen. dom_pft values are both in range of (0 - NAT_PFT-1) and (NAT_PFT - MAX_PFT). @@ -214,14 +214,12 @@ def check_dom_pft(self): logger.info( "WARNING, you trying to run with generic crops (16 PFT surface dataset)" ) - # raise argparse.ArgumentTypeError(err_msg) # -- check if all dom_pft are in the same range: if min_dom_pft < NAT_PFT <= max_dom_pft: err_msg = ( - "WARNING, you are subsetting using mixed land " - "units that have both natural pfts and crop cfts. Check " - "your surface dataset." + "You are subsetting using mixed land units that have both " + "natural pfts and crop cfts. Check your surface dataset. " ) raise argparse.ArgumentTypeError(err_msg) diff --git a/python/ctsm/test/test_unit_singlept_data.py b/python/ctsm/test/test_unit_singlept_data.py index 7d239c5243..644af82588 100755 --- a/python/ctsm/test/test_unit_singlept_data.py +++ b/python/ctsm/test/test_unit_singlept_data.py @@ -225,7 +225,7 @@ def test_check_dom_pft_mixed_range(self): single_point.dom_pft = [1, 5, 15] single_point.num_pft = 78 with self.assertRaisesRegex( - argparse.ArgumentTypeError, "WARNING, you are subsetting using mixed land*" + argparse.ArgumentTypeError, "You are subsetting using mixed land*" ): single_point.check_dom_pft()