Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
===================================================================
diff -u -r2193 -r2405
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 2193)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 2405)
@@ -431,7 +431,7 @@
permeabilityKx = aquiferLayer.PermeabilityKx;
upliftFactor = upliftLocationAndResult.UpliftFactor;
}
- var seepageLength = xExit - xEntry;
+ var seepageLength = (xExit - xEntry) + damKernelInput.Location.DistanceToEntryPoint;
// Reference level is highest value of surfaceLevel or PolderLevel
// Uit TR Zandmeevoerende wellen (1999): "Het verval dH is gelijk aan het verschil tussen buitenwaterstand (het ontwerppeil(OP))
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r2211 -r2405
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2211)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 2405)
@@ -348,6 +348,7 @@
location.XSoilGeometry2DOrigin = 1.23;
location.ModelParametersForPlLines.PlLineCreationMethod = (PlLineCreationMethod)i;
location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType)i;
+ location.DistanceToEntryPoint = 1.2 * i + 0.56;
location.PolderLevel = 1.0 * i + 0.11;
location.ModelParametersForPlLines.DampingFactorPl4 = 1.0 * i + 0.12;
location.ModelParametersForPlLines.DampingFactorPl3 = 1.0 * i + 0.13;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r2211 -r2405
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2211)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 2405)
@@ -492,6 +492,10 @@
var location = new Location();
var inputLocation = inputLocations[i];
location.Name = inputLocation.Name;
+ if (inputLocation.DistanceToEntryPointSpecified)
+ {
+ location.DistanceToEntryPoint = inputLocation.DistanceToEntryPoint;
+ }
if (inputLocation.XSoilGeometry2DOriginSpecified) location.XSoilGeometry2DOrigin = inputLocation.XSoilGeometry2DOrigin;
// Waternet options
var waternetOptions = inputLocation.WaternetOptions;
Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r2211 -r2405
--- DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2211)
+++ DamEngine/trunk/xsd/DamLocation.xsd (.../DamLocation.xsd) (revision 2405)
@@ -157,5 +157,6 @@
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r2211 -r2405
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2211)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 2405)
@@ -489,6 +489,8 @@
var inputLocation = new Io.XmlInput.Location();
inputLocation.Name = location.Name;
+ inputLocation.DistanceToEntryPoint = location.DistanceToEntryPoint;
+ inputLocation.DistanceToEntryPointSpecified = true;
inputLocation.XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin;
inputLocation.XSoilGeometry2DOriginSpecified = true;
inputLocation.SurfaceLineName = location.SurfaceLine.Name;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
===================================================================
diff -u -r2111 -r2405
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 2405)
@@ -193,6 +193,7 @@
{
var location = new Location();
location.Name = "A" + (i + 1);
+ location.DistanceToEntryPoint = 0.2 * i + 0.56;
location.Segment = new Segment();
var soilGeometryProbability = new SoilGeometryProbability();
soilGeometryProbability.SoilProfile1D = new SoilProfile1D();
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r2211 -r2405
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2211)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 2405)
@@ -344,6 +344,10 @@
private bool xSoilGeometry2DOriginFieldSpecified;
+ private double distanceToEntryPointField;
+
+ private bool distanceToEntryPointFieldSpecified;
+
///
public object OperationalOptions {
get {
@@ -480,6 +484,28 @@
this.xSoilGeometry2DOriginFieldSpecified = value;
}
}
+
+ ///
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public double DistanceToEntryPoint {
+ get {
+ return this.distanceToEntryPointField;
+ }
+ set {
+ this.distanceToEntryPointField = value;
+ }
+ }
+
+ ///
+ [System.Xml.Serialization.XmlIgnoreAttribute()]
+ public bool DistanceToEntryPointSpecified {
+ get {
+ return this.distanceToEntryPointFieldSpecified;
+ }
+ set {
+ this.distanceToEntryPointFieldSpecified = value;
+ }
+ }
}
///
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r2227 -r2405
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2227)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2405)
@@ -21,6 +21,7 @@
using System;
using System.Collections.Generic;
+using System.Dynamic;
using System.Linq;
using Deltares.DamEngine.Data.Design;
using Deltares.DamEngine.Data.General.Gauges;
@@ -42,7 +43,8 @@
private ModelParametersForPlLines modelParametersForPlLines = new ModelParametersForPlLines();
private string dikeEmbankmentMaterial = "";
private double dikeTableHeight;
-
+ private double distanceToEntryPoint;
+
private IList gaugePlLines = new List();
private IList gauges = new List();
private double? headPl2;
@@ -134,6 +136,18 @@
}
///
+ /// Gets or sets the distance to entry point (can be used for Piping Sellmeijer).
+ ///
+ ///
+ /// The distance to entry point.
+ ///
+ public double DistanceToEntryPoint
+ {
+ get { return distanceToEntryPoint;}
+ set { distanceToEntryPoint = value; }
+ }
+
+ ///
/// Gets or sets the sensor location.
///
///
@@ -171,7 +185,7 @@
}
///
- /// Gets or sets the x rd dike line (for senesors).
+ /// Gets or sets the x rd dike line (for sensors).
///
///
/// The x rd dike line.