Commit graph

846 commits

Author SHA1 Message Date
Steve Harris
bc84d97750 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java


Former-commit-id: 3ba87373d75582c47288fe39e8f72aa404de0a94
2015-09-22 15:57:39 -05:00
Roger Ferrel
69f5eac314 Omaha #4819 Changes for browsers and GFE to add HWRF.
Change-Id: Icdb2ad322a57d19e8fe4f5745785fe114c50c8fd

Former-commit-id: 2af405298fd751a3f9282a24fb4310216bb84acd
2015-09-21 07:00:31 -05:00
Shawn.Hooper
bda1720de0 Merge tag 'OB_15.1.2-4' into master_16.1.1
15.1.2-4


Former-commit-id: 16cef2c4e589eb7e711958b86993a5091041c663
2015-09-18 14:56:50 -04:00
Ron Anderson
7361070504 Omaha #4852 TO56: Correct fillValue for wave models with masked grids
Change-Id: I66b92609211963495857a78e1e5196d3edaec3a8

Former-commit-id: 2312e07d79f0a2ffc217470799de29e51a111a60
2015-09-15 18:22:03 -05:00
Steve Harris
fbdce3bede Merge tag 'OB_16.1.1-11' into omaha_16.2.1
16.1.1-11

 Conflicts:
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 3104ad23039ebe9333df058e004e3c9a6cdb1a11
2015-09-15 15:43:10 -05:00
Shawn.Hooper
2ca04afc68 Merge tag 'OB_14.4.2-5' into master_15.1.2
14.4.2-5


Former-commit-id: a156ce76711a4680bf6b0491e4b8e970d3a224e7
2015-09-15 10:17:14 -04:00
Shawn.Hooper
0a6934292f Merge branch 'omaha_15.1.2' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.2
Former-commit-id: 53cfd7c2108034c1eaf4d81f0c28ecd3ac2117cc
2015-09-09 17:03:56 -04:00
Ron Anderson
eaf1248061 Omaha #4847 Restore Hazard_HLS to templateProds
Change-Id: I92075a49d506d5c56843e6995fd4010269885318

Former-commit-id: e931bf1f54f3ebcf836d4ee0b1efea9645cc97a2
2015-09-08 17:21:09 -05:00
Steve Harris
4bb1dfd213 Merge tag 'OB_16.1.1-9' into omaha_16.2.1
16.1.1-9

 Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java


Former-commit-id: 4ff4f4722a0fd37cf6ec75c701acd43d778ce7c2
2015-09-01 16:06:40 -05:00
Shawn.Hooper
90b248db2a Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: c5d332ccda6c6eeebb523f4cd950f9d1b066107f
2015-08-27 15:44:03 -04:00
Yun.Teng
a68697ffce ASM #17647 - Correct end time of grid from ViewWCL procedure
Change-Id: I854ed40bd21e4286263eb70f08be9b236ec184fe

Former-commit-id: 2f61d67b2949ce1ae504531ca3849b9efac27753
2015-08-26 20:25:55 +01:00
Ron Anderson
2e1f47b969 Omaha #4751 Fix regression in DGEX.py
Change-Id: I2b6fa4e0ac72d9e504c064c6cf098b456262381c

Former-commit-id: 3cc47c60e219e748c23079bcfe49961ae29eaed1
2015-08-25 08:31:17 -05:00
Ron Anderson
7fbefd0046 Omaha #4704 Fix more dtype issues
Change-Id: I841fab00a3f477e53b5f076139849d016155cb47

Former-commit-id: 37bd1954dda045853648500f9679b2b0a0f55f02
2015-08-24 08:34:52 -05:00
Shawn.Hooper
24a6a476f8 Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: fcf60cfd5d3e5d9e64b5ea4d85bd85908de2b254
2015-08-21 11:16:20 -04:00
Ron Anderson
b3ac8f7b9b Merge "Omaha #4704 Fix syntax error when computing __gridShape" into omaha_16.2.1
Former-commit-id: ae15a20dd21014ba27e2081b84edfaec1fe3517b
2015-08-19 16:55:14 -05:00
Shawn.Hooper
5759470634 Merge tag 'OB_15.1.1-32' into master_16.1.1
15.1.1-32

Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
	edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java

Former-commit-id: f925ff11b783389e5ca32a2d7cd1ec5edfa835db
2015-08-19 14:58:31 -04:00
Steve Harris
a9c82d6eb5 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java


Former-commit-id: 15f842700f3c6919ca3d29e5bd393913143cdde9
2015-08-19 13:45:47 -05:00
Ron Anderson
1c5e77a7dd Omaha #4704 Fix syntax error when computing __gridShape
Change-Id: Ie3bc441d4d40e5c1ce8b4bfcd4ef5dc9a028456c

Former-commit-id: a01e70174c0f65e25edd415e9cbde8d9cfe84cc0
2015-08-19 12:11:29 -05:00
Ron Anderson
3a03348288 Omaha #4751 Remove use of self._empty and self._minus from baseline smartInits/smartTools/procedures
Change-Id: I3656148f97b438b40fcd94fbd3fa1daa6b69e55e

Former-commit-id: e3ac78fd1d9bcfc97cba82450c4e2a29998a8ac7
2015-08-18 17:25:08 -05:00
Nate Jensen
5868156a2a Merge "Omaha #4719: Optimize use of numpy.where in GFE viz code." into omaha_16.2.1
Former-commit-id: 62108e3fb994f22c420853005d192dc27e0874cb
2015-08-18 12:50:57 -05:00
David Gillingham
89224a5fca Omaha #4750: Remove call to pickle from iscUtil.getRequestXML.
Change-Id: Idb7ea3d195f975dedf44f38ddb73bb39aa8aa662

Former-commit-id: efb48221302a0e061d8da04489ef5ba98cbfdfc4
2015-08-18 12:47:09 -05:00
David Gillingham
8724737db3 Omaha #4719: Optimize use of numpy.where in GFE viz code.
Change-Id: I032e4e45e48dfc8dc191b83bcfc38583d5057aaa

Former-commit-id: 85ef6c2a7daaa2a186a58a0b5d8080a490792d35
2015-08-18 12:35:13 -05:00
David Gillingham
added7d1a3 Omaha #4750: Remove python call from DataManager.doIscRequestQuery.
Change-Id: I31cadce5753f89b31f55b46e2c92c91684da68d5

Former-commit-id: 23fd85e29be6c4da9d6d1a843f5627477bf7a147
2015-08-18 10:54:26 -05:00
Roger Ferrel
e6962d2c5e Omaha #4753 Fix accidental rename of BL0180.
Former-commit-id: c7c625229e440115f0d8d80e174ed811b0fd0666
2015-08-17 11:03:52 -05:00
Bruce.Hundermark
0ce8fd624d ASM #17801 GFS20 precipitation data does not have correct duration
Change-Id: I3d3800f23ddfd1c66101750f39185a1bc4d3f3b9

Former-commit-id: 467126961a32894ee2f07f7c14bdaa8dce3f45e8
2015-08-14 20:12:11 +00:00
Ron Anderson
dbebf862cf Omaha #4704 Add NumpyJavaEnforcer support for smartInits and procedures
Change-Id: I8be4d7b986024cbda8c3d18eb016fc1347ce81d3

Former-commit-id: bc644168fd0b776a24804447cc6bee3313b60d18
2015-08-13 19:24:54 -05:00
Ron Anderson
cbc312d45a Merge "Omaha #4718: Optimize use of numpy.where in GFE ISC and smart init code." into omaha_16.2.1
Former-commit-id: b7ab9666245d179dbd6079156c0673cdcd8beafe
2015-08-12 15:03:08 -05:00
David Gillingham
25933215b4 Omaha #4718: Optimize use of numpy.where in GFE ISC and smart init code.
Change-Id: I1458eccb026d7ccace1b52406d05105de928018c

Former-commit-id: 7f04ad56bfefc4aa1e3c04228481ab2cb444b618
2015-08-11 13:51:39 -05:00
Nathan Bowler
90046acf93 Omaha #1574 Add orphan purging.
Change-Id: I9e406522a5ca289a57368da9b60372fa70e6fe7e

Former-commit-id: 8bbe80aaf5d958a2b18ce4b113833d72bb085761
2015-08-11 12:43:27 -04:00
Richard Peter
5d7f17e149 Omaha #4486 - Hibernate return java.util.Date instead of java.sql.Timestamp
Change-Id: Ib425d2f4021a587b5c8cd52bfe3816c723f6b0a1

Former-commit-id: 06d943d51fec264ec34a45ed84547b7972925e7e
2015-08-05 15:19:05 -05:00
Sarah Pontius
10e8fa3ac9 VLab Issue #9414 - GFE Formatter: Storm surge forecast can differ significantly from Threat and potential impacts provided in TCV; fixes #9414
Change-Id: I1279f9f9ace9253120d48ff3c64196a90a8a4b28

Former-commit-id: 0f74b7bc2b624db5a55c224066281c1b73f1bb0a
2015-08-05 13:47:13 -06:00
Steve Harris
d69d6103ca Merge tag 'OB_15.1.1-28' into omaha_15.1.1
15.1.1-28


Former-commit-id: 41d9ebaa99304437132ec599c5c30967960272c9
2015-08-05 08:33:13 -05:00
Fay.Liang
e0b8b2f813 Merge remote-tracking branch 'origin/master_14.4.2' into master_15.1.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 39babf90e69c4b8d3319cc385bb6a19bb3f93aad
2015-07-31 09:56:36 -04:00
Sarah Pontius
0a500a18a7 VLab Issue #9414 - GFE Formatter: Storm surge forecast can differ significantly from Threat and potential impacts provided in TCV; fixes #9414
Change-Id: Ia1ad56f5043f4a153fdc35398637ab308ced6778

Former-commit-id: ba08dcdc83ea47b16e641b9c2ab70d7bb0a7ae93
2015-07-24 10:23:48 -06:00
Ron Anderson
1c4d5a5a9d Omaha #4013 Allow rsyncGridsToCWF_client.sh to use entire EDEX cluster
Change-Id: I98a849bbd96a35ac8f3e418c3410dac5839e77b4

Former-commit-id: 7276286f419d5baba1efb2374eec2f3b903973d9
2015-07-21 12:42:01 -05:00
Ana Rivera
9a33597d6e Merge branch 'omaha_16.1.1' into field_16.1.1
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6

Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
2015-07-20 15:56:51 +00:00
Richard Peter
dfc255531a Merge "Omaha #4500 - Fix SQL Injection Concerns." into omaha_16.1.1
Former-commit-id: 2b25be688266a27f564d5acff991d1e9a94dd081
2015-07-17 13:35:21 -05:00
Ron Anderson
e86e0dd6da Merge "Omaha #4537 Fix smartInit issues with HRRR sub-hourly data." into omaha_16.1.1
Former-commit-id: 7f9cae62b3fe3274525ebb8e5161feb7fbea7e59
2015-07-14 10:30:59 -05:00
Steve Harris
55b82a66ff Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java


Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
2015-07-13 18:39:29 -05:00
Ron Anderson
c1724c364e Omaha #4537 Fix smartInit issues with HRRR sub-hourly data.
Change-Id: Ifcd616c69e5eed8455909f298aaedaf1947e990c

Former-commit-id: c32d496014b97e1787e41a01e59fd7eb8e6c53bb
2015-07-13 18:09:22 -05:00
Richard Peter
47bdd9984d Omaha #4500 - Fix SQL Injection Concerns.
Change-Id: I3af5ce39d163a212f66e675d3386ae5c68b9b295

Former-commit-id: 7613c06d4351c52dcc8e49d6bc64ecb0166f72e7
2015-07-13 16:31:26 -05:00
Ron Anderson
1c6dc6010f Omaha #4648 Fix bullets in follow up hazard products
Change-Id: Iaeba35d5893b5f439858d35dfb849b3d7635f27b

Former-commit-id: be8cbc18536402d2b8fbd02a94bf707e8f6f2b8e
2015-07-13 11:59:42 -05:00
Ana Rivera
e075f22bf7 Merge branch 'omaha_16.1.1' into field_16.1.1
Entry for NTAT missing from omaha_16.1.1's LevelMappingFile.xml.

Change-Id: I39893e6aa748f7dfeb30bd23bcfca3853fa51e17

Former-commit-id: cc1e4ea67074c41be411c99ce979124a63c7c743
2015-07-07 19:41:48 +00:00
Ana Rivera
e066b91c4b Merge branch 'master_15.1.1'(OB_15.1.1-20) into field_16.1.1
Change-Id: Id98b18f9b406c2829d99cdfee27aa2b40194713e

Former-commit-id: b98013140a5400cbab2e338327bd6c8c74628dff
2015-07-07 17:30:40 +00:00
Ron Anderson
b1501e5871 Merge "Omaha #4259 Fix lat/lon grids and ifpnetCDF parmList issues" into omaha_16.1.1
Former-commit-id: 54aaa408ce3e236131fb132001bf9994fe04439b
2015-07-07 11:27:08 -05:00
Ron Anderson
2853d08519 Omaha #4259 Fix lat/lon grids and ifpnetCDF parmList issues
Change-Id: Ie1437c6455a7c88a31ba0152bd56976ab6ce70c3

Former-commit-id: 26faf2500b76504bddcda0e6eb5dbe334e6cdc3f
2015-07-07 10:35:17 -05:00
Roger Ferrel
17a2e9a0d8 Omaha #4537 Put back needed NTAT changes removed in 4422.
Former-commit-id: e2c311dc18c48d1e681c2d53aa606abc5182bd27
2015-07-06 10:22:29 -05:00
Steve Harris
11d147911d Merge tag 'OB_15.1.1-20' into omaha_16.1.1
15.1.1-20

 Conflicts:
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py


Former-commit-id: d3fc25a0bc4136a28efcd024dd272373982b2c9d
2015-07-06 09:48:19 -05:00
David Gillingham
79da33d7a8 Omaha #4422: Revert "Support ingest and display of NAM12 simulated satellite data in D2D and GFE."
This reverts commit bbcff29843 [formerly 0e5a00548514123df7e2439e51878e492cdf3a6f].

Change-Id: I36995a9c432f6d6462d29d3c3aea5c45d69dfcd6

Former-commit-id: 72a841a8c93a66ac8c8c768fe230b81960efa733
2015-07-02 10:12:20 -05:00
Roger Ferrel
7ea0965a35 Omaha #4537 - Changes to HRRR parameterInfo for 15 minute interals and GFE entries.
Change-Id: Id1fceb6181d3eee0149ef19ed0d5c88be631fc10

Former-commit-id: 383074e1fd79706f3c7662360f3d43178300d383
2015-06-30 12:35:42 -05:00