Commit graph

340 commits

Author SHA1 Message Date
Steve Harris
67b3a77c4f Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
14.4.1_18m

 Conflicts:
	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: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
Fay.Liang
6293139493 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
df86b25aa9 VLab Issue #6834 - MRMS Sub-gridding velocity patch; fixes #6834
Former-commit-id: 639a67e0ff96c5ea23613a75071017ecf86085c8
2015-03-10 09:42:14 -05:00
Steve Harris
85b687be0b 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
0e475cb704 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
Richard Peter
e0ff8b49c1 Omaha #3959 - Make subgridding grid based.
Change-Id: If1970961641536655fd1a951c0e433dbaca0687c

Former-commit-id: c3b5f78811d231009dad7533fd650a68634e3e29
2015-03-05 16:13:41 -06:00
Fay.Liang
bafd1eb2db 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
ac92410d39 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
ead97f053e 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
47882c9ca1 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
d73e7e2d8b 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
14ee6d9e50 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
1a7cde7f53 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
3877625b2f 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
112c0322b2 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
fa9e3791cb ASM #17100 - Revert "VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563"
This reverts commit bfc550b378 [formerly 5189ae1c3ce12320045c431d9552036ea9272cef].

Change-Id: Ie8d46f14aab90286a5562e6b79cd7dfabceb33c0

Former-commit-id: 0ed82706fda1158292e6f789cceea378f5879e37
2015-02-05 10:30:29 -05:00
Steve Harris
d95158ec53 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
afb3d31759 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
f1c34884a5 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
070f0136ec 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
47234a3757 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
20ad0a65f3 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
7c25945fd9 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
4604975854 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
5aa4748569 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
1823ed3596 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
dcf5dc2173 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
bca4b40eed 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
64b8d193f4 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
597fdb8280 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
fe5bfbaa73 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
5abf37ea62 VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1].

Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685

Former-commit-id: 373acfce57d5e0044f13382b926cb2fc1f830e54
2014-12-02 13:43:03 +00:00
Richard Peter
6759ffa76c 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
fedc4aae8a Omaha #3870 Updated table to include missing elements.
Former-commit-id: 7569e4f2b962d22453b7414ea882f2383cec9ade
2014-11-25 14:31:05 -06:00
Roger Ferrel
0df840602e 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
b7b2087e1f 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
1999049d90 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
9de825c332 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
acf00264f4 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
e9b971471a VLab Issue #5069
Files for DR 14006.


Former-commit-id: c41dcab19a03ea315d6d77128208f65d839c6aec
2014-10-23 15:30:37 -06:00
Ana Rivera
f1f5f2c717 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
Steve Harris
bfade7674d Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: ea787b645974850607658e5a7dfc4a072d831a3b
2014-10-22 11:45:39 -05:00
Brian.Dyke
0d5f2c0add Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ea0a81b12c7b1a0154361d97882ef65fc55b20e1
2014-10-16 11:21:39 -04:00
Nate Jensen
d5a5d55265 Omaha #3730 export postprocessors package
Change-Id: Ie87558540777c1cea7354b040e386ba67f835311

Former-commit-id: db613b63005c2763ca94851182042867aedd43c9
2014-10-15 14:46:12 -05:00
Steve Harris
2db03d95b3 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
2014-10-06 13:57:59 -05:00
Darrel Kingfield
aa168071aa VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: 48565726c39ea8139d4a3dfd505732cee2d32b16
2014-10-06 10:01:36 -05:00
Brian.Dyke
f3f95aabb0 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
2014-10-02 10:38:51 -04:00
Slav Korolev
ad4bae10c9 Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: 2a03c64bb098a141c82aac4bab42d7d9f4a6296f
2014-10-01 16:45:33 -04:00
Steve Harris
3b6a8a1447 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
Ben Steffensmeier
5b10ac2f36 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
2014-09-29 10:49:14 -05:00