Skip to content

Commit

Permalink
Merge pull request #141 from akrherz/gh140_nawips_7_17_0
Browse files Browse the repository at this point in the history
Merge NAWIPS 7.17.0
  • Loading branch information
akrherz authored Oct 29, 2023
2 parents f3997c8 + b12a661 commit 84ff331
Show file tree
Hide file tree
Showing 61 changed files with 211,243 additions and 210,764 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: gempak
Version: 7.16.1
Version: 7.17.0
Maintainer: Daryl Herzmann
Architecture: all
Description: Unidata GEMPAK Distribution
Expand Down
2 changes: 1 addition & 1 deletion build/Installer.gempak/extlibs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion build/Installer.gempak/gempak.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion build/docker/Dockerfile.centos
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/gempak-devel/Dockerfile.centos6
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/gempak-devel/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/gempak-devel/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion gempak/include/shpprm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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" *
***********************************************************************/

/*---------------------------------------------------------------------*/
Expand Down Expand Up @@ -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 */
Expand Down
Binary file modified gempak/maps/hicnus.nws
Binary file not shown.
Binary file modified gempak/maps/hicwa.nws
Binary file not shown.
Binary file modified gempak/maps/hifzus.nws
Binary file not shown.
Binary file modified gempak/maps/himzcn.nws
Binary file not shown.
Binary file modified gempak/maps/hiosuo.nws
Binary file not shown.
Binary file modified gempak/maps/hiznus.nws
Binary file not shown.
Binary file modified gempak/maps/locnus.nws
Binary file not shown.
Binary file modified gempak/maps/locwa.nws
Binary file not shown.
Binary file modified gempak/maps/lofzus.nws
Binary file not shown.
Binary file modified gempak/maps/lomzcn.nws
Binary file not shown.
Binary file modified gempak/maps/loosuo.nws
Binary file not shown.
Binary file modified gempak/maps/loznus.nws
Binary file not shown.
Binary file modified gempak/maps/mecnus.nws
Binary file not shown.
Binary file modified gempak/maps/mecwa.nws
Binary file not shown.
Binary file modified gempak/maps/mefzus.nws
Binary file not shown.
Binary file modified gempak/maps/memzcn.nws
Binary file not shown.
Binary file modified gempak/maps/meosuo.nws
Binary file not shown.
Binary file modified gempak/maps/meznus.nws
Binary file not shown.
Binary file modified gempak/maps/tpcnus.nws
Binary file not shown.
Binary file modified gempak/maps/tpcwa.nws
Binary file not shown.
Binary file modified gempak/maps/tpfzus.nws
Binary file not shown.
Binary file modified gempak/maps/tpmzcn.nws
Binary file not shown.
Binary file modified gempak/maps/tposuo.nws
Binary file not shown.
Binary file modified gempak/maps/tpznus.nws
Binary file not shown.
3 changes: 2 additions & 1 deletion gempak/source/gemlib/ss/ssvers.f
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions gempak/source/programs/gui/nmap2/nmap_dsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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;

}

Expand Down
Loading

0 comments on commit 84ff331

Please sign in to comment.