xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1792 Improve performance of gfe parm time weighted average.

Browse source 
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]
Former-commit-id: 52c167cf00
This commit is contained in:
Ben Steffensmeier 2013-03-13 16:32:17 -05:00
parent e080fb5106
commit 8f6a7c0746
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java
View file

@ -179,6 +179,8 @@ import com.vividsolutions.jts.geom.Coordinate;
* no interaction with Parms after dispose
* is called.
* 02/13/13 #1597 randerso Removed debug logging to improve performance
* Mar 13, 2013 1792 bsteffen Improve performance of gfe parm average
* ant time weighted average.
* </pre>
*
* @author chammack
@ -2068,12 +2070,17 @@ public abstract class Parm implements Comparable<Parm> {
}
} else if (getGridInfo().getGridType() == GridType.SCALAR) {
Grid2DFloat grid = new Grid2DFloat(ge.getSpan(0), ge.getSpan(1));
Grid2DFloat[] scalarGrids = new Grid2DFloat[gridCount];
for (int c = 0; c < gridCount; c++) {
scalarGrids[c] = ((ScalarGridSlice) grids[c].getGridSlice())
.getScalarGrid();
}
for (int i = 0; i < ge.getSpan(0); i++) {
for (int j = 0; j < ge.getSpan(1); j++) {
float value = 0.0f;
for (int k = 0; k < gridCount; k++) {
value += ((ScalarWxValue) grids[k].getWxValue(i, j))
.getValue() * gridTR.get(k).getDuration();
value += scalarGrids[k].get(i, j)
* gridTR.get(k).getDuration();
}
grid.set(i, j, value / totalDuration);
}
@ -2091,7 +2098,7 @@ public abstract class Parm implements Comparable<Parm> {
Grid2DFloat uGrid;
Grid2DFloat vGrid;
Grid2DFloat uSum = new Grid2DFloat(ge.getSpan(0), ge.getSpan(1));
Grid2DFloat vSum = new Grid2DFloat(uSum);
Grid2DFloat vSum = new Grid2DFloat(ge.getSpan(0), ge.getSpan(1));
// sum
for (int k = 0; k < gridCount; k++) {
VectorGridSlice vgs = (VectorGridSlice) grids[k].getGridSlice();
@ -3615,12 +3622,16 @@ public abstract class Parm implements Comparable<Parm> {
}
} else if (this.gridInfo.getGridType() == GridType.SCALAR) {
Grid2DFloat grid = new Grid2DFloat(gridSize.x, gridSize.y);
Grid2DFloat[] scalarGrids = new Grid2DFloat[gridCount];
for (int c = 0; c < gridCount; c++) {
scalarGrids[c] = ((ScalarGridSlice) grids[c].getGridSlice())
.getScalarGrid();
}
for (i = 0; i < gridSize.x; i++) {
for (j = 0; j < gridSize.y; j++) {
float value = 0.0f;
for (k = 0; k < gridCount; k++) {
value += ((ScalarWxValue) grids[k].getWxValue(i, j))
.getValue();
value += scalarGrids[k].get(i, j);
}
grid.set(i, j, value / gridCount);
}