Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/Tkh.java @ 8940:82998242ba84
Preparing for additional outputs of SINFO-Tkh
author | gernotbelger |
---|---|
date | Tue, 06 Mar 2018 18:51:18 +0100 |
parents | d9dbf0b74bc2 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/Tkh.java Tue Mar 06 17:14:56 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/Tkh.java Tue Mar 06 18:51:18 2018 +0100 @@ -26,6 +26,10 @@ private final double meanBedHeight; + private final double flowDepth; + + private final double flowDepthTkh; + private final double discharge; private final SoilKind kind; @@ -36,20 +40,35 @@ private final double tkhDown; - public Tkh(final double km, final double wst, final double meanBedHeight, final double discharge) { - this(km, wst, meanBedHeight, discharge, null, Double.NaN, Double.NaN, Double.NaN); + private final double velocity; + + private final double d50; + + private final double tau; + + public Tkh(final double km, final double wst, final double meanBedHeight, final double flowDepth, final double discharge) { + this(km, wst, meanBedHeight, flowDepth, discharge, null); } - public Tkh(final double km, final double wst, final double meanBedHeight, final double discharge, final SoilKind kind, final double tkh, final double tkhUp, - final double tkhDown) { + public Tkh(final double km, final double wst, final double meanBedHeight, final double flowDepth, final double discharge, final SoilKind kind) { + this(km, wst, meanBedHeight, flowDepth, Double.NaN, discharge, kind, Double.NaN, Double.NaN, Double.NaN, Double.NaN, Double.NaN, Double.NaN); + } + + public Tkh(final double km, final double wst, final double meanBedHeight, final double flowDepth, final double flowDepthTkh, final double discharge, + final SoilKind kind, final double tkh, final double tkhUp, final double tkhDown, final double velocity, final double d50, final double tau) { this.km = km; this.wst = wst; this.meanBedHeight = meanBedHeight; + this.flowDepth = flowDepth; + this.flowDepthTkh = flowDepthTkh; this.discharge = discharge; this.kind = kind; this.tkh = tkh; this.tkhUp = tkhUp; this.tkhDown = tkhDown; + this.velocity = velocity; + this.d50 = d50; + this.tau = tau; } public double getStation() { @@ -83,4 +102,24 @@ public double getMeanBedHeight() { return this.meanBedHeight; } + + public double getFlowDepth() { + return this.flowDepth; + } + + public double getFlowDepthTkh() { + return this.flowDepthTkh; + } + + public double getVelocity() { + return this.velocity; + } + + public double getD50() { + return this.d50; + } + + public double getTau() { + return this.tau; + } } \ No newline at end of file