Merge pull request #141 from akrherz/gh140_nawips_7_17_0

Merge NAWIPS 7.17.0
Unidata · Oct 29, 2023 · 84ff331 · 84ff331
2 parents f3997c8 + b12a661
commit 84ff331
Show file tree

Hide file tree

Showing 61 changed files with 211,243 additions and 210,764 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.17.0 (29 Oct 2023)
+
+This release merges upstream NCEP NAWIPS 7.17.0, changes are mostly table
+and NWS Zone updates.
+
 ## 7.16.1 (21 June 2023)
 
 This release merges upstream NCEP NAWIPS 7.16.1, whose CHANGELOG includes:

diff --git a/build/DEBIAN/control b/build/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gempak
-Version: 7.16.1
+Version: 7.17.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.16.1
+%define version 7.17.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.16.1
+%define version 7.17.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.16.1-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.17.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.16.1.deb
-RUN dpkg -i gempak-7.16.1.deb
+RUN wget https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.17.0.deb
+RUN dpkg -i gempak-7.17.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.16.1-1.el6.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.17.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.16.1-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.17.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.16.1-1.fc26.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.17.0-1.fc26.x86_64.rpm
diff --git a/gempak/include/shpprm.h b/gempak/include/shpprm.h
@@ -14,6 +14,7 @@
  * m.gamazaychikov/SAIC 06/08		Added MAP_OFSH, _CNPR, _UNDF	*
  * S. Jacobs/NCEP	 4/10		Added MAP_NPSA			*
  * S. Jacobs/NCEP	 3/11		Modified MAXFLD: 16 -> 24	*
+ * B. Hebbard/NCEP	 7/23		Added American Samoa: "AS"	*
  ***********************************************************************/
 
 /*---------------------------------------------------------------------*/
@@ -262,7 +263,7 @@ char stateno[NUMSTNO][3] = {
 	"GU",		/* 54 */	/* Guam */
 	"MP",		/* 55 */	/* Marianas Islands */
 	"UM",		/* 56 */	/* Midway Islands */
-	"--",		/* 57 */	/* No name */
+	"AS",		/* 57 */	/* American Samoa */
 	"--",		/* 58 */	/* No name */
 	"--",		/* 59 */	/* No name */
 	"LC",		/* 60 */	/* Lake St. Clair */

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/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/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/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/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
@@ -79,14 +79,15 @@ SUBROUTINE SS_VERS  ( vmsg, iret )
 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* B. Hebbard/NCEP      07/23           Updated to 7.17.0               *
 C************************************************************************
 	CHARACTER*(*)	vmsg
 C------------------------------------------------------------------------
 	iret = 0
 C
 C*	Set the version string and add a null to the end.
 C
-	vmsg = 'Version 7.16.1'
+	vmsg = 'Version 7.17.0'
 	CALL ST_NULL ( vmsg, vmsg, lens, ier )
 C*
 	RETURN

diff --git a/gempak/source/programs/gui/nmap2/nmap_dsp.c b/gempak/source/programs/gui/nmap2/nmap_dsp.c
@@ -1798,6 +1798,7 @@ void dsp_getSingleTmOrdr ( int lp, int nsrcs, int frm, int plot_ordr[],
  * M. Li/GSC		07/01	subtract ndata by the "off" grid source	*
  * E. Safford/GSC	07/01	revise noff calculation    		*
  * M. Li/SAIC		03/08	Added case CAT_ENS			*
+ * S. Guan/NCO          09/23   adjust *ndata                           *
  ***********************************************************************/
 {
 dsrc_t	*dsrc, *dom;
@@ -1822,6 +1823,7 @@ int	catg_ordr[] = {CAT_IMG, CAT_GRD, CAT_ENS, CAT_SFC, CAT_SND, CAT_SFF,
 
     if (nsrcs == 1) {
 	plot_ordr[0] = 0;
+	cnt++;
 	ngds++;
     }
     else {
@@ -1889,6 +1891,10 @@ int	catg_ordr[] = {CAT_IMG, CAT_GRD, CAT_ENS, CAT_SFC, CAT_SND, CAT_SFF,
      *
      */
     *ndata = nsrcs - ngds - noff + 1;
+    /*
+     * Adjust *ndata 
+     */
+    if (  *ndata > cnt ) *ndata = cnt;
 
 }