NOAA-EMC · YaliMao-NOAA · Dec 9, 2024 · Dec 6, 2024
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/docs/Release_Notes.md b/docs/Release_Notes.md
@@ -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
 -----------

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

diff --git a/ecf/def/wafs_nrt.def.tmpl b/ecf/def/wafs_nrt.def.tmpl
@@ -209,6 +209,7 @@ suite wafs@EXPID@
               edit FHR 120
           endfamily  # endfamily upp
           family gcip
+	    edit DCOMROOTsat '/lfs/h1/ops/dev/dcom'
 	    time 04:40
             task jwafs_gcip_f000
               trigger ../jwafs_gfs_manager:release_wafs_gcip_000
@@ -422,7 +423,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
 	          time 04:30
@@ -618,6 +618,7 @@ suite wafs@EXPID@
               edit FHR 120
           endfamily  # endfamily upp
           family gcip
+	    edit DCOMROOTsat '/lfs/h1/ops/dev/dcom'
 	    time 10:40
             task jwafs_gcip_f000
               trigger ../jwafs_gfs_manager:release_wafs_gcip_000
@@ -831,7 +832,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
 	          time 10:30
@@ -1027,6 +1027,7 @@ suite wafs@EXPID@
               edit FHR 120
           endfamily  # endfamily upp
           family gcip
+	    edit DCOMROOTsat '/lfs/h1/ops/dev/dcom'
 	    time 16:40
             task jwafs_gcip_f000
               trigger ../jwafs_gfs_manager:release_wafs_gcip_000
@@ -1240,7 +1241,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
                   time 16:30
@@ -1436,6 +1436,7 @@ suite wafs@EXPID@
               edit FHR 120
           endfamily  # endfamily upp
           family gcip
+	    edit DCOMROOTsat '/lfs/h1/ops/dev/dcom'
 	    time 22:40
             task jwafs_gcip_f000
               trigger ../jwafs_gfs_manager:release_wafs_gcip_000
@@ -1649,7 +1650,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
                   time 22:30

diff --git a/ecf/gcip/jwafs_gcip_master.ecf b/ecf/gcip/jwafs_gcip_master.ecf
@@ -39,6 +39,7 @@ set -x
 #############################################################
 # WCOSS environment settings
 #############################################################
+export DCOMROOTsat=%DCOMROOTsat:$DCOMROOT%
 
 # Set up mailing list
 if [[ "${envir}" != "prod" ]]; then

diff --git a/jobs/JWAFS_GCIP b/jobs/JWAFS_GCIP
@@ -35,7 +35,8 @@ export RUN=${RUN:-wafs}
 # Define COM directories
 ##############################################
 export COMINgfs=${COMINgfs:-$(compath.py "${envir}/gfs/${gfs_ver}")"/gfs.${PDY}/${cyc}/atmos"}
-export COMINsat=${COMINsat:-"${DCOMROOT}/${PDY}/mcidas"}
+export DCOMROOTsat=${DCOMROOTsat:-"$DCOMROOT"}
+export COMINsat=${COMINsat:-"${DCOMROOTsat}/${PDY}/mcidas"}
 export COMINradar=${COMINradar:-$(compath.py "${envir}/radarl2/${radarl2_ver}")"/radar.${PDY}"}
 export COMOUT=${COMOUT:-$(compath.py -o "${NET}/${wafs_ver}")"/${RUN}.${PDY}/${cyc}/gcip"}
 mkdir -p "${COMOUT}"

diff --git a/parm/wafs/wafs_gcip_gfs.cfg b/parm/wafs/wafs_gcip_gfs.cfg
@@ -216,10 +216,10 @@ nfiner = 2
 #
 #satellite sources: preset values and the corresponsing longitudes
 # https://www.ssec.wisc.edu/mcidas/doc/users_guide.html
-# https://www.ssec.wisc.edu/mcidas/doc/users_guide/2018.1/app_c-1.html
+# https://www.ssec.wisc.edu/mcidas/doc/users_guide/current/app_c-1.html or https://www.ssec.wisc.edu/mcidas/doc/users_guide/2018.1/app_c-1.html
 # https://www.eumetsat.int/website/home/Satellites/CurrentSatellites/Meteosat/index.html
-#                  METEOSAT-8 METEOSAT-9 METEOSAT-10 METEOSAT-11 HIMAWARI-8  GOES-W 15   GOES-E 16  GOES-W 17   ( MTSAT-1   MTSAT-2)
-satellite_source = 51 41.5,   52 3.5,    53 9.5,     98 0.0,     86 140.7,   184 -128.0, 186 -75.2, 188 -137.2, 84 145.0,  85 145.0
+#                  METEOSAT-9(MSG2) METEOSAT-10(MSG3) METEOSAT-11(MSG4) HIMAWARI-8  HIMAWARI-9   GOES-E 16  GOES-W 17   GOES-18
+satellite_source = 52 45.5,         53 0.0,           98 9.5,           86 140.7,   31 140.7,     186 -75.2, 188 -105,   190 -137.2
 # Fortran code has taken care of the well known SS numbers
 
 # for SatDerive

diff --git a/scripts/exwafs_gcip.sh b/scripts/exwafs_gcip.sh
@@ -47,13 +47,13 @@ satFiles=""
 channels="VIS SIR LIR SSR"
 # If one channel is missing, satFiles will be empty
 for channel in ${channels}; do
-	satFile="GLOBCOMP${channel}.${PDY}${vhour}"
+	satFile="$(find ${COMINsat} -name GLOBCOMP${channel}*${PDY}${vhour}*area)"
 	if [[ "${COMINsat}" == *ftp:* ]]; then
 		curl -O "${COMINsat}/${satFile}"
 	else
-		# check the availability of satellite data file
-		if [[ -s "${COMINsat}/${satFile}" ]]; then
-			cpreq "${COMINsat}/${satFile}" .
+	        # check the availability of satellite data file
+		if [ ! -z ${satFile} ]; then
+			cpreq "${COMINsat}/$(basename ${satFile})" ${channel}.area
 		else
 			msg="GCIP at ${vhour}z ABORTING, no satellite ${channel} file!"
 			echo "${msg}"
@@ -74,8 +74,8 @@ for channel in ${channels}; do
 			exit
 		fi
 	fi
-	if [[ -s "${satFile}" ]]; then
-		satFiles="${satFiles} ${satFile}"
+	if [[ -s "${channel}.area" ]]; then
+		satFiles="${satFiles} ${channel}.area"
 	else
 		satFiles=""
 		break