From 28569d256ded71658e4d8d37480c1144ed975802 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 11 Dec 2024 09:08:29 -0500
Subject: [PATCH 1/3] Convert all setup >>>-vars to @-vars

---
 AGCM.rc.tmpl               |  56 +++++++--------
 HISTORY.AGCM.rc.tmpl       |  76 ++++++++++----------
 HISTORY.AOGCM-MOM5.rc.tmpl |  76 ++++++++++----------
 HISTORY.AOGCM.rc.tmpl      | 138 ++++++++++++++++++-------------------
 HISTORY.BENCHMARK.rc.tmpl  |  76 ++++++++++----------
 gcm_CPLFCST360NM2_setup    |  20 +++---
 gcm_CPLFCST360S2S_setup    |  20 +++---
 gcm_CPLFCST360S2Sallsetup  |  20 +++---
 gcm_forecast.tmpl          |   8 +--
 gcm_run.j                  |  32 ++++-----
 gcm_run_CPLFCST360S2S.j    |  10 +--
 gcm_run_CPLFCST360S2Sall.j |  10 +--
 gcm_run_benchmark.j        |  42 +++++------
 gcm_setup                  |  30 ++++----
 geoschemchem_setup         |  30 ++++----
 gmichem_setup              |  30 ++++----
 linkbcs.tmpl               |   4 +-
 stratchem_setup            |  30 ++++----
 18 files changed, 347 insertions(+), 361 deletions(-)

diff --git a/AGCM.rc.tmpl b/AGCM.rc.tmpl
index 162aa713..7628debf 100644
--- a/AGCM.rc.tmpl
+++ b/AGCM.rc.tmpl
@@ -361,21 +361,21 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<
 
 #   4DIAU (recreate analysis tendency on the fly)
 #   ---------------------------------------------
-#>>>4DIAUDAS<<<    AINC_FILE: @EXPID.ana.eta.%y4%m2%d2_%h2%n2z.nc4
-#>>>4DIAUDAS<<<    NUDGE_STATE: YES
-##>>>4DIAUDAS<<<    TAUANL: 3600
-#>>>4DIAUDAS<<<    AGCM_IMPORT_RESTART_FILE:  agcm_import_rst.>>>ANA0YYYYMMDDHHMN<<<z.nc4
-#>>>4DIAUDAS<<<    AGCM_IMPORT_RESTART_TYPE:  binary
+#@4DIAUDAS    AINC_FILE: @EXPID.ana.eta.%y4%m2%d2_%h2%n2z.nc4
+#@4DIAUDAS    NUDGE_STATE: YES
+##@4DIAUDAS    TAUANL: 3600
+#@4DIAUDAS    AGCM_IMPORT_RESTART_FILE:  agcm_import_rst.>>>ANA0YYYYMMDDHHMN<<<z.nc4
+#@4DIAUDAS    AGCM_IMPORT_RESTART_TYPE:  binary
 
 #   Exact REPLAY Mode for 4D-IAU
 #   ----------------------------
->>>4DIAUDAS<<<    REPLAY_MODE: Exact
->>>4DIAUDAS<<<    REPLAY_FILE: agcm_import_rst.%y4%m2%d2_%h2%n2z.nc4
->>>4DIAUDAS<<<    REPLAY_FILE_FREQUENCY: 7200
->>>4DIAUDAS<<<    REPLAY_SHUTOFF: 21600.0 #  ShutOff Replay after 6-hours for G5NCEP and G5ECMWF Forecasts
+@4DIAUDAS    REPLAY_MODE: Exact
+@4DIAUDAS    REPLAY_FILE: agcm_import_rst.%y4%m2%d2_%h2%n2z.nc4
+@4DIAUDAS    REPLAY_FILE_FREQUENCY: 7200
+@4DIAUDAS    REPLAY_SHUTOFF: 21600.0 #  ShutOff Replay after 6-hours for G5NCEP and G5ECMWF Forecasts
 
-#>>>4DIAUDAS<<<    REPLAY_INTERVAL: 3600.0
-#>>>4DIAUDAS<<<    PREDICTOR_OFFSET: 3600.0
+#@4DIAUDAS    REPLAY_INTERVAL: 3600.0
+#@4DIAUDAS    PREDICTOR_OFFSET: 3600.0
 
 ####################################################################################################
 ####                    Miscellaneous Exact/Regular REPLAY Parameters                           ####
@@ -408,22 +408,22 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<
 #   REPLAY_V:  YES or NO    #  (Default: YES)
 #   REPLAY_T:  YES or NO    #  (Default: YES)
 #   REPLAY_QV: YES or NO    #  (Default: YES)
->>>REGULAR_REPLAY_GMAO<<<   REPLAY_O3: YES or NO    #  (Default: YES)
->>>REGULAR_REPLAY_NCEP<<<   REPLAY_O3: YES or NO    #  (Default: YES)
->>>REGULAR_REPLAY_ECMWF<<<  REPLAY_O3: YES or NO    #  (Default: YES)
+@REGULAR_REPLAY_GMAO   REPLAY_O3: YES or NO    #  (Default: YES)
+@REGULAR_REPLAY_NCEP   REPLAY_O3: YES or NO    #  (Default: YES)
+@REGULAR_REPLAY_ECMWF  REPLAY_O3: YES or NO    #  (Default: YES)
 #   REPLAY_TS: YES or NO    #  (Default:  NO)
 #
 #   Regular REPLAY Remapping and Blending Variables
 #   -----------------------------------------------
 #   REPLAY_REMAP:    YES    #  Default = YES,  Remap ANA Data to BKG Topography
->>>REGULAR_REPLAY_ECMWF<<<  REPLAY_DAMPBEG: 1000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
->>>REGULAR_REPLAY_ECMWF<<<  REPLAY_DAMPEND: 5000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
->>>REGULAR_REPLAY_GMAO<<<   REPLAY_DAMPBEG:  100.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
->>>REGULAR_REPLAY_GMAO<<<   REPLAY_DAMPEND: 5000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
->>>REGULAR_REPLAY_NCEP<<<   REPLAY_DAMPBEG: 1000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
->>>REGULAR_REPLAY_NCEP<<<   REPLAY_DAMPEND: 5000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
->>>REGULAR_REPLAY<<<   REPLAY_SHUTOFF: 21600   #  ShutOff Replay after 6-hours of Integration
->>>REGULAR_REPLAY<<<   REPLAY_WINDFIX: YES     #  Apply windfix to force vertically-integrated analysis divergence increment to zero
+@REGULAR_REPLAY_ECMWF  REPLAY_DAMPBEG: 1000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
+@REGULAR_REPLAY_ECMWF  REPLAY_DAMPEND: 5000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
+@REGULAR_REPLAY_GMAO   REPLAY_DAMPBEG:  100.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
+@REGULAR_REPLAY_GMAO   REPLAY_DAMPEND: 5000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
+@REGULAR_REPLAY_NCEP   REPLAY_DAMPBEG: 1000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
+@REGULAR_REPLAY_NCEP   REPLAY_DAMPEND: 5000.0  #  Default =  1,   Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
+@REGULAR_REPLAY   REPLAY_SHUTOFF: 21600   #  ShutOff Replay after 6-hours of Integration
+@REGULAR_REPLAY   REPLAY_WINDFIX: YES     #  Apply windfix to force vertically-integrated analysis divergence increment to zero
 #
 #   REPLAY_BLEND_QV_AT_TP: .FALSE. #  Default = FALSE,  Blend QV to BKG upwards from tropopause
 #
@@ -566,14 +566,14 @@ LSM_CHOICE: @LSM_CHOICE
 # AGCM_INTERNAL = BIAS Correction Increment: BIAS(n+1) = ALPHA*IAU(n) + BETA*BIAS(n)
 # ----------------------------------------------------------------------------------
 
->>>FORCEDAS<<<AGCM_IMPORT_RESTART_FILE:               agcm_import_rst
+@FORCEDASAGCM_IMPORT_RESTART_FILE:               agcm_import_rst
 
->>>FORCEGCM<<<AGCM_INTERNAL_RESTART_FILE:             agcm_internal_rst
->>>FORCEGCM<<<AGCM_INTERNAL_CHECKPOINT_FILE:          agcm_internal_checkpoint
->>>FORCEGCM<<<AGCM_INTERNAL_CHECKPOINT_TYPE:          @CHECKPOINT_TYPE
+@FORCEGCMAGCM_INTERNAL_RESTART_FILE:             agcm_internal_rst
+@FORCEGCMAGCM_INTERNAL_CHECKPOINT_FILE:          agcm_internal_checkpoint
+@FORCEGCMAGCM_INTERNAL_CHECKPOINT_TYPE:          @CHECKPOINT_TYPE
 
->>>FORCEGCM<<<AGCM_ALPHA: 0.000
->>>FORCEGCM<<<AGCM_BETA:  1.000
+@FORCEGCMAGCM_ALPHA: 0.000
+@FORCEGCMAGCM_BETA:  1.000
 
 MAPL_ENABLE_BOOTSTRAP: @BOOT
 
diff --git a/HISTORY.AGCM.rc.tmpl b/HISTORY.AGCM.rc.tmpl
index e1932d6f..0b4ae61b 100644
--- a/HISTORY.AGCM.rc.tmpl
+++ b/HISTORY.AGCM.rc.tmpl
@@ -272,44 +272,44 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
                                  'PHIW'           , 'SURFACE'     ,
                                  'TAUTW'          , 'SURFACE'     ,
                                  'ZETA_W'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNLAI'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNTLAI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNSAI'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNTOTC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNVEGC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNROOT'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNFROOTC'       , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNNPP'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNGPP'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNSR'           , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNNEE'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNXSMR'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNADD'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'PARABS'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'PARINC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'SCSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'SCUNS'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'BTRANT'         , 'SURFACE'     , 'BTRAN'     ,
->>>HIST_CATCHCN<<<               'SIF'            , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNLOSS'         , 'SURFACE'     , 'CLOSS'     ,
->>>HIST_CATCHCN<<<               'CNBURN'         , 'SURFACE'     , 'BURN'      ,
->>>HIST_CATCHCN<<<               'CNFSEL'         , 'SURFACE'     , 'FSEL'      ,
->>>HIST_CATCHCN<<<               'EVPICE'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPSNO'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPINT'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPSOI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPVEG'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRUST'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRWLT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPUNST'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPWLT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPSURF'         , 'SURFACE'     , 'TSURF'     ,
->>>HIST_CATCHCN<<<               'GHTSKIN'        , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'WAT10CM'        , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'WATSOI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'ICESOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNLAI'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNTLAI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNSAI'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNTOTC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNVEGC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNROOT'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNFROOTC'       , 'SURFACE'     ,
+@HIST_CATCHCN               'CNNPP'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNGPP'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNSR'           , 'SURFACE'     ,
+@HIST_CATCHCN               'CNNEE'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNXSMR'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNADD'          , 'SURFACE'     ,
+@HIST_CATCHCN               'PARABS'         , 'SURFACE'     ,
+@HIST_CATCHCN               'PARINC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'SCSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'SCUNS'          , 'SURFACE'     ,
+@HIST_CATCHCN               'BTRANT'         , 'SURFACE'     , 'BTRAN'     ,
+@HIST_CATCHCN               'SIF'            , 'SURFACE'     ,
+@HIST_CATCHCN               'CNLOSS'         , 'SURFACE'     , 'CLOSS'     ,
+@HIST_CATCHCN               'CNBURN'         , 'SURFACE'     , 'BURN'      ,
+@HIST_CATCHCN               'CNFSEL'         , 'SURFACE'     , 'FSEL'      ,
+@HIST_CATCHCN               'EVPICE'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPSNO'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPINT'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPSOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPVEG'         , 'SURFACE'     ,
+@HIST_CATCHCN               'FRSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'FRUST'          , 'SURFACE'     ,
+@HIST_CATCHCN               'FRWLT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPUNST'         , 'SURFACE'     ,
+@HIST_CATCHCN               'TPWLT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPSURF'         , 'SURFACE'     , 'TSURF'     ,
+@HIST_CATCHCN               'GHTSKIN'        , 'SURFACE'     ,
+@HIST_CATCHCN               'WAT10CM'        , 'SURFACE'     ,
+@HIST_CATCHCN               'WATSOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'ICESOI'         , 'SURFACE'     ,
                                   ::
 
   geosgcm_ocn.template:          '%y4%m2%d2_%h2%n2z.nc4' ,
diff --git a/HISTORY.AOGCM-MOM5.rc.tmpl b/HISTORY.AOGCM-MOM5.rc.tmpl
index c5937806..6c289064 100644
--- a/HISTORY.AOGCM-MOM5.rc.tmpl
+++ b/HISTORY.AOGCM-MOM5.rc.tmpl
@@ -280,44 +280,44 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
                                  'PHIW'           , 'SURFACE'     ,
                                  'TAUTW'          , 'SURFACE'     ,
                                  'ZETA_W'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNLAI'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNTLAI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNSAI'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNTOTC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNVEGC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNROOT'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNFROOTC'       , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNNPP'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNGPP'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNSR'           , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNNEE'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNXSMR'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNADD'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'PARABS'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'PARINC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'SCSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'SCUNS'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'BTRANT'         , 'SURFACE'     , 'BTRAN'     ,
->>>HIST_CATCHCN<<<               'SIF'            , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNLOSS'         , 'SURFACE'     , 'CLOSS'     ,
->>>HIST_CATCHCN<<<               'CNBURN'         , 'SURFACE'     , 'BURN'      ,
->>>HIST_CATCHCN<<<               'CNFSEL'         , 'SURFACE'     , 'FSEL'      ,
->>>HIST_CATCHCN<<<               'EVPICE'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPSNO'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPINT'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPSOI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPVEG'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRUST'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRWLT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPUNST'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPWLT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPSURF'         , 'SURFACE'     , 'TSURF'     ,
->>>HIST_CATCHCN<<<               'GHTSKIN'        , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'WAT10CM'        , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'WATSOI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'ICESOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNLAI'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNTLAI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNSAI'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNTOTC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNVEGC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNROOT'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNFROOTC'       , 'SURFACE'     ,
+@HIST_CATCHCN               'CNNPP'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNGPP'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNSR'           , 'SURFACE'     ,
+@HIST_CATCHCN               'CNNEE'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNXSMR'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNADD'          , 'SURFACE'     ,
+@HIST_CATCHCN               'PARABS'         , 'SURFACE'     ,
+@HIST_CATCHCN               'PARINC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'SCSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'SCUNS'          , 'SURFACE'     ,
+@HIST_CATCHCN               'BTRANT'         , 'SURFACE'     , 'BTRAN'     ,
+@HIST_CATCHCN               'SIF'            , 'SURFACE'     ,
+@HIST_CATCHCN               'CNLOSS'         , 'SURFACE'     , 'CLOSS'     ,
+@HIST_CATCHCN               'CNBURN'         , 'SURFACE'     , 'BURN'      ,
+@HIST_CATCHCN               'CNFSEL'         , 'SURFACE'     , 'FSEL'      ,
+@HIST_CATCHCN               'EVPICE'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPSNO'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPINT'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPSOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPVEG'         , 'SURFACE'     ,
+@HIST_CATCHCN               'FRSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'FRUST'          , 'SURFACE'     ,
+@HIST_CATCHCN               'FRWLT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPUNST'         , 'SURFACE'     ,
+@HIST_CATCHCN               'TPWLT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPSURF'         , 'SURFACE'     , 'TSURF'     ,
+@HIST_CATCHCN               'GHTSKIN'        , 'SURFACE'     ,
+@HIST_CATCHCN               'WAT10CM'        , 'SURFACE'     ,
+@HIST_CATCHCN               'WATSOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'ICESOI'         , 'SURFACE'     ,
                                   ::
 
   geosgcm_ocn.template:          '%y4%m2%d2_%h2%n2z.nc4' ,
diff --git a/HISTORY.AOGCM.rc.tmpl b/HISTORY.AOGCM.rc.tmpl
index 0d6cbf97..3f5c13ef 100644
--- a/HISTORY.AOGCM.rc.tmpl
+++ b/HISTORY.AOGCM.rc.tmpl
@@ -39,7 +39,7 @@ COLLECTIONS: 'geosgcm_prog'
               'geosgcm_rad'
 #             'geosgcm_int'
               'geosgcm_seaice'
->>>HIST_CICE4<<<              'geosgcm_icethm'
+@HIST_CICE4              'geosgcm_icethm'
               'geosgcm_ocn2dT'
 #             'geosgcm_aoflux'
 #             'geosgcm_icecat'
@@ -277,44 +277,44 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
                                  'PHIW'           , 'SURFACE'     ,
                                  'TAUTW'          , 'SURFACE'     ,
                                  'ZETA_W'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNLAI'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNTLAI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNSAI'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNTOTC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNVEGC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNROOT'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNFROOTC'       , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNNPP'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNGPP'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNSR'           , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNNEE'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNXSMR'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNADD'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'PARABS'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'PARINC'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'SCSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'SCUNS'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'BTRANT'         , 'SURFACE'     , 'BTRAN'     ,
->>>HIST_CATCHCN<<<               'SIF'            , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'CNLOSS'         , 'SURFACE'     , 'CLOSS'     ,
->>>HIST_CATCHCN<<<               'CNBURN'         , 'SURFACE'     , 'BURN'      ,
->>>HIST_CATCHCN<<<               'CNFSEL'         , 'SURFACE'     , 'FSEL'      ,
->>>HIST_CATCHCN<<<               'EVPICE'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPSNO'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPINT'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPSOI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'EVPVEG'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRUST'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'FRWLT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPSAT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPUNST'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPWLT'          , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'TPSURF'         , 'SURFACE'     , 'TSURF'     ,
->>>HIST_CATCHCN<<<               'GHTSKIN'        , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'WAT10CM'        , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'WATSOI'         , 'SURFACE'     ,
->>>HIST_CATCHCN<<<               'ICESOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNLAI'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNTLAI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNSAI'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNTOTC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNVEGC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNROOT'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNFROOTC'       , 'SURFACE'     ,
+@HIST_CATCHCN               'CNNPP'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNGPP'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNSR'           , 'SURFACE'     ,
+@HIST_CATCHCN               'CNNEE'          , 'SURFACE'     ,
+@HIST_CATCHCN               'CNXSMR'         , 'SURFACE'     ,
+@HIST_CATCHCN               'CNADD'          , 'SURFACE'     ,
+@HIST_CATCHCN               'PARABS'         , 'SURFACE'     ,
+@HIST_CATCHCN               'PARINC'         , 'SURFACE'     ,
+@HIST_CATCHCN               'SCSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'SCUNS'          , 'SURFACE'     ,
+@HIST_CATCHCN               'BTRANT'         , 'SURFACE'     , 'BTRAN'     ,
+@HIST_CATCHCN               'SIF'            , 'SURFACE'     ,
+@HIST_CATCHCN               'CNLOSS'         , 'SURFACE'     , 'CLOSS'     ,
+@HIST_CATCHCN               'CNBURN'         , 'SURFACE'     , 'BURN'      ,
+@HIST_CATCHCN               'CNFSEL'         , 'SURFACE'     , 'FSEL'      ,
+@HIST_CATCHCN               'EVPICE'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPSNO'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPINT'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPSOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'EVPVEG'         , 'SURFACE'     ,
+@HIST_CATCHCN               'FRSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'FRUST'          , 'SURFACE'     ,
+@HIST_CATCHCN               'FRWLT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPSAT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPUNST'         , 'SURFACE'     ,
+@HIST_CATCHCN               'TPWLT'          , 'SURFACE'     ,
+@HIST_CATCHCN               'TPSURF'         , 'SURFACE'     , 'TSURF'     ,
+@HIST_CATCHCN               'GHTSKIN'        , 'SURFACE'     ,
+@HIST_CATCHCN               'WAT10CM'        , 'SURFACE'     ,
+@HIST_CATCHCN               'WATSOI'         , 'SURFACE'     ,
+@HIST_CATCHCN               'ICESOI'         , 'SURFACE'     ,
                                   ::
 
   geosgcm_ocn.template:          '%y4%m2%d2_%h2%n2z.nc4' ,
@@ -1451,41 +1451,41 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
 #  geosgcm_seaice.frequency:  240000,
    geosgcm_seaice.fields:    'UI'          , 'SEAICE',
                              'VI'          , 'SEAICE',
->>>HIST_CICE4<<<                             'VEL'         , 'SEAICE',
->>>HIST_CICE4<<<                             'STRENGTH'    , 'SEAICE',
->>>HIST_CICE4<<<                             'SHEAR'       , 'SEAICE',
->>>HIST_CICE4<<<                             'DIVU'        , 'SEAICE',
+@HIST_CICE4                             'VEL'         , 'SEAICE',
+@HIST_CICE4                             'STRENGTH'    , 'SEAICE',
+@HIST_CICE4                             'SHEAR'       , 'SEAICE',
+@HIST_CICE4                             'DIVU'        , 'SEAICE',
                              'HICE'        , 'SEAICE',
->>>HIST_CICE4<<<                             'HICE0'       , 'SEAICE',
+@HIST_CICE4                             'HICE0'       , 'SEAICE',
                              'HSNO'        , 'SEAICE',
->>>HIST_CICE4<<<                             'HSNO0'       , 'SEAICE',
->>>HIST_CICE4<<<                             'DRAFT'       , 'SEAICE',
->>>HIST_CICE4<<<                             'DRAFT0'      , 'SEAICE',
+@HIST_CICE4                             'HSNO0'       , 'SEAICE',
+@HIST_CICE4                             'DRAFT'       , 'SEAICE',
+@HIST_CICE4                             'DRAFT0'      , 'SEAICE',
                              'AICE'        , 'SEAICE',
->>>HIST_CICE4<<<                             'DVIDTD'      , 'SEAICE',
->>>HIST_CICE4<<<                             'DAIDTD'      , 'SEAICE',
->>>HIST_CICE4<<<                             'DVIRDGDT'    , 'SEAICE',
->>>HIST_CICE4<<<                             'STRCORX'     , 'SEAICE',
->>>HIST_CICE4<<<                             'STRCORY'     , 'SEAICE',
->>>HIST_CICE4<<<                             'STRTLTX'     , 'SEAICE',
->>>HIST_CICE4<<<                             'STRTLTY'     , 'SEAICE',
->>>HIST_CICE4<<<                             'STRINTX'     , 'SEAICE',
->>>HIST_CICE4<<<                             'STRINTY'     , 'SEAICE',
->>>HIST_CICE4<<<                             'TAUXOCNB'    , 'SEAICE',
->>>HIST_CICE4<<<                             'TAUYOCNB'    , 'SEAICE',
->>>HIST_CICE4<<<                             'TAUXI'       , 'SEAICE',
->>>HIST_CICE4<<<                             'TAUYI'       , 'SEAICE',
->>>HIST_CICE4<<<                             'TAUXIB'      , 'SEAICE',
->>>HIST_CICE4<<<                             'TAUYIB'      , 'SEAICE',
+@HIST_CICE4                             'DVIDTD'      , 'SEAICE',
+@HIST_CICE4                             'DAIDTD'      , 'SEAICE',
+@HIST_CICE4                             'DVIRDGDT'    , 'SEAICE',
+@HIST_CICE4                             'STRCORX'     , 'SEAICE',
+@HIST_CICE4                             'STRCORY'     , 'SEAICE',
+@HIST_CICE4                             'STRTLTX'     , 'SEAICE',
+@HIST_CICE4                             'STRTLTY'     , 'SEAICE',
+@HIST_CICE4                             'STRINTX'     , 'SEAICE',
+@HIST_CICE4                             'STRINTY'     , 'SEAICE',
+@HIST_CICE4                             'TAUXOCNB'    , 'SEAICE',
+@HIST_CICE4                             'TAUYOCNB'    , 'SEAICE',
+@HIST_CICE4                             'TAUXI'       , 'SEAICE',
+@HIST_CICE4                             'TAUYI'       , 'SEAICE',
+@HIST_CICE4                             'TAUXIB'      , 'SEAICE',
+@HIST_CICE4                             'TAUYIB'      , 'SEAICE',
                              'TAUXBOT'     , 'SEAICE',
                              'TAUYBOT'     , 'SEAICE',
->>>HIST_CICE4<<<                             'UOCN'        , 'SEAICE',
->>>HIST_CICE4<<<                             'VOCN'        , 'SEAICE',
->>>HIST_CICE4<<<                             'SSH'         , 'SEAICE',
->>>HIST_CICE4<<<                             'SLV'         , 'SEAICE',
->>>HIST_CICE4<<<                             'AREA'        , 'SEAICE',
->>>HIST_CICE4<<<                             'FROCEAN'     , 'SEAICE',
->>>HIST_CICE4<<<                             'TMASK'       , 'SEAICE',
+@HIST_CICE4                             'UOCN'        , 'SEAICE',
+@HIST_CICE4                             'VOCN'        , 'SEAICE',
+@HIST_CICE4                             'SSH'         , 'SEAICE',
+@HIST_CICE4                             'SLV'         , 'SEAICE',
+@HIST_CICE4                             'AREA'        , 'SEAICE',
+@HIST_CICE4                             'FROCEAN'     , 'SEAICE',
+@HIST_CICE4                             'TMASK'       , 'SEAICE',
                               ::
 
   geosgcm_icethm.template:      '%y4%m2%d2_%h2%n2z.nc4',
diff --git a/HISTORY.BENCHMARK.rc.tmpl b/HISTORY.BENCHMARK.rc.tmpl
index 5ba8e435..f264d1e3 100755
--- a/HISTORY.BENCHMARK.rc.tmpl
+++ b/HISTORY.BENCHMARK.rc.tmpl
@@ -302,44 +302,44 @@ PC23040x11521-DC.LM: 181
                                'PHIW'          , 'SURFACE'       ,
                                'TAUTW'         , 'SURFACE'       ,
                                'ZETA_W'        , 'SURFACE'       ,
->>>HIST_CATCHCN<<<        'CNLAI'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNTLAI'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNSAI'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNTOTC'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNVEGC'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNROOT'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNFROOTC' , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNNPP'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNGPP'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNSR'     , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNNEE'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNXSMR'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNADD'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'PARABS'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'PARINC'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'SCSAT'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'SCUNS'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'BTRANT'   , 'SURFACE'  , 'BTRAN'     ,
->>>HIST_CATCHCN<<<        'SIF'      , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'CNLOSS'   , 'SURFACE'  , 'CLOSS'     ,
->>>HIST_CATCHCN<<<        'CNBURN'   , 'SURFACE'  , 'BURN'      ,
->>>HIST_CATCHCN<<<        'CNFSEL'   , 'SURFACE'  , 'FSEL'      ,
->>>HIST_CATCHCN<<<        'EVPICE'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'EVPSNO'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'EVPINT'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'EVPSOI'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'EVPVEG'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'FRSAT'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'FRUST'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'FRWLT'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'TPSAT'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'TPUNST'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'TPWLT'    , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'TPSURF'   , 'SURFACE'  , 'TSURF'     ,
->>>HIST_CATCHCN<<<        'GHTSKIN'  , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'WAT10CM'  , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'WATSOI'   , 'SURFACE'  ,
->>>HIST_CATCHCN<<<        'ICESOI'   , 'SURFACE'  ,
+@HIST_CATCHCN        'CNLAI'    , 'SURFACE'  ,
+@HIST_CATCHCN        'CNTLAI'   , 'SURFACE'  ,
+@HIST_CATCHCN        'CNSAI'    , 'SURFACE'  ,
+@HIST_CATCHCN        'CNTOTC'   , 'SURFACE'  ,
+@HIST_CATCHCN        'CNVEGC'   , 'SURFACE'  ,
+@HIST_CATCHCN        'CNROOT'   , 'SURFACE'  ,
+@HIST_CATCHCN        'CNFROOTC' , 'SURFACE'  ,
+@HIST_CATCHCN        'CNNPP'    , 'SURFACE'  ,
+@HIST_CATCHCN        'CNGPP'    , 'SURFACE'  ,
+@HIST_CATCHCN        'CNSR'     , 'SURFACE'  ,
+@HIST_CATCHCN        'CNNEE'    , 'SURFACE'  ,
+@HIST_CATCHCN        'CNXSMR'   , 'SURFACE'  ,
+@HIST_CATCHCN        'CNADD'    , 'SURFACE'  ,
+@HIST_CATCHCN        'PARABS'   , 'SURFACE'  ,
+@HIST_CATCHCN        'PARINC'   , 'SURFACE'  ,
+@HIST_CATCHCN        'SCSAT'    , 'SURFACE'  ,
+@HIST_CATCHCN        'SCUNS'    , 'SURFACE'  ,
+@HIST_CATCHCN        'BTRANT'   , 'SURFACE'  , 'BTRAN'     ,
+@HIST_CATCHCN        'SIF'      , 'SURFACE'  ,
+@HIST_CATCHCN        'CNLOSS'   , 'SURFACE'  , 'CLOSS'     ,
+@HIST_CATCHCN        'CNBURN'   , 'SURFACE'  , 'BURN'      ,
+@HIST_CATCHCN        'CNFSEL'   , 'SURFACE'  , 'FSEL'      ,
+@HIST_CATCHCN        'EVPICE'   , 'SURFACE'  ,
+@HIST_CATCHCN        'EVPSNO'   , 'SURFACE'  ,
+@HIST_CATCHCN        'EVPINT'   , 'SURFACE'  ,
+@HIST_CATCHCN        'EVPSOI'   , 'SURFACE'  ,
+@HIST_CATCHCN        'EVPVEG'   , 'SURFACE'  ,
+@HIST_CATCHCN        'FRSAT'    , 'SURFACE'  ,
+@HIST_CATCHCN        'FRUST'    , 'SURFACE'  ,
+@HIST_CATCHCN        'FRWLT'    , 'SURFACE'  ,
+@HIST_CATCHCN        'TPSAT'    , 'SURFACE'  ,
+@HIST_CATCHCN        'TPUNST'   , 'SURFACE'  ,
+@HIST_CATCHCN        'TPWLT'    , 'SURFACE'  ,
+@HIST_CATCHCN        'TPSURF'   , 'SURFACE'  , 'TSURF'     ,
+@HIST_CATCHCN        'GHTSKIN'  , 'SURFACE'  ,
+@HIST_CATCHCN        'WAT10CM'  , 'SURFACE'  ,
+@HIST_CATCHCN        'WATSOI'   , 'SURFACE'  ,
+@HIST_CATCHCN        'ICESOI'   , 'SURFACE'  ,
                                 ::
 
   geosgcm_ocn.template:        '%y4%m2%d2_%h2%n2z.nc4',
diff --git a/gcm_CPLFCST360NM2_setup b/gcm_CPLFCST360NM2_setup
index aa7b0400..612b5f28 100755
--- a/gcm_CPLFCST360NM2_setup
+++ b/gcm_CPLFCST360NM2_setup
@@ -1739,23 +1739,21 @@ s?@DASTUNING?#?g
 
 s?@CLDMICRO?$CLDMICRO?g
 
-s?>>>FORCEDAS<<<?$FORCEDAS?g
-s?>>>FORCEGCM<<<?$FORCEGCM?g
+s?@FORCEDAS?$FORCEDAS?g
+s?@FORCEGCM?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
 s?@shared_COUPLED?$shared_COUPLED?g
 s?>>>FORCAST<<<?$FORCAST?g
 s?@DATAOCEAN?$DATAOCEAN?g
-s?>>>GOCART<<<?$GOCART?g
-s?>>>FVCUBED<<<?$FVCUBED?g
-s?>>>FVLATLON<<<?$FVLATLON?g
+s?@FVCUBED?$FVCUBED?g
+s?@FVLATLON?$FVLATLON?g
 s?@HIST_GOCART?$HIST_GOCART?g
-s?>>>OSTIA<<<?$OSTIA?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?@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/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g
 
 s?@OX_RELAXTIME?259200.?g
diff --git a/gcm_CPLFCST360S2S_setup b/gcm_CPLFCST360S2S_setup
index 81a82f97..35c72009 100755
--- a/gcm_CPLFCST360S2S_setup
+++ b/gcm_CPLFCST360S2S_setup
@@ -1733,24 +1733,22 @@ s?RECORD_?#RECORD_?g
 
 s?@DASTUNING?#?g
 
-s?>>>FORCEDAS<<<?$FORCEDAS?g
-s?>>>FORCEGCM<<<?$FORCEGCM?g
+s?@FORCEDAS?$FORCEDAS?g
+s?@FORCEGCM?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
 s?@shared_COUPLED?$shared_COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?>>>FORCAST<<<?$FORCAST?g
 s?@DATAOCEAN?$DATAOCEAN?g
-s?>>>GOCART<<<?$GOCART?g
-s?>>>FVCUBED<<<?$FVCUBED?g
-s?>>>FVLATLON<<<?$FVLATLON?g
+s?@FVCUBED?$FVCUBED?g
+s?@FVLATLON?$FVLATLON?g
 s?@HIST_GOCART?$HIST_GOCART?g
-s?>>>OSTIA<<<?$OSTIA?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?@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/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g
 
 s?@OX_RELAXTIME?259200.?g
diff --git a/gcm_CPLFCST360S2Sallsetup b/gcm_CPLFCST360S2Sallsetup
index 9dffd2c1..1f986d39 100755
--- a/gcm_CPLFCST360S2Sallsetup
+++ b/gcm_CPLFCST360S2Sallsetup
@@ -1743,25 +1743,23 @@ s?RECORD_?#RECORD_?g
 
 s?@DASTUNING?#?g
 
-s?>>>FORCEDAS<<<?$FORCEDAS?g
-s?>>>FORCEGCM<<<?$FORCEGCM?g
+s?@FORCEDAS?$FORCEDAS?g
+s?@FORCEGCM?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?>>>FORCAST<<<?$FORCAST?g
 s?>>>VEGCPLD<<<?$VEGCPLD?g
 s?>>>VEGMERR<<<?$VEGMERR?g
 s?@DATAOCEAN?$DATAOCEAN?g
-s?>>>GOCART<<<?$GOCART?g
-s?>>>FVCUBED<<<?$FVCUBED?g
-s?>>>FVLATLON<<<?$FVLATLON?g
+s?@FVCUBED?$FVCUBED?g
+s?@FVLATLON?$FVLATLON?g
 s?@HIST_GOCART?$HIST_GOCART?g
-s?>>>OSTIA<<<?$OSTIA?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?@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/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g
 
 s?@OX_RELAXTIME?259200.?g
diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl
index fd958308..a6e2283d 100755
--- a/gcm_forecast.tmpl
+++ b/gcm_forecast.tmpl
@@ -359,10 +359,10 @@ setenv BCRSLV    @ATMOStag_@OCEANtag
 setenv EMISSIONS @EMISSIONS
 chmod +x linkbcs
 
->>>GCMRUN_CATCHCN<<<set LSM_CHOICE = `grep LSM_CHOICE:  AGCM.rc | cut -d':' -f2`
->>>GCMRUN_CATCHCN<<<if ($LSM_CHOICE == 2) then
->>>GCMRUN_CATCHCN<<<  grep -v "'CNFROOTC'" HISTORY.rc > Hist_tmp.rc && mv Hist_tmp.rc HISTORY.rc
->>>GCMRUN_CATCHCN<<<endif
+@GCMRUN_CATCHCNset LSM_CHOICE = `grep LSM_CHOICE:  AGCM.rc | cut -d':' -f2`
+@GCMRUN_CATCHCNif ($LSM_CHOICE == 2) then
+@GCMRUN_CATCHCN  grep -v "'CNFROOTC'" HISTORY.rc > Hist_tmp.rc && mv Hist_tmp.rc HISTORY.rc
+@GCMRUN_CATCHCNendif
 
 #######################################################################
 #                    Get Executable and RESTARTS
diff --git a/gcm_run.j b/gcm_run.j
index d7946e8d..366856fa 100755
--- a/gcm_run.j
+++ b/gcm_run.j
@@ -176,24 +176,24 @@ awk '{$1=$1};1' < CAP.rc.orig > CAP.rc
 set year  = `echo $RSTDATE | cut -d_ -f1 | cut -b1-4`
 set month = `echo $RSTDATE | cut -d_ -f1 | cut -b5-6`
 
->>>EMIP_OLDLAND<<<# Copy MERRA-2 Restarts
->>>EMIP_OLDLAND<<<# ---------------------
->>>EMIP_NEWLAND<<<# Copy Jason-3_4 REPLAY MERRA-2 NewLand Restarts
->>>EMIP_NEWLAND<<<# ----------------------------------------------
+@EMIP_OLDLAND# Copy MERRA-2 Restarts
+@EMIP_OLDLAND# ---------------------
+@EMIP_NEWLAND# Copy Jason-3_4 REPLAY MERRA-2 NewLand Restarts
+@EMIP_NEWLAND# ----------------------------------------------
 cp /discover/nobackup/projects/gmao/g6dev/ltakacs/@EMIP_MERRA2/restarts/AMIP/M${month}/restarts.${year}${month}.tar .
 tar xf  restarts.${year}${month}.tar
 /bin/rm restarts.${year}${month}.tar
->>>EMIP_OLDLAND<<</bin/rm MERRA2*bin
+@EMIP_OLDLAND/bin/rm MERRA2*bin
 
 
->>>EMIP_OLDLAND<<<# Regrid MERRA-2 Restarts
->>>EMIP_OLDLAND<<<# -----------------------
->>>EMIP_NEWLAND<<<# Regrid Jason-3_4 REPLAY MERRA-2 NewLand Restarts
->>>EMIP_NEWLAND<<<# ------------------------------------------------
+@EMIP_OLDLAND# Regrid MERRA-2 Restarts
+@EMIP_OLDLAND# -----------------------
+@EMIP_NEWLAND# Regrid Jason-3_4 REPLAY MERRA-2 NewLand Restarts
+@EMIP_NEWLAND# ------------------------------------------------
 set RSTID = `/bin/ls *catch* | cut -d. -f1`
 set day   = `/bin/ls *catch* | cut -d. -f3 | awk 'match($0,/[0-9]{8}/) {print substr($0,RSTART+6,2)}'`
 $GEOSBIN/remap_restarts.py command_line -np -ymdh ${year}${month}${day}21 -grout C${AGCM_IM} -levsout ${AGCM_LM} -out_dir . -rst_dir . -expid $RSTID -bcvin @EMIP_BCS_IN -oceanin 1440x720 -nobkg -lbl -nolcv -bcvout @LSMBCS -rs 3 -oceanout @OCEANOUT -in_bc_base @BC_BASE -out_bc_base @BC_BASE
->>>EMIP_OLDLAND<<</bin/rm $RSTID.*.bin
+@EMIP_OLDLAND/bin/rm $RSTID.*.bin
 
      set IMC = $AGCM_IM
 if(     $IMC < 10 ) then
@@ -210,8 +210,8 @@ if( "$chk_type" =~ "application/x-hdf"        ) set ext = nc4
 
 $GEOSBIN/stripname C${AGCM_IM}@OCEANOUT_${RSTID}.
 $GEOSBIN/stripname .${year}${month}${day}_21z.$ext.@LSMBCS.@ATMOStag_@OCEANtag
->>>EMIP_OLDLAND<<</bin/mv gocart_internal_rst gocart_internal_rst.merra2
->>>EMIP_OLDLAND<<<$GEOSBIN/gogo.x -s $RSTID.Chem_Registry.rc.${year}${month}${day}_21z -t $EXPDIR/RC/Chem_Registry.rc -i gocart_internal_rst.merra2 -o gocart_internal_rst -r C${AGCM_IM} -l ${AGCM_LM}
+@EMIP_OLDLAND/bin/mv gocart_internal_rst gocart_internal_rst.merra2
+@EMIP_OLDLAND$GEOSBIN/gogo.x -s $RSTID.Chem_Registry.rc.${year}${month}${day}_21z -t $EXPDIR/RC/Chem_Registry.rc -i gocart_internal_rst.merra2 -o gocart_internal_rst -r C${AGCM_IM} -l ${AGCM_LM}
 
 
 # Create CAP.rc and cap_restart
@@ -327,10 +327,10 @@ setenv BCRSLV    @ATMOStag_@OCEANtag
 setenv EMISSIONS @EMISSIONS
 chmod +x linkbcs
 
->>>GCMRUN_CATCHCN<<<set LSM_CHOICE = `grep LSM_CHOICE:  AGCM.rc | cut -d':' -f2`
->>>GCMRUN_CATCHCN<<<if ($LSM_CHOICE == 2) then
->>>GCMRUN_CATCHCN<<<  grep -v "'CNFROOTC'" HISTORY.rc > Hist_tmp.rc && mv Hist_tmp.rc HISTORY.rc
->>>GCMRUN_CATCHCN<<<endif
+@GCMRUN_CATCHCNset LSM_CHOICE = `grep LSM_CHOICE:  AGCM.rc | cut -d':' -f2`
+@GCMRUN_CATCHCNif ($LSM_CHOICE == 2) then
+@GCMRUN_CATCHCN  grep -v "'CNFROOTC'" HISTORY.rc > Hist_tmp.rc && mv Hist_tmp.rc HISTORY.rc
+@GCMRUN_CATCHCNendif
 #######################################################################
 #                  Setup executable
 #######################################################################
diff --git a/gcm_run_CPLFCST360S2S.j b/gcm_run_CPLFCST360S2S.j
index f929f4c0..36a85b54 100755
--- a/gcm_run_CPLFCST360S2S.j
+++ b/gcm_run_CPLFCST360S2S.j
@@ -102,8 +102,8 @@ set OGCM_JM_Tag = `echo $OGCM_JM | awk '{printf "%4.4i", $1}'`
 @COUPLED set HIST_IM_Tag = `echo $HIST_IM | awk '{printf "%4.4i", $1}'`
 @COUPLED set HIST_JM_Tag = `echo $HIST_JM | awk '{printf "%4.4i", $1}'`
 
->>>FVLATLON<<<set ATMOStag = DC${AGCM_IM_Tag}xPC${AGCM_JM_Tag}
->>>FVCUBED<<<set ATMOStag = CF${AGCM_IM_Tag}x6C
+@FVLATLONset ATMOStag = DC${AGCM_IM_Tag}xPC${AGCM_JM_Tag}
+@FVCUBEDset ATMOStag = CF${AGCM_IM_Tag}x6C
 @DATAOCEAN set OCEANtag = DE${OGCM_IM_Tag}xPE${OGCM_JM_Tag}
 @COUPLED set OCEANtag = TM${OGCM_IM_Tag}xTM${OGCM_JM_Tag}
 @COUPLED set HISTtag = DC${HIST_IM_Tag}xPC${HIST_JM_Tag}
@@ -220,9 +220,9 @@ cat << _EOF_ > $FILE
 /bin/ln -sf $BCSDIR/$BCRSLV/topo_GWD_var_@RES_DATELINE.data topo_gwdvar.data
 /bin/ln -sf $BCSDIR/$BCRSLV/topo_TRB_var_@RES_DATELINE.data topo_trbvar.data
 
->>>FVCUBED<<<if(     -e  $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat ) then
->>>FVCUBED<<</bin/ln -sf $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat .
->>>FVCUBED<<<endif
+@FVCUBEDif(     -e  $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat ) then
+@FVCUBED/bin/ln -sf $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat .
+@FVCUBEDendif
 
 @COUPLED /bin/cp $HOMDIR/input.nml .
 @COUPLED /bin/cp $HOMDIR/*_table .
diff --git a/gcm_run_CPLFCST360S2Sall.j b/gcm_run_CPLFCST360S2Sall.j
index e01c504f..9e66ff01 100755
--- a/gcm_run_CPLFCST360S2Sall.j
+++ b/gcm_run_CPLFCST360S2Sall.j
@@ -103,8 +103,8 @@ set OGCM_JM_Tag = `echo $OGCM_JM | awk '{printf "%4.4i", $1}'`
 @COUPLED set HIST_IM_Tag = `echo $HIST_IM | awk '{printf "%4.4i", $1}'`
 @COUPLED set HIST_JM_Tag = `echo $HIST_JM | awk '{printf "%4.4i", $1}'`
 
->>>FVLATLON<<<set ATMOStag = DC${AGCM_IM_Tag}xPC${AGCM_JM_Tag}
->>>FVCUBED<<<set ATMOStag = CF${AGCM_IM_Tag}x6C
+@FVLATLONset ATMOStag = DC${AGCM_IM_Tag}xPC${AGCM_JM_Tag}
+@FVCUBEDset ATMOStag = CF${AGCM_IM_Tag}x6C
 @DATAOCEAN set OCEANtag = DE${OGCM_IM_Tag}xPE${OGCM_JM_Tag}
 @COUPLED set OCEANtag = TM${OGCM_IM_Tag}xTM${OGCM_JM_Tag}
 @COUPLED set HISTtag = DC${HIST_IM_Tag}xPC${HIST_JM_Tag}
@@ -222,9 +222,9 @@ cat << _EOF_ > $FILE
 /bin/ln -sf $BCSDIR/$BCRSLV/topo_GWD_var_@RES_DATELINE.data topo_gwdvar.data
 /bin/ln -sf $BCSDIR/$BCRSLV/topo_TRB_var_@RES_DATELINE.data topo_trbvar.data
 
->>>FVCUBED<<<if(     -e  $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat ) then
->>>FVCUBED<<</bin/ln -sf $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat .
->>>FVCUBED<<<endif
+@FVCUBEDif(     -e  $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat ) then
+@FVCUBED/bin/ln -sf $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat .
+@FVCUBEDendif
 
 @COUPLED /bin/cp $HOMDIR/input.nml .
 @COUPLED /bin/cp $HOMDIR/*_table .
diff --git a/gcm_run_benchmark.j b/gcm_run_benchmark.j
index 64321eda..f0b6377e 100755
--- a/gcm_run_benchmark.j
+++ b/gcm_run_benchmark.j
@@ -178,24 +178,24 @@ awk '{$1=$1};1' < CAP.rc.orig > CAP.rc
 set year  = `echo $RSTDATE | cut -d_ -f1 | cut -b1-4`
 set month = `echo $RSTDATE | cut -d_ -f1 | cut -b5-6`
 
->>>EMIP_OLDLAND<<<# Copy MERRA-2 Restarts
->>>EMIP_OLDLAND<<<# ---------------------
->>>EMIP_NEWLAND<<<# Copy Jason-3_4 REPLAY MERRA-2 NewLand Restarts
->>>EMIP_NEWLAND<<<# ----------------------------------------------
+@EMIP_OLDLAND# Copy MERRA-2 Restarts
+@EMIP_OLDLAND# ---------------------
+@EMIP_NEWLAND# Copy Jason-3_4 REPLAY MERRA-2 NewLand Restarts
+@EMIP_NEWLAND# ----------------------------------------------
 cp /discover/nobackup/projects/gmao/g6dev/ltakacs/@EMIP_MERRA2/restarts/AMIP/M${month}/restarts.${year}${month}.tar .
 tar xf  restarts.${year}${month}.tar
 /bin/rm restarts.${year}${month}.tar
->>>EMIP_OLDLAND<<</bin/rm MERRA2*bin
+@EMIP_OLDLAND/bin/rm MERRA2*bin
 
 
->>>EMIP_OLDLAND<<<# Regrid MERRA-2 Restarts
->>>EMIP_OLDLAND<<<# -----------------------
->>>EMIP_NEWLAND<<<# Regrid Jason-3_4 REPLAY MERRA-2 NewLand Restarts
->>>EMIP_NEWLAND<<<# ------------------------------------------------
+@EMIP_OLDLAND# Regrid MERRA-2 Restarts
+@EMIP_OLDLAND# -----------------------
+@EMIP_NEWLAND# Regrid Jason-3_4 REPLAY MERRA-2 NewLand Restarts
+@EMIP_NEWLAND# ------------------------------------------------
 set RSTID = `/bin/ls *catch* | cut -d. -f1`
 set day   = `/bin/ls *catch* | cut -d. -f3 | awk 'match($0,/[0-9]{8}/) {print substr($0,RSTART+6,2)}'`
 $GEOSBIN/regrid.pl -np -ymd ${year}${month}${day} -hr 21 -grout C${AGCM_IM} -levsout ${AGCM_LM} -outdir . -d . -expid $RSTID -tagin @EMIP_BCS_IN -oceanin e -i -nobkg -lbl -nolcv -tagout @LSMBCS -rs 3 -oceanout @OCEANOUT
->>>EMIP_OLDLAND<<</bin/rm $RSTID.*.bin
+@EMIP_OLDLAND/bin/rm $RSTID.*.bin
 
      set IMC = $AGCM_IM
 if(     $IMC < 10 ) then
@@ -212,8 +212,8 @@ if( "$chk_type" =~ "application/x-hdf"        ) set ext = nc4
 
 $GEOSBIN/stripname C${AGCM_IM}@OCEANOUT_${RSTID}.
 $GEOSBIN/stripname .${year}${month}${day}_21z.$ext.@LSMBCS_@BCSTAG.@ATMOStag_@OCEANtag
->>>EMIP_OLDLAND<<</bin/mv gocart_internal_rst gocart_internal_rst.merra2
->>>EMIP_OLDLAND<<<$GEOSBIN/gogo.x -s $RSTID.Chem_Registry.rc.${year}${month}${day}_21z -t $EXPDIR/RC/Chem_Registry.rc -i gocart_internal_rst.merra2 -o gocart_internal_rst -r C${AGCM_IM} -l ${AGCM_LM}
+@EMIP_OLDLAND/bin/mv gocart_internal_rst gocart_internal_rst.merra2
+@EMIP_OLDLAND$GEOSBIN/gogo.x -s $RSTID.Chem_Registry.rc.${year}${month}${day}_21z -t $EXPDIR/RC/Chem_Registry.rc -i gocart_internal_rst.merra2 -o gocart_internal_rst -r C${AGCM_IM} -l ${AGCM_LM}
 
 
 # Create CAP.rc and cap_restart
@@ -380,8 +380,8 @@ cat << _EOF_ > $FILE
 @COUPLED/bin/ln -sf $ABCSDIR/green_clim_@RES_DATELINE.data green.data
 @COUPLED/bin/ln -sf $ABCSDIR/ndvi_clim_@RES_DATELINE.data ndvi.data
 
->>>GCMRUN_CATCHCN<<<if ( -f $BCSDIR/$BCRSLV/lnfm_clim_@RES_DATELINE.data  ) /bin/ln -sf $BCSDIR/$BCRSLV/lnfm_clim_@RES_DATELINE.data lnfm.data
->>>GCMRUN_CATCHCN<<</bin/ln -s $BCSDIR/land/shared/CO2_MonthlyMean_DiurnalCycle.nc4
+@GCMRUN_CATCHCNif ( -f $BCSDIR/$BCRSLV/lnfm_clim_@RES_DATELINE.data  ) /bin/ln -sf $BCSDIR/$BCRSLV/lnfm_clim_@RES_DATELINE.data lnfm.data
+@GCMRUN_CATCHCN/bin/ln -s $BCSDIR/land/shared/CO2_MonthlyMean_DiurnalCycle.nc4
 
 #@DATAOCEAN/bin/ln -sf $BCSDIR/$BCRSLV/topo_DYN_ave_@RES_DATELINE.data topo_dynave.data
 #@DATAOCEAN/bin/ln -sf $BCSDIR/$BCRSLV/topo_GWD_var_@RES_DATELINE.data topo_gwdvar.data
@@ -394,9 +394,9 @@ cat << _EOF_ > $FILE
 @COUPLED/bin/ln -sf $ABCSDIR/topo_GWD_var_@RES_DATELINE.data topo_gwdvar.data
 @COUPLED/bin/ln -sf $ABCSDIR/topo_TRB_var_@RES_DATELINE.data topo_trbvar.data
 
->>>FVCUBED<<<if(     -e  $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat ) then
->>>FVCUBED<<</bin/ln -sf $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat .
->>>FVCUBED<<<endif
+@FVCUBEDif(     -e  $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat ) then
+@FVCUBED/bin/ln -sf $BCSDIR/$BCRSLV/Gnomonic_$BCRSLV.dat .
+@FVCUBEDendif
 
 @COUPLED cp $HOMDIR/*_table .
 @COUPLED cp $OBCSDIR/INPUT/* INPUT
@@ -405,10 +405,10 @@ cat << _EOF_ > $FILE
 
 _EOF_
 
->>>GCMRUN_CATCHCN<<<set LSM_CHOICE = `grep LSM_CHOICE:  AGCM.rc | cut -d':' -f2`
->>>GCMRUN_CATCHCN<<<if ($LSM_CHOICE == 2) then
->>>GCMRUN_CATCHCN<<<  grep -v "'CNFROOTC'" HISTORY.rc > Hist_tmp.rc && mv Hist_tmp.rc HISTORY.rc
->>>GCMRUN_CATCHCN<<<endif
+@GCMRUN_CATCHCNset LSM_CHOICE = `grep LSM_CHOICE:  AGCM.rc | cut -d':' -f2`
+@GCMRUN_CATCHCNif ($LSM_CHOICE == 2) then
+@GCMRUN_CATCHCN  grep -v "'CNFROOTC'" HISTORY.rc > Hist_tmp.rc && mv Hist_tmp.rc HISTORY.rc
+@GCMRUN_CATCHCNendif
 
 @DATAOCEAN echo "/bin/ln -sf $SSTDIR"'/@SSTFILE   sst.data' >> $FILE
 @DATAOCEAN echo "/bin/ln -sf $SSTDIR"'/@ICEFILE fraci.data' >> $FILE
diff --git a/gcm_setup b/gcm_setup
index cfd6de0f..39e8b2cf 100755
--- a/gcm_setup
+++ b/gcm_setup
@@ -624,7 +624,7 @@ if( $OGCM == TRUE ) then
        set MOM6 = "#DELETE"
        set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM-MOM5.rc.tmpl"
 
-       set mom5_warning=">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nYou (user) have chosen to set up a coupled model experiment with MOM5.\nBe aware that such a set up is _known_ to have problems. See following for more details.\nhttps://github.com/GEOS-ESM/MOM5/issues/19\nIf your intent is to help _fix_ above issue, your help is much appreciated. Thank you and good luck!\nOtherwise, until this above issue is _fixed_ you are on your own with above choice.\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+       set mom5_warning="######################################################\nYou (user) have chosen to set up a coupled model experiment with MOM5.\nBe aware that such a set up is _known_ to have problems. See following for more details.\nhttps://github.com/GEOS-ESM/MOM5/issues/19\nIf your intent is to help _fix_ above issue, your help is much appreciated. Thank you and good luck!\nOtherwise, until this above issue is _fixed_ you are on your own with above choice.\n######################################################"
        echo "\033[31;5m"${mom5_warning}"\033[0m"
        set MIT  = "#DELETE"
     else if ( "$OCNMODEL" == "MOM6" ) then
@@ -2321,8 +2321,8 @@ s?^[ \t]*RECORD_?#RECORD_?g
 
 s?@DASTUNING?#?g
 
-s?>>>FORCEDAS<<<?$FORCEDAS?g
-s?>>>FORCEGCM<<<?$FORCEGCM?g
+s?@FORCEDAS?$FORCEDAS?g
+s?@FORCEGCM?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?@MOM5?$MOM5?g
@@ -2330,29 +2330,27 @@ s?@MOM6?$MOM6?g
 s?@OCNMODEL?$OCNMODEL?g
 s?@CICE4?$CICE4?g
 s?@CICE6?$CICE6?g
-s?>>>HIST_CICE4<<<?$HIST_CICE4?g
+s?@HIST_CICE4?$HIST_CICE4?g
 s?@MIT?$MIT?g
 s?@DATAOCEAN?$DATAOCEAN?g
-s?>>>GOCART<<<?$GOCART?g
 s?@OPS_SPECIES?$OPS_SPECIES?g
 s?@CMIP_SPECIES?$CMIP_SPECIES?g
 s?@MERRA2OX_SPECIES?$MERRA2OX_SPECIES?g
-s?>>>FVCUBED<<<?$FVCUBED?g
+s?@FVCUBED?$FVCUBED?g
 s?@HIST_GOCART?$HIST_GOCART?g
-s?>>>OSTIA<<<?$OSTIA?g
-s?>>>HIST_CATCHCN<<<?$HIST_CATCHCN?g
-s?>>>GCMRUN_CATCHCN<<<?$GCMRUN_CATCHCN?g
-s?>>>EMIP_OLDLAND<<<?$EMIP_OLDLAND?g
-s?>>>EMIP_NEWLAND<<<?$EMIP_NEWLAND?g
+s?@HIST_CATCHCN?$HIST_CATCHCN?g
+s?@GCMRUN_CATCHCN?$GCMRUN_CATCHCN?g
+s?@EMIP_OLDLAND?$EMIP_OLDLAND?g
+s?@EMIP_NEWLAND?$EMIP_NEWLAND?g
 s?@LSM_PARMS?$LSM_PARMS?g
 s?@OCEAN_NAME?$OCEAN_NAME?g
 s?@OCEAN_PRELOAD?$OCEAN_PRELOAD?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?@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/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g
 
 s?@REPLAY_ANA_EXPID?$REPLAY_ANA_EXPID?g
diff --git a/geoschemchem_setup b/geoschemchem_setup
index 213a32e6..993fc249 100755
--- a/geoschemchem_setup
+++ b/geoschemchem_setup
@@ -624,7 +624,7 @@ if( $OGCM == TRUE ) then
        set MOM6 = "#DELETE"
        set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM-MOM5.rc.tmpl"
 
-       set mom5_warning=">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nYou (user) have chosen to set up a coupled model experiment with MOM5.\nBe aware that such a set up is _known_ to have problems. See following for more details.\nhttps://github.com/GEOS-ESM/MOM5/issues/19\nIf your intent is to help _fix_ above issue, your help is much appreciated. Thank you and good luck!\nOtherwise, until this above issue is _fixed_ you are on your own with above choice.\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+       set mom5_warning="######################################################\nYou (user) have chosen to set up a coupled model experiment with MOM5.\nBe aware that such a set up is _known_ to have problems. See following for more details.\nhttps://github.com/GEOS-ESM/MOM5/issues/19\nIf your intent is to help _fix_ above issue, your help is much appreciated. Thank you and good luck!\nOtherwise, until this above issue is _fixed_ you are on your own with above choice.\n######################################################"
        echo "\033[31;5m"${mom5_warning}"\033[0m"
        set MIT  = "#DELETE"
     else if ( "$OCNMODEL" == "MOM6" ) then
@@ -2351,8 +2351,8 @@ s?^[ \t]*RECORD_?#RECORD_?g
 
 s?@DASTUNING?#?g
 
-s?>>>FORCEDAS<<<?$FORCEDAS?g
-s?>>>FORCEGCM<<<?$FORCEGCM?g
+s?@FORCEDAS?$FORCEDAS?g
+s?@FORCEGCM?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?@MOM5?$MOM5?g
@@ -2360,29 +2360,27 @@ s?@MOM6?$MOM6?g
 s?@OCNMODEL?$OCNMODEL?g
 s?@CICE4?$CICE4?g
 s?@CICE6?$CICE6?g
-s?>>>HIST_CICE4<<<?$HIST_CICE4?g
+s?@HIST_CICE4?$HIST_CICE4?g
 s?@MIT?$MIT?g
 s?@DATAOCEAN?$DATAOCEAN?g
-s?>>>GOCART<<<?$GOCART?g
 s?@OPS_SPECIES?$OPS_SPECIES?g
 s?@CMIP_SPECIES?$CMIP_SPECIES?g
 s?@MERRA2OX_SPECIES?$MERRA2OX_SPECIES?g
-s?>>>FVCUBED<<<?$FVCUBED?g
+s?@FVCUBED?$FVCUBED?g
 s?@HIST_GOCART?$HIST_GOCART?g
-s?>>>OSTIA<<<?$OSTIA?g
-s?>>>HIST_CATCHCN<<<?$HIST_CATCHCN?g
-s?>>>GCMRUN_CATCHCN<<<?$GCMRUN_CATCHCN?g
-s?>>>EMIP_OLDLAND<<<?$EMIP_OLDLAND?g
-s?>>>EMIP_NEWLAND<<<?$EMIP_NEWLAND?g
+s?@HIST_CATCHCN?$HIST_CATCHCN?g
+s?@GCMRUN_CATCHCN?$GCMRUN_CATCHCN?g
+s?@EMIP_OLDLAND?$EMIP_OLDLAND?g
+s?@EMIP_NEWLAND?$EMIP_NEWLAND?g
 s?@LSM_PARMS?$LSM_PARMS?g
 s?@OCEAN_NAME?$OCEAN_NAME?g
 s?@OCEAN_PRELOAD?$OCEAN_PRELOAD?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?@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/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g
 
 s?@REPLAY_ANA_EXPID?$REPLAY_ANA_EXPID?g
diff --git a/gmichem_setup b/gmichem_setup
index 7d3098a1..b36a8a8c 100755
--- a/gmichem_setup
+++ b/gmichem_setup
@@ -629,7 +629,7 @@ if( $OGCM == TRUE ) then
        set MOM6 = "#DELETE"
        set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM-MOM5.rc.tmpl"
 
-       set mom5_warning=">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nYou (user) have chosen to set up a coupled model experiment with MOM5.\nBe aware that such a set up is _known_ to have problems. See following for more details.\nhttps://github.com/GEOS-ESM/MOM5/issues/19\nIf your intent is to help _fix_ above issue, your help is much appreciated. Thank you and good luck!\nOtherwise, until this above issue is _fixed_ you are on your own with above choice.\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+       set mom5_warning="######################################################\nYou (user) have chosen to set up a coupled model experiment with MOM5.\nBe aware that such a set up is _known_ to have problems. See following for more details.\nhttps://github.com/GEOS-ESM/MOM5/issues/19\nIf your intent is to help _fix_ above issue, your help is much appreciated. Thank you and good luck!\nOtherwise, until this above issue is _fixed_ you are on your own with above choice.\n######################################################"
        echo "\033[31;5m"${mom5_warning}"\033[0m"
        set MIT  = "#DELETE"
     else if ( "$OCNMODEL" == "MOM6" ) then
@@ -2522,8 +2522,8 @@ s?^[ \t]*RECORD_?#RECORD_?g
 
 s?@DASTUNING?#?g
 
-s?>>>FORCEDAS<<<?$FORCEDAS?g
-s?>>>FORCEGCM<<<?$FORCEGCM?g
+s?@FORCEDAS?$FORCEDAS?g
+s?@FORCEGCM?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?@MOM5?$MOM5?g
@@ -2531,29 +2531,27 @@ s?@MOM6?$MOM6?g
 s?@OCNMODEL?$OCNMODEL?g
 s?@CICE4?$CICE4?g
 s?@CICE6?$CICE6?g
-s?>>>HIST_CICE4<<<?$HIST_CICE4?g
+s?@HIST_CICE4?$HIST_CICE4?g
 s?@MIT?$MIT?g
 s?@DATAOCEAN?$DATAOCEAN?g
-s?>>>GOCART<<<?$GOCART?g
 s?@OPS_SPECIES?$OPS_SPECIES?g
 s?@CMIP_SPECIES?$CMIP_SPECIES?g
 s?@MERRA2OX_SPECIES?$MERRA2OX_SPECIES?g
-s?>>>FVCUBED<<<?$FVCUBED?g
+s?@FVCUBED?$FVCUBED?g
 s?@HIST_GOCART?$HIST_GOCART?g
-s?>>>OSTIA<<<?$OSTIA?g
-s?>>>HIST_CATCHCN<<<?$HIST_CATCHCN?g
-s?>>>GCMRUN_CATCHCN<<<?$GCMRUN_CATCHCN?g
-s?>>>EMIP_OLDLAND<<<?$EMIP_OLDLAND?g
-s?>>>EMIP_NEWLAND<<<?$EMIP_NEWLAND?g
+s?@HIST_CATCHCN?$HIST_CATCHCN?g
+s?@GCMRUN_CATCHCN?$GCMRUN_CATCHCN?g
+s?@EMIP_OLDLAND?$EMIP_OLDLAND?g
+s?@EMIP_NEWLAND?$EMIP_NEWLAND?g
 s?@LSM_PARMS?$LSM_PARMS?g
 s?@OCEAN_NAME?$OCEAN_NAME?g
 s?@OCEAN_PRELOAD?$OCEAN_PRELOAD?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?@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/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g
 
 s?@REPLAY_ANA_EXPID?$REPLAY_ANA_EXPID?g
diff --git a/linkbcs.tmpl b/linkbcs.tmpl
index aef85fe0..5b0758cc 100644
--- a/linkbcs.tmpl
+++ b/linkbcs.tmpl
@@ -55,8 +55,8 @@ setenv BCRSLV    @ATMOStag_@OCEANtag
 /bin/ln -sf $BCSDIR/land/$BCRSLV/green_clim_@AGCM_IMx@AGCM_JM.data green.data
 /bin/ln -sf $BCSDIR/land/$BCRSLV/ndvi_clim_@AGCM_IMx@AGCM_JM.data ndvi.data
 
->>>GCMRUN_CATCHCN<<<if ( -f $BCSDIR/$BCRSLV/lnfm_clim_@AGCM_IMx@AGCM_JM.data  ) /bin/ln -sf $BCSDIR/$BCRSLV/lnfm_clim_@AGCM_IMx@AGCM_JM.data lnfm.data
->>>GCMRUN_CATCHCN<<</bin/ln -s $BCSDIR/land/shared/CO2_MonthlyMean_DiurnalCycle.nc4
+@GCMRUN_CATCHCNif ( -f $BCSDIR/$BCRSLV/lnfm_clim_@AGCM_IMx@AGCM_JM.data  ) /bin/ln -sf $BCSDIR/$BCRSLV/lnfm_clim_@AGCM_IMx@AGCM_JM.data lnfm.data
+@GCMRUN_CATCHCN/bin/ln -s $BCSDIR/land/shared/CO2_MonthlyMean_DiurnalCycle.nc4
 
 
 set MERRA2OX_SPECIES = "#"
diff --git a/stratchem_setup b/stratchem_setup
index b76d11fa..d12c3d03 100755
--- a/stratchem_setup
+++ b/stratchem_setup
@@ -624,7 +624,7 @@ if( $OGCM == TRUE ) then
        set MOM6 = "#DELETE"
        set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM-MOM5.rc.tmpl"
 
-       set mom5_warning=">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nYou (user) have chosen to set up a coupled model experiment with MOM5.\nBe aware that such a set up is _known_ to have problems. See following for more details.\nhttps://github.com/GEOS-ESM/MOM5/issues/19\nIf your intent is to help _fix_ above issue, your help is much appreciated. Thank you and good luck!\nOtherwise, until this above issue is _fixed_ you are on your own with above choice.\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+       set mom5_warning="######################################################\nYou (user) have chosen to set up a coupled model experiment with MOM5.\nBe aware that such a set up is _known_ to have problems. See following for more details.\nhttps://github.com/GEOS-ESM/MOM5/issues/19\nIf your intent is to help _fix_ above issue, your help is much appreciated. Thank you and good luck!\nOtherwise, until this above issue is _fixed_ you are on your own with above choice.\n######################################################"
        echo "\033[31;5m"${mom5_warning}"\033[0m"
        set MIT  = "#DELETE"
     else if ( "$OCNMODEL" == "MOM6" ) then
@@ -2336,8 +2336,8 @@ s?^[ \t]*RECORD_?#RECORD_?g
 
 s?@DASTUNING?#?g
 
-s?>>>FORCEDAS<<<?$FORCEDAS?g
-s?>>>FORCEGCM<<<?$FORCEGCM?g
+s?@FORCEDAS?$FORCEDAS?g
+s?@FORCEGCM?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?@MOM5?$MOM5?g
@@ -2345,29 +2345,27 @@ s?@MOM6?$MOM6?g
 s?@OCNMODEL?$OCNMODEL?g
 s?@CICE4?$CICE4?g
 s?@CICE6?$CICE6?g
-s?>>>HIST_CICE4<<<?$HIST_CICE4?g
+s?@HIST_CICE4?$HIST_CICE4?g
 s?@MIT?$MIT?g
 s?@DATAOCEAN?$DATAOCEAN?g
-s?>>>GOCART<<<?$GOCART?g
 s?@OPS_SPECIES?$OPS_SPECIES?g
 s?@CMIP_SPECIES?$CMIP_SPECIES?g
 s?@MERRA2OX_SPECIES?$MERRA2OX_SPECIES?g
-s?>>>FVCUBED<<<?$FVCUBED?g
+s?@FVCUBED?$FVCUBED?g
 s?@HIST_GOCART?$HIST_GOCART?g
-s?>>>OSTIA<<<?$OSTIA?g
-s?>>>HIST_CATCHCN<<<?$HIST_CATCHCN?g
-s?>>>GCMRUN_CATCHCN<<<?$GCMRUN_CATCHCN?g
-s?>>>EMIP_OLDLAND<<<?$EMIP_OLDLAND?g
-s?>>>EMIP_NEWLAND<<<?$EMIP_NEWLAND?g
+s?@HIST_CATCHCN?$HIST_CATCHCN?g
+s?@GCMRUN_CATCHCN?$GCMRUN_CATCHCN?g
+s?@EMIP_OLDLAND?$EMIP_OLDLAND?g
+s?@EMIP_NEWLAND?$EMIP_NEWLAND?g
 s?@LSM_PARMS?$LSM_PARMS?g
 s?@OCEAN_NAME?$OCEAN_NAME?g
 s?@OCEAN_PRELOAD?$OCEAN_PRELOAD?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?@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/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g
 
 s?@REPLAY_ANA_EXPID?$REPLAY_ANA_EXPID?g

From 4e677eb965e9b3e4c833d3eaff8aa55772eb9a97 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 11 Dec 2024 10:34:38 -0500
Subject: [PATCH 2/3] Order matters now

---
 gcm_setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcm_setup b/gcm_setup
index 39e8b2cf..b08506f7 100755
--- a/gcm_setup
+++ b/gcm_setup
@@ -2347,10 +2347,10 @@ s?@OCEAN_NAME?$OCEAN_NAME?g
 s?@OCEAN_PRELOAD?$OCEAN_PRELOAD?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?@REGULAR_REPLAY?#?g
 s?ana4replay.eta.%y4%m2%d2_%h2z.nc4?/discover/nobackup/projects/gmao/merra2/data/ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4?g
 
 s?@REPLAY_ANA_EXPID?$REPLAY_ANA_EXPID?g

From 3833a37dd6d977e2f8eb331a39b62eda1e318f62 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Fri, 13 Dec 2024 11:47:57 -0500
Subject: [PATCH 3/3] Update to orb v4

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eeec7610..7c7d0d6a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,11 +1,11 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v7.23.0
-#bcs_version: &bcs_version v11.5.0
+#baselibs_version: &baselibs_version v7.27.0
+#bcs_version: &bcs_version v11.6.0
 
 orbs:
-  ci: geos-esm/circleci-tools@2
+  ci: geos-esm/circleci-tools@4
 
 workflows:
   build-test: