Merge pull request #98 from akrherz/gh97_nawips7.15.0

Merge NCEP NAWIPS 7.15.0
Unidata · May 25, 2022 · 80ba576 · 80ba576
2 parents 879f898 + 17dcbec
commit 80ba576
Show file tree

Hide file tree

Showing 93 changed files with 671,472 additions and 655,610 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,25 @@
 <!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
 # Unidata Community GEMPAK Change Log
 
+## 7.15.0 (25 May 2022)
+
+This release merges upstream NCEP NAWIPS 7.15.0, whose CHANGELOG includes:
+
+- Bug fixes and other issue resolutions.
+- Cumulative revisions to NAWIPS data tables to support maps/bounds,
+surface stations, tropical, and other routine periodic updates.
+- Integration of compiler, and certain changes required to support the
+WCOSS supercomputer and RHEL 8 Operating System transition projects.
+- Updates to Volcanic Ash Advisory user interface to support the NESDIS
+Satellite Analysis Branch.
+
+This release also includes the following GEMPAK Community changes:
+
+- More dynamic setting of `NAWIPS` environment variable on bash (#85).
+- Update MRMS Grib Tables to v12.1 (#89).
+- Continued cleanup of bad previous merges that overwrote Unidata
+local table modifications.
+
 ## 7.14.0.1 (13 March 2022)
 
 This release signifies the desire for the community to make releases at a faster

diff --git a/build/DEBIAN/control b/build/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gempak
-Version: 7.14.0.1
+Version: 7.15.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.14.0.1
+%define version 7.15.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.14.0.1
+%define version 7.15.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.14.0.1-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.15.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.14.0.1.deb
-RUN dpkg -i gempak-7.14.0.1.deb
+RUN wget https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.15.0.deb
+RUN dpkg -i gempak-7.15.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.14.0.1-1.el6.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.15.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.14.0.1-1.el7.centos.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.15.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.14.0.1-1.fc26.x86_64.rpm
+RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.15.0-1.fc26.x86_64.rpm
diff --git a/gempak/include/BRIDGE.PRM b/gempak/include/BRIDGE.PRM
@@ -8,6 +8,7 @@ C**									*
 C* Log:									*
 C* S. Jacobs/NMC	 7/95						*
 C* S. Jacobs/NCEP	12/02	Increased DCMXBF from 16kb to 100kb	*
+C* B. Hebbard/NCEP       9/21   Increased DCMXBF from 100kB to 5MB      *
 C************************************************************************
 	INTEGER		DCDFTM, DCMXLN, DCMXBF, EOD,
      +			EBNMEM, EBREAD, EBTMOUT, EBFULL, EBEMPT
@@ -18,7 +19,7 @@ C!
 	PARAMETER	( DCMXLN  =   132 )
 C!						Max char length
 C!
-	PARAMETER	( DCMXBF  = 102400 )
+	PARAMETER	( DCMXBF  = 5000000 )
 C!						Max bulletin length
 C!
 	PARAMETER	( EOD     =    -2 )

diff --git a/gempak/include/bridge.h b/gempak/include/bridge.h
@@ -9,13 +9,14 @@
  * S. Jacobs/NMC	 7/95						*
  * A. Hardy/GSC		 1/01	Added proto_bridge.h			*
  * S. Jacobs/NCEP	12/02	Increased DCMXBF from 16kb to 100kb	*
+ * B. Hebbard/NCEP       9/21   Increased DCMXBF from 100kB to 5MB      *
  ***********************************************************************/
 
 #define DCDFTM  (   600 )	/* Default timeout */
 
 #define DCMXLN  (   133 )	/* Max length for a character string */
 
-#define DCMXBF  ( 102400 )	/* Max length of the data buffer */
+#define DCMXBF  ( 5000000 )	/* Max length of the data buffer */
 
 #define EOD     (  0xfe )	/* End of data marker */
 

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/spcout.ncp b/gempak/maps/spcout.ncp
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/bridge/dc/dcgbul.c b/gempak/source/bridge/dc/dcgbul.c
@@ -1,5 +1,7 @@
 #include "dccmn.h"
 
+#define MAX_TRIES 10
+
 /*
 ** Define and initialize the finite-state machine for finding a
 ** bulletin in the buffer.
@@ -34,12 +36,23 @@ void dc_gbul ( char *bulletin, int *lenb, int *ifdtyp, int *iret )
  * E. Wehner/EAI	 7/96	Added more checking for state machine	*
  * J. Whistler/AWC	 8/96	Changed call to dcb_peekc		*
  * S. Chiswell/UPC	 1/99	Fixed CR_CR_ state when CR_ is found	*
- * S. Chiswell/UPC	 2/04	handle EBFULL to continue looking	*
+ * S. Guan/NCEP		11/10	Added retry when EOF is found		*
+ * J. Ator/NCEP		10/13	For WMO feed, don't accept CHCTLC as	*
+ *				end of bulletin if it immediately	*
+ *				follows the header.			*
+ * M. Weiss/NCEP         5/2018 Inserted ^M check in case IN_BULLETIN   *
+ *                              when ifdtyp = 1                         * 
  ***********************************************************************/
 {
 
 	static unsigned char	ch;
-	int			ier;
+	int			ier, try;
+	unsigned long		nline;
+				/* Keeps count of number of lines
+				   (CR_CR_NL) in current bulletin. */
+	unsigned long		nchar;
+				/* Keeps count of number of characters
+				   in current line of bulletin. */
 
 /*---------------------------------------------------------------------*/
 	*iret = 0;
@@ -57,30 +70,40 @@ void dc_gbul ( char *bulletin, int *lenb, int *ifdtyp, int *iret )
 	    if  ( ( finite_state != START ) ||
 		  ( dcb_isempt() == 1 ) ) {
 
+		try = 0;
+		while ( try < MAX_TRIES ) {
 /*
-**		Read from standard input to the buffer.
+**		    Read from standard input to the buffer.
 */
-		if  ( ( ier = dcb_put ( STDIN_FILENO, itmout ) ) < 0 ) {
-
-		    if  ( ier == EBFULL ) {
+		    ier = dcb_put ( STDIN_FILENO, itmout );
+		    if  ( ( ier == EBEND  ) < 0 ) {
 /*
-**			If buffer overflowed, start over looking for 
-**			bulletins that we can fit into buffer. 
+**			End of data file has occurred.
+**			To make sure it is true end,
+**			check maximum MAX_TRIES times,
+**			each waits one second.
 */
-			dcb_sbtl ( 0 );
-			ier = dcb_getb ( bulletin );
-			/* reset start (Chiz) */
-			finite_state = START;
-			continue;
+			sleep(1);
+			try++;
 		    }
-
-		    else {
+		    else if ( ier < 0 ) {
 /*
-**		        Timeout or end of data file has occurred.
+**			Timeout has occurred.
 */
 			*iret = ier;
 			return;
 		    }
+		    else {
+			break;
+		    }
+                }
+
+		if ( ier < 0 ) {
+/*
+**		    "True" end of data file has occurred.
+*/
+		    *iret = ier;
+		    return;
 		}
 
 	    }
@@ -171,6 +194,13 @@ void dc_gbul ( char *bulletin, int *lenb, int *ifdtyp, int *iret )
 			    dcb_sbhd ( -3 );
 			    finite_state = IN_BULLETIN;
 			    *ifdtyp = 0;
+/*
+**			    SOH_CR_CR_NL is the 1st line of the bulletin.  The
+**			    next 2 lines will contain the rest of the header,
+**			    for a total of 3 lines in the bulletin header.
+*/
+			    nline = 1;
+			    nchar = 0;
 			}
 			else {
 			    if (ch == 'Z')
@@ -271,12 +301,16 @@ void dc_gbul ( char *bulletin, int *lenb, int *ifdtyp, int *iret )
 			    }
 			    else {
 				finite_state = IN_BULLETIN;
+				nchar++;
 			    }
 			}
 			else {
 			    if  ( ch == 'N' ) {
 				finite_state = N_;
 			    }
+                            else if ( ch == CHCR ) {
+                                finite_state = CR_;
+                            }
 			    else {
 				finite_state = IN_BULLETIN;
 			    }
@@ -293,6 +327,7 @@ void dc_gbul ( char *bulletin, int *lenb, int *ifdtyp, int *iret )
 			}
 			else {
 			    finite_state = IN_BULLETIN;
+			    nchar++;
 			}
 			break;
 
@@ -303,6 +338,8 @@ void dc_gbul ( char *bulletin, int *lenb, int *ifdtyp, int *iret )
 		    case CR_CR_:
 			if  ( ch == CHLF ) {
 			    finite_state = CR_CR_NL_;
+			    if ( nchar > 0 ) nline++;
+			    nchar = 0;
 			}
 			else 
 			{
@@ -313,16 +350,18 @@ void dc_gbul ( char *bulletin, int *lenb, int *ifdtyp, int *iret )
       			    else
 			    {
 			        finite_state = IN_BULLETIN;
+				nchar++;
 			    }
 			}
 			break;
 
 /*
 **		    If two Carriage Returns and a Line Feed have been
-**		    found, check for a Control-C.
+**		    found, and if we've reached at least the end of the
+**		    4th line of the bulletin, check for a Control-C.
 */
 		    case CR_CR_NL_:
-			if  ( ch == CHCTLC ) {
+			if  ( ( ch == CHCTLC ) && ( nline > 3 ) ) {
 /*
 **			    If it is a Control-C, reset the search, then
 **			    retrieve and return the complete bulletin.
@@ -344,6 +383,7 @@ void dc_gbul ( char *bulletin, int *lenb, int *ifdtyp, int *iret )
 			}
 			else {
 			    finite_state = IN_BULLETIN;
+			    nchar++;
 			}
 			break;
 

diff --git a/gempak/source/bridge/nc/nchdr.f b/gempak/source/bridge/nc/nchdr.f
@@ -36,6 +36,8 @@ SUBROUTINE NC_HDR ( strbuf, org, iotarr, strtim, stptim, updt,
 C* J. Lewis/AWC		04/05	Remove check for match between          *
 C*				originating station and stnid		*
 C*				in product				*
+C* B. Hebbard/NCO per   04/21   Fix AWC non-convective SIGMETs for      *
+C* L. Hinson/AWC                Blowing Dust (NAWIPS-173)               *
 C************************************************************************
 	INCLUDE		'GEMPRM.PRM'
 C*
@@ -58,10 +60,10 @@ SUBROUTINE NC_HDR ( strbuf, org, iotarr, strtim, stptim, updt,
 	astart = ' '
 	astop  = ' '
 	ii     = 1
-	DO WHILE ( .not. found )
-	    IF ( ( INDEX ( carr ( ii + 1 ), 'WS' ) .ne. 0 ) .or.
-     +           ( INDEX ( carr ( ii + 1 ), 'WC' ) .ne. 0 ) .or.
-     +           ( INDEX ( carr ( ii + 1 ), 'WV' ) .ne. 0 ) ) THEN
+   	DO WHILE ( .not. found )
+	    IF ( carr ( ii + 1 ) .eq. "WS" .or.
+     +		 carr ( ii + 1 ) .eq. "WC" .or.
+     +		 carr ( ii + 1 ) .eq. "WV" ) THEN
                 found  = .true.
 	        astart = carr ( ii + 2 )
 	        IF ( carr ( ii + 3 ) .ne. 'SIGMET' ) THEN