Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.StiFileCreator/StiFileCreator.cs =================================================================== diff -u -r3152 -r3161 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.StiFileCreator/StiFileCreator.cs (.../StiFileCreator.cs) (revision 3152) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.StiFileCreator/StiFileCreator.cs (.../StiFileCreator.cs) (revision 3161) @@ -54,7 +54,7 @@ { var ioMStabDamDoc = new IoMStabDamDoc(); ioMStabDamDoc.MStabInput.MStabFileName = stiFileCreatorInput.OutputFilename; - ioMStabDamDoc.MStabInput.SoilDbName = @"TestFiles\Example.mdb"; // TODO: make soilbase optionals + //ioMStabDamDoc.MStabInput.SoilDbName = @"TestFiles\Example.mdb"; // TODO: make soilbase optionals ioMStabDamDoc.MStabInput.Model.CalculationModel = ModelType.Bishop; ioMStabDamDoc.MStabInput.Model.GridPosition = GridPositionType.Right; ioMStabDamDoc.MStabInput.Model.Probabilistic = false; @@ -64,6 +64,7 @@ ioMStabDamDoc.MStabInput.GeometryCreationOptions.MaterialForDike = stiFileCreatorInput.DikeMaterialName; ioMStabDamDoc.MStabInput.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin = stiFileCreatorInput.XOffset; ioMStabDamDoc.MStabInput.GeometryCreationOptions.SoilGeometry2DFilename = stiFileCreatorInput.InputFilename; + ioMStabDamDoc.MStabInput.GeometryCreationOptions.PlLineAssignment = PlLineAssignment.NoPlLines; ioMStabDamDoc.MStabInput.CalculationOptions.ZonesType = ZonesType.NoZones; ioMStabDamDoc.MStabInput.TrafficLoad.DegreeOfConsolidationSpecified = false; double leftSide = stiFileCreatorInput.SurfaceLine.SurfaceLinePoints[0].XCoordinate; Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs =================================================================== diff -u -r3152 -r3161 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs (.../FillIoDamMStabDocFromXml.cs) (revision 3152) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs (.../FillIoDamMStabDocFromXml.cs) (revision 3161) @@ -136,6 +136,7 @@ geometryCreationOptions.SoilGeometryType = xmlGeometryCreationOptions.SoilGeometryType; geometryCreationOptions.XOffsetSoilGeometry2DOrigin = xmlGeometryCreationOptions.XOffsetSoilGeometry2DOrigin; geometryCreationOptions.PenetrationLength = xmlGeometryCreationOptions.PenetrationLength; + geometryCreationOptions.PlLineAssignment = xmlGeometryCreationOptions.PLLineAssignment; } } } \ No newline at end of file Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs =================================================================== diff -u -r3152 -r3161 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs (.../FillXmlDamMStabDocFromIo.cs) (revision 3152) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs (.../FillXmlDamMStabDocFromIo.cs) (revision 3161) @@ -155,6 +155,7 @@ xmlGeometryCreationOptions.SoilGeometryType = ioGeometryCreationOptions.SoilGeometryType; xmlGeometryCreationOptions.XOffsetSoilGeometry2DOrigin = ioGeometryCreationOptions.XOffsetSoilGeometry2DOrigin; xmlGeometryCreationOptions.PenetrationLength = ioGeometryCreationOptions.PenetrationLength; + xmlGeometryCreationOptions.PLLineAssignment = ioGeometryCreationOptions.PlLineAssignment; } } } \ No newline at end of file Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.StiFileCreator.Tests/DGSMStabDAMInterfaceTests.cs =================================================================== diff -u -r3111 -r3161 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.StiFileCreator.Tests/DGSMStabDAMInterfaceTests.cs (.../DGSMStabDAMInterfaceTests.cs) (revision 3111) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.StiFileCreator.Tests/DGSMStabDAMInterfaceTests.cs (.../DGSMStabDAMInterfaceTests.cs) (revision 3161) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Runtime.Remoting; using NUnit.Framework; namespace Deltares.LayerOnSlopeTool.StiFileCreator.Tests @@ -31,7 +30,7 @@ public void CanGetVersionInfo() { var mStabDAMInterface = new DGSMStabDAMInterface(); - Assert.AreEqual("19.1.0.27557", mStabDAMInterface.GetDllVersion()); + Assert.AreEqual("20.1", mStabDAMInterface.GetDllVersion().Substring(0,4)); } } } \ No newline at end of file Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/IoDamMStabDocSeriliazerTests.cs =================================================================== diff -u -r3152 -r3161 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/IoDamMStabDocSeriliazerTests.cs (.../IoDamMStabDocSeriliazerTests.cs) (revision 3152) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/IoDamMStabDocSeriliazerTests.cs (.../IoDamMStabDocSeriliazerTests.cs) (revision 3161) @@ -259,6 +259,7 @@ geometryCreationOptions.SoilGeometryType = SoilGeometryType.SoilGeometry2D; geometryCreationOptions.XOffsetSoilGeometry2DOrigin = 1.1; geometryCreationOptions.PenetrationLength = 0.8; + geometryCreationOptions.PlLineAssignment = PlLineAssignment.ExpertKnowledge; } } } \ No newline at end of file Index: DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd =================================================================== diff -u -r3152 -r3161 --- DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd (.../DamMStabDefinitions.xsd) (revision 3152) +++ DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd (.../DamMStabDefinitions.xsd) (revision 3161) @@ -78,7 +78,7 @@ - + Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs =================================================================== diff -u -r3152 -r3161 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs (.../DamMStabDoc.cs) (revision 3152) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs (.../DamMStabDoc.cs) (revision 3161) @@ -554,8 +554,6 @@ private PlLineAssignment pLLineAssignmentField; - private bool pLLineAssignmentFieldSpecified; - private double intrusionVerticalWaterPressureField; private bool intrusionVerticalWaterPressureFieldSpecified; @@ -659,17 +657,6 @@ } /// - [System.Xml.Serialization.XmlIgnoreAttribute()] - public bool PLLineAssignmentSpecified { - get { - return this.pLLineAssignmentFieldSpecified; - } - set { - this.pLLineAssignmentFieldSpecified = value; - } - } - - /// [System.Xml.Serialization.XmlAttributeAttribute()] public double IntrusionVerticalWaterPressure { get { Index: DamTools/LayerOnSlopeTool/trunk/lib/DGSMStabDam/DGSMStabDAM.dll =================================================================== diff -u -r3068 -r3161 Binary files differ Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoGeometryCreationOptions.cs =================================================================== diff -u -r3152 -r3161 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoGeometryCreationOptions.cs (.../IoGeometryCreationOptions.cs) (revision 3152) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoGeometryCreationOptions.cs (.../IoGeometryCreationOptions.cs) (revision 3161) @@ -43,5 +43,9 @@ /// Gets or sets the length of the penetration. /// The length of the penetration. public double PenetrationLength { get; set; } + + /// Gets or sets the pl line assignment. + /// The pl line assignment. + public PlLineAssignment PlLineAssignment { get; set; } } } \ No newline at end of file