Merge pull request #152 from akrherz/gh151_nawips_7_18_0

Merge NAWIPS 7.18.0
Unidata · May 24, 2024 · c39de8b · c39de8b
2 parents bd034af + 91dbd34
commit c39de8b
Show file tree

Hide file tree

Showing 68 changed files with 324,859 additions and 322,796 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 <!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
 # Unidata Community GEMPAK Change Log
 
+## 7.18.0 (24 May 2024)
+
+This release merges upstream NCEP NAWIPS 7.17.0, changes are mostly table
+and NWS Zone updates.
+
 ## 7.17.0 (29 Oct 2023)
 
 This release merges upstream NCEP NAWIPS 7.17.0, changes are mostly table

diff --git a/build/DEBIAN/control b/build/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gempak
-Version: 7.17.0
+Version: 7.18.0
 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.17.0
+%define version 7.18.0
 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.17.0
+%define version 7.18.0
 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.17.0-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.18.0-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.17.0.deb
-RUN dpkg -i gempak-7.17.0.deb
+RUN wget https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.18.0.deb
+RUN dpkg -i gempak-7.18.0.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.17.0-1.el6.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.18.0-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.17.0-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.18.0-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.17.0-1.fc26.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.18.0-1.fc26.x86_64.rpm
diff --git a/gempak/maps/hicnus.nws b/gempak/maps/hicnus.nws
diff --git a/gempak/maps/hicwa.nws b/gempak/maps/hicwa.nws
diff --git a/gempak/maps/hifzus.nws b/gempak/maps/hifzus.nws
diff --git a/gempak/maps/hiisus.nws b/gempak/maps/hiisus.nws
diff --git a/gempak/maps/himouo.nws b/gempak/maps/himouo.nws
diff --git a/gempak/maps/himzcn.nws b/gempak/maps/himzcn.nws
diff --git a/gempak/maps/hiosuo.nws b/gempak/maps/hiosuo.nws
diff --git a/gempak/maps/hiznus.nws b/gempak/maps/hiznus.nws
diff --git a/gempak/maps/locnus.nws b/gempak/maps/locnus.nws
diff --git a/gempak/maps/locwa.nws b/gempak/maps/locwa.nws
diff --git a/gempak/maps/lofzus.nws b/gempak/maps/lofzus.nws
diff --git a/gempak/maps/loisus.nws b/gempak/maps/loisus.nws
diff --git a/gempak/maps/lomouo.nws b/gempak/maps/lomouo.nws
diff --git a/gempak/maps/lomzcn.nws b/gempak/maps/lomzcn.nws
diff --git a/gempak/maps/loosuo.nws b/gempak/maps/loosuo.nws
diff --git a/gempak/maps/loznus.nws b/gempak/maps/loznus.nws
diff --git a/gempak/maps/mecnus.nws b/gempak/maps/mecnus.nws
diff --git a/gempak/maps/mecwa.nws b/gempak/maps/mecwa.nws
diff --git a/gempak/maps/mefzus.nws b/gempak/maps/mefzus.nws
diff --git a/gempak/maps/memouo.nws b/gempak/maps/memouo.nws
diff --git a/gempak/maps/memzcn.nws b/gempak/maps/memzcn.nws
diff --git a/gempak/maps/meosuo.nws b/gempak/maps/meosuo.nws
diff --git a/gempak/maps/meznus.nws b/gempak/maps/meznus.nws
diff --git a/gempak/maps/tpcnus.nws b/gempak/maps/tpcnus.nws
diff --git a/gempak/maps/tpcwa.nws b/gempak/maps/tpcwa.nws
diff --git a/gempak/maps/tpfzus.nws b/gempak/maps/tpfzus.nws
diff --git a/gempak/maps/tpmouo.nws b/gempak/maps/tpmouo.nws
diff --git a/gempak/maps/tpmzcn.nws b/gempak/maps/tpmzcn.nws
diff --git a/gempak/maps/tposuo.nws b/gempak/maps/tposuo.nws
diff --git a/gempak/maps/tpznus.nws b/gempak/maps/tpznus.nws
diff --git a/gempak/source/gemlib/ss/ssvers.f b/gempak/source/gemlib/ss/ssvers.f
@@ -80,14 +80,15 @@ SUBROUTINE SS_VERS  ( vmsg, iret )
 C* B. Hebbard/NCEP      02/23           Updated to 7.16.0               *
 C* B. Hebbard/NCEP      05/23           Updated to 7.16.1               *
 C* B. Hebbard/NCEP      07/23           Updated to 7.17.0               *
+C* B. Hebbard/NCEP      01/24           Updated to 7.18.0               *
 C************************************************************************
 	CHARACTER*(*)	vmsg
 C------------------------------------------------------------------------
 	iret = 0
 C
 C*	Set the version string and add a null to the end.
 C
-	vmsg = 'Version 7.17.0'
+	vmsg = 'Version 7.18.0'
 	CALL ST_NULL ( vmsg, vmsg, lens, ier )
 C*
 	RETURN

diff --git a/gempak/source/programs/dc/dcuair/dcudcd.f b/gempak/source/programs/dc/dcuair/dcudcd.f
@@ -41,9 +41,10 @@ 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* S. Guan/NCEP          3/23   Decoded both the 21212 group winds in   *
 C*                              the TTBB message and the following PPBB *
 C*                              winds.                                  * 
+C* S. Guan/NCEP          4/24   Added duplicate PPBB winds check.       *      
 C************************************************************************
 	INCLUDE		'GEMPRM.PRM'
 	INCLUDE		'BRIDGE.PRM'
@@ -243,7 +244,9 @@ SUBROUTINE DCUDCD ( curtim, gemfil, stntbl, iadstn, maxtim,
 C
                                 ipres =  INDEX ( bultin ( 1: lenbul ), '21212' )
                                 IF  ( ipres .ne. 0 )  THEN
-                                    IF ( part .eq.  'PPBB' )  good  = .true.
+                                    IF ( part .eq.  'PPBB' )  THEN
+                                       IF ( .not.  zwind ) good  = .true.
+                                    END IF   
                                 END IF    
 			    END IF
 			    IF ( good ) THEN

diff --git a/gempak/source/programs/gp/gptcww/gptcww.f b/gempak/source/programs/gp/gptcww/gptcww.f
@@ -32,7 +32,9 @@ PROGRAM GPTCWW
 C*				the correct first tau, pass the inital  *
 C*                              tau to GC_TC2VG                         *
 C* X. Guo/CWS		05/10   Added idays to GH_TCWW			*
-C* S. Jacobs/NCEP	 6/10	Re-added flag for plotting the scale	*
+C* S. Jacobs/NCEP        6/10   Re-added flag for plotting the scale    *
+C* B. Hebbard/SDB       02/24   Changed 2-digit-year century break from *
+C*                              2025/2026 to 2040/2041 to match others  *
 C************************************************************************
 	INCLUDE		'GEMPRM.PRM'
 C*
@@ -260,7 +262,9 @@ PROGRAM GPTCWW
                 CALL ST_LSTR( strnam, lenn, ier )
                 IF ( lenn .eq. 6 ) THEN
                     CALL ST_NUMB ( strnam(5:6), istrm, ier )
-                    IF ( istrm .le. 25 ) THEN
+C                   Two-digit-year century break is currently 2040/2041;
+C                   will require pushback before then.
+                    IF ( istrm .le. 40 ) THEN
                         chyy = '20'
                       ELSE
                         chyy = '19'

diff --git a/gempak/source/programs/gp/gptpc/gptpc.f b/gempak/source/programs/gp/gptpc/gptpc.f
@@ -24,6 +24,8 @@ PROGRAM GPTPC
 C* m.gamazaychikov/SAIC 06/08   Added remnlo to GH_RDAD CS		*
 C* X. Guo/CWS           03/10   Used Post-Tropical instead of Extratrop *
 C*                              and Remnant Low. Removed remnlo         *
+C* B. Hebbard/SDB       02/24   Changed 2-digit-year century break from *
+C*                              2025/2026 to 2040/2041 to match others  *
 C************************************************************************
 	INCLUDE		'GEMPRM.PRM'
 C*
@@ -174,7 +176,9 @@ PROGRAM GPTPC
                 CALL ST_LSTR( strnam, lenn, ier )
                 IF ( lenn .eq. 6 ) THEN
                     CALL ST_NUMB ( strnam(5:6), istrm, ier )
-                    IF ( istrm .le. 25 ) THEN
+C                   Two-digit-year century break is currently 2040/2041;
+C                   will require pushback before then.
+                    IF ( istrm .le. 40 ) THEN
                         chyy = '20'
                       ELSE
                         chyy = '19'