Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java @ 9528:55c187a0a31e
Fixed: consistent gauge assignment with downstream gauge as reference gauge for calc range starting at a gauge range limit
| author | mschaefer |
|---|---|
| date | Tue, 02 Oct 2018 16:39:51 +0200 |
| parents | 9ea704de63ee |
| children | b9c87bbff6a4 |
comparison
equal
deleted
inserted
replaced
| 9527:7c8d62867876 | 9528:55c187a0a31e |
|---|---|
| 38 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.WaterlevelValuesFinder; | 38 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.WaterlevelValuesFinder; |
| 39 import org.dive4elements.river.artifacts.sinfo.util.BedHeightInfo; | 39 import org.dive4elements.river.artifacts.sinfo.util.BedHeightInfo; |
| 40 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils; | 40 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils; |
| 41 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; | 41 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; |
| 42 import org.dive4elements.river.artifacts.sinfo.util.WstInfo; | 42 import org.dive4elements.river.artifacts.sinfo.util.WstInfo; |
| 43 import org.dive4elements.river.artifacts.states.WaterlevelData; | |
| 44 import org.dive4elements.river.exports.WaterlevelDescriptionBuilder; | 43 import org.dive4elements.river.exports.WaterlevelDescriptionBuilder; |
| 45 import org.dive4elements.river.model.BedHeight; | 44 import org.dive4elements.river.model.BedHeight; |
| 46 import org.dive4elements.river.model.River; | 45 import org.dive4elements.river.model.River; |
| 47 | 46 |
| 48 /** | 47 /** |
| 156 | 155 |
| 157 // We have no wst year as the wst is created by a calculation; we do not need it though | 156 // We have no wst year as the wst is created by a calculation; we do not need it though |
| 158 final int wspYear = -1; | 157 final int wspYear = -1; |
| 159 // Remark: showAllGauges only true for Fixierungsanalyse, false for WInfo, so false here as well | 158 // Remark: showAllGauges only true for Fixierungsanalyse, false for WInfo, so false here as well |
| 160 final boolean showAllGauges = false; | 159 final boolean showAllGauges = false; |
| 161 final WaterlevelData waterlevel = new WaterlevelData(wkms, wspYear, showAllGauges, true); | 160 |
| 162 | 161 final RiverInfoProvider riverInfoProvider = riverInfo.forReferenceRange(calcRange, showAllGauges); |
| 163 final RiverInfoProvider riverInfoProvider = riverInfo.forWaterlevel(waterlevel); | |
| 164 | 162 |
| 165 final String waterlevelLabel = descBuilder.getDesc(wkms); | 163 final String waterlevelLabel = descBuilder.getDesc(wkms); |
| 166 | 164 |
| 167 final WstInfo wstInfo = new WstInfo(waterlevelLabel, wspYear, riverInfoProvider.getReferenceGauge(), true); | 165 final WstInfo wstInfo = new WstInfo(waterlevelLabel, wspYear, riverInfoProvider.getReferenceGauge(), true); |
| 168 | 166 |