From e74478abdbb95b3b9f96370a4829f58176a0e3b1 Mon Sep 17 00:00:00 2001
From: George Gayno <George.Gayno@noaa.gov>
Date: Fri, 31 Jan 2020 14:17:53 +0000
Subject: [PATCH] feature/cfp:  This commit references #2.

Reduce the number of APRUN environment variables by
using APRUN_GLDAS_DATA_PROC in all scripts which use
cfp.
---
 scripts/exgdas_gldas.sh.ecf | 7 +------
 ush/gldas_forcing.sh        | 3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/scripts/exgdas_gldas.sh.ecf b/scripts/exgdas_gldas.sh.ecf
index 770823b..872b9bf 100755
--- a/scripts/exgdas_gldas.sh.ecf
+++ b/scripts/exgdas_gldas.sh.ecf
@@ -98,7 +98,6 @@ ${USHgldas}/gldas_get_data.sh $gldas_sdate $gldas_cdate
 export err=$?
 $ERRSCRIPT || exit 2
 
-
 #---------------------------------------------------------------
 ### 2) Get CPC daily precip and temporally disaggreated 
 #---------------------------------------------------------------
@@ -134,13 +133,11 @@ if [ $machine = "WCOSS_DELL_P3" ] ; then
   touch ./cfile
 fi
 
-iter=0
 while [ $ymd -le $ymdend ]; do
   if [ $ymd -ne $ymdpre ]; then
     if [ $machine = "WCOSS_DELL_P3" ] ; then
       echo "$COPYGB -i3 '-g"$gds"' -x $GDAS/cpc.$ymd/precip.gldas.${ymd}00 $RUNDIR/cmap.gdas.${ymd}00" >> ./cfile
       echo "$COPYGB -i3 '-g"$gds"' -x $GDAS/cpc.$ymd/precip.gldas.${ymd}06 $RUNDIR/cmap.gdas.${ymd}06" >> ./cfile
-      iter=$((iter+2))
     else
       $COPYGB -i3 -g"$gds" -x $GDAS/cpc.$ymd/precip.gldas.${ymd}00 $RUNDIR/cmap.gdas.${ymd}00
       $COPYGB -i3 -g"$gds" -x $GDAS/cpc.$ymd/precip.gldas.${ymd}06 $RUNDIR/cmap.gdas.${ymd}06
@@ -150,7 +147,6 @@ while [ $ymd -le $ymdend ]; do
     if [ $machine = "WCOSS_DELL_P3" ] ; then
       echo "$COPYGB -i3 '-g"$gds"' -x $GDAS/cpc.$ymd/precip.gldas.${ymd}12 $RUNDIR/cmap.gdas.${ymd}12" >> ./cfile
       echo "$COPYGB -i3 '-g"$gds"' -x $GDAS/cpc.$ymd/precip.gldas.${ymd}18 $RUNDIR/cmap.gdas.${ymd}18" >> ./cfile
-      iter=$((iter+2))
     else
       $COPYGB -i3 -g"$gds" -x $GDAS/cpc.$ymd/precip.gldas.${ymd}12 $RUNDIR/cmap.gdas.${ymd}12
       $COPYGB -i3 -g"$gds" -x $GDAS/cpc.$ymd/precip.gldas.${ymd}18 $RUNDIR/cmap.gdas.${ymd}18
@@ -160,8 +156,7 @@ while [ $ymd -le $ymdend ]; do
 done
 
 if [ $machine = "WCOSS_DELL_P3" ] ; then
-  APRUN_GLDAS_COPYGB=${APRUN_GLDAS_COPYGB:-"${launcher} ${iter} cfp"}
-  $APRUN_GLDAS_COPYGB ./cfile
+  $APRUN_GLDAS_DATA_PROC ./cfile
 fi
 
 # create configure file
diff --git a/ush/gldas_forcing.sh b/ush/gldas_forcing.sh
index 75811ed..43c47e2 100755
--- a/ush/gldas_forcing.sh
+++ b/ush/gldas_forcing.sh
@@ -72,14 +72,13 @@ prate=gdas.${sdate}06
 $WGRIB -s $sflux | grep "PRATE:sfc" | $WGRIB -i $sflux -grib -o $prate
 
 if [ $machine = "WCOSS_DELL_P3" ] ; then
-  APRUN_GLDAS_FORCING=${APRUN_GLDAS_FORCING:-"${launcher} 4 cfp"}
   rm -f ./cfile
   touch ./cfile
   echo "$COPYGB -i3 '-g255 0 2881 1441 90000 0 128 -90000 360000 125 125' -x gdas.${sdat0}12 grib.12" >> ./cfile
   echo "$COPYGB -i3 '-g255 0 2881 1441 90000 0 128 -90000 360000 125 125' -x gdas.${sdat0}18 grib.18" >> ./cfile
   echo "$COPYGB -i3 '-g255 0 2881 1441 90000 0 128 -90000 360000 125 125' -x gdas.${sdate}00 grib.00" >> ./cfile
   echo "$COPYGB -i3 '-g255 0 2881 1441 90000 0 128 -90000 360000 125 125' -x gdas.${sdate}06 grib.06" >> ./cfile
-  $APRUN_GLDAS_FORCING ./cfile
+  $APRUN_GLDAS_DATA_PROC ./cfile
 else
   $COPYGB -i3 '-g255 0 2881 1441 90000 0 128 -90000 360000 125 125' -x gdas.${sdat0}12 grib.12
   $COPYGB -i3 '-g255 0 2881 1441 90000 0 128 -90000 360000 125 125' -x gdas.${sdat0}18 grib.18