diff --git a/jobs/rocoto/earc.sh b/jobs/rocoto/earc.sh index 11f20804e6..3bc42fab68 100755 --- a/jobs/rocoto/earc.sh +++ b/jobs/rocoto/earc.sh @@ -80,32 +80,34 @@ if [[ $ENSGRP -gt 0 ]] && [[ $HPSSARCH = "YES" ]]; then if [ $CDATE -eq $SDATE -a $cyc -eq $EARCICS_CYC ] ; then SAVEWARMICB="YES" ; fi fi - if [ $CDATE -gt $SDATE ]; then - htar -P -cvf $ATARDIR/$CDATE/enkf${CDUMP}_grp${ENSGRP}.tar `cat $ARCH_LIST/enkf${CDUMP}_grp${n}.txt` - status=$? - if [ $status -ne 0 -a $CDATE -ge $firstday ]; then - echo "HTAR $CDATE enkf${CDUMP}_grp${ENSGRP}.tar failed" - exit $status - fi - fi + if [ $CDATE -gt $SDATE ]; then # Don't run for first half cycle - if [ $SAVEWARMICA = "YES" -a $cyc -eq $EARCINC_CYC ]; then + htar -P -cvf $ATARDIR/$CDATE/enkf${CDUMP}_grp${ENSGRP}.tar `cat $ARCH_LIST/enkf${CDUMP}_grp${n}.txt` + status=$? + if [ $status -ne 0 -a $CDATE -ge $firstday ]; then + echo "HTAR $CDATE enkf${CDUMP}_grp${ENSGRP}.tar failed" + exit $status + fi + + if [ $SAVEWARMICA = "YES" -a $cyc -eq $EARCINC_CYC ]; then htar -P -cvf $ATARDIR/$CDATE/enkf${CDUMP}_restarta_grp${ENSGRP}.tar `cat $ARCH_LIST/enkf${CDUMP}_restarta_grp${n}.txt` status=$? if [ $status -ne 0 ]; then echo "HTAR $CDATE enkf${CDUMP}_restarta_grp${ENSGRP}.tar failed" exit $status fi - fi + fi - if [ $SAVEWARMICB = "YES" -a $cyc -eq $EARCICS_CYC ]; then + if [ $SAVEWARMICB = "YES" -a $cyc -eq $EARCICS_CYC ]; then htar -P -cvf $ATARDIR/$CDATE/enkf${CDUMP}_restartb_grp${ENSGRP}.tar `cat $ARCH_LIST/enkf${CDUMP}_restartb_grp${n}.txt` status=$? if [ $status -ne 0 ]; then echo "HTAR $CDATE enkf${CDUMP}_restartb_grp${ENSGRP}.tar failed" exit $status fi - fi + fi + + fi # CDATE>SDATE fi diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index 86b4d1fdcd..ee4578ae4a 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -156,7 +156,7 @@ export FIXgsi="$HOMEgfs/fix/fix_gsi" export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd" export HOMEpost="$HOMEgfs" export HOMEobsproc_prep="$BASE_GIT/obsproc/obsproc_prep_RB-5.2.0" -export HOMEobsproc_network="$BASE_GIT/obsproc/obsproc_global_RB-3.2.2" +export HOMEobsproc_network="$BASE_GIT/obsproc/obsproc_global.v3.2.3" export HOMEobsproc_global=$HOMEobsproc_network export BASE_VERIF="$BASE_SVN/verif/global/tags/vsdb" diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy index 242db6a967..b7791ce775 100755 --- a/parm/config/config.vrfy +++ b/parm/config/config.vrfy @@ -133,20 +133,11 @@ fi # Cyclone genesis and cyclone track verification #------------------------------------------------- -if [ $machine = "WCOSS_C" ] ; then - export ens_tracker_ver=v1.1.15.1 - export HOMEens_tracker=$BASE_GIT/ens_tracker.${ens_tracker_ver} -elif [ $machine = "WCOSS_DELL_P3" ] ; then +export ens_tracker_ver=v1.1.15.1 +if [ $machine = "WCOSS_DELL_P3" ] ; then export ens_tracker_ver=v1.1.15.2 - export HOMEens_tracker=$BASE_GIT/tracker/ens_tracker.${ens_tracker_ver} -elif [ $machine = "THEIA" -o $machine = "HERA" ] ; then - export ens_tracker_ver=v1.1.15.1 - export HOMEens_tracker=$BASE_GIT/tracker/ens_tracker.${ens_tracker_ver} -else - echo "WARNING: Genesis and cyclone verifications are not enabled on $machine!" - export VRFYGENESIS="NO" - export VRFYTRAK="NO" fi +export HOMEens_tracker=$BASE_GIT/tracker/ens_tracker.${ens_tracker_ver} if [ "$VRFYTRAK" = "YES" ]; then diff --git a/ush/rocoto/rocoto_viewer.py b/ush/rocoto/rocoto_viewer.py index 26db6943fc..1a8e62ad23 100755 --- a/ush/rocoto/rocoto_viewer.py +++ b/ush/rocoto/rocoto_viewer.py @@ -192,11 +192,11 @@ def load_produtil_pythonpath(): pass PRODUTIL = collections.defaultdict(list) - PRODUTIL['theia'] = '/scratch4/NCEPDEV/global/save/glopara/svn/nceplibs/produtil/trunk/ush' + PRODUTIL['hera'] = '/scratch1/NCEPDEV/global/glopara/svn/nceplibs/produtil/trunk/ush' PRODUTIL['luna'] = '/gpfs/hps3/emc/global/noscrub/emc.glopara/svn/nceplibs/produtil/trunk/ush' PRODUTIL['tide'] = '/gpfs/td1/emc/global/save/emc.glopara/svn/nceplibs/produtil/trunk/ush' PRODUTIL['gyre'] = '/gpfs/gd1/emc/global/save/emc.glopara/svn/nceplibs/produtil/trunk/ush' - try_clusters = ('theia','luna','tide','gyre') + try_clusters = ('hera','luna','tide','gyre') for cluster in try_clusters: sys.path.append(PRODUTIL[cluster])