Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/SieveArray.java @ 4813:bf2fd9c58ac4
Fixed MINFO SQ calculation.
* Fixed calculation of sieve 8.
* Fixed calculation of 'Geschiebetransport'.
* Fixed calculation of fractions (Sand, gravel, coarse).
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Sun, 20 Jan 2013 15:02:19 +0100 |
| parents | 3b79e8afca7e |
| children | 9e25c7523485 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/SieveArray.java Fri Jan 11 13:57:38 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/SieveArray.java Sun Jan 20 15:02:19 2013 +0100 @@ -51,6 +51,11 @@ } } + public void adjust(double eight, double four) { + this.normLoads[4] = eight; + this.normLoads[5] = four; + } + /** * Gets the loads for this instance. * @@ -91,7 +96,7 @@ public double sandNormFraction() { double sum = 0d; - for (int i = 8; i < normLoads.length; ++i) { + for (int i = 7; i < normLoads.length; ++i) { sum += normLoads[i]; } return sum; @@ -107,7 +112,7 @@ public double gravelNormFraction() { double sum = 0d; - for (int i = 4; i < 8; ++i) { + for (int i = 4; i < 7; ++i) { sum += normLoads[i]; } return sum;