Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs
===================================================================
diff -u -r1965 -r2463
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs (.../CalculationHelper.cs) (revision 1965)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/CalculationHelper.cs (.../CalculationHelper.cs) (revision 2463)
@@ -39,6 +39,9 @@
PlLineAssignment plLineAssignment = PlLineAssignment.ExpertKnowledge;
switch (plLineCreationMethod)
{
+ case PlLineCreationMethod.None:
+ plLineAssignment = PlLineAssignment.NoPlLines;
+ break;
case PlLineCreationMethod.ExpertKnowledgeRRD:
case PlLineCreationMethod.ExpertKnowledgeLinearInDike:
case PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD:
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs
===================================================================
diff -u -r2113 -r2463
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 2113)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 2463)
@@ -57,9 +57,7 @@
private double? plLineOffsetFactorBelowShoulderCrest;
private double? headPl3;
private double? headPl4;
- private double? waterHeightDecimeringsHoogte;
- private double? maxWaterLevel;
-
+
public CalculationResult CalculationResult
{
get { return calculationResult; }
@@ -421,42 +419,6 @@
}
///
- /// Gets or sets the water height decimerings hoogte.
- ///
- ///
- /// The water height decimerings hoogte.
- ///
- public double? WaterHeightDecimeringsHoogte
- {
- get
- {
- return waterHeightDecimeringsHoogte;
- }
- set
- {
- waterHeightDecimeringsHoogte = value;
- }
- }
-
- ///
- /// Gets or sets the maximum water level.
- ///
- ///
- /// The maximum water level.
- ///
- public double? MaxWaterLevel
- {
- get
- {
- return maxWaterLevel;
- }
- set
- {
- maxWaterLevel = value;
- }
- }
-
- ///
/// Gets or sets the model factors.
///
///
@@ -638,29 +600,25 @@
"DikeTableHeight={4} " +
"SafetyFactorStabilityInnerSlope={5} " +
"RequiredSafetyFactorStabilityOuterSlope={6} " +
- "WaterHeightDecimeringsHoogte= {7} " +
- "MaxWaterheight={8} " +
- "PlLineOffsetBelowDikeTopAtRiver={9} " +
- "PlLineOffsetBelowDikeToeAtPolder={10} " +
- "PlLineOffsetBelowDikeTopAtPolder={11} " +
- "PlLineOffsetBelowShoulderBaseInside={12} " +
- "UsePlLineOffsetBelowDikeCrestMiddle {13} " +
- "PlLineOffsetBelowDikeCrestMiddle {14} " +
- "UsePlLineOffsetFactorBelowShoulderCrest {15} " +
- "PlLineOffsetFactorBelowShoulderCrest {16} " +
- "HeadPl3={17} " +
- "HeadPl4={18}",
+ "PlLineOffsetBelowDikeTopAtRiver={7} " +
+ "PlLineOffsetBelowDikeToeAtPolder={8} " +
+ "PlLineOffsetBelowDikeTopAtPolder={9} " +
+ "PlLineOffsetBelowShoulderBaseInside={10} " +
+ "UsePlLineOffsetBelowDikeCrestMiddle {11} " +
+ "PlLineOffsetBelowDikeCrestMiddle {12} " +
+ "UsePlLineOffsetFactorBelowShoulderCrest {13} " +
+ "PlLineOffsetFactorBelowShoulderCrest {14} " +
+ "HeadPl3={15} " +
+ "HeadPl4={16}",
Location.Name,
LocationScenarioID,
RiverLevel,
RiverLevelLow.HasValue ? RiverLevelLow.ToString() : "?",
DikeTableHeight.HasValue ? DikeTableHeight.ToString() : "?",
ModelFactors.RequiredSafetyFactorStabilityInnerSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityInnerSlope.ToString() : "?",
ModelFactors.RequiredSafetyFactorStabilityOuterSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityOuterSlope.ToString() : "?",
- WaterHeightDecimeringsHoogte.HasValue ? WaterHeightDecimeringsHoogte.ToString() : "?",
- MaxWaterLevel.HasValue ? MaxWaterLevel.ToString() : "?",
PlLineOffsetBelowDikeTopAtRiver.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?",
- PlLineOffsetBelowDikeToeAtPolder.HasValue ? MaxWaterLevel.ToString() : "?",
+ PlLineOffsetBelowDikeToeAtPolder.HasValue ? PlLineOffsetBelowDikeToeAtPolder.ToString() : "?",
PlLineOffsetBelowDikeTopAtPolder.HasValue ? PlLineOffsetBelowDikeTopAtPolder.ToString() : "?",
PlLineOffsetBelowShoulderBaseInside.HasValue ? PlLineOffsetBelowShoulderBaseInside.ToString() : "?",
UsePlLineOffsetBelowDikeCrestMiddle.HasValue ? UsePlLineOffsetBelowDikeCrestMiddle.ToString() : "?",
Index: DamEngine/trunk/src/Deltares.DamEngine.Version/GlobalAssembly.cs.svn
===================================================================
diff -u -r2091 -r2463
--- DamEngine/trunk/src/Deltares.DamEngine.Version/GlobalAssembly.cs.svn (.../GlobalAssembly.cs.svn) (revision 2091)
+++ DamEngine/trunk/src/Deltares.DamEngine.Version/GlobalAssembly.cs.svn (.../GlobalAssembly.cs.svn) (revision 2463)
@@ -8,5 +8,5 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("19.1.0.SVNREV")]
-[assembly: AssemblyFileVersion("19.1.0.SVNREV")]
\ No newline at end of file
+[assembly: AssemblyVersion("19.2.0.SVNREV")]
+[assembly: AssemblyFileVersion("19.2.0.SVNREV")]
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs
===================================================================
diff -u -r2318 -r2463
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 2318)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 2463)
@@ -72,9 +72,6 @@
public string SoilGeometry2DName { get; set; }
public double RiverLevel { get; set; }
public double DikeTableHeight { get; set; }
- public double MaxWaterLevel { get; set; }
- public double RiverLevelDecimateHeight { get; set; }
- public double RequiredProbabilityOfFailure { get; set; }
public double TrafficLoad { get; set; }
///
@@ -128,9 +125,6 @@
this.RiverLevel = failureMechanismParametersMStab.RiverLevel;
this.DikeTableHeight = failureMechanismParametersMStab.DikeTableHeight;
- this.MaxWaterLevel = failureMechanismParametersMStab.MaxWaterLevel;
- this.RiverLevelDecimateHeight = failureMechanismParametersMStab.RiverLevelDecimateHeight;
- this.RequiredProbabilityOfFailure = failureMechanismParametersMStab.RequiredProbabilityOfFailure;
this.TrafficLoad = failureMechanismParametersMStab.TrafficLoad; ;
this.EmbankmentDesignParameters = failureMechanismParametersMStab.EmbankmentDesignParameters;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs
===================================================================
diff -u -r2227 -r2463
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs (.../PlLineEnumerations.cs) (revision 2227)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLineEnumerations.cs (.../PlLineEnumerations.cs) (revision 2463)
@@ -27,9 +27,7 @@
public enum PlLineAssignment
{
NoPlLines,
- ExpertKnowledge,
- DikeFlow,
- OrginalPlLines
+ ExpertKnowledge
}
///
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd
===================================================================
diff -u -r2231 -r2463
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 2231)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 2463)
@@ -172,8 +172,6 @@
-
-
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
===================================================================
diff -u -r2231 -r2463
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 2231)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 2463)
@@ -443,32 +443,6 @@
}
}
}
- // #zant properties missing #Bka: Dupuit is not to be used in this version so that is ok
-// if (failureMechanismParametersMStab.DupuitPLLines != null)
-// {
-// externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines);
-// for (int plLineIndex = 0;
-// plLineIndex <
-// failureMechanismParametersMStab.DupuitPLLines.PLLines.Count;
-// plLineIndex++)
-// {
-// PLLine line = failureMechanismParametersMStab.DupuitPLLines.PLLines[plLineIndex];
-// line.IsPhreatic = (plLineIndex == failureMechanismParametersMStab.DupuitPLLines.PLLines.Count - 1);
-// line.BoundaryLayer = plLineIndex;
-// var PLLineElement = new XElement(tnsb + XmlElementPLLine);
-// externalPLLinesElement.Add(PLLineElement);
-// PLLineElement.Add(new XAttribute(XmlAttributeIsPhreatic, line.IsPhreatic));
-// PLLineElement.Add(new XAttribute(XmlAttributeBoundaryLayer, line.BoundaryLayer));
-// for (int pointIndex = 1; pointIndex < line.Points.Count - 1; pointIndex++)
-// {
-// GeometryPoint point = line.Points[pointIndex];
-// var PLPointElement = new XElement(tnsb + XmlElementPLPoint);
-// PLPointElement.Add(new XAttribute(XmlAttributeXCoord, point.X));
-// PLPointElement.Add(new XAttribute(XmlAttributeYCoord, point.Z));
-// PLLineElement.Add(PLPointElement);
-// }
-// }
-// }
return externalPLLinesElement;
}