Shortened DO_MAKE to MAKE for prepbufr files. NOAA-EMC#138

DavidHuber-NOAA · Sep 23, 2022 · cee1d31 · cee1d31
1 parent bb3f90d
commit cee1d31
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/jobs/JGDAS_ENKF_DIAG b/jobs/JGDAS_ENKF_DIAG
@@ -56,8 +56,8 @@ export pgmerr=errfile
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
 export COMPONENT=${COMPONENT:-atmos}
-export DO_MAKE_NSSTBUFR=${DO_MAKE_NSSTBUFR:-"NO"}
-export DO_MAKE_ACFTBUFR=${DO_MAKE_ACFTBUFR:-"NO"}
+export MAKE_NSSTBUFR=${MAKE_NSSTBUFR:-"NO"}
+export MAKE_ACFTBUFR=${MAKE_ACFTBUFR:-"NO"}
 
 
 ##############################################
@@ -108,14 +108,14 @@ if [ ! -f $PREPQC ]; then
 fi
 export TCVITL="$COMIN_ANL/${OPREFIX}syndata.tcvitals.tm00"
 if [[ $DONST = "YES" ]]; then
-   if [[ $DO_MAKE_NSSTBUFR == "YES" ]]; then
+   if [[ $MAKE_NSSTBUFR == "YES" ]]; then
       export NSSTBF="${COMOUT}/${OPREFIX}nsstbufr"
    else
       export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
    fi
 fi
 
-if [[ $DO_MAKE_ACFTBUFR == "YES" ]]; then
+if [[ $MAKE_ACFTBUFR == "YES" ]]; then
    export PREPQCPF="${COMOUT}/${OPREFIX}prepbufr.acft_profiles"
 else
    export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"

diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS
@@ -56,8 +56,8 @@ export pgmerr=errfile
 export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gdas"}}
 export COMPONENT=${COMPONENT:-atmos}
-export DO_MAKE_NSSTBUFR=${DO_MAKE_NSSTBUFR:-"NO"}
-export DO_MAKE_ACFTBUFR=${DO_MAKE_ACFTBUFR:-"NO"}
+export MAKE_NSSTBUFR=${MAKE_NSSTBUFR:-"NO"}
+export MAKE_ACFTBUFR=${MAKE_ACFTBUFR:-"NO"}
 
 
 ##############################################
@@ -111,14 +111,14 @@ if [ ! -f $PREPQC ]; then
 fi
 export TCVITL="$COMIN_ANL/${OPREFIX}syndata.tcvitals.tm00"
 if [[ $DONST = "YES" ]]; then
-   if [[ $DO_MAKE_NSSTBUFR == "YES" ]]; then
+   if [[ $MAKE_NSSTBUFR == "YES" ]]; then
       export NSSTBF="${COMOUT}/${OPREFIX}nsstbufr"
    else
       export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
    fi
 fi
 
-if [[ $DO_MAKE_ACFTBUFR == "YES" ]]; then
+if [[ $MAKE_ACFTBUFR == "YES" ]]; then
    export PREPQCPF="${COMOUT}/${OPREFIX}prepbufr.acft_profiles"
 else
    export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"

diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS
@@ -58,8 +58,8 @@ export CDATE=${CDATE:-${PDY}${cyc}}
 export CDUMP=${CDUMP:-${RUN:-"gfs"}}
 export COMPONENT=${COMPONENT:-atmos}
 export DO_CALC_ANALYSIS=${DO_CALC_ANALYSIS:-"YES"} 
-export DO_MAKE_NSSTBUFR=${DO_MAKE_NSSTBUFR:-"NO"}
-export DO_MAKE_ACFTBUFR=${DO_MAKE_ACFTBUFR:-"NO"}
+export MAKE_NSSTBUFR=${MAKE_NSSTBUFR:-"NO"}
+export MAKE_ACFTBUFR=${MAKE_ACFTBUFR:-"NO"}
 
 
 ##############################################
@@ -128,14 +128,14 @@ if [ ! -f $PREPQC ]; then
 fi
 export TCVITL="${COMOUT}/${OPREFIX}syndata.tcvitals.tm00"
 if [[ $DONST = "YES" ]]; then
-   if [[ $DO_MAKE_NSSTBUFR == "YES" ]]; then
+   if [[ $MAKE_NSSTBUFR == "YES" ]]; then
       export NSSTBF="${COMOUT}/${OPREFIX}nsstbufr"
    else
       export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
    fi
 fi
 
-if [[ $DO_MAKE_ACFTBUFR == "YES" ]]; then
+if [[ $MAKE_ACFTBUFR == "YES" ]]; then
    export PREPQCPF="${COMOUT}/${OPREFIX}prepbufr.acft_profiles"
 else
    export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"

diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh
@@ -84,7 +84,7 @@ fi
 
 ###############################################################
 # Generate prepbufr files from dumps or copy from OPS
-if [ $DO_MAKEPREPBUFR = "YES" ]; then
+if [ $MAKEPREPBUFR = "YES" ]; then
     if [ $ROTDIR_DUMP = "YES" ]; then
         rm -f $COMOUT/${OPREFIX}prepbufr
         rm -f $COMOUT/${OPREFIX}prepbufr.acft_profiles
@@ -105,7 +105,7 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
     fi
 
     # Disable creating NSSTBUFR if desired, copy from DMPDIR instead
-    if [[ ${DO_MAKE_NSSTBUFR:-"NO"} = "NO" ]]; then
+    if [[ ${MAKE_NSSTBUFR:-"NO"} = "NO" ]]; then
         export MAKE_NSSTBUFR="NO"
     fi
 
@@ -114,7 +114,7 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
     [[ $status -ne 0 ]] && exit $status
 
     # If creating NSSTBUFR was disabled, copy from DMPDIR if appropriate.
-    if [[ ${DO_MAKE_NSSTBUFR:-"NO"} = "NO" ]]; then
+    if [[ ${MAKE_NSSTBUFR:-"NO"} = "NO" ]]; then
         [[ $DONST = "YES" ]] && $NCP $DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}/${COMPONENT}/${OPREFIX}nsstbufr $COMOUT/${OPREFIX}nsstbufr
     fi
 

diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
@@ -357,10 +357,10 @@ if [ $DONST = "YES" ]; then export FNTSFA="        "; fi
 export nst_anl=.true.
 
 # Make the nsstbufr file on the fly or use the GDA version
-export DO_MAKE_NSSTBUFR="@DO_MAKE_NSSTBUFR@"
+export MAKE_NSSTBUFR="@MAKE_NSSTBUFR@"
 
 # Make the aircraft prepbufr file on the fly or use the GDA version
-export DO_MAKE_ACFTBUFR="@DO_MAKE_ACFTBUFR@"
+export MAKE_ACFTBUFR="@MAKE_ACFTBUFR@"
 
 # Analysis increments to zero in CALCINCEXEC
 export INCREMENTS_TO_ZERO="'liq_wat_inc','icmr_inc'"

diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml
@@ -18,5 +18,5 @@ chgrp_cmd: 'chgrp rstprod'
 hpssarch: 'YES'
 localarch: 'NO'
 atardir: '/NCEPDEV/$HPSS_PROJECT/1year/$USER/$machine/scratch/$PSLOT'
-do_make_nsstbufr: 'NO'
-do_make_acftbufr: 'NO'
+make_nsstbufr: 'NO'
+make_acftbufr: 'NO'
diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml
@@ -18,5 +18,5 @@ chgrp_cmd: 'chgrp rstprod'
 hpssarch: 'NO'
 localarch: 'NO'
 atardir: '$NOSCRUB/archive_rotdir/$PSLOT'
-do_make_nsstbufr: 'NO'
-do_make_acftbufr: 'NO'
+make_nsstbufr: 'NO'
+make_acftbufr: 'NO'
diff --git a/workflow/hosts/s4.yaml b/workflow/hosts/s4.yaml
@@ -18,5 +18,5 @@ chgrp_cmd: 'ls'
 hpssarch: 'NO'
 localarch: 'NO'
 atardir: '$NOSCRUB/archive_rotdir/$PSLOT'
-do_make_nsstbufr: 'YES'
-do_make_acftbufr: 'YES'
+make_nsstbufr: 'YES'
+make_acftbufr: 'YES'
diff --git a/workflow/setup_expt.py b/workflow/setup_expt.py
@@ -143,8 +143,8 @@ def edit_baseconfig(host, inputs):
         "@HPSSARCH@": host.info["hpssarch"],
         "@LOCALARCH@": host.info["localarch"],
         "@ATARDIR@": host.info["atardir"],
-        "@DO_MAKE_NSSTBUFR@": host.info["do_make_nsstbufr"],
-        "@DO_MAKE_ACFTBUFR@": host.info["do_make_acftbufr"],
+        "@MAKE_NSSTBUFR@": host.info["make_nsstbufr"],
+        "@MAKE_ACFTBUFR@": host.info["make_acftbufr"],
         "@gfs_cyc@": inputs.gfs_cyc,
         "@APP@": inputs.app,
     }