Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java @ 2418:899ca89f497e
Another partial fix for flys/issue499: Do the W to Q conversions
needed for 'W am Pegel' correctly.
flys-artifacts/trunk@4052 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 14 Feb 2012 16:48:13 +0000 |
| parents | 2898b1ff6013 |
| children | 44dc117aa2b7 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java Tue Feb 14 09:02:51 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java Tue Feb 14 16:48:13 2012 +0000 @@ -84,7 +84,19 @@ segment.backup(); for (int i = 0; i < values.length; ++i) { - values[i] = DischargeTables.getQForW(table, values[i]); + double w = values[i] * 100; + double [] qs = DischargeTables.getQsForW(table, w); + if (qs.length == 0) { + logger.warn("No Qs found for W = " + values[i]); + values[i] = Double.NaN; + } + else { + values[i] = qs[0]; + if (qs.length > 1) { + logger.warn( + "More than one Q found for W = " + values[i]); + } + } } } } // for all segments