Removed more REPLAY lines from setup; clarified MERRA2 dates slightly…

… in ctm_run.j

src/Applications/GEOSctm_App/ctm_run.j

@@ -581,23 +581,23 @@ if( ${DRIVING_DATASETS} == MERRA2) then
     set oldstring = `cat CAP.rc | grep EXTDATA_CF:`
     set COMPNAME = `grep COMPNAME CAP.rc | awk '{print $2}'`
 
-    if( $startYear > 1979 && $startYear < 1992 ) then
+    if( $startYear >= 1980 && $startYear < 1992 ) then
         set sYear  = 1980
         set sMonth = jan79
         set MERRA2type = MERRA2_100
         set data_Transition_Date = 19920101
-    else if( $startYear > 1991 && $startYear < 2000 ) then
+    else if( $startYear >= 1992 && $startYear < 2000 ) then
         set sYear  = 1992
         set sMonth = jan91
         set MERRA2type = MERRA2_200
         set data_Transition_Date = 20000101
-    else if( $startYear > 1999 && $startYear < 2011 ) then
+    else if( $startYear >= 2000 && $startYear < 2011 ) then
         set sYear  = 2000
         set sMonth = jan00
         set MERRA2type = MERRA2_300
         set data_Transition_Date = 20110101
-    else if( $startYear > 2010 ) then
-        set sYear  = 2010
+    else if( $startYear >= 2011 ) then
+        set sYear  = 2011
         set sMonth = jan10
         set MERRA2type = MERRA2_400
         set data_Transition_Date = 20500101

src/Applications/GEOSctm_App/ctm_setup

@@ -1875,13 +1875,6 @@ s?>>>EMIP_OLDLAND<<<?$EMIP_OLDLAND?g
 s?>>>EMIP_NEWLAND<<<?$EMIP_NEWLAND?g
 s?@LSM_PARMS?$LSM_PARMS?g
 
-s?>>>4DIAUDAS<<<?#DELETE?g
-s?>>>REGULAR_REPLAY<<<?#?g
-s?>>>REGULAR_REPLAY_GMAO<<<?#?g
-s?>>>REGULAR_REPLAY_NCEP<<<?#DELETE?g
-s?>>>REGULAR_REPLAY_ECMWF<<<?#DELETE?g
-s?ana4replay.eta.%y4%m2%d2_%h2z.nc4?/discover/nobackup/projects/gmao/share/gmao_ops/verification/MERRA2_MEANS/ana/Y%y4/M%m2/MERRA-2.ana.eta.%y4%m2%d2_%h2z.nc4?g
-
 s?@OX_RELAXTIME?259200.?g
 s?@PCHEM_CLIM_YEARS?228?g