Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java @ 9335:7dc238bd062c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed: calculation of flow depth and tkh with rounding to cm, calculator return differentiated
author mschaefer
date Mon, 30 Jul 2018 08:03:46 +0200
parents 7b2b086e45f0
children 392745cccede
comparison
equal deleted inserted replaced
9334:f30bae00a161 9335:7dc238bd062c
32 import org.dive4elements.river.artifacts.resources.Resources; 32 import org.dive4elements.river.artifacts.resources.Resources;
33 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact; 33 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
34 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider; 34 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider;
35 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.DischargeValuesFinder; 35 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.DischargeValuesFinder;
36 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.TkhCalculator; 36 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.TkhCalculator;
37 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.TkhCalculator.TkhCalculateState;
37 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.WaterlevelValuesFinder; 38 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.WaterlevelValuesFinder;
38 import org.dive4elements.river.artifacts.sinfo.util.BedHeightInfo; 39 import org.dive4elements.river.artifacts.sinfo.util.BedHeightInfo;
39 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils; 40 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils;
40 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; 41 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
41 import org.dive4elements.river.artifacts.sinfo.util.WstInfo; 42 import org.dive4elements.river.artifacts.sinfo.util.WstInfo;
182 183
183 row.putValue(GeneralResultType.waterlevelLabel, waterlevelLabel); 184 row.putValue(GeneralResultType.waterlevelLabel, waterlevelLabel);
184 row.putValue(GeneralResultType.gaugeLabel, riverInfoProvider.findGauge(station)); 185 row.putValue(GeneralResultType.gaugeLabel, riverInfoProvider.findGauge(station));
185 row.putValue(GeneralResultType.location, riverInfoProvider.getLocation(station)); 186 row.putValue(GeneralResultType.location, riverInfoProvider.getLocation(station));
186 187
187 if (tkhCalculator.calculateTkh(station, row)) 188 final TkhCalculateState calcState = tkhCalculator.calculateTkh(station, row);
189 if (calcState == TkhCalculateState.SUCCESS)
188 rows.add(row); 190 rows.add(row);
189 } 191 }
190 192
191 return new TkhCalculationResult(waterlevelLabel, wstInfo, true, rows); 193 return new TkhCalculationResult(waterlevelLabel, wstInfo, true, rows);
192 } 194 }
http://dive4elements.wald.intevation.org