Skip to content

Commit

Permalink
feature/cfp: This commit references #2.
Browse files Browse the repository at this point in the history
Update "gldas_get_data.sh" for Cray.  And use the correct
environment variable for machine.
  • Loading branch information
GeorgeGayno-NOAA committed Jan 3, 2020
1 parent a613957 commit fe05c9c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion scripts/exgdas_gldas.sh.ecf
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ ln -fs $EXECgldas/gldas_${model} $RUNDIR/LIS
#---------------------------------------------------------------
### 1) Get gdas 6-tile netcdf restart file and gdas forcing data
#---------------------------------------------------------------
${USHgldas}/gldas_get_data.sh $gldas_sdate $gldas_cdate $USHgldas

${USHgldas}/gldas_get_data.sh $gldas_sdate $gldas_cdate
export err=$?
$ERRSCRIPT || exit 2

Expand Down
7 changes: 3 additions & 4 deletions ush/gldas_get_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ fi

bdate=$1
edate=$2
USHgldas=$3

if [ $MACHINE = "WCOSS_DELL_P3" ]; then
if [ $machine = "WCOSS_DELL_P3" ] || [ $machine = "WCOSS_C" ]; then
touch ./cfile
fi

Expand Down Expand Up @@ -52,7 +51,7 @@ while [ $f -le $cycint ]; do
fcsty=anl
if [ $f -ge 1 ]; then fcsty=fcst; fi

if [ $MACHINE = "WCOSS_DELL_P3" ]; then
if [ $machine = "WCOSS_DELL_P3" ] || [ $machine = "WCOSS_C" ]; then
echo "${USHgldas}/gldas_process_data.sh $rflux $fcsty $fflux $gflux $f" >> ./cfile
else
${USHgldas}/gldas_process_data.sh $rflux $fcsty $fflux $gflux $f
Expand All @@ -66,7 +65,7 @@ done
done
#-------------------------------

if [ $MACHINE = "WCOSS_DELL_P3" ]; then
if [ $machine = "WCOSS_DELL_P3" ] || [ $machine = "WCOSS_C" ]; then
$APRUN_GLDAS_DATA_PROC ./cfile
fi

Expand Down

0 comments on commit fe05c9c

Please sign in to comment.