first set of updates for waves and ice/ocean post updates

.gitignore

@@ -165,3 +165,5 @@ util/sub_wcoss_d
 workflow/user.yaml
 sorc/checkout-gldas.fd.log
 sorc/gldas.fd/
+sorc/reg2grb2.fd/*.o
+sorc/reg2grb2.fd/*.mod

README.md

@@ -11,8 +11,9 @@ sh checkout.sh coupled                                    # Check out the couple
 ```
 ## Compile code used in ufs-s2s-model and EMC_post and link fixed files and executable programs:
 ```
-sh build_ncep_post.sh        #This command will build ncep_post.
+sh build_ncep_post.sh        #This command will build ncep_post
 sh build_fv3_coupled.sh      #This command will build ufs-s2s-model
+sh build_reg2grb2.sh         #This command will build exes for ocean-ice post
 
 To link fixed files and executable programs for the coupled application:
 On Hera: 

jobs/JWAVE_INIT

@@ -45,6 +45,10 @@ sh ./PDY
 
 export pgmout=OUTPUT.$$
 
+export COMINice=${COMINice:-$COMROOTp2/omb/prod}
+export COMINwnd=${COMINwnd:-$COMROOT/gfs/prod}
+export COMIN_WAV_CUR=${COMIN_WAV_CUR:-$COMROOTp2/rtofs/prod} 
+
 export COMINwave=${COMINwave:-${ROTDIR:?}}
 export COMOUTwave=${COMOUTwave:-${ROTDIR:?}}
 export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}}
@@ -59,8 +63,6 @@ fi
 $HOMEwave/scripts/exwave_init.sh
 
 # Remove temp directories
-if [ "$KEEPDATA" != "YES" ]; then
-  cd $DATAROOT
-  rm -rf $DATA
-fi
+[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
+
 date

jobs/rocoto/coupled_ic.sh

@@ -67,6 +67,7 @@ cp -r $ORIGIN_ROOT/$CPL_OCNIC/$CDATE/ocn/$OCNRES/MOM*.nc  $ICSDIR/$CDATE/ocn/
 cp $ORIGIN_ROOT/$CPL_ICEIC/$CDATE/ice/$ICERES/cice5_model_${ICERESdec}.res_$CDATE.nc $ICSDIR/$CDATE/ice/
 
 if [ $cplwav = ".true." ]; then
+  [[ ! -d $ICSDIR/$CDATE/wav ]] && mkdir -p $ICSDIR/$CDATE/wav
   for grdID in $waveGRD
   do
     cp $ORIGIN_ROOT/$CPL_WAVIC/$CDATE/wav/$grdID/*restart.$grdID $ICSDIR/$CDATE/wav/

jobs/rocoto/waveinit.sh

@@ -15,7 +15,3 @@ $HOMEgfs/jobs/JWAVE_INIT
 status=$?
 exit $status
 
-###############################################################
-# Force Exit out cleanly
-if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi
-exit 0

modulefiles/modulefile.reg2grb2.hera

@@ -0,0 +1,14 @@
+#%Module#####################################################
+# reg2grb2 - hera
+#############################################################
+
+module load intel/18.0.5.274
+module load netcdf/4.7.0
+module load ip/3.0.1
+module load sp/2.0.2
+module load w3nco/2.0.7
+module load bacio/2.0.2
+module load landsfcutil/2.1.0
+module use /apps/modules/modulefamilies/intel
+module load wgrib2/2.0.8
+set FCMP ifort

modulefiles/modulefile.reg2grb2.orion

@@ -0,0 +1,14 @@
+#%Module#####################################################
+# reg2grb2 - orion
+#############################################################
+export FCOMP=ifort
+module load intel/2020
+module load netcdf/4.7.2
+module load ip/3.0.2
+module load sp/2.0.3
+module load w3nco/2.0.7
+module load bacio/2.0.3
+module load landsfcutil/2.2.0
+module use -a /apps/contrib/NCEPLIBS/orion/modulefiles
+module load wgrib/2.0.8
+export WGRIB2_ROOT=/apps/contrib/NCEPLIBS/orion/NCEPLIBS/NCEPLIBS-external/build5/wgrib2/grib2

scripts/exwave_init.sh

@@ -125,12 +125,15 @@
         echo ' '
         echo $msg
         [[ "$LOUD" = YES ]] && set -x
-        echo "$COMPONENTwave init config $date $cycle : ww3_grid.inp.$grdID missing." >> $wavelog
         err=2;export err;${errchk}
       fi
 
       [[ ! -d $COMOUT/rundata ]] && mkdir -m 775 -p $COMOUT/rundata
-      echo "$USHwave/wave_grid_moddef.sh $grdID > $grdID.out 2>&1" >> cmdfile
+      if [ ${CFP_MP:-"NO"} = "YES" ]; then
+        echo "$nmoddef $USHwave/wave_grid_moddef.sh $grdID > $grdID.out 2>&1" >> cmdfile
+      else
+        echo "$USHwave/wave_grid_moddef.sh $grdID > $grdID.out 2>&1" >> cmdfile
+      fi
 
       nmoddef=`expr $nmoddef + 1`
 
@@ -163,7 +166,11 @@
 
     if [ "$NTASKS" -gt '1' ]
     then
-      ${wavempexec} ${wavenproc} ${wave_mpmd} cmdfile
+      if [ ${CFP_MP:-"NO"} = "YES" ]; then
+        ${wavempexec} -n ${wavenproc} ${wave_mpmd} cmdfile
+      else
+        ${wavempexec} ${wavenproc} ${wave_mpmd} cmdfile
+      fi
       exit=$?
     else
       ./cmdfile
@@ -208,7 +215,6 @@
       echo $msg
       sed "s/^/$grdID.out : /g"  $grdID.out
       [[ "$LOUD" = YES ]] && set -x
-      echo "$COMPONENTwave prep $date $cycle : mod_def.$grdID missing." >> $wavelog
       err=3;export err;${errchk}
     fi
   done