Merge pull request #262 from JessicaMeixner-NOAA/coupled/archive

Coupled-crow update archive
NOAA-EMC · Feb 11, 2021 · 0d79bdf · 0d79bdf
2 parents 243dbbd + fe94164
commit 0d79bdf
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 11 deletions.
diff --git a/jobs/rocoto/arch.sh b/jobs/rocoto/arch.sh
@@ -36,7 +36,8 @@ fi
 
 # CURRENT CYCLE
 APREFIX="${CDUMP}.t${cyc}z."
-ASUFFIX=${ASUFFIX:-$SUFFIX}
+AASUFFIX=${SUFFIX:-".nc"}
+ASUFFIX=${ASUFFIX:-$AASUFFIX}
 
 if [ $ASUFFIX = ".nc" ]; then
    format="netcdf"
@@ -174,6 +175,27 @@ cd $ROTDIR
 
 if [ $CDUMP = "gfs" ]; then
 
+
+  if [ $cplflx = ".true." ]; then
+    # ocn and ice files
+    for targrp in ocn_ice_grib2_0p5 ocn_ice_grib2_0p25  ocn_2D ocn_3D ocn_xsect ice ocn_daily log wavocn wave; do
+       htar -P -cvf $ATARDIR/$CDATE/${targrp}.tar `cat $ARCH_LIST/${targrp}.txt`
+    done
+
+    #rearrangement of atm files
+    htar -P -cvf $ATARDIR/$CDATE/gfs_pgrb2_0p25.tar `cat $ARCH_LIST/gfsa.txt`
+    htar -P -cvf $ATARDIR/$CDATE/gfs_pgrb2_1p00.tar `cat $ARCH_LIST/gfsb.txt`
+
+    for targrp in gfs_flux gfs_${format}a gfs_sfc_${format}b gfs_atm_${format}b gfs_flux_1p00 gfs_pgrb2_1p00 gfs_pgrb2_0p25 gfs_pgrb2b_1p00 gfs_pgrb2b_0p25; do
+       htar -P -cvf $ATARDIR/$CDATE/${targrp}.tar `cat $ARCH_LIST/${targrp}.txt`
+       status=$?
+       if [ $status -ne 0  -a $CDATE -ge $firstday ]; then
+          echo "HTAR $CDATE ${targrp}.tar failed"
+          exit $status
+       fi
+    done
+  else  #if not cplflx, normal: 
+
     #for targrp in gfsa gfsb - NOTE - do not check htar error status
     for targrp in gfsa gfsb; do
         htar -P -cvf $ATARDIR/$CDATE/${targrp}.tar `cat $ARCH_LIST/${targrp}.txt`
@@ -190,6 +212,7 @@ if [ $CDUMP = "gfs" ]; then
             fi
         done
     fi
+  fi #end if cplflx
 
     #for targrp in gfswave
     if [ $DO_WAVE = "YES" -a "$WAVE_CDUMP" != "gdas" ]; then

diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
@@ -535,7 +535,7 @@ if [ $SEND = "YES" ]; then
   fi
 fi
 
-$NCP $DATA/input.nml $ROTDIR/${CDUMP}.${PDY}/${cyc}/
+$NCP $DATA/input.nml $ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/
 
 echo "SUB ${FUNCNAME[0]}: Output data for FV3 copied"
 }

diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
@@ -57,6 +57,60 @@ if [ $type = "gfs" ]; then
     touch gfs_downstream.txt
   fi
 
+  # for coupled model
+  if [ $cplflx = ".true." ]; then
+
+    dirpath="gfs.${PDY}/${cyc}/"
+    dirname="./${dirpath}"
+
+    head="gfs.t${cyc}z."
+
+    rm -f gfs_pgrb2b_1p00.txt
+    rm -f gfs_pgrb2b_0p25.txt
+    rm -f gfs_flux_1p00.txt
+    rm -f ocn_ice_grib2_0p5.txt 
+    rm -f ocn_ice_grib2_0p25.txt
+    rm -f ocn_2D.txt
+    rm -f ocn_3D.txt
+    rm -f ocn_xsect.txt
+    rm -f log.txt
+    rm -f ice.txt
+    rm -f ocn_daily.txt
+    rm -f wavocn.txt
+    rm -f gfs_atm_${format}b.txt
+    rm -f gfs_sfc_${format}b.txt
+    touch gfs_flux_1p00.txt
+    touch gfs_pgrb2b_1p00.txt
+    touch gfs_pgrb2b_0p25.txt
+    touch ocn_ice_grib2_0p5.txt
+    touch ocn_ice_grib2_0p25.txt
+    touch ocn_2D.txt
+    touch ocn_3D.txt
+    touch ocn_xsect.txt
+    touch ocn_daily.txt
+    touch log.txt
+    touch ice.txt
+    touch wavocn.txt
+    touch gfs_atm_${format}b.txt
+    touch gfs_sfc_${format}b.txt
+    echo  "${dirname}ice*nc                     " >>ice.txt
+    echo  "${dirname}ocn_2D*                    " >>ocn_2D.txt
+    echo  "${dirname}ocn_3D*                    " >>ocn_3D.txt
+    echo  "${dirname}ocn*EQ*                    " >>ocn_xsect.txt
+    echo  "${dirname}ocn_daily*                 " >>ocn_daily.txt
+    echo  "${dirname}wavocn*                    " >>wavocn.txt
+    echo  "${dirname}/atmos/input.nml           " >>log.txt
+    echo  "${dirname}ice_in                     " >>log.txt
+    echo  "${dirname}MOM_input                  " >>log.txt
+    echo  "./logs/${CDATE}/gfs*.log             " >>log.txt
+    echo  "${dirname}/atmos/${head}logf*.txt    " >>log.txt
+    echo  "${dirname}/wave/rundata/ww3_multi*   " >>log.txt
+    echo  "${dirname}ocn_ice*0p5x0p5.grb2       " >>ocn_ice_grib2_0p5.txt
+    echo  "${dirname}ocn_ice*0p25x0p25.grb2     " >>ocn_ice_grib2_0p25.txt
+    echo  "${dirname}${head}flux.1p00.f???      " >>gfs_flux_1p00.txt
+    echo  "${dirname}${head}flux.1p00.f???.idx  " >>gfs_flux_1p00.txt
+  fi
+
   dirpath="gfs.${PDY}/${cyc}/atmos/"
   dirname="./${dirpath}"
 
@@ -67,8 +121,9 @@ if [ $type = "gfs" ]; then
   echo  "${dirname}${head}pgrb2b.0p25.anl.idx              " >>gfs_pgrb2b.txt
   echo  "${dirname}${head}pgrb2b.0p50.anl                  " >>gfs_pgrb2b.txt
   echo  "${dirname}${head}pgrb2b.0p50.anl.idx              " >>gfs_pgrb2b.txt
-
-  echo  "./logs/${CDATE}/gfs*.log                          " >>gfsa.txt
+  if [ $cplflx = ".false." ]; then
+    echo  "./logs/${CDATE}/gfs*.log                          " >>gfsa.txt
+  fi
   echo  "${dirname}${head}gsistat                          " >>gfsa.txt
   echo  "${dirname}${head}nsstbufr                         " >>gfsa.txt
   echo  "${dirname}${head}prepbufr                         " >>gfsa.txt
@@ -119,12 +174,25 @@ if [ $type = "gfs" ]; then
        echo  "${dirname}${head}pgrb2b.0p50.f${fhr}.idx     " >>gfs_pgrb2b.txt
     fi
 
+    if [ $cplflx = ".true." ]; then
+      echo  "${dirname}${head}pgrb2b.0p25.f${fhr}           " >>gfs_pgrb2b_0p25.txt
+      echo  "${dirname}${head}pgrb2b.0p25.f${fhr}.idx       " >>gfs_pgrb2b_0p25.txt
+      echo  "${dirname}${head}pgrb2b.1p00.f${fhr}           " >>gfs_pgrb2b_1p00.txt
+      echo  "${dirname}${head}pgrb2b.1p00.f${fhr}.idx       " >>gfs_pgrb2b_1p00.txt
+      echo  "${dirname}${head}flux.1p00.f${fhr}             " >>gfs_flux_1p00.txt
+      echo  "${dirname}${head}flux.1p00.f${fhr}.idx         " >>gfs_flux_1p00.txt
+      echo  "${dirname}${head}atmf${fhr}${SUFFIX}           " >>gfs_atm_${format}b.txt
+      echo  "${dirname}${head}sfcf${fhr}${SUFFIX}           " >>gfs_sfc_${format}b.txt
+    fi
+
     echo  "${dirname}${head}sfluxgrbf${fhr}.grib2           " >>gfs_flux.txt
     echo  "${dirname}${head}sfluxgrbf${fhr}.grib2.idx       " >>gfs_flux.txt
 
     echo  "${dirname}${head}pgrb2.0p25.f${fhr}              " >>gfsa.txt
     echo  "${dirname}${head}pgrb2.0p25.f${fhr}.idx          " >>gfsa.txt
-    echo  "${dirname}${head}logf${fhr}.txt                  " >>gfsa.txt
+    if [ $cplflx = ".false." ]; then
+      echo  "${dirname}${head}logf${fhr}.txt                " >>gfsa.txt
+    fi
 
     if [ -s $ROTDIR/${dirpath}${head}pgrb2.0p50.f${fhr} ]; then
        echo  "${dirname}${head}pgrb2.0p50.f${fhr}          " >>gfsb.txt
@@ -187,6 +255,8 @@ if [ $type = "gfs" ]; then
 
   fi
 
+
+
 #-----------------------------------------------------
 fi   ##end of gfs
 #-----------------------------------------------------

diff --git a/workflow/config/base.yaml b/workflow/config/base.yaml
@@ -28,6 +28,12 @@ config_base:
     export print_esmf="{doc.settings.print_esmf}"
     export esmf_profile="{doc.settings.esmf_profile}"
 
+    if [[ $cplwav = ".true." ]]; then
+       export DO_WAVE="YES"
+    else
+       export DO_WAVE="NO"
+    fi
+
     export nems_temp="{doc.settings.nems_temp}"
     export nems_temp_cold="{doc.settings.nems_temp_cold}"
                

diff --git a/workflow/config/fcst.yaml b/workflow/config/fcst.yaml
@@ -189,12 +189,6 @@ config_fcst:
     export sppt_sfclimit=.true.
     export use_zmtnblck=.true.
 
-
-    if [[ $cplwav = ".true." ]]; then 
-       export DO_WAVE="YES"
-    else 
-       export DO_WAVE="NO"
-    fi
     #---------------------------------------------------------------------
     # Disable the use of coupler.res; get model start time from model_configure
     export USE_COUPLER_RES="NO"