Shawn.Hooper
292c824c03
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
...
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
Richard Peter
a88520a94e
Omaha #4468 - Fix gribDatasets_NCEP-7.xml typos
...
Change-Id: I5cd8f130c86cde73b88b75017cc46dce7dbaed34
Former-commit-id: 3185ab93ef9d1ba7efbd59f24cc3c8a270938853
2015-05-06 09:17:50 -05:00
Fay.Liang
c31d3f0910
Merge tag 'OB_14.4.1-25' into master_15.1.1
...
This merge includes all changes in 14.4.1-22, -23, -24, and -25
Conflicts:
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt
Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
David Gillingham
b13f8c7794
Omaha #4384 : Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
...
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6
Former-commit-id: 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb
2015-04-09 13:26:52 -05:00
Fay.Liang
8ce086e41a
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
2015-04-01 13:04:48 -04:00
Fay.Liang
3bd4d76143
Merge tag 'OB_14.4.1-20m' into master_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
Melissa Porricel
d96bbe4799
ASM #16905 - Implement missing RTMA/URMA parameters
...
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527
Former-commit-id: d68078b665787d91bfd92440345d41f9fcc98b3d
2015-03-26 09:58:45 -04:00
Fay.Liang
2eb8777058
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Melissa Porricel
7db813d59c
ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
...
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c
Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
2015-03-16 17:14:56 -04:00
Fay.Liang
e3f07916ea
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 3b4b5c100cc6972beff6e22a609f069f97bdc765
2015-03-13 16:03:02 -04:00
Tiffany Meyer
62b8b3a30c
VLab Issue #6834 - MRMS Sub-gridding velocity patch; fixes #6834
...
Former-commit-id: 639a67e0ff96c5ea23613a75071017ecf86085c8
2015-03-10 09:42:14 -05:00
Steve Harris
379163b888
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
...
14.4.1-16m
Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
2015-03-09 18:54:39 -05:00
Fay.Liang
059eb032b1
Merge tag 'OB_14.3.2-19m' into master_14.4.1
...
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
Melissa Porricel
2c5d5defa8
ASM #14542 - Add HPCGuide wxType
...
Change-Id: Ie42a870c8bfede85cf00bb1d71a68f9fe4bafc1d
Former-commit-id: 1f1fe776f013990637d04f168c6c3df22aeb01fb
2015-03-09 12:48:02 -04:00
Richard Peter
9df7d7e987
Omaha #3959 - Make subgridding grid based.
...
Change-Id: If1970961641536655fd1a951c0e433dbaca0687c
Former-commit-id: c3b5f78811d231009dad7533fd650a68634e3e29
2015-03-05 16:13:41 -06:00
Fay.Liang
2cdb454dc0
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: c127d4bd2f42a22d91e9a0517a6d0e8b17198d6b
2015-03-05 10:41:04 -05:00
Joshua Watson
7fc4a6f2ae
VLab Issue #6684 - Fixed parameter abbrev in derived parameter CONVP2hr.xml and fixed grib table entry in grib/tables/7/14/4.2.0.19.table; fixes #6684
...
Change-Id: Ibcfe705b56cc4112da732c46eb17d52f9a4a6df7
Former-commit-id: 5a0b0653e28f31a080eec2123386359691c4b1fd
2015-03-02 12:10:07 -05:00
Steve Harris
07363394a1
Merge tag 'OB_14.4.1-14m' into omaha_15.1.1
...
14.4.1-14
Former-commit-id: cdca3c5b9eb65bed9d773019917245d1000d78dd
2015-03-02 10:58:40 -06:00
Fay.Liang
94a7507b9b
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: d6d761a5170a91dbd6fed78af582bfc2a8f662a3
2015-02-24 14:56:50 -05:00
Darrel Kingfield
00880112ba
VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
...
Former-commit-id: f43b83069eaf12e4190f1827eeed8d954239b164
2015-02-24 10:14:35 -06:00
Ana Rivera
861a749706
VLab Issue #6432 - EKDMOS: add entries for CONUS and AK in gribModels_NCEP-7.xml; fixes #6432
...
Change-Id: I3596da11343b453b2c9f48d4a3e271f19228197a
Former-commit-id: 9242a49a1a688379c625ee93af21e98a007470b0
2015-02-23 21:21:25 +00:00
Ana Rivera
0e90c25595
VLab Issue #6432 - EKDMOS: update grib.xml; rename GribModel:7:14:114; fixes #6432
...
Change-Id: Ie2041a6e46cf421fc5ecafce49836007847855ac
Former-commit-id: a5fc4d46bff38ecab9c9019c5184fae99a6ecc90
2015-02-23 15:56:58 +00:00
Ana Rivera
ce6241f01a
VLab Issue #6432 - Rename GribModel:7:14:114 as EKDMOS; fixes #6432
...
Change-Id: I9c750ee1970de2705abec0fb806babbcd32c512c
Former-commit-id: f747715fb7479dcaf0bfd0849ca4a96e8b99dad5
2015-02-20 20:04:56 +00:00
Roger Ferrel
64d76144f1
Omaha #4053 Added Great Lakes Wave Model 2.5KM to product browser, volume browser and GFE.
...
Change-Id: Iabb0b401a51e7fbb069ed8c6e7b44e2d9382c421
Former-commit-id: 66098b89fcf6cd5bcf950024c5a40722018b02d5
2015-02-12 13:43:37 -06:00
Shawn.Hooper
0ac88acf05
ASM #17100 - Revert "VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563 "
...
This reverts commit bf5bb1bacf
2015-02-05 10:30:29 -05:00
Steve Harris
85457e37cb
Merge tag 'OB_14.4.1-7m' into omaha_15.1.1
...
14.4.1-7
Former-commit-id: bf0368503a8defd41a20e369e154d560b93bee6c
2015-02-03 17:30:23 -06:00
Steve Harris
8cd98ea3b9
Merge tag 'OB_14.4.1-6m' into omaha_15.1.1
...
14.4.1-6
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 9fd5ed1aea1a667552144da88dcc394a99133c52
2015-02-03 12:25:05 -06:00
Fay.Liang
ae85ade54d
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 06a34c609a217ca98b027ac6d92a31faf802b668
2015-02-03 11:24:57 -05:00
Ana Rivera
ea92049aac
Merge branch 'master_14.4.1' into gsd_14.4.1
...
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: d5996a81aad0809aaddbb8df99a985c86c66aaf8
2015-01-30 19:29:29 +00:00
Steve Harris
995d60fb54
Merge tag 'OB_14.4.1-5m' into omaha_15.1.1
...
14.4.1-5
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
2015-01-28 13:45:36 -06:00
Ana Rivera
8bfa7c4087
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 291d66c66af4f1f4d298185412d5930714ffb2c5
2015-01-27 22:05:59 +00:00
Ana Rivera
98ac97e397
Merge branch 'master_14.4.1' into emc_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00
David Gillingham
41af2f661c
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
2015-01-20 14:02:06 -06:00
Joshua Watson
3f2f7f2f3a
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
...
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
2014-12-17 08:38:27 -05:00
Ana Rivera
043bc3a8b7
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129 , #5421 , #5345 .
...
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 111ae763e6becb944e34e262e1d87d2d344236e4
2014-12-16 23:39:02 +00:00
Ana Rivera
2eec9d9557
VLab Issue #4365 Decode Ensemble Kernel Density MOS (EKDMOS); fixes 4365
...
Change-Id: I1272721f43ee78b310fcf74227317cf27e8d6b28
Former-commit-id: cb236c208fe6489f88144adab3178dccd4a826db
2014-12-16 16:39:22 +00:00
Joshua Watson
a8f5bb480b
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
...
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
2014-12-11 11:39:00 -05:00
Roger Ferrel
5d91f976af
Omaha #3658 Scale arrows and use consistent units.
...
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899
Former-commit-id: 0f0eafd8687edc0c10ef21495175f1e68f926577
2014-12-05 11:54:27 -06:00
Roger Ferrel
462e0d85c0
Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
...
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a
Former-commit-id: 46d3bbcc99d93845dcb159012b872fe746756b7c
2014-12-04 12:52:22 -06:00
Ana Rivera
709d571947
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
...
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 6866439b0a7075f04146af4b4bdce59477269f4d
2014-12-02 15:44:07 +00:00
Ana Rivera
0e8473e91e
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
...
This reverts commit c245f3a3c4
2014-12-02 13:43:03 +00:00
Richard Peter
6d046826dc
Merge "Omaha #3870 Updated table to include missing elements." into omaha_14.4.1
...
Former-commit-id: e7056504ae5758e2b4abbdef9cec7b2467d49add
2014-11-26 10:13:40 -06:00
Roger Ferrel
c4cf624d04
Omaha #3870 Updated table to include missing elements.
...
Former-commit-id: 7569e4f2b962d22453b7414ea882f2383cec9ade
2014-11-25 14:31:05 -06:00
Roger Ferrel
9b986c7cf8
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
...
Former-commit-id: 56833ab1b84e50c6ca4150d3c90501448233313b
2014-11-25 10:01:30 -06:00
Evan Polster
78a4d3425b
Merge "VLab Issue #5069 Files for DR 14006." into gsd_14.4.1
...
Former-commit-id: f0d0953f6fe1bc6d2ace9dce159a6354a2c55264
2014-11-21 13:30:59 -05:00
Ana Rivera
1645ccd9ca
Merge branch 'master_14.4.1' into emc_14.4.1
...
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: c69e94f227cb908a9af2e1cd2db35b25bef28701
2014-11-21 14:23:49 +00:00
Steve Harris
a16abe1b8b
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
2014-11-10 08:42:01 -06:00
Brian.Dyke
aae68215c8
Merge branch 'master_14.2.4' into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
2014-11-06 12:55:21 -05:00
Jim Ramer
e35ac6eeca
VLab Issue #5069
...
Files for DR 14006.
Former-commit-id: c41dcab19a03ea315d6d77128208f65d839c6aec
2014-10-23 15:30:37 -06:00
Ana Rivera
c245f3a3c4
VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
...
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426
Former-commit-id: a72135fc85a602b67b929b6870edbaabf4dc8fc1
2014-10-22 17:03:07 +00:00
