Merge pull request #1 from KateFriedman-NOAA/ccpp

Fix missing COMROOT setting for Orion
jkhender · Nov 16, 2020 · 66cc1a0 · 66cc1a0
2 parents 9e8f960 + 2432dc5
commit 66cc1a0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/parm/config/config.prep b/parm/config/config.prep
@@ -17,10 +17,7 @@ export DO_RELOCATE="NO"
 export TROPCYQCRELOSH="$HOMEgfs/scripts/exglobal_atmos_tropcy_qc_reloc.sh"
 export SENDCOM=YES
 
-export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)}
-if [ $machine = "HERA" ]; then
-    export COMINsyn="${COMROOT}/arch/prod/syndat"
-fi
+export COMINsyn=${COMINsyn:-${COMROOT}/gfs/prod/syndat}
 
 export HOMERELO=$HOMEgfs
 export EXECRELO=${HOMERELO}/exec

diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy
@@ -159,11 +159,6 @@ if [ "$VRFYTRAK" = "YES" ]; then
         export FHOUT_CYCLONE=6            
         export FHMAX_CYCLONE=$(( FHMAX_GFS<240 ? FHMAX_GFS : 240 ))
     fi
-    if [ $machine = "HERA" ]; then
-       export COMROOT="/scratch1/NCEPDEV/global/glopara/com"
-    elif [ $machine = "ORION" ]; then
-       export COMROOT="/work/noaa/global/glopara/com"
-    fi
     export COMINsyn=${COMINsyn:-${COMROOT}/gfs/prod/syndat}
 fi
 

diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py
@@ -240,6 +240,7 @@ def edit_baseconfig():
       base_svn = '/work/noaa/global/glopara/svn'
       dmpdir = '/work/noaa/global/glopara/dump'
       nwprod = '/work/noaa/global/glopara/nwpara'
+      comroot = '/work/noaa/global/glopara/com'
       homedir = '/work/noaa/global/$USER'
       stmp = '/work/noaa/stmp/$USER'
       ptmp = '/work/noaa/stmp/$USER'

diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py
@@ -206,6 +206,7 @@ def edit_baseconfig():
       base_svn = '/work/noaa/global/glopara/svn'
       dmpdir = '/work/noaa/global/glopara/dump'
       nwprod = '/work/noaa/global/glopara/nwpara'
+      comroot = '/work/noaa/global/glopara/com'
       homedir = '/work/noaa/global/$USER'
       stmp = '/work/noaa/stmp/$USER'
       ptmp = '/work/noaa/stmp/$USER'