NOAA-EMC · YaliMao-NOAA · Jan 11, 2025 · Oct 15, 2024 · Oct 15, 2024 · Nov 15, 2024
diff --git a/.gitignore b/.gitignore
@@ -13,12 +13,12 @@ log*
 parm/upp
 
 # Ignore the symlinked files in the ecf/scripts directory
-ecf/scripts/upp/jwafs_upp_f*.ecf
-ecf/scripts/upp/jwafs_upp_anl.ecf
-ecf/scripts/grib2/1p25/jwafs_grib2_1p25_f*.ecf
-ecf/scripts/grib2/0p25/jwafs_grib2_0p25_f*.ecf
-ecf/scripts/gcip/jwafs_gcip_f*.ecf
-ecf/scripts/grib/jwafs_grib_f*.ecf
+ecf/upp/jwafs_upp_f*.ecf
+ecf/upp/jwafs_upp_anl.ecf
+ecf/grib2/1p25/jwafs_grib2_1p25_f*.ecf
+ecf/grib2/0p25/jwafs_grib2_0p25_f*.ecf
+ecf/gcip/jwafs_gcip_f*.ecf
+ecf/grib/jwafs_grib_f*.ecf
 
 # Ignore wafs.def
 ecf/def/wafs*.def
diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "sorc/wafs_upp.fd"]
   path = sorc/wafs_upp.fd
   url = https://github.com/NOAA-EMC/UPP
-  branch = upp_wafs_v7.0.0
+  branch = upp_wafs_v7.0.1
   ignore = dirty
diff --git a/dev/driver/run_JWAFS_GCIP b/dev/driver/run_JWAFS_GCIP
@@ -38,6 +38,7 @@ module list
 ############################################
 echo $DCOMROOT
 export DCOMROOT=/lfs/h1/ops/prod/dcom
+export DCOMROOTsat=/lfs/h2/emc/ptmp/yali.mao/gmgsi_testdata
 
 ############################################
 # Define envir

diff --git a/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING b/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING
@@ -38,8 +38,7 @@ module list
 ############################################
 export DBNROOT=${UTILROOT}/fakedbn
 # for UK (canned)  data
-export DCOMROOT=/lfs/h1/ops/prod/dcom
-export DCOMROOT=/lfs/h1/ops/dev/dcom/test
+#export DCOMROOT=/lfs/h1/ops/dev/dcom/test
 
 ############################################
 # Define envir
@@ -87,7 +86,7 @@ export COMROOT=/lfs/h2/emc/ptmp/$USER/wafs_dwn/$envir/com
 
 # For COMIN
 # export COMPATH=$COMROOT/wafs
-export COMPATH=/lfs/h2/emc/ptmp/yali.mao/wafsx001/prod/com/wafs
+export COMPATH=/lfs/h2/emc/ptmp/$USER/wafs_dwn/prod/com/wafs
 
 export DATA=/lfs/h2/emc/ptmp/$USER/working_wafs
 

diff --git a/dev/driver/submit.run_JWAFS.sh b/dev/driver/submit.run_JWAFS.sh
@@ -6,9 +6,9 @@ set -eu
 readonly DIR_ROOT=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}")")/../.." && pwd -P)
 
 job=${1?"Must specify a job to submit"}
-PDYcyc=${2:-"2024081918"}
+PDYcyc=${2:-"2024110112"}
 
-tmpdir=/lfs/h2/emc/ptmp/${USER}/working_wafs.${job}_${PDYcyc:0:8}
+tmpdir=/lfs/h2/emc/ptmp/${USER}/working_wafs.${job}_${PDYcyc}
 mkdir -p $tmpdir
 cd $tmpdir
 
@@ -36,7 +36,7 @@ elif [ $job = 'grib2_0p25_blending' ]; then
   -e "s|HOMEwafs=.*|HOMEwafs=$DIR_ROOT|g" \
   -e "s|PDY=.*|PDY=${PDYcyc:0:8}|g" \
   -e "s|cyc=.*|cyc=${PDYcyc:8:2}|g" \
-  -e "s|working_wafs|working_wafs.${job}_${PDYcyc:0:8}|g" \
+  -e "s|working_wafs|working_wafs.${job}_${PDYcyc}|g" \
   -i $jobcard
   qsub $jobcard
   exit
@@ -56,7 +56,7 @@ for fhr in $FHOURS; do
   -e "s|PDY=.*|PDY=${PDYcyc:0:8}|g" \
   -e "s|cyc=.*|cyc=${PDYcyc:8:2}|g" \
   -e "s|fhr=.*|fhr=$fhr|g" \
-  -e "s|working_wafs|working_wafs.${job}_${PDYcyc:0:8}|g" \
+  -e "s|working_wafs|working_wafs.${job}_${PDYcyc}|g" \
   $jobcard >$jobcard.$fhr
 
   qsub $jobcard.$fhr

diff --git a/dev/ecf/run.nrt_ecflow.sh b/dev/ecf/run.nrt_ecflow.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Instructions: https://github.com/NOAA-EMC/WAFS/tree/release/wafs.v7/dev/ecf
+#
+# Two requirements to run this script
+# 1. ecflow_server has been started
+# 2. ecflow_server is started on either cdecflow01 or ddecflow01
+#
+# What the script will do:
+# 1. Follow the instructions from dev/ecf/setup_ecf.sh and creates a suite definition file for real time parallel run
+# 2. Load the suite def file to the ecflow_server which was started already
+# 3. Begin parallel run of the suite in real time
+
+set -eu
+
+# Get the root of the script
+readonly DIR_ROOT=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}")")/../.." && pwd -P)
+cd $DIR_ROOT/dev/ecf
+# create a suite def file in real time
+./setup_ecf.sh
+
+suitename="wafs"
+
+# set ECF_HOST according to which WCOSS2 machine
+if [[ $(hostname) =~ ^[d][login|dxfer] ]]  ; then
+    export ECF_HOST="ddecflow01"
+elif [[ $(hostname) =~ ^[c][login|dxfer] ]]  ; then
+    export ECF_HOST="cdecflow01"
+fi
+echo $ECF_HOST
+module load ecflow
+
+# Make sure ecflow_server is not halted
+ecflow_client --restart
+
+cd $DIR_ROOT/ecf/def
+
+# echo "yes" | ecflow_client --delete=/$suitename
+# ecflow_client --load $PWD/$suitename.def
+
+# Replace: it can either load a new suite def or
+# replace with a new suite def UNLESS a job is active for the current suite
+ecflow_client --replace=/$suitename $PWD/$suitename.def
+
+ecflow_client --begin $suitename
diff --git a/dev/ecf/setup_ecf.sh b/dev/ecf/setup_ecf.sh
@@ -10,7 +10,7 @@
 # Setting up ecflow suite requires the package to be cloned in a directory matching 'wafs.vX.Y.Z'
 # where X, Y, Z are numbers
 # The script replaces @VARIABLE@ names in suite definition files with values
-# and links ecflow scripts in the ecf/scripts directory
+# and links ecflow scripts in the ecf/ directory
 #
 # The script is expected to be run after the package is cloned and executables are built
 
@@ -102,7 +102,7 @@ sed -e "s|@EXPID@|${EXPID}|g" \
     "${DIR_ROOT}/ecf/def/${template}" >"${DIR_ROOT}/ecf/def/wafs${EXPID}.def"
 
 # Link ecflow scripts
-echo "Link ecflow scripts in ... ecf/scripts"
+echo "Link ecflow scripts in ... ecf/"
 cd "${DIR_ROOT}/ecf" || exit 1
 ./setup_ecf_links.sh
 

diff --git a/docs/Release_Notes.md b/docs/Release_Notes.md
@@ -1,4 +1,4 @@
-WAFS v7.0.0  RELEASE NOTES
+WAFS v7.0.1  RELEASE NOTES
 
 -------
 Prelude
@@ -14,8 +14,8 @@ The NOAA-EMC and NCAR organization spaces on GitHub are used to manage the WAFS
 Checkout the package from GitHub and `cd` into the directory:
 ```bash
 cd ${PACKAGEROOT}
-git clone --recursive -b wafs.v7.0.0 https://github.com/noaa-emc/wafs wafs.v7.0.0
-cd wafs.v7.0.0
+git clone --recursive -b wafs.v7.0.1 https://github.com/noaa-emc/wafs wafs.v7.0.1
+cd wafs.v7.0.1
 ```
 
 The checkout procedure extracts the following WAFS components, while GTG is a subcomponent of UPP.:
@@ -67,6 +67,7 @@ Parm Changes
 2. parm/upp is created after system building. Per AWC request, WAFS UPP control files add 4 low levels for icing and 1 upper lower for turbulence:
    - postxconfig-NT-GFS-WAFS.txt
    - postcntrl_gfs_wafs.xml
+3. parm/wafs/wafs_gcip_gfs.cfg is updated for GMGSI satellite update
 
 Script Changes
 --------------
@@ -91,6 +92,8 @@ Additionally there are other changes:
 5. In exwafs_grib2_0p25_blending.sh, use MPMD for each forecast hour to call ush/wafs_grib2_0p25_blending.sh.
    - Collect missing files from ush/wafs_grib2_0p25_blending.sh, send out warning email and dbn_alert of missing data once per cycle
    - Add not-blended email and dbn_alert if both UK and US unblended files are missing
+6. In exwafs_grib2_0p25_blending.sh, UK unblended data filenames are changed to whatever UK sends, NCO doesn't rename anymore.
+7. In exwafs_gcip.sh, GMGSI satellite filenames are changed.
 
 Fix Changes
 -----------
@@ -132,7 +135,7 @@ Environment and Resource Changes
 Pre-implementation Testing Requirements
 ---------------------------------------
 * Which production jobs should be tested as part of this implementation?
-  * The entire WAFS v7.0.0 package needs to be installed and tested on WCOSS-2
+  * The entire WAFS v7.0.1 package needs to be installed and tested on WCOSS-2
 * Does this change require a 30-day evaluation?
   * No
 
@@ -171,6 +174,7 @@ Product Changes
     | gfs.tCCz.wafs_blend_0p25_usonly.emailbody  | wafs.tCCz.wafs_blend_0p25_ukmissing.emailbody |
     | gfs.tCCz.wafs_blend_0p25_ukonly.emailbody  | wafs.tCCz.wafs_blend_0p25_usmissing.emailbody |
     |                                            | wafs.tCCz.wafs_blend_0p25_noblending.emailbody (new) |
+    | wmo/xtrn.wfsgfsCCFF[a/b].gfs_atmos_wafs_fFF_CC | wmo/xtrn.wfsgfsCCFF[a/b] |
 
 
 * File content changes

diff --git a/ecf/cycle_end.ecf b/ecf/cycle_end.ecf
@@ -0,0 +1,20 @@
+#!/bin/bash -l
+
+model=%SUITE%
+%include <head.h>
+%include <envir-p1.h>
+set -x
+cyc=%CYC%
+ecflow_client --requeue=force /wafs/primary/${cyc}/wafs
+
+%include <tail.h>
+%manual
+TASK: cycle_end.ecf
+
+PURPOSE:
+  To force requeue of wafs package. It replaces 'repeat day 1' to solve system unstable issue.
+
+The job is scheduled to requeue wafs tasks by 'cron' one hour ahead of each cycle.
+
+%end
+exit 0
diff --git a/ecf/def/wafs.def.tmpl b/ecf/def/wafs.def.tmpl
@@ -4,7 +4,7 @@ suite wafs@EXPID@
   edit wafs_ver '@MODELVER@'
   edit PACKAGEHOME '@PACKAGEROOT@/wafs.%wafs_ver%'
   edit ECF_INCLUDE '@PACKAGEROOT@/wafs.@MODELVER@/ecf/include'
-  edit ECF_FILES '%PACKAGEHOME%/ecf/scripts'
+  edit ECF_FILES '%PACKAGEHOME%/ecf'
   edit ENVIR 'prod'
   edit QUEUE 'dev'
   edit QUEUE_ARCH 'dev_transfer'
@@ -207,6 +207,7 @@ suite wafs@EXPID@
               edit FHR 120
           endfamily  # endfamily upp
           family gcip
+            edit DCOMROOTsat '/lfs/h1/ops/dev/dcom'
             task jwafs_gcip_f000
               trigger ../jwafs_gfs_manager:release_wafs_gcip_000
               edit FHR 000
@@ -419,7 +420,6 @@ suite wafs@EXPID@
                 trigger ../../upp/jwafs_upp_f120 == complete
                 edit FHR 120
               family blending
-                edit DCOMROOT '/lfs/h1/ops/dev/dcom/test'
                 task jwafs_grib2_0p25_blending
                   trigger ../jwafs_grib2_0p25_f048 == complete
               endfamily  # endfamily blending