Rename COUPLED_shared to shared_COUPLED -- this makes the string uniq…

…ue enough and therefore works! Thank you @sdrabenh for suggesting it.
GEOS-ESM · Nov 21, 2023 · ee70a6c · ee70a6c
1 parent 04a4301
commit ee70a6c
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/gcm_CPLFCST360NM2_setup b/gcm_CPLFCST360NM2_setup
@@ -1742,7 +1742,7 @@ s?@CLDMICRO?$CLDMICRO?g
 s?>>>FORCEDAS<<<?$FORCEDAS?g
 s?>>>FORCEGCM<<<?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
-s?@COUPLEDIR_shared?$COUPLEDIR_shared?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?>>>FORCAST<<<?$FORCAST?g
 s?@DATAOCEAN?$DATAOCEAN?g
 s?>>>GOCART<<<?$GOCART?g

diff --git a/gcm_CPLFCST360S2S_setup b/gcm_CPLFCST360S2S_setup
@@ -1736,7 +1736,7 @@ s?@DASTUNING?#?g
 s?>>>FORCEDAS<<<?$FORCEDAS?g
 s?>>>FORCEGCM<<<?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
-s?@COUPLEDIR_shared?$COUPLEDIR_shared?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?>>>FORCAST<<<?$FORCAST?g
 s?@DATAOCEAN?$DATAOCEAN?g

diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl
@@ -354,7 +354,7 @@ setenv EMISSIONS @EMISSIONS
 @MOM5setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
 @MOM5setenv OBCSDIR  @COUPLEDIR/ocean_bcs/MOM5/${OGCM_IM}x${OGCM_JM}
 @MOM6setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
-@MOM6setenv OBCSDIR  @COUPLEDIR_shared/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
+@MOM6setenv OBCSDIR  @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
 @COUPLEDsetenv SSTDIR  @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
 @COUPLEDsetenv BCTAG `basename $ABCSDIR`
 @DATAOCEAN setenv BCTAG `basename $BCSDIR`

diff --git a/gcm_run.j b/gcm_run.j
@@ -317,9 +317,9 @@ setenv DATELINE  DC
 setenv EMISSIONS @EMISSIONS
 
 @MOM5setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
-@MOM5setenv OBCSDIR  @COUPLEDIR_shared/ocean/MOM5/${OGCM_IM}x${OGCM_JM}
+@MOM5setenv OBCSDIR  @shared_COUPLED/ocean/MOM5/${OGCM_IM}x${OGCM_JM}
 @MOM6setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
-@MOM6setenv OBCSDIR  @COUPLEDIR_shared/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
+@MOM6setenv OBCSDIR  @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
 @MOM5setenv SSTDIR  @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
 @MOM6setenv SSTDIR  @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
 @MOM5setenv BCTAG `basename $ABCSDIR`

diff --git a/gcm_run_benchmark.j b/gcm_run_benchmark.j
@@ -310,9 +310,9 @@ setenv DATELINE  DC
 setenv EMISSIONS @EMISSIONS
 
 @MOM5setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
-@MOM5setenv OBCSDIR  @COUPLEDIR_shared/ocean/MOM5/${OGCM_IM}x${OGCM_JM}
+@MOM5setenv OBCSDIR  @shared_COUPLED/ocean/MOM5/${OGCM_IM}x${OGCM_JM}
 @MOM6setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
-@MOM6setenv OBCSDIR  @COUPLEDIR_shared/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
+@MOM6setenv OBCSDIR  @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
 @COUPLEDsetenv SSTDIR  @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
 @COUPLEDsetenv BCTAG `basename $ABCSDIR`
 @DATAOCEANsetenv BCTAG `basename $BCSDIR`

diff --git a/gcm_setup b/gcm_setup
@@ -1835,7 +1835,7 @@ else if( $SITE == 'NCCS' ) then
               setenv CHMDIR     $SHARE/gmao_ops/fvInput_nc3                            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /discover/nobackup/$LOGNAME                            # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # OLD Coupled Ocean/Atmos Forcing
-              setenv COUPLEDIR_shared  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
               if (${OGRIDTYP} == "LL") then
                 setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
@@ -2323,7 +2323,7 @@ s?@ICEFILE?$ICEFILE?g
 s?@KPARFILE?$KPARFILE?g
 s?@CHMDIR?$CHMDIR?g
 s?@COUPLEDIR?$COUPLEDIR?g
-s?@COUPLEDIR_shared?$COUPLEDIR_shared?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@GWDRSDIR?$GWDRSDIR?g
 s?@EXPDIR?$EXPDIR?g
 s?@EXPDSC?$EXPDSC?g

diff --git a/geoschemchem_setup b/geoschemchem_setup
@@ -1865,7 +1865,7 @@ else if( $SITE == 'NCCS' ) then
               setenv CHMDIR     $SHARE/gmao_ops/fvInput_nc3                            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /discover/nobackup/$LOGNAME                            # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # OLD Coupled Ocean/Atmos Forcing
-              setenv COUPLEDIR_shared  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
               if (${OGRIDTYP} == "LL") then
                 setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
@@ -2390,7 +2390,7 @@ s?@DASTUNING?#?g
 s?>>>FORCEDAS<<<?$FORCEDAS?g
 s?>>>FORCEGCM<<<?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
-s?@COUPLEDIR_shared?$COUPLEDIR_shared?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?@MOM5?$MOM5?g
 s?@MOM6?$MOM6?g

diff --git a/gmichem_setup b/gmichem_setup
@@ -2026,7 +2026,7 @@ else if( $SITE == 'NCCS' ) then
               setenv CHMDIR     $SHARE/gmao_ops/fvInput_nc3                            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /discover/nobackup/$LOGNAME                            # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # OLD Coupled Ocean/Atmos Forcing
-              setenv COUPLEDIR_shared  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
               if (${OGRIDTYP} == "LL") then
                 setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR

diff --git a/stratchem_setup b/stratchem_setup
@@ -1850,7 +1850,7 @@ else if( $SITE == 'NCCS' ) then
               setenv CHMDIR     $SHARE/gmao_ops/fvInput_nc3                            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /discover/nobackup/$LOGNAME                            # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # OLD Coupled Ocean/Atmos Forcing
-              setenv COUPLEDIR_shared  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
               if (${OGRIDTYP} == "LL") then
                 setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
@@ -2375,7 +2375,7 @@ s?@DASTUNING?#?g
 s?>>>FORCEDAS<<<?$FORCEDAS?g
 s?>>>FORCEGCM<<<?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
-s?@COUPLEDIR_shared?$COUPLEDIR_shared?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?@MOM5?$MOM5?g
 s?@MOM6?$MOM6?g