Commit graph

27 commits

Author SHA1 Message Date
Slav Korolev
187f4af636 Omaha #4536 - Cleaned up base gridPurgeRules.xml.
Former-commit-id: cb17abf61d461f085c9611c726d646e5742642a2
2015-06-18 08:41:48 -04:00
Fay.Liang
a204a6210e 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
133a603566 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
9a2a726fb9 ASM #16905 - Implement missing RTMA/URMA parameters
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527

Former-commit-id: d68078b665787d91bfd92440345d41f9fcc98b3d
2015-03-26 09:58:45 -04:00
Fay.Liang
86a8041062 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
fcdcb81963 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
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
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
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
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
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
Darrel Kingfield
88a8dddef3 VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872

Former-commit-id: a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a
2014-09-19 11:14:09 -05:00
Ana Rivera
088ebd2ca2 VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 9c3460d34513dd2f54643b87cb8afd122d94ea9c
2014-07-21 21:41:17 +00:00
Kenneth Sperow
9fa9425aea Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f

Former-commit-id: 41ee30cbe04bb6cba695f7480d6b1492aec4219c
2014-05-22 14:16:49 -07:00
brian.dyke
58683ad040 Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
2014-05-19 09:45:37 -04:00
Ana Rivera
81a9d4fa44 VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Former-commit-id: e71ef5db23122405fc6aab71526a9cc3ec3ad823
2014-05-12 18:55:06 +00:00
Ana Rivera
1b4450ec5f VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Former-commit-id: c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e
2014-05-08 20:10:24 +00:00
Melissa Porricel
92231e051d ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: 012fa438f085498027402c1cd0897dd13c0d4edc
2014-05-05 14:56:58 -04:00
David Gillingham
6ca193b8e9 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 33197dc6708b65e85233b51be1e99e6411ece60f
2014-04-25 10:56:43 -05:00
Richard Peter
0787e7cc86 Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: 1af6e051089c8f0a216307647e044d19d41f6828
2013-10-15 11:36:12 -05:00
Steve Harris
f36cf09d21 13.5.2-9 baseline
Former-commit-id: 948fc5e8cbbb6fa563e871417e455638fcbe154f
2013-10-10 10:55:20 -04:00
Ben Steffensmeier
8f94e1434c Issue #2390 update grib decoder and vb to handle new storm surge parameters.
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209

Former-commit-id: 6de5f10b9abf900fc412f2b1e867ce339a15d41e
2013-10-03 16:30:13 -05:00
Steve Harris
58c6821427 13.5.2-4 baseline
Former-commit-id: da631849bc9eaaa5c83c2393520b6099413107a5
2013-09-12 11:13:59 -04:00
Greg Armendariz
ea7ac37930 13.5.1-5 baseline
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
2013-07-03 12:20:27 -04:00
Steve Harris
328c6dccad 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
4ba416aeb3 13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00