Skip to content

Commit

Permalink
Merge pull request #157 from akrherz/gh156_nawips_7_19_0
Browse files Browse the repository at this point in the history 
Merge NAWIPS 7.19.0
  • Loading branch information
@akrherz
akrherz authored Dec 12, 2024
2 parents c39de8b + 7a30e14 commit aaaaa35
Show file tree
Hide file tree
Showing 19 changed files with 465 additions and 61 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
# Unidata Community GEMPAK Change Log

## 7.19.0 (12 Dec 2024)

This release merges upstream NCEP NAWIPS 7.19.0.

## 7.18.0 (24 May 2024)

This release merges upstream NCEP NAWIPS 7.17.0, changes are mostly table
This release merges upstream NCEP NAWIPS 7.18.0, changes are mostly table
and NWS Zone updates.

## 7.17.0 (29 Oct 2023)
Expand Down
2 changes: 1 addition & 1 deletion build/DEBIAN/control
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: gempak
Version: 7.18.0
Version: 7.19.0
Maintainer: Daryl Herzmann
Architecture: all
Description: Unidata GEMPAK Distribution
Expand Down
2 changes: 1 addition & 1 deletion build/Installer.gempak/extlibs.spec
View file
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.18.0
%define version 7.19.0
Name: gempak-extlibs
Summary: Unidata Community GEMPAK
Version: %{version}
Expand Down
2 changes: 1 addition & 1 deletion build/Installer.gempak/gempak.spec
View file
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.18.0
%define version 7.19.0
Name: gempak
Summary: Unidata Community GEMPAK
Version: %{version}
Expand Down
2 changes: 1 addition & 1 deletion build/docker/Dockerfile.centos
View file
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.18.0-1.el7.centos.x86_64.rpm
RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.19.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
View file
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.18.0.deb
RUN dpkg -i gempak-7.18.0.deb
RUN wget https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-7.19.0.deb
RUN dpkg -i gempak-7.19.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
View file
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.18.0-1.el6.x86_64.rpm
RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.19.0-1.el6.x86_64.rpm
2 changes: 1 addition & 1 deletion build/gempak-devel/Dockerfile.centos7
View file
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.18.0-1.el7.centos.x86_64.rpm
RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.19.0-1.el7.centos.x86_64.rpm
2 changes: 1 addition & 1 deletion build/gempak-devel/Dockerfile.fedora
View file
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.18.0-1.fc26.x86_64.rpm
RUN rpm -ivh https://www.unidata.ucar.edu/downloads/gempak/latest/gempak-extlibs-7.19.0-1.fc26.x86_64.rpm
2 changes: 1 addition & 1 deletion gempak/include/vgstruct.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ typedef struct sgwxinfo {
typedef struct sgwxtype {
SGWXInfo info;
SptxType spt;
float latlon[256];
float latlon[512];
} SGWXType;

typedef struct vg_hdrstruct
Expand Down
62 changes: 54 additions & 8 deletions gempak/source/contrib/awc/vgToSGWX/vgToSGWX.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@
Radiation Symbols
JET - Create Jet Objects with Labels properly rotated so they can
be registered with placement objects to be placed around the jet.
TROP - Create TROP Objects so that they can be registered with placement
objects placed around the Trops.
Usage Statement: Usage: vgToSGWX -i <filenamein> -o <filenameout>
Log:
L. Hinson/AWC 06/12 Created
L. Hinson/AWC 06/12 Created
L. Hinson/AWC 10/13 Add Trop Object
******************************************************************************/
static void genTropObject(VG_DBStruct *el_txt, char *vgFileOut);

static void genSGWXTurb(VG_DBStruct *el_line, VG_DBStruct *el_txt,
char *vgFileOut);
Expand All @@ -46,7 +50,7 @@ static void cvg_crthdrcolor ( VG_DBStruct *el, int np, float *lat, float *lon,
int major, int minor, int grouptype, int groupnumber, int *iret );

int main (int argc, char *argv[]) {
static char usageString[] = "Usage: vgToSGWX -i <filenamein> -o <filenameout>";
static char usageString[] = "Usage: vgToSGWX -i <filenamein> -o <filenameout> -cvttrop";
char vgFileIn [FILE_FULLSZ];
char vgFileOut [FILE_FULLSZ];
VG_DBStruct *el;
Expand All @@ -60,7 +64,8 @@ int main (int argc, char *argv[]) {
int iret;
char command[256];
long fsize;
char newfil[256];
char newfil[256];
int cvtTropFlag = 0;

for (i=0; i < argc; i++) {
if (strcmp(argv[i], "-h") == 0) {
Expand All @@ -74,6 +79,9 @@ int main (int argc, char *argv[]) {
strcpy(vgFileOut, argv[i+1]);
outfileset = -1;
}
if (strcmp(argv[i], "-cvttrop") == 0) {
cvtTropFlag = -1;
}
}
if (! infileset) {
printf("%s",usageString);
Expand Down Expand Up @@ -169,11 +177,41 @@ int main (int argc, char *argv[]) {
}
if (el[i].hdr.vg_type == JET_ELM ) {
genJetObject(&el[i],vgFileOut);
}
/* Process Tropopause Data */
if (cvtTropFlag && el[i].hdr.vg_type == SPTX_ELM) {
genTropObject(&el[i],vgFileOut);
}

}
return 0;
}

static void genTropObject(VG_DBStruct *el_txt, char *vgFileOut)
{
int start, loc, ier;
start = -1;
switch(el_txt->elem.spt.info.sptxtyp) {
/* Is this a Regular Tropopause Box ? */
case 4:
el_txt->elem.spt.info.sztext = 1.25F;
break;
/* Is this a high tropopause Box ? */
case 2:
el_txt->elem.spt.info.sztext = 0.85F;
break;
/* Is this a low tropopause Box ? */
case 1:
el_txt->elem.spt.info.sztext = 0.85F;
break;
/* Default */
default:
el_txt->elem.spt.info.sztext = 1.00F;
break;
}
cvg_writefD ( el_txt, start, el_txt->hdr.recsz, vgFileOut, &loc, &ier);
}

static void genSGWXTurb(VG_DBStruct *el_line, VG_DBStruct *el_txt,
char *vgFileOut)
{
Expand Down Expand Up @@ -311,6 +349,7 @@ static void genSGWXSpSymObject(VG_DBStruct *el_sym, VG_DBStruct *el_txt,
el.elem.sgwx.info.textlon = el_txt->elem.spt.info.lon;

strcpy(el.elem.sgwx.spt.text,"");
el.elem.sgwx.spt.info.sptxtyp = 4;
if (el_sym->hdr.vg_type == SPSYM_ELM || el_sym->hdr.vg_type == WXSYM_ELM) {
/* Is this a STMSYM? */
if (fabs(el_sym->elem.sym.data.code[0] - STMSYM) < .001) {
Expand All @@ -320,27 +359,34 @@ static void genSGWXSpSymObject(VG_DBStruct *el_sym, VG_DBStruct *el_txt,
el.elem.sgwx.info.splsym = STMSYM_S;
}
if (strstr(el_txt->elem.spt.text,"TCNN")) {
strcpy(el.elem.sgwx.spt.text, "TC NN");
strcpy(el.elem.sgwx.spt.text, "\"TC NN\"");
} else {
strcpy(el.elem.sgwx.spt.text, el_txt->elem.spt.text);
}
el.elem.sgwx.spt.info.sptxtyp = 0;
el.elem.sgwx.spt.info.filcol = 0;
el.elem.sgwx.spt.info.lincol = 0;
}
/* Is this a VOLSYM? */
if (fabs(el_sym->elem.sym.data.code[0] - VOLSYM) < .001) {
el.elem.sgwx.info.wxsym = VOLSYM;
el.elem.sgwx.spt.info.turbsym = 0;
strcpy(el.elem.sgwx.spt.text, el_txt->elem.spt.text);
el.elem.sgwx.spt.info.filcol = 31;
el.elem.sgwx.spt.info.lincol = 32;
el.elem.sgwx.spt.info.sztext = 0.70;
el.elem.sgwx.spt.info.ialign = 0;
}
/* Is this a RADSYM? */
if (fabs(el_sym->elem.sym.data.code[0] - RADSYM) < .001) {
el.elem.sgwx.info.splsym = RADSYM;
strcpy(el.elem.sgwx.spt.text, el_txt->elem.spt.text);
el.elem.sgwx.spt.info.filcol = 31;
el.elem.sgwx.spt.info.lincol = 32;

}
el.elem.sgwx.spt.info.sptxtyp = 4;
el.elem.sgwx.spt.info.turbsym = 4;
el.elem.sgwx.spt.info.txtcol = el_txt->elem.spt.info.txtcol;
el.elem.sgwx.spt.info.filcol = 31;
el.elem.sgwx.spt.info.lincol = 32;

}
/* Write the SGWX Polygon Object */
Expand All @@ -362,7 +408,7 @@ static void genJetObject(VG_DBStruct *el, char *vgFileOut)
lwfactor = (int)(el->elem.jet.line.spl.info.splwid / 14.0);

for (i=0; i < el->elem.jet.nbarb; i++) {
el->elem.jet.barb[i].spt.info.sztext=0.7;
el->elem.jet.barb[i].spt.info.sztext=0.8;
el->elem.jet.barb[i].spt.info.itxfn=2;
el->elem.jet.barb[i].spt.info.lat = el->elem.jet.barb[i].wnd.data.latlon[0];
el->elem.jet.barb[i].spt.info.lon = el->elem.jet.barb[i].wnd.data.latlon[1];
Expand Down
3 changes: 2 additions & 1 deletion gempak/source/gemlib/ss/ssvers.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,15 @@ SUBROUTINE SS_VERS ( vmsg, iret )
C* B. Hebbard/NCEP 05/23 Updated to 7.16.1 *
C* B. Hebbard/NCEP 07/23 Updated to 7.17.0 *
C* B. Hebbard/NCEP 01/24 Updated to 7.18.0 *
C* B. Hebbard/NCEP 10/24 Updated to 7.19.0 *
C************************************************************************
CHARACTER*(*) vmsg
C------------------------------------------------------------------------
iret = 0
C
C* Set the version string and add a null to the end.
C
vmsg = 'Version 7.18.0'
vmsg = 'Version 7.19.0'
CALL ST_NULL ( vmsg, vmsg, lens, ier )
C*
RETURN
Expand Down
8 changes: 4 additions & 4 deletions gempak/tables/bufr/bufrprefs.tbl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ AREAS_TO_INCLUDE ICAO_EU;ICAO_ME;ICAO_AS;ICAO_NA
ICAO_EU NO_LONDON_BACKUP
ICAO_ME NO_LONDON_BACKUP
ICAO_AS NO_LONDON_BACKUP
ICAO_NA 17.2_-54.1,_44.7_-101.7,_50.7_60.3,_19.7_10.0
ICAO_NA 17.2_-54.1,_44.7_-101.7,_50.7_60.3,_19.7_10.0.
! Backup values for WAFC London
ICAO_EU_BKUP 21.4_-21.6,_46.6_-56.6,_58.7_68.4,_26.4_33.4
ICAO_ME_BKUP 10.0_17.0,_44.0_17.0,_44.0_70.0,_10.0_70.0
ICAO_AS_BKUP 0.0_53.0,_36.0_53.0,_36.0_108.0,_0.0_108.0
ICAO_EU_BKUP 21.4_-21.6,_46.6_-56.6,_58.7_68.4,_26.4_33.4.
ICAO_ME_BKUP 10.0_17.0,_44.0_17.0,_44.0_70.0,_10.0_70.0.
ICAO_AS_BKUP 0.0_53.0,_36.0_53.0,_36.0_108.0,_0.0_108.0.
! Values for BUFR sections 0, 1 and 3. Keep entries in the order given below.
MASTER_TABLE 0
EDITION 3
Expand Down
5 changes: 3 additions & 2 deletions gempak/tables/config/forecasters.tbl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!* *
!* This table contains the names of individual forecasters. *
!* This list is used when thunderstorm or tornado watchs are issued. *
!* The range lists may contain a maximum of 30 elements *
!* The range lists may contain a maximum of 50 elements *
!* of no more than 16 characters each. *
!* *
!** *
Expand All @@ -13,10 +13,11 @@
!* G. Grosshans 11/99 Updated Outlook forecasters *
!* R. Curtis 5/00 Increased max and removed key word *
!* G. Grosshans 6/00 Added rest of forecasters *
!* B. Hebbard 11/24 Updated comment to max 50 (chg'd 2009) *
!************************************************************************
!
! Forecaster names
! (maximum of 30 names, maximum of 16 characters each)
! (maximum of 50 names, maximum of 16 characters each)
!
BANACOS
BOTHWELL
Expand Down
3 changes: 2 additions & 1 deletion gempak/tables/pgen/vaa.tbl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
! B. Hebbard/NCEP 02/23 updates for NAWIPS-142 various UI changes & merge SAB's updates
! B. Hebbard/NCEP 03/23 added volcano <NUMBER> to NEAR, and also to new TEST and EXER
! B. Hebbard/NCEP 05/23 restore <REMARKS> field to END product; inadv. removed with <ALL>
! B. Hebbard/NCEP 11/24 change SUMMIT ELEV wording to SOURCE ELEV per SAB
!
!--------------------------------------------------------------------------
! VAA GUI Information
Expand Down Expand Up @@ -289,7 +290,7 @@ WORDING <VAA> VOLCANIC_ASH_ADVISORY | VA_ADVISORY
WORDING <DTG> ISSUED | DTG
WORDING <STS> STATUS | STATUS
WORDING <PSN> LOCATION | PSN
WORDING <SUM> SUMMIT_ELEVATION | SUMMIT_ELEV
WORDING <SUM> SUMMIT_ELEVATION | SOURCE_ELEV
WORDING <ADV> ADVISORY_NUMBER | ADVISORY_NR
WORDING <INF> INFORMATION_SOURCE | INFO_SOURCE
WORDING <OAD> OBS_ASH_DATE/TIME | OBS_VA_DTG
Expand Down
39 changes: 31 additions & 8 deletions gempak/tables/stns/buoys.tbl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
!
! Log:
! G. Krueger/EAI 6/97
! A. Hardy/GSC 4/99 Added underscores to names
! C.J.Janota/MPC 7/00 Added 3 more WATL buoys for MPC verification
! A. Hardy/GSC 4/99 Added underscores to names
! C.J.Janota/MPC 7/00 Added 3 more WATL buoys for MPC verification
! B. Hebbard/SDB 10/24 Added 22 buoys per recent data-curation list
!
! The format for the file is given below, with the number of characters in
! parentheses.
Expand Down Expand Up @@ -41,10 +42,32 @@
46274 Leucadia_Nearshore US 3306 -11731 0 0
46275 Red_Beach_Nearshore US 3329 -11750 0 0
44084 Bethany_Beach US 3854 -7504 11 0
41067 FRP2WAVE US 3228 -8041 0 0
45200 Maumee_Bay US 4172 -8337 174 0
45210 Rawley_Point_East US 4406 -8705 0 0
45211 Grand_Island_North US 4697 -8657 183 0
46277 Green_Beach_Offshore US 3334 -11766 0 0
41067 FRP2WAVE US 3228 -8041 0 0
45200 Maumee_Bay US 4172 -8337 174 0
45210 Rawley_Point_East US 4406 -8705 0 0
45211 Grand_Island_North US 4697 -8657 183 0
46277 Green_Beach_Offshore US 3334 -11766 0 0
41112 Hollywood_Beach US 2600 -8010 0 0
46276 Pajaro_Beach US 3685 -12183 0 0
46276 Pajaro_Beach US 3685 -12183 0 0
46278 Tillamook_Bay_South_Jetty US 4556 -12399 0 0
46279 Pajaro_Beach_South US 3684 -12182 0 0
41068 Fort_Pierce US 2759 -8019 0 0
41069 Ponce_de_Leon_Inlet US 2929 -8080 0 0
41070 Ponce_de_Leon_Inlet_Waves US 2929 -8080 0 0
44078 OOI_Irminger_Sea_Surface_Mooring -- 5994 -3952 0 0
45213 East_Superior_Spotter US 4759 8659 183 0
45212 North_Huron_Spotter US 4535 8284 177 0
45214 South_Michigan_Spotter US 4267 -8703 176 0
52213 North_Point FM 708 15824 0 0
41082 Mid-Atl_Bight_Central_Sfc_Mooring US 3595 -7513 4 0
41083 Mid-Atl_Bright_Southern_Sfc_Mooring US 3573 -7485 0 0
44079 Mid-Atl_Bright_Northern_Sfc_Mooring US 3618 -7483 0 0
45218 Sheboygan_Shipwreck_Coast_NMS US 4373 8762 176 0
46280 Newport_PWS_North US 4458 -12423 0 0
46281 Newport_PWS_South US 4456 -12423 0 0
52214 Rumung FM 968 13818 0 0
45216 Ontonagon US 4693 -8935 183 0
45219 Two_Harbors_Nearshore US 4702 -9163 183 0
51214 King-Poloa AS 1430 -17088 0 0
46282 Aptos_Creek_Nearshore US 3695 -12192 0 0
52215 Utwe FM 524 16300 0 0
Loading

0 comments on commit aaaaa35

Please sign in to comment.
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy