Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java @ 6500:f3b3742fbdad
SedimentLoadCalculation: Handle boring cases in total sed load calculation.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Fri, 28 Jun 2013 14:00:15 +0200 |
parents | 857f4d51d859 |
children | 1ca0688dddc7 |
comparison
equal
deleted
inserted
replaced
6499:857f4d51d859 | 6500:f3b3742fbdad |
---|---|
463 } | 463 } |
464 } | 464 } |
465 else { | 465 else { |
466 // Some values are missing or no intersection with former values. | 466 // Some values are missing or no intersection with former values. |
467 // Stay as we are. | 467 // Stay as we are. |
468 if (hasButSuspValues(fraction)) { | |
469 double total = fraction.getCoarse() + | |
470 fraction.getFineMiddle() + | |
471 fraction.getSand() + | |
472 fraction.getSuspSand(); | |
473 lastOtherRange = fraction.getCoarseRange(); | |
474 lastOtherValue = total; | |
475 lastSuspRange = null; | |
476 } | |
477 else if (hasOnlySuspValues(fraction)) { | |
478 lastSuspRange = fraction.getSuspSedimentRange(); | |
479 lastSuspValue = fraction.getSuspSediment(); | |
480 lastOtherRange = null; | |
481 } | |
468 } | 482 } |
469 } | 483 } |
470 return fairLoad; | 484 return fairLoad; |
471 } | 485 } |
472 | 486 |