Update other invocation of orog code in the ocean merge

step.

Fixes ufs-community#932.

ush/fv3gfs_make_orog.sh

@@ -44,7 +44,7 @@ cp ${indir}/topography.gmted2010.30s.nc .
 cp ${griddir}/$OUTGRID .
 cp $executable .
 
-echo $OUTGRID >> INPS
+echo $OUTGRID > INPS
 echo $orogfile >> INPS
 if [ -z ${ocn+x} ]; then
   echo ".false." >> INPS

ush/fv3gfs_ocean_merge.sh

@@ -45,8 +45,7 @@ EOF
     for tnum in '1' '2' '3' '4' '5' '6'
     do
     cd ${TEMP_DIR}/C${res}/orog/tile$tnum
-    echo $tnum $res $res 0 0 0 0 0 0 > INPS
-    echo C${res}_grid.tile${tnum}.nc >> INPS
+    echo C${res}_grid.tile${tnum}.nc > INPS
 
     echo none >> INPS
     echo ".false." >> INPS
@@ -55,9 +54,14 @@ EOF
     cat INPS
 
     time ${exec_dir}/orog < INPS
+    rc=$?   
+
+    if [[ $rc -ne 0 ]] ; then
+      echo "FATAL ERROR running orog."
+      exit $rc
+    fi
+
    ncks -4 -O ${TEMP_DIR}/ocean_merged/C${res}.mx${ocn}/C${res}.mx${ocn}.tile${tnum}.nc  ${TEMP_DIR}/ocean_merged/C${res}.mx${ocn}/C${res}.mx${ocn}.tile${tnum}.nc		
     ncks -A -v lake_frac,lake_depth ${TEMP_DIR}/ocean_merged/C${res}.mx${ocn}/C${res}.mx${ocn}.tile${tnum}.nc out.oro.nc
-    #cp out.oro.nc $out_dir/oro_C${res}.mx${ocn}.tile${tnum}.nc
     cp out.oro.nc $orog_dir/oro.C${res}.tile${tnum}.nc
-    #cp C${res}_grid.tile${tnum}.nc $out_dir/C${res}_grid.tile${tnum}.nc
     done