Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java @ 9505:3f230fe8eb19
Bezugspegel-assignment changed for coinciding gauge and calculation range (Meilenstein-2 2.2.4)
author | mschaefer |
---|---|
date | Fri, 28 Sep 2018 10:16:12 +0200 |
parents | 853f2dafc16e |
children | 55c187a0a31e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Fri Sep 28 10:13:09 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Fri Sep 28 10:16:12 2018 +0200 @@ -39,7 +39,6 @@ import org.dive4elements.river.model.BedHeightValueType; import org.dive4elements.river.model.River; import org.dive4elements.river.utils.DoubleUtil; -import org.dive4elements.river.utils.Formatter; class BezugswstCalculation { @@ -198,7 +197,7 @@ final double msh = bedHeightsFinder.getMeanBedHeight(station); row.putValue(SInfoResultType.meanBedHeight, msh); if (!Double.isNaN(w) && !Double.isNaN(msh)) - row.putValue(SInfoResultType.flowdepth, Formatter.roundFlowDepth(w).subtract(Formatter.roundFlowDepth(msh)).doubleValue()); + row.putValue(SInfoResultType.flowdepth, w - msh); else row.putValue(SInfoResultType.flowdepth, Double.NaN); @@ -206,7 +205,7 @@ row.putValue(BunduResultType.channelDepth, channelDepth); double channelHeight; if (!Double.isNaN(w) && !Double.isNaN(channelDepth)) - channelHeight = Formatter.roundFlowDepth(w).subtract(Formatter.roundFlowDepth(channelDepth)).doubleValue(); + channelHeight = w - channelDepth; else channelHeight = Double.NaN; row.putValue(BunduResultType.channelLowerEdge, channelHeight);