[PATCH 2 of 2] issue1235: Do not add 'other' values twice to suspended sed. values, fix range

Wald Commits scm-commit at wald.intevation.org
Mon Sep 16 16:07:51 CEST 2013


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1379341081 -7200
# Node ID a18a4376479383d7b6233bfa2d27737c8686c90a
# Parent  0f99aa385d99fe648b314da17b3d524e900f2d1a
issue1235: Do not add 'other' values twice to suspended sed. values, fix range.

diff -r 0f99aa385d99 -r a18a43764793 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java	Mon Sep 16 15:11:02 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java	Mon Sep 16 16:18:01 2013 +0200
@@ -391,7 +391,7 @@
                     else {
                         // Geschiebe is longer.
                         // Adjust and remember other values.
-                        lastOtherRange = (Range) fraction.getSuspSedimentRange().clone();
+                        lastOtherRange = (Range) fraction.getCoarseRange().clone();
                         lastOtherRange.setStart(fraction.getSuspSedimentRange().getEnd());
                         lastOtherValue = (total - fraction.getSuspSediment());
                         lastSuspRange = null;
@@ -429,7 +429,7 @@
                         lastOtherRange = null;
                         lastSuspRange = null;
                     }
-                    fairLoad.setTotal(km, total + fraction.getSuspSediment(), totalRange);
+                    fairLoad.setTotal(km, total, totalRange);
                 }
                 else {
                     lastSuspRange = suspSedimentRange;


More information about the Dive4elements-commits mailing list