From 79fb68aeb1db61e011510ff5174df837720c5a40 Mon Sep 17 00:00:00 2001 From: David Friedman Date: Wed, 18 Feb 2015 16:21:31 +0000 Subject: [PATCH 01/10] ASM #17125 - Fix decoding of upper air collectives Change-Id: I20e342561ce80460b2c1189277a45de539bc6540 Former-commit-id: 420ca2787415f4f609fd6016ace1435f87b740f4 --- .../impl/separator/UACollectiveSeparator.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java index 9f022fcc29..cd500d96e9 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java @@ -51,6 +51,7 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData; * Apr 02, 2014 2652 skorolev Corrected a removing of excess control characters. * May 14, 2014 2536 bclement moved WMO Header to common * Dec 03, 2014 ASM #16859 D. Friedman Use CharBuffer instead of StringBuilder. + * Feb 17, 2014 ASM #17125 D. Friedman Fix parsing of type and date fields. * * * @author jkorman @@ -423,12 +424,18 @@ public class UACollectiveSeparator extends WMOMessageSeparator { } // Check for USUS80 or 90 formatted messages and decode else if (dataDes.endsWith("80") || dataDes.endsWith("90")) { + /* // A1 logic. It is not clear what this was for. if (checkCharNum(buffer.charAt(0))) { buffer.get(); } else { stationNum.append(assignTextSegment(buffer, CSPC)); } + */ + if (! checkCharNum(buffer.charAt(0))) { + buffer.get(); + } + stationNum.append(assignTextSegment(buffer, CSPC)); getTextSegment(buffer, parsedMsg, CSEP); } else { // Otherwise it's standard format so decode @@ -442,18 +449,19 @@ public class UACollectiveSeparator extends WMOMessageSeparator { // to be used as the station number instead of the third, so the // length of a string between spaces is now used to determine a // valid field. + CharBuffer stationSearchBuffer = buffer.duplicate(); int x = 0; - while (x < 2 && buffer.length() > 0) { - int len = buffer.length(); - if (safeStrpbrk(buffer, CSPC)) { - if (len - buffer.length() >= 4) { + while (x < 2 && stationSearchBuffer.length() > 0) { + int len = stationSearchBuffer.length(); + if (safeStrpbrk(stationSearchBuffer, CSPC)) { + if (len - stationSearchBuffer.length() >= 4) { x++; } - buffer.get(); + stationSearchBuffer.get(); } } - stationNum.append(assignTextSegment(buffer, CSPC)); + stationNum.append(assignTextSegment(stationSearchBuffer, CSPC)); } getTextSegment(buffer, parsedMsg, CSEP); From bc8875c276a457b31ee88f9b1c316c5c92d2d13f Mon Sep 17 00:00:00 2001 From: Jingtao Deng Date: Wed, 18 Feb 2015 13:53:36 -0500 Subject: [PATCH 02/10] VLab Issue #6488 - DR17123 Hydro HPE bias_source field in HPERadarResult table needs NO BIAS for some products; fixes #6488 Change-Id: I8c33b5e39222c13d2d3c1143d17ba77a06f6f877 Former-commit-id: d8f55d811a11bdb76f69dc7a5ee7cd656c8e63fe --- .../src/hpe_fieldgen/TEXT/apply_local_bias.c | 12 ++++++----- .../src/hpe_fieldgen/TEXT/empe_fieldgen.h | 5 ++++- .../src/hpe_fieldgen/TEXT/project.c | 17 ++++++++++++---- .../src/hpe_fieldgen/TEXT/run_bdhrmosaic.c | 8 +++++++- .../src/hpe_fieldgen/TEXT/run_dhrmosaic.c | 13 ++++++++---- .../src/hpe_fieldgen/TEXT/run_ebmosaic.c | 8 ++++++-- .../src/hpe_fieldgen/TEXT/run_ermosaic.c | 7 ++++++- .../hpe_fieldgen/TEXT/wrtodb_HPERadarResult.c | 20 +++++++++++++------ 8 files changed, 66 insertions(+), 24 deletions(-) diff --git a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/apply_local_bias.c b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/apply_local_bias.c index 9ff0cc531c..e86b29acb6 100644 --- a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/apply_local_bias.c +++ b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/apply_local_bias.c @@ -71,6 +71,7 @@ * Date Developer Action * 08/16/2007 Guoxian Zhou first version * 07/2013 JingtaoD dual pol +* 02/2015 JingtaoD A2 OB14.4.1 DR#17123 - HPE Bias Source field ***********************************************************************/ static double ** origLocBias = NULL; @@ -102,7 +103,8 @@ int applyLocalBias(const time_t tRunTime , struct tm * pRunTime = NULL ; static int first = 0; - char prefix[10] = {'\0'}; + + char prefix[20] = {'\0'}; int i, j ; @@ -128,7 +130,7 @@ int applyLocalBias(const time_t tRunTime , { strcpy(prefix, "LOCBIASDP"); sprintf ( message , "STATUS: using dual pol local bias.") ; - printMessage( message ); + hpe_fieldgen_printMessage( message ); } } @@ -138,7 +140,7 @@ int applyLocalBias(const time_t tRunTime , { sprintf ( message , "WARNING: token \"%s\" not available" " - using mean field bias.", LOCBIAS_DIR_TOKEN) ; - printMessage( message ); + hpe_fieldgen_printMessage( message ); return 0; @@ -147,7 +149,7 @@ int applyLocalBias(const time_t tRunTime , { strcpy(prefix, "LOCBIAS"); sprintf ( message , "STATUS: using single pol local bias.") ; - printMessage( message ); + hpe_fieldgen_printMessage( message ); } } @@ -161,7 +163,7 @@ int applyLocalBias(const time_t tRunTime , "%Y%m%d%H", pRunTime); sprintf(fileName, "%s/%s%sz", localBiasDir, prefix, strDateTime ); - sprintf(message, "STATUS: local bias file name is %s.", fileName); + sprintf(message, "STATUS: in apply_local_bias-local bias file name is %s.", fileName); hpe_fieldgen_printMessage( message ); diff --git a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/empe_fieldgen.h b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/empe_fieldgen.h index 9d79e38797..16959f674b 100644 --- a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/empe_fieldgen.h +++ b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/empe_fieldgen.h @@ -11,6 +11,8 @@ * MODIFICATION HISTORY: * DATE PROGRAMMER DESCRIPTION/REASON * 07/2013 JingtaoD add prototypes for dual pol proudcts DSA/DPR +* 02/2015 JingtaoD A2 OB14.4.1 DR#17123 - HPE Bias Source field +* update wrtodb_HPERadarResult() ******************************************************************************** */ @@ -742,6 +744,7 @@ void read_daabiasdyn(const char *radar_id, void wrtodb_HPERadarResult(const char * hpe_productname, const char * producttime, const empe_params_struct * pEMPEParams, - const int radar_data_source); + const int radar_data_source, + const int nobias_flag); #endif /* #ifndef MPE_FIELDGEN_H */ diff --git a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/project.c b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/project.c index a6ad9b7a8a..77d74429b1 100644 --- a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/project.c +++ b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/project.c @@ -92,7 +92,7 @@ * Jul. 2001 R. Fulton added mxpra limiting of projected rates * Aug. 11, 2006 Shucai Guan finish conversion to C Language * Mar., 2008 Guoxian Zhou finish first operational version - * + * 02/2015 JingtaoD A2 OB14.4.1 DR#17123 - HPE Bias Source field ***********************************************************************/ static void writeGrib(char * fileName, char * procFlag) @@ -175,6 +175,7 @@ void project(const geo_data_struct * pGeoData, const char * mosaicID, int i, j, iprj, isFilled; long irc; + int nobias_flag; int origRowSize = pGeoData->num_rows; int origColSize = pGeoData->num_cols; @@ -508,11 +509,13 @@ void project(const geo_data_struct * pGeoData, const char * mosaicID, if (strstr(mosaicID, "BDHR") != NULL) { + nobias_flag = 0; sprintf(procFlag, "%s%02d ", biasedRateFilePrefix, k * 15); sprintf(fileName, "%sM%d%sz", biasedRateFilePrefix, k * 15, strDateTime); } else { + nobias_flag = 1; sprintf(procFlag, "%s%02d ", rateFilePrefix, k * 15); sprintf(fileName, "%sM%d%sz", rateFilePrefix, k * 15, strDateTime); @@ -587,8 +590,10 @@ void project(const geo_data_struct * pGeoData, const char * mosaicID, sprintf ( message , "\nSTATUS: In Project, insert/update 1km mosaic nowcast into HPERadarResult table"); printLogMessage( message ); + sprintf ( message, "nobias flag is %d", nobias_flag); + printLogMessage( message ); - wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, radar_data_source); + wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, radar_data_source, nobias_flag); } @@ -636,10 +641,12 @@ void project(const geo_data_struct * pGeoData, const char * mosaicID, { if (strstr(mosaicID, "BDHR") != NULL) { + nobias_flag = 0; sprintf(procFlag, "rfcwide "); sprintf(fileName, "%s4kmH%sz", biasedAccFilePrefix, strDateTime); } else { + nobias_flag = 1; sprintf(procFlag, "rfcwide "); sprintf(fileName, "%s4kmH%sz", accFilePrefix, strDateTime); } @@ -662,7 +669,7 @@ void project(const geo_data_struct * pGeoData, const char * mosaicID, sprintf ( message , "\nSTATUS: In Project, insert/update 4km mosaic nowcast into HPERadarResult table"); printLogMessage( message ); - wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, radar_data_source); + wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, radar_data_source, nobias_flag); } } @@ -683,10 +690,12 @@ void project(const geo_data_struct * pGeoData, const char * mosaicID, if (strstr(mosaicID, "BDHR") != NULL) { + nobias_flag = 0; sprintf(procFlag, "BTP1H "); sprintf(fileName, "%sH%sz", biasedAccFilePrefix, strDateTime); } else { + nobias_flag = 1; sprintf(procFlag, "TP1H "); sprintf(fileName, "%sH%sz", accFilePrefix, strDateTime); } @@ -760,7 +769,7 @@ void project(const geo_data_struct * pGeoData, const char * mosaicID, sprintf ( message , "\nSTATUS: In Project, insert/update 1km mosaic nowcast into HPERadarResult table"); printLogMessage( message ); - wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, radar_data_source); + wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, radar_data_source, nobias_flag); } /* diff --git a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_bdhrmosaic.c b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_bdhrmosaic.c index 27968f05dd..8bf818eee1 100644 --- a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_bdhrmosaic.c +++ b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_bdhrmosaic.c @@ -71,6 +71,7 @@ * Date Developer Action * 10/24/2006 Guoxian Zhou Modified from run_bmosaic.c * 07/2013 JingtaoD dual pol +* 02/2015 JingtaoD A2 OB14.4.1 DR#17123 - HPE Bias Source field ***********************************************************************/ static double ** Mosaic = NULL; @@ -114,9 +115,14 @@ void runBDHRMosaic(const run_date_struct * pRunDate , static int first = 1 ; struct tm * pRunTime = NULL ; long int irc ; + int nobias_flag; + + /*for BDHR product, there is bias applied */ + nobias_flag = 0; int status = 0 ; + /* * strDateTime string should be in format: yyyymmddHHMM */ @@ -235,7 +241,7 @@ void runBDHRMosaic(const run_date_struct * pRunDate , sprintf ( message , "\nSTATUS: In BDHRMOSAIC, insert/update HPERadarResult table"); printLogMessage( message ); - wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, dualpol_used); + wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, dualpol_used, nobias_flag); sprintf ( message , "\nSTATUS: In BDHRMOSAIC, complete insert/update HPERadarResult table"); diff --git a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_dhrmosaic.c b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_dhrmosaic.c index 83efa96c22..e72cf4728d 100644 --- a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_dhrmosaic.c +++ b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_dhrmosaic.c @@ -74,9 +74,10 @@ * Date Developer Action * 8/13/2006 Guoxian Zhou Build operational version * 07/2013 Jingtao Deng Modify for adding dual pol producat DPR - * first try to find the DPR product from dprradar - * table and calculate the rain rate. if - * not able to get DPR product, then use DHR product +* first try to find the DPR product from dprradar +* table and calculate the rain rate. if +* not able to get DPR product, then use DHR product +* 02/2015 JingtaoD A2 OB14.4.1 DR#17123 - HPE Bias Source field ***********************************************************************/ extern short ** radarMiscBins ; @@ -164,6 +165,10 @@ void runDHRMosaic(const run_date_struct * pRunDate, int dualpol_meanbias_flag[MAX_RADAR_NUM]; int sp_meanbias_flag[MAX_RADAR_NUM]; int dualpol_data_avail[MAX_RADAR_NUM]; + int nobias_flag; + + /* for DHR product, there is no bias applied */ + nobias_flag = 1; /* initialize no dualpol MFB and no dual pol product avialble for each radar */ for (i = 0; i < MAX_RADAR_NUM; i++) @@ -652,7 +657,7 @@ void runDHRMosaic(const run_date_struct * pRunDate, sprintf ( message , "\nSTATUS: In DHRMOSAIC, insert/update HPERadarResult table"); printLogMessage( message ); - wrtodb_HPERadarResult(dhrmosaic_fileName, prdDateTime, pEMPEParams, dualpol_used); + wrtodb_HPERadarResult(dhrmosaic_fileName, prdDateTime, pEMPEParams, dualpol_used, nobias_flag); sprintf ( message , "\nSTATUS: In DHRMOSAIC, complete insert/update HPERadarResult table"); printLogMessage( message ); diff --git a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_ebmosaic.c b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_ebmosaic.c index 749d94b6d9..0dc525e133 100644 --- a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_ebmosaic.c +++ b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_ebmosaic.c @@ -73,7 +73,7 @@ * April 2005 Guoxian Zhou converted to C Language * 10/05/2006 Guoxian Zhou Modified for empe version * 08/08/2007 Guoxian Zhou add option to use local bias data -* +* 02/2015 JingtaoD A2 OB14.4.1 DR#17123 - HPE Bias Source field ***********************************************************************/ extern int dualpol_used; @@ -113,9 +113,13 @@ void runEBMosaic(const run_date_struct * pRunDate , static int first = 1 ; struct tm * pRunTime = NULL ; long int irc ; + int nobias_flag; int status = 0 ; + /* for EBMOSAIC, there is bias applied */ + nobias_flag = 0; + /* * strDateTime string should be in format: yyyymmddHHMM */ @@ -225,7 +229,7 @@ void runEBMosaic(const run_date_struct * pRunDate , sprintf ( message , "\nSTATUS: In EBMOSAIC, insert/update HPERadarResult table"); printLogMessage( message ); - wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, dualpol_used); + wrtodb_HPERadarResult(fileName, prdDateTime, pEMPEParams, dualpol_used, nobias_flag); sprintf ( message , "\nSTATUS: In EBMOSAIC, complete insert/update HPERadarResult table"); printLogMessage( message ); diff --git a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_ermosaic.c b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_ermosaic.c index 0c15edc77a..e7f5cccfff 100644 --- a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_ermosaic.c +++ b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/run_ermosaic.c @@ -81,6 +81,7 @@ * first try to find the DSA product from dsaradar * table and calculate the 1 hour precipitation. if * not able to get DSA product, then use DSP product +* 02/2015 JingtaoD A2 OB14.4.1 DR#17123 - HPE Bias Source field ***********************************************************************/ extern short ** radarMiscBins ; @@ -195,6 +196,10 @@ void runERMosaic(const run_date_struct * pRunDate, int dualpol_meanbias_flag[MAX_RADAR_NUM]; int sp_meanbias_flag[MAX_RADAR_NUM]; int dualpol_data_avail[MAX_RADAR_NUM]; + int nobias_flag; + + /*ERMOSAIC product has no bias applied */ + nobias_flag = 1; /* initialize no dualpol MFB and no dual pol product avialble for each radar */ for (i = 0; i < MAX_RADAR_NUM; i++) @@ -970,7 +975,7 @@ void runERMosaic(const run_date_struct * pRunDate, printLogMessage( message ); if(blnMosaic[ermosaic] == 1) - wrtodb_HPERadarResult(ermosaic_fileName, prdDateTime, pEMPEParams, dualpol_used); + wrtodb_HPERadarResult(ermosaic_fileName, prdDateTime, pEMPEParams, dualpol_used, nobias_flag); sprintf ( message , "\nSTATUS: In ERMOSAIC, complete insert/update HPERadarResult table"); printLogMessage( message ); diff --git a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/wrtodb_HPERadarResult.c b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/wrtodb_HPERadarResult.c index c001cb2397..f8fab61109 100644 --- a/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/wrtodb_HPERadarResult.c +++ b/nativeLib/rary.ohd.pproc/src/hpe_fieldgen/TEXT/wrtodb_HPERadarResult.c @@ -12,7 +12,7 @@ * MACHINE: * MODIFICATION HISTORY: * MODULE # DATE PROGRAMMER DESCRIPTION/REASON -* +* 02/2015 JingtaoD A2 OB14.4.1 DR#17123 - HPE Bias Source field ******************************************************************************** */ @@ -55,19 +55,20 @@ void wrtodb_HPERadarResult(const char * hpe_productname, const char * producttime, const empe_params_struct * pEMPEParams, - const int radar_data_source) + const int radar_data_source, + const int nobias_flag) { HPERadarResult hperadarresult_struct; const char * HPE_BIAS_SOURCE_TOKEN = "hpe_bias_source"; - static int first = 1 ; + static int first = 0 ; static char bias_source[6] = "RFC"; // RFC or LOCAL, default to RFC char strTokenValue[6] = {'\0'} ; /* retrieve token HPE_BIAS_SOURCE_TOKEN, it can be LOCAL or RFC */ - if(first == 1) + if(first == 0) { if(hpe_fieldgen_getAppsDefaults(HPE_BIAS_SOURCE_TOKEN, strTokenValue) != -1) { @@ -97,12 +98,19 @@ void wrtodb_HPERadarResult(const char * hpe_productname, hpe_fieldgen_printMessage( message ); } - first = 0; + first = 1; } + + /* Initialize the product name. and assign value */ /*hperadarresult_struct.hpe_productname [ PRESET_DESCR_LEN + 1 ] = '\0';*/ strncpy(hperadarresult_struct.hpe_productname, hpe_productname, PRESET_DESCR_LEN); + sprintf ( message, "STATUS: the hpe productname is %s", hpe_productname); + hpe_fieldgen_printMessage( message ); + + sprintf ( message, "STATUS: the nobias_flag is %d", nobias_flag); + hpe_fieldgen_printMessage( message ); /* assign producttime */ yearsec_ansi_to_dt(producttime, &hperadarresult_struct.producttime); @@ -114,7 +122,7 @@ void wrtodb_HPERadarResult(const char * hpe_productname, /* Initialize the bias source . and assign value */ hperadarresult_struct.bias_source[BIAS_LEN + 1] = '\0'; - if (pEMPEParams->blnMeanFieldBias == 0 && pEMPEParams->blnDHRMeanFieldBias == 0) + if (nobias_flag == 1) strcpy(hperadarresult_struct.bias_source, "NO BIAS"); else //EBMOSAIC or BDHRMOSAIC { From 20dbdea326cb5da15e6705830d7430bba2397ab3 Mon Sep 17 00:00:00 2001 From: Joshua Watson Date: Wed, 18 Feb 2015 16:17:16 -0500 Subject: [PATCH 03/10] VLab Issue #6496 - Key in sfcGrid.xml changed from HI-MOSGuide to MOSGuide-HI; fixes #6496 Change-Id: I4571bb639d474a86df39b7ea3bde1a23bad8f37f Former-commit-id: aa05e8a312511e61c0dd01680b536282ee733154 --- .../localization/volumebrowser/VbSources/sfcGrid.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml index 2310df45a1..b8daa3f5a5 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml @@ -52,7 +52,7 @@ - + From 7e1d77fc7d454930fd5914d166f7a14b61487568 Mon Sep 17 00:00:00 2001 From: Joshua Watson Date: Wed, 18 Feb 2015 16:23:05 -0500 Subject: [PATCH 04/10] VLab Issue #6495 - Fixed parameter abbrev in derived parameter CLGTN2hr.xml; fixes #6495 Change-Id: I48f5c7a8c73a156d578c801c90b57364d8f5af1e Former-commit-id: b8a493859cf272d116cc05c6121c2c84791962d9 --- .../base/derivedParameters/definitions/CLGTN2hr.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CLGTN2hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CLGTN2hr.xml index d16bbea627..a008141550 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CLGTN2hr.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CLGTN2hr.xml @@ -18,4 +18,4 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + From ce6241f01ae35f722f7e677fdac2bfc59ff1e6dd Mon Sep 17 00:00:00 2001 From: Ana Rivera Date: Fri, 20 Feb 2015 20:04:10 +0000 Subject: [PATCH 05/10] VLab Issue #6432 - Rename GribModel:7:14:114 as EKDMOS; fixes #6432 Change-Id: I9c750ee1970de2705abec0fb806babbcd32c512c Former-commit-id: f747715fb7479dcaf0bfd0849ca4a96e8b99dad5 --- .../edex_static/base/grib/models/gribModels_NCEP-7.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml index 19b6919f41..ffcaa947de 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml @@ -3250,6 +3250,15 @@ 0 + + EKDMOS +
7
+ 14 + 197 + + 114 + + From 4a0df1fc59a510b08b148f189729399076b88c6e Mon Sep 17 00:00:00 2001 From: Jason Burks Date: Fri, 20 Feb 2015 23:31:11 +0000 Subject: [PATCH 06/10] VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554 Change-Id: I9e11f605069ee8dab0c8efa0c77fe4702d95d18a Former-commit-id: ec6e24420ad62fc306c577a0ec9e19c72d0d2bbe --- .../gov.nasa.msfc.sport.edex.plugin.lma/META-INF/MANIFEST.MF | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/META-INF/MANIFEST.MF b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/META-INF/MANIFEST.MF index 8e25766996..2e11e804b9 100755 --- a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/META-INF/MANIFEST.MF +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/META-INF/MANIFEST.MF @@ -9,8 +9,7 @@ Require-Bundle: com.raytheon.edex.common, org.geotools, ucar.nc2, com.raytheon.uf.common.dataplugin.grid, - com.raytheon.uf.edex.plugin.level, - org.apache.commons.logging + com.raytheon.uf.edex.plugin.level Export-Package: gov.nasa.msfc.sport.edex.plugin.lma Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.raytheon.uf.common.localization, From 0e90c2559598842f86418655d9d724c90901857b Mon Sep 17 00:00:00 2001 From: Ana Rivera Date: Mon, 23 Feb 2015 15:56:58 +0000 Subject: [PATCH 07/10] VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432 Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac Former-commit-id: a5fc4d46bff38ecab9c9019c5184fae99a6ecc90 --- .../utility/common_static/base/grid/dataset/alias/grib.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/dataset/alias/grib.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/dataset/alias/grib.xml index 7bad99d4ee..3eb24c3a1c 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/dataset/alias/grib.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/dataset/alias/grib.xml @@ -22,4 +22,5 @@ GribModel:7:0:96:212 GribModel:7:0:81:212 GribModel:7:0:77:212 - \ No newline at end of file + GribModel:7:14:114 + From 861a749706bb9f041b960e552aad02c12f042468 Mon Sep 17 00:00:00 2001 From: Ana Rivera Date: Mon, 23 Feb 2015 21:21:25 +0000 Subject: [PATCH 08/10] VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432 Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a Former-commit-id: 9242a49a1a688379c625ee93af21e98a007470b0 --- .../base/grib/models/gribModels_NCEP-7.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml index ffcaa947de..afd09bf08a 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml @@ -3254,11 +3254,21 @@ EKDMOS
7
14 - 197 + 184 114 + + EKDMOS-AK +
7
+ 14 + 1023 + + 114 + + + From cc2c3da325c9bb915f629cc2549b42f5bcf2b145 Mon Sep 17 00:00:00 2001 From: David Friedman Date: Tue, 24 Feb 2015 15:33:48 +0000 Subject: [PATCH 09/10] ASM #14990 - Add pqact patterns for earthquake and tsunami products Change-Id: Ied72bd5896a9e1939f4ddd9d68cb362067406d65 Former-commit-id: 899c6472abfdcfa27018d20cc204735dea4d2f43 --- .../awips2.core/Installer.ldm/patch/etc/pqact.conf.template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template index dc85a93ddf..8b6e1dda1a 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -442,6 +442,12 @@ IDS|DDPLUS ^(M[A-Z]{3}[0-9]{2}) ([KPTMC].{3}) (..)(..)(..) IDS|DDPLUS ^(T[BCHPRTWXY][A-Z]{2}[0-9]{2}) ([A-Z]{4}) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H +IDS|DDPLUS ^(SE[A-Z]{2}[0-9]{2}) ([A-Z]{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + +IDS|DDPLUS ^(WE[CHP][A-Z][0-9]{2}) ([A-Z]{4}) (..)(..)(..) + FILE -overwrite -log -close -edex /data_store/text/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H + # summaries #IDS|DDPLUS ^(A.{5}) (.{4}) (..)(..)(..) # FILE -overwrite -log -close -edex /data_store/summaries/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H From 00880112ba3f4ff82d5206ebd825c733f23f6c9a Mon Sep 17 00:00:00 2001 From: Darrel Kingfield Date: Tue, 24 Feb 2015 10:14:35 -0600 Subject: [PATCH 10/10] VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585 Former-commit-id: f43b83069eaf12e4190f1827eeed8d954239b164 --- cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml | 6 +++--- .../edex_static/base/grib/tables/161/0/4.2.0.15.table | 2 +- .../edex_static/base/grib/tables/161/0/4.2.209.6.table | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml b/cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml index 6fec96a168..75b23ba6b8 100644 --- a/cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml +++ b/cave/com.raytheon.viz.grid/localization/menus/mrms/mrms.xml @@ -1,10 +1,10 @@ - + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.0.15.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.0.15.table index 4f144ee198..55a5cd6c6a 100755 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.0.15.table +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.0.15.table @@ -31,7 +31,7 @@ 229:229:Seamless Hybrid Scan Reflectivity (SHSR):dBZ:SeamlessHSR 230:230:Radar Quality Index (RQI)::RadarQualityIndex 231:231:QPE - Radar Only (1 hr. accum.):mm:RadarOnlyQPE01H -232:232:QPE - Radar Only (3 hr. accum.):RadarOnlyQPE03H +232:232:QPE - Radar Only (3 hr. accum.):mm:RadarOnlyQPE03H 233:233:QPE - Radar Only (6 hr. accum.):mm:RadarOnlyQPE06H 234:234:QPE - Radar Only (12 hr. accum.):mm:RadarOnlyQPE12H 235:235:QPE - Radar Only (24 hr. accum.):mm:RadarOnlyQPE24H diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.6.table b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.6.table index bf430ba558..a7631c7606 100755 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.6.table +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/tables/161/0/4.2.209.6.table @@ -2,7 +2,7 @@ 0:0:Surface Precipitation Type (SPT)::PrecipType 1:1:Radar Precipitation Rate (SPR):mm/hr:PrecipRate 2:2:QPE - Radar Only (1 hr. accum.):mm:RadarOnlyQPE01H -3:3:QPE - Radar Only (3 hr. accum.):RadarOnlyQPE03H +3:3:QPE - Radar Only (3 hr. accum.):mm:RadarOnlyQPE03H 4:4:QPE - Radar Only (6 hr. accum.):mm:RadarOnlyQPE06H 5:5:QPE - Radar Only (12 hr. accum.):mm:RadarOnlyQPE12H 6:6:QPE - Radar Only (24 hr. accum.):mm:RadarOnlyQPE24H