Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 4794:a7d080347ac3 | 4813:bf2fd9c58ac4 |
|---|---|
| 49 for (int i = 0; i < normLoads.length; ++i) { | 49 for (int i = 0; i < normLoads.length; ++i) { |
| 50 normLoads[i] = total*loads[i]; | 50 normLoads[i] = total*loads[i]; |
| 51 } | 51 } |
| 52 } | 52 } |
| 53 | 53 |
| 54 public void adjust(double eight, double four) { | |
| 55 this.normLoads[4] = eight; | |
| 56 this.normLoads[5] = four; | |
| 57 } | |
| 58 | |
| 54 /** | 59 /** |
| 55 * Gets the loads for this instance. | 60 * Gets the loads for this instance. |
| 56 * | 61 * |
| 57 * @return The loads. | 62 * @return The loads. |
| 58 */ | 63 */ |
| 89 return this.normLoads[index]; | 94 return this.normLoads[index]; |
| 90 } | 95 } |
| 91 | 96 |
| 92 public double sandNormFraction() { | 97 public double sandNormFraction() { |
| 93 double sum = 0d; | 98 double sum = 0d; |
| 94 for (int i = 8; i < normLoads.length; ++i) { | 99 for (int i = 7; i < normLoads.length; ++i) { |
| 95 sum += normLoads[i]; | 100 sum += normLoads[i]; |
| 96 } | 101 } |
| 97 return sum; | 102 return sum; |
| 98 } | 103 } |
| 99 | 104 |
| 105 return sum; | 110 return sum; |
| 106 } | 111 } |
| 107 | 112 |
| 108 public double gravelNormFraction() { | 113 public double gravelNormFraction() { |
| 109 double sum = 0d; | 114 double sum = 0d; |
| 110 for (int i = 4; i < 8; ++i) { | 115 for (int i = 4; i < 7; ++i) { |
| 111 sum += normLoads[i]; | 116 sum += normLoads[i]; |
| 112 } | 117 } |
| 113 return sum; | 118 return sum; |
| 114 } | 119 } |
| 115 } | 120 } |