Merge pull request #131 from akrherz/nawips7_15_2

Nawips 7.15.2
Unidata · Feb 16, 2023 · 73c2340 · 73c2340
2 parents 9a73a71 + d145ea9
commit 73c2340
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 <!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
 # Unidata Community GEMPAK Change Log
 
+## 7.15.2 (15 Feb 2023)
+
+This release merges upstream NCEP NAWIPS 7.15.2, whose CHANGELOG includes:
+
+- fix to gempak/source/bridge/ru/ruwhgt.f
+
+This release also includes the following GEMPAK Community changes:
+
+- Some fixes and cleanups to CI/build infrastructure.
+
 ## 7.15.1 (8 Oct 2022)
 
 This release merges upstream NCEP NAWIPS 7.15.1, whose CHANGELOG includes:

diff --git a/build/DEBIAN/control b/build/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gempak
-Version: 7.15.1
+Version: 7.15.2
 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.15.1
+%define version 7.15.2
 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.15.1
+%define version 7.15.2
 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.15.1-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.15.2-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.15.1.deb
-RUN dpkg -i gempak-7.15.1.deb
+RUN wget https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.15.2.deb
+RUN dpkg -i gempak-7.15.2.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.15.1-1.el6.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.15.2-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.15.1-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.15.2-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.15.1-1.fc26.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.15.2-1.fc26.x86_64.rpm
diff --git a/gempak/source/bridge/ru/ruwhgt.f b/gempak/source/bridge/ru/ruwhgt.f
@@ -21,6 +21,8 @@ SUBROUTINE RU_WHGT  ( field, nwnd, hght, iret )
 C**									*
 C* Log:									*
 C* M. desJardins/GSFC	 8/86						*
+C* S. Guan   NCEP/NCO	11/22		Improve to handle all missing	*
+C*					data case.			*
 C************************************************************************
 	INCLUDE		'GEMPRM.PRM'
 C*
@@ -51,15 +53,28 @@ SUBROUTINE RU_WHGT  ( field, nwnd, hght, iret )
 C
 C*	Convert the unit digits to integers and compute height.
 C
-	DO WHILE ( ( ier .eq. 0 ) .and. ( nwnd .lt. 3 ) )
+	DO WHILE ( ( nwnd .lt. 3 ) )
 	    i = nwnd + 3
 	    CALL ST_INTG ( field (i:i), iunit, ier )
+	    nwnd = nwnd + 1
 	    IF  ( ier .eq. 0 ) THEN
-		nwnd = nwnd + 1
-		z    = ( (iten + iunit) * 1000 + iadd ) 
-		hght ( nwnd ) = PR_HGFM  ( z )
+	        z    = ( (iten + iunit) * 1000 + iadd )
+	        hght ( nwnd ) = PR_HGFM ( z )
+	    ELSE
+	        hght ( nwnd ) = RMISSD
 	    END IF
 	END DO
-C*
+C
+C*	Determine nwnd.
+C
+	DO  i = 5, 3, -1
+	    CALL ST_INTG ( field (i:i), iunit, ier )
+	    IF  ( ier .eq. 0 ) THEN
+	        nwnd = i - 2
+	        RETURN
+	    END IF
+	END DO
+	nwnd = 0
+
 	RETURN
 	END
diff --git a/gempak/source/gemlib/ss/ssvers.f b/gempak/source/gemlib/ss/ssvers.f
@@ -76,15 +76,16 @@ SUBROUTINE SS_VERS  ( vmsg, iret )
 C* B. Hebbard/NCEP      03/21           Updated to 7.14.0               *
 C* B. Hebbard/NCEP      04/21           Updated to 7.15.0               *
 C* B. Hebbard/NCEP      10/20           Updated to 8.0.0                *
-C* B. Hebbard/NCEP      07/21           Updated to 7.15.1               *
+C* B. Hebbard/NCEP      07/22           Updated to 7.15.1               *
+C* B. Hebbard/NCEP      12/22           Updated to 7.15.2               *
 C************************************************************************
 	CHARACTER*(*)	vmsg
 C------------------------------------------------------------------------
 	iret = 0
 C
 C*	Set the version string and add a null to the end.
 C
-	vmsg = 'Version 7.15.1'
+	vmsg = 'Version 7.15.2'
 	CALL ST_NULL ( vmsg, vmsg, lens, ier )
 C*
 	RETURN

diff --git a/gempak/utilities/a2conv/distXC/xmlConverter.jar b/gempak/utilities/a2conv/distXC/xmlConverter.jar