Merge pull request #137 from akrherz/gh136_nawips_7.16.1

Merge NAWIPS 7.16.1
Unidata · Jun 23, 2023 · f3997c8 · f3997c8
2 parents 8a3c8e6 + 872b38a
commit f3997c8
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 <!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
 # Unidata Community GEMPAK Change Log
 
+## 7.16.1 (21 June 2023)
+
+This release merges upstream NCEP NAWIPS 7.16.1, whose CHANGELOG includes:
+
+- Bug fix for upper air decoder (dcuair) where 21212 group is processed incorrectly.
+- Bug fix for “white spots/specks” graphic issue on accumulated QPF.
+
 ## 7.16.0 (4 May 2023)
 
 This release merges upstream NCEP NAWIPS 7.16.0, whose CHANGELOG includes:

diff --git a/build/DEBIAN/control b/build/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gempak
-Version: 7.16.0
+Version: 7.16.1
 Maintainer: Daryl Herzmann
 Architecture: all
 Description: Unidata GEMPAK Distribution

diff --git a/build/Installer.gempak/extlibs.spec b/build/Installer.gempak/extlibs.spec
@@ -2,7 +2,7 @@
 %define __prelink_undo_cmd %{nil}
 %define gem_home /home/gempak/GEMPAK7
 %define prefix /home/gempak
-%define version 7.16.0
+%define version 7.16.1
 Name: gempak-extlibs
 Summary: Unidata Community GEMPAK
 Version: %{version}

diff --git a/build/Installer.gempak/gempak.spec b/build/Installer.gempak/gempak.spec
@@ -10,7 +10,7 @@
 %define __prelink_undo_cmd %{nil}
 %define gem_home /home/gempak/GEMPAK7
 %define prefix /home/gempak
-%define version 7.16.0
+%define version 7.16.1
 Name: gempak
 Summary: Unidata Community GEMPAK
 Version: %{version}

diff --git a/build/docker/Dockerfile.centos b/build/docker/Dockerfile.centos
@@ -10,7 +10,7 @@ RUN yum clean all
 RUN yum install openmotif libX11 libXt libXext libXp libXft libXtst xorg-x11-xbitmaps csh libgfortran which python-pip git -y
 
 # Latest RPM for CentOS 7
-RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.16.0-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.16.1-1.el7.centos.x86_64.rpm
 
 # Python AWIPS Data Acess Framework
 RUN pip install six shapely numpy

diff --git a/build/docker/Dockerfile.ubuntu b/build/docker/Dockerfile.ubuntu
@@ -11,8 +11,8 @@ RUN apt-get install wget python-pip python-dev build-essential -y
 RUN pip install --upgrade pip 
 
 # Latest source code
-RUN wget https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.16.0.deb
-RUN dpkg -i gempak-7.16.0.deb
+RUN wget https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.16.1.deb
+RUN dpkg -i gempak-7.16.1.deb
 
 # Python AWIPS Data Acess Framework
 RUN pip install six shapely numpy

diff --git a/build/gempak-devel/Dockerfile.centos6 b/build/gempak-devel/Dockerfile.centos6
@@ -26,4 +26,4 @@ RUN yum install -y \
   python-devel
 
 # Bootstrap install extlibs...
-RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.0-1.el6.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.1-1.el6.x86_64.rpm
diff --git a/build/gempak-devel/Dockerfile.centos7 b/build/gempak-devel/Dockerfile.centos7
@@ -26,4 +26,4 @@ RUN yum install -y \
   python-devel
 
 # Bootstrap install extlibs...
-RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.0-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.1-1.el7.centos.x86_64.rpm
diff --git a/build/gempak-devel/Dockerfile.fedora b/build/gempak-devel/Dockerfile.fedora
@@ -26,4 +26,4 @@ RUN yum install -y \
   python-devel
 
 # Bootstrap install extlibs...
-RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.0-1.fc26.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.1-1.fc26.x86_64.rpm
diff --git a/gempak/source/gemlib/ss/ssvers.f b/gempak/source/gemlib/ss/ssvers.f
@@ -78,14 +78,15 @@ SUBROUTINE SS_VERS  ( vmsg, iret )
 C* B. Hebbard/NCEP      07/22           Updated to 7.15.1               *
 C* B. Hebbard/NCEP      12/22           Updated to 7.15.2               *
 C* B. Hebbard/NCEP      02/23           Updated to 7.16.0               *
+C* B. Hebbard/NCEP      05/23           Updated to 7.16.1               *
 C************************************************************************
 	CHARACTER*(*)	vmsg
 C------------------------------------------------------------------------
 	iret = 0
 C
 C*	Set the version string and add a null to the end.
 C
-	vmsg = 'Version 7.16.0'
+	vmsg = 'Version 7.16.1'
 	CALL ST_NULL ( vmsg, vmsg, lens, ier )
 C*
 	RETURN

diff --git a/gempak/source/gridlib/gu/filbox.f b/gempak/source/gridlib/gu/filbox.f
@@ -32,6 +32,7 @@ SUBROUTINE FILBOX  ( box, x1, y1, x2, y2, nlvl, clvl, lincol,
 C* M. desJardins/NMC	11/91	Adapted algorithm for GEMPAK 5.1	*
 C* S. Jacobs/EAI	 3/93	Fixed typo cver --> dver		*
 C* S. Guan/NCEP		 6/22	Fixed a divide by zero			*
+C* S. Guan/NCEP		 5/23	Set smallv to 0.0000001			*
 C************************************************************************
 	REAL		box (4), clvl (*)
 	INTEGER		lincol (*), lintyp (*), linwid (*)
@@ -48,7 +49,7 @@ SUBROUTINE FILBOX  ( box, x1, y1, x2, y2, nlvl, clvl, lincol,
      +					    ( xy2 - xy1 )
 C----------------------------------------------------------------------
 	iret = 0
-        smallv = 0.0001
+        smallv = 0.0000001
 	ilow = icornr
 	dlow = box (ilow)
 C

diff --git a/gempak/source/programs/dc/dcuair/dcudcd.f b/gempak/source/programs/dc/dcuair/dcudcd.f
@@ -41,6 +41,9 @@ SUBROUTINE DCUDCD ( curtim, gemfil, stntbl, iadstn, maxtim,
 C* S. Chiswell/Unidata	 5/01	Added stid to RU_SHDR, RU_DECD, RU_DUPE	*
 C* B. Yin/SAIC           3/04   Changed SS_GTIM to CSS_GTIM             *
 C* m.gamazaychikov/SAIC	07/05	Added code for dropsonde wind cutoff hgt*
+C* S. Guan/NCEP          3/23   Decode both the 21212 group winds in    *
+C*                              the TTBB message and the following PPBB *
+C*                              winds.                                  * 
 C************************************************************************
 	INCLUDE		'GEMPRM.PRM'
 	INCLUDE		'BRIDGE.PRM'
@@ -233,6 +236,15 @@ SUBROUTINE DCUDCD ( curtim, gemfil, stntbl, iadstn, maxtim,
      +					       stid, part, ihhmm, 
      +					       nlev, data, zwind, ier )
 			        IF ( ier .ne. 0 ) good = .false.
+C
+C*                              If there are the 21212 group winds in 
+C*                              the TTBB message, still decode the following
+C*                              PPBB winds.
+C
+                                ipres =  INDEX ( bultin ( 1: lenbul ), '21212' )
+                                IF  ( ipres .ne. 0 )  THEN
+                                    IF ( part .eq.  'PPBB' )  good  = .true.
+                                END IF    
 			    END IF
 			    IF ( good ) THEN
 C

diff --git a/gempak/tables/pgen/vaa.tbl b/gempak/tables/pgen/vaa.tbl
@@ -20,6 +20,8 @@
 ! B. Hebbard/NCEP	03/20	updates for NAWIPS-125 "NO ASH EXP" ==> "NO VA EXP"
 ! B. Hebbard/NCEP	04/20	updates for NAWIPS-125 "NOT AVBL" ==> "NOT PROVIDED" for NEAR only
 ! B. Hebbard/NCEP	02/23	updates for NAWIPS-142 various UI changes & merge SAB's updates
+! B. Hebbard/NCEP	03/23	added volcano <NUMBER> to NEAR, and also to new TEST and EXER
+! B. Hebbard/NCEP	05/23	restore <REMARKS> field to END product; inadv. removed with <ALL>
 !
 !--------------------------------------------------------------------------
 ! VAA GUI Information
@@ -166,6 +168,7 @@ FORMAT  LOC_1  END         <OBS ASH CLOUD>VA NOT IDENTIFIABLE FROM SATELLITE DAT
 FORMAT  LOC_1  END         <FCST ASH CLOUD +6H>
 FORMAT  LOC_1  END         <FCST ASH CLOUD +12H>
 FORMAT  LOC_1  END         <FCST ASH CLOUD +18H>
+FORMAT  LOC_1  END         <REMARKS>
 FORMAT  LOC_1  END         <NEXT ADVISORY> NO FURTHER ADVISORIES
 !
 FORMAT  LOC_1  QUICK       <VOLCANO>
@@ -184,7 +187,8 @@ FORMAT  LOC_1  QUICK       <FCST ASH CLOUD +18H>NOT AVBL
 FORMAT  LOC_1  QUICK       <REMARKS>WE HAVE RECEIVED INFORMATION SUGGESTING A POSSIBLE VA EMISSION. WE WILL GATHER FURTHER INFORMATION AND ISSUE A FULL ADVISORY AS SOON AS POSSIBLE.
 FORMAT  LOC_1  QUICK       <NEXT ADVISORY>AS SOON AS POSSIBLE
 !
-FORMAT  LOC_1  NEAR        <VOLCANO> 
+FORMAT  LOC_1  NEAR        <VOLCANO>
+FORMAT  LOC_1  NEAR        <NUMBER>
 FORMAT  LOC_1  NEAR        <LOCATION>
 FORMAT  LOC_1  NEAR        <AREA>
 FORMAT  LOC_1  NEAR        <SUMMIT ELEVATION>
@@ -199,19 +203,20 @@ FORMAT  LOC_1  NEAR        <FCST ASH CLOUD +18H>NOT PROVIDED
 FORMAT  LOC_1  NEAR        <REMARKS>
 FORMAT  LOC_1  NEAR        <NEXT ADVISORY>
 !
-FORMAT  LOC_1  WATCH       <VOLCANO> 
+FORMAT  LOC_1  WATCH       <VOLCANO>
 FORMAT  LOC_1  WATCH       <NUMBER>
 FORMAT  LOC_1  WATCH       <LOCATION>
 FORMAT  LOC_1  WATCH       <AREA>
 FORMAT  LOC_1  WATCH       <SUMMIT ELEVATION>
 FORMAT  LOC_1  WATCH       <ADVISORY NUMBER>
 FORMAT  LOC_1  WATCH       <INFORMATION SOURCE>
 FORMAT  LOC_1  WATCH       <ERUPTION DETAILS>NO ERUPTION HAS OCCURRED
-FORMAT  LOC_1  WATCH       <REMARKS> 
+FORMAT  LOC_1  WATCH       <REMARKS>
 FORMAT  LOC_1  WATCH       <NEXT ADVISORY>WILL BE ISSUED DAILY UNTIL THE IMMINENT THREAT HAS PASSED OR SOONER IF AN ERUPTION OCCURS.
 !
 FORMAT  LOC_1  TEST        <STATUS>TEST
-FORMAT  LOC_1  TEST        <VOLCANO> 
+FORMAT  LOC_1  TEST        <VOLCANO>
+FORMAT  LOC_1  TEST        <NUMBER>
 FORMAT  LOC_1  TEST        <LOCATION>
 FORMAT  LOC_1  TEST        <AREA>
 FORMAT  LOC_1  TEST        <SUMMIT ELEVATION>
@@ -227,7 +232,8 @@ FORMAT  LOC_1  TEST        <REMARKS>
 FORMAT  LOC_1  TEST        <NEXT ADVISORY>
 !
 FORMAT  LOC_1  EXER        <STATUS>EXER
-FORMAT  LOC_1  EXER        <VOLCANO> 
+FORMAT  LOC_1  EXER        <VOLCANO>
+FORMAT  LOC_1  EXER        <NUMBER>
 FORMAT  LOC_1  EXER        <LOCATION>
 FORMAT  LOC_1  EXER        <AREA>
 FORMAT  LOC_1  EXER        <SUMMIT ELEVATION>
@@ -293,6 +299,6 @@ WORDING         <EAC>   EST_ASH_CLOUD           |       EST_VA_CLD
 WORDING         <F06>   FCST_ASH_CLOUD_+6H      |       FCST_VA_CLD_+6HR
 WORDING         <F12>   FCST_ASH_CLOUD_+12H     |       FCST_VA_CLD_+12HR
 WORDING         <F18>   FCST_ASH_CLOUD_+18H     |       FCST_VA_CLD_+18HR
-WORDING         <RMK>	REMARKS			|	RMK
-WORDING         <TXT>	NEXT_ADVISORY		|	NXT_ADVISORY
-WORDING         <TOF>	TO			|	FROM
+WORDING         <RMK>   REMARKS                 |       RMK
+WORDING         <TXT>   NEXT_ADVISORY           |       NXT_ADVISORY
+WORDING         <TOF>   TO                      |       FROM