Merge pull request #135 from akrherz/gh134_nawips_7_16_0

Merge NAWIPS 7.16.0
Unidata · May 4, 2023 · 8a3c8e6 · 8a3c8e6
2 parents 73c2340 + c491ea5
commit 8a3c8e6
Show file tree

Hide file tree

Showing 79 changed files with 410,229 additions and 411,889 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 <!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
 # Unidata Community GEMPAK Change Log
 
+## 7.16.0 (4 May 2023)
+
+This release merges upstream NCEP NAWIPS 7.16.0, whose CHANGELOG includes:
+
+- NWS zones updated to March 2023
+- Small nmap2 fixes
+- Volcanic Ash Advisory updates
+
 ## 7.15.2 (15 Feb 2023)
 
 This release merges upstream NCEP NAWIPS 7.15.2, whose CHANGELOG includes:

diff --git a/build/DEBIAN/control b/build/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gempak
-Version: 7.15.2
+Version: 7.16.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.15.2
+%define version 7.16.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.15.2
+%define version 7.16.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.15.2-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.16.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.15.2.deb
-RUN dpkg -i gempak-7.15.2.deb
+RUN wget https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.16.0.deb
+RUN dpkg -i gempak-7.16.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.15.2-1.el6.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.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.15.2-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.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.15.2-1.fc26.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.16.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/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/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
@@ -75,17 +75,17 @@ SUBROUTINE SS_VERS  ( vmsg, iret )
 C* B. Hebbard/NCEP      02/21           Updated to 7.13.0               *
 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/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************************************************************************
 	CHARACTER*(*)	vmsg
 C------------------------------------------------------------------------
 	iret = 0
 C
 C*	Set the version string and add a null to the end.
 C
-	vmsg = 'Version 7.15.2'
+	vmsg = 'Version 7.16.0'
 	CALL ST_NULL ( vmsg, vmsg, lens, ier )
 C*
 	RETURN

diff --git a/gempak/source/programs/gui/nmap2/nmap_dslw.c b/gempak/source/programs/gui/nmap2/nmap_dslw.c
@@ -3728,6 +3728,7 @@ void dslw_setFirst (int mod, int mem,  char *list1, char *list2 )
  **                                                                     *
  * Log:                                                                 *
  * M. Li/SAIC           07/08                                           *
+ * S. Guan/NCEP         02/23   Fixed Nmap2 crashes.                    *
  ***********************************************************************/
 {
     int         ii, iflag = -1, nn, ipos1, ipos2, ier;
@@ -3794,11 +3795,6 @@ void dslw_setFirst (int mod, int mem,  char *list1, char *list2 )
     strcat ( list2, "}" );
     list2[strlen(list2)] = '\0';
 
-    for (  ii = 0; ii < 30; ii++) {
-	free(clist[ii]);
-    }
-    free(clist);
-
     if ( strchr(clist[0], '/') ) {
         cst_ilst ( _cycIdx, ',', -1, 20, intattr, &intnum, &ier );
         itmp = intattr[0];
@@ -3817,6 +3813,11 @@ void dslw_setFirst (int mod, int mem,  char *list1, char *list2 )
         _cycIdx[strlen(_cycIdx)] = '\0';
     }
 
+    for (  ii = 0; ii < 30; ii++) {
+        free(clist[ii]);
+    }
+    free(clist);
+
 }
 
 /*=====================================================================*/

diff --git a/gempak/source/programs/gui/nmap2/nmap_pgsigw.c b/gempak/source/programs/gui/nmap2/nmap_pgsigw.c
@@ -2735,10 +2735,12 @@ void pgsigw_phenllCb ( Widget wid, long clnt, XtPointer cbs )
  * H. Zeng/EAI          11/00   Added more rigid check to the values    *
  * E. Safford/SAIC	12/01	correct array bound write, use NO_VAL   *
  * J. Lewis/AWC         09/07   Prepend N,S,E,W to phenom lat/lon values*
+ * S. Guan/NCEP         02/23   Concurred and accepted the code change  *
+ *                              Larry Hinson/AWC did.                   * 
  ***********************************************************************/
 {
     char	*newlatlon,  chlatlon[MAX_LONSTR], chnum[MAX_LONSTR];
-    char	dirch[] = "N", chtmp[4];
+    char	dirch[] = "N", chtmp[MAX_LONSTR];
     int		length, iret, nlatlon;
 /*---------------------------------------------------------------------*/
 

diff --git a/gempak/source/programs/gui/nmap2/nmap_pgvolw.c b/gempak/source/programs/gui/nmap2/nmap_pgvolw.c
@@ -1002,7 +1002,7 @@ Widget pgvolw_editCreate ( Widget parent )
 		   XmNtopOffset,        -2,
                    XmNleftAttachment,   XmATTACH_WIDGET,
 		   XmNleftWidget,	obtime_rc,
-		   XmNleftOffset,	30,
+		   XmNleftOffset,	28,
                    NULL);
 
 /*
@@ -1019,7 +1019,7 @@ Widget pgvolw_editCreate ( Widget parent )
 		   NULL );
 
 /*
- * EST check box
+ * EST (estimated, or "Est'd"check box
  */
     _estBtnW = XtVaCreateManagedWidget(" ",
 			xmToggleButtonWidgetClass,  info_form,
@@ -1038,13 +1038,13 @@ Widget pgvolw_editCreate ( Widget parent )
 		   XmNtopOffset,        16,
                    XmNleftAttachment,   XmATTACH_WIDGET,
 		   XmNleftWidget,	obtime_rc,
-		   XmNleftOffset,	30,
+		   XmNleftOffset,	28,
                    NULL);
 
 /*
- * EST label
+ * ESTi (estimated, or "Est'd" label
  */
-    XtVaCreateManagedWidget ("EST",
+    XtVaCreateManagedWidget ("Est'd",
 		   xmLabelWidgetClass,	info_form,
                    XmNtopAttachment,    XmATTACH_OPPOSITE_WIDGET,
 		   XmNtopWidget,	obtime_rc,
@@ -3765,8 +3765,9 @@ void pgvolw_createProd ( VG_DBStruct *vol, char **filter, char *text,
  * J. Wu/SAIC		04/06		add parameter in cst_wrap 	*
  * H. Zeng/SAIC		04/06	changed to use month index number	*
  * S. Jacobs/NCEP	10/12	Removed NNNN and preceding blank line	*
- * B. Hebbard/NCEP	11/19	If obsdate/time NIL, dflt OAC->NOT AVBL	*i
+ * B. Hebbard/NCEP	11/19	If obsdate/time NIL, dflt OAC->NOT AVBL	*
  * B. Hebbard/NCEP 	03/22	Choose OBS v. EST in prod text for init	*
+ * B. Hebbard/NCEP      02/23   F06/F12/F18: Show generated times always*
  ***********************************************************************/
 {
     int   vg_class, vg_type, adjust_min;
@@ -4078,10 +4079,11 @@ void pgvolw_createProd ( VG_DBStruct *vol, char **filter, char *text,
               strcat ( text, vol->elem.vol.info.fcst_06 );
               strcat ( text, "\n\n" );
 	 }
-	 else {
+	 else { 
 
-	      strcat ( text, filter[10] );
-	      strcat ( text, "\n\n"    );
+              strcat ( text, vol->elem.vol.info.fcst_06 );
+              strcat ( text, filter[10] );
+              strcat ( text, "\n\n" );
          }
     }
 
@@ -4096,11 +4098,12 @@ void pgvolw_createProd ( VG_DBStruct *vol, char **filter, char *text,
               strcat ( text, vol->elem.vol.info.fcst_12 );
               strcat ( text, "\n\n" );
 	 }
-	 else {
+         else {
 
-	      strcat ( text, filter[11] );
-	      strcat ( text, "\n\n"    );
-         }
+              strcat ( text, vol->elem.vol.info.fcst_12 );
+              strcat ( text, filter[11] );
+              strcat ( text, "\n\n" );
+	 }
     }
 
     if ( filter[12] != NULL ) { 
@@ -4114,11 +4117,12 @@ void pgvolw_createProd ( VG_DBStruct *vol, char **filter, char *text,
               strcat ( text, vol->elem.vol.info.fcst_18 );
               strcat ( text, "\n\n" );
 	 }
-	 else {
+         else {
 
-	      strcat ( text, filter[12] );
-	      strcat ( text, "\n\n"    );
-         }
+              strcat ( text, vol->elem.vol.info.fcst_18 );
+              strcat ( text, filter[12] );
+              strcat ( text, "\n\n" );
+	 }
     }
 
     if ( filter[13] != NULL ) {