Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java @ 2422:44dc117aa2b7
Picked rev 4058,4063,4065,4068,4069 from trunk.
flys-artifacts/tags/2.6.1@4077 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 17 Feb 2012 11:29:41 +0000 |
parents | 899ca89f497e |
children | cb11919cccf9 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java Thu Feb 16 12:35:51 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java Fri Feb 17 11:29:41 2012 +0000 @@ -9,6 +9,7 @@ import de.intevation.flys.model.River; import de.intevation.flys.model.Gauge; +import de.intevation.flys.model.DischargeTable; import de.intevation.flys.artifacts.model.WstValueTable.QPosition; @@ -77,17 +78,21 @@ // convert to Q if needed if (!isQ && gauge != null) { - double [][] table = new DischargeTables( - river.getName(), gauge.getName()).getFirstTable(); + + DischargeTable dt = gauge.fetchMasterDischargeTable(); + + double [][] table = + DischargeTables.loadDischargeTableValues(dt, 1); // need the original values for naming segment.backup(); for (int i = 0; i < values.length; ++i) { - double w = values[i] * 100; + double w = values[i] / 100.0; double [] qs = DischargeTables.getQsForW(table, w); if (qs.length == 0) { logger.warn("No Qs found for W = " + values[i]); + addProblem("cannot.find.w.for.q", values[i]); values[i] = Double.NaN; } else {