Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/IoDamMStabDocSeriliazerTests.cs =================================================================== diff -u -r3123 -r3132 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/IoDamMStabDocSeriliazerTests.cs (.../IoDamMStabDocSeriliazerTests.cs) (revision 3123) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/IoDamMStabDocSeriliazerTests.cs (.../IoDamMStabDocSeriliazerTests.cs) (revision 3132) @@ -55,10 +55,24 @@ private IoMStabDamDoc CreateMStabDamDocExample() { var ioMStabDamDoc = new IoMStabDamDoc(); + + // Geometry Creation Options ioMStabDamDoc.MStabInput.GeometryCreationOptions.MaterialForDike = "DikeMaterial"; ioMStabDamDoc.MStabInput.GeometryCreationOptions.SoilGeometry2DFilename = "Geometry2DFilename"; ioMStabDamDoc.MStabInput.GeometryCreationOptions.SoilGeometryType = SoilGeometryType.SoilGeometry2D; ioMStabDamDoc.MStabInput.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin = 1.1; + + // Model + ioMStabDamDoc.MStabInput.Model.CalculationModel = ModelType.UpliftVan; + ioMStabDamDoc.MStabInput.Model.GridPosition = GridPositionType.Right; + ioMStabDamDoc.MStabInput.Model.Probabilistic = false; + ioMStabDamDoc.MStabInput.Model.SearchMethod = SearchMethodType.Grid; + ioMStabDamDoc.MStabInput.Model.ShearStrength = ShearStrengthType.CPhi; + + // SurfaceLine + + // Characteristic Points + return ioMStabDamDoc; } } Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs =================================================================== diff -u -r3122 -r3132 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs (.../FillXmlDamMStabDocFromIo.cs) (revision 3122) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillXmlDamMStabDocFromIo.cs (.../FillXmlDamMStabDocFromIo.cs) (revision 3132) @@ -30,18 +30,31 @@ { var xmlDamMStabDoc = new tnsPrefixDamMStabDoc(); xmlDamMStabDoc.tnsPrefixDamMStabInput = new tnsPrefixDamMStabDocTnsPrefixDamMStabInput(); + xmlDamMStabDoc.tnsPrefixDamMStabInput.tnsbPrefixGeometryCreationOptions = new tnsbPrefixGeometryCreationOptions(); TransferGeometryCreationOptions(ioDamMStabDamDoc.MStabInput.GeometryCreationOptions, xmlDamMStabDoc.tnsPrefixDamMStabInput.tnsbPrefixGeometryCreationOptions); + + xmlDamMStabDoc.tnsPrefixDamMStabInput.tnsbPrefixModel = new tnsbPrefixModel(); + TransferModel(ioDamMStabDamDoc.MStabInput.Model, xmlDamMStabDoc.tnsPrefixDamMStabInput.tnsbPrefixModel); return xmlDamMStabDoc; } + private static void TransferModel(IoModel ioModel, tnsbPrefixModel xmlModel) + { + xmlModel.CalculationModel = ioModel.CalculationModel; + xmlModel.GridPosition = ioModel.GridPosition; + xmlModel.Probabilistic = ioModel.Probabilistic; + xmlModel.SearchMethod = ioModel.SearchMethod; + xmlModel.ShearStrength = ioModel.ShearStrength; + } + private static void TransferGeometryCreationOptions(IoGeometryCreationOptions ioGeometryCreationOptions, - tnsbPrefixGeometryCreationOptions geometryCreationOptions) + tnsbPrefixGeometryCreationOptions xmlGeometryCreationOptions) { - geometryCreationOptions.MaterialForDike = ioGeometryCreationOptions.MaterialForDike; - geometryCreationOptions.SoilGeometry2DFilename = ioGeometryCreationOptions.SoilGeometry2DFilename; - geometryCreationOptions.SoilGeometryType = ioGeometryCreationOptions.SoilGeometryType; - geometryCreationOptions.XOffsetSoilGeometry2DOrigin = ioGeometryCreationOptions.XOffsetSoilGeometry2DOrigin; + xmlGeometryCreationOptions.MaterialForDike = ioGeometryCreationOptions.MaterialForDike; + xmlGeometryCreationOptions.SoilGeometry2DFilename = ioGeometryCreationOptions.SoilGeometry2DFilename; + xmlGeometryCreationOptions.SoilGeometryType = ioGeometryCreationOptions.SoilGeometryType; + xmlGeometryCreationOptions.XOffsetSoilGeometry2DOrigin = ioGeometryCreationOptions.XOffsetSoilGeometry2DOrigin; } } } \ No newline at end of file Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoModel.cs =================================================================== diff -u -r3117 -r3132 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoModel.cs (.../IoModel.cs) (revision 3117) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/IoModel.cs (.../IoModel.cs) (revision 3132) @@ -23,6 +23,14 @@ { public class IoModel { - + public ModelType CalculationModel { get; set; } + + public ShearStrengthType ShearStrength { get; set; } + + public bool Probabilistic { get; set; } + + public SearchMethodType SearchMethod { get; set; } + + public GridPositionType GridPosition { get; set; } } } \ No newline at end of file Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs =================================================================== diff -u -r3122 -r3132 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs (.../FillIoDamMStabDocFromXml.cs) (revision 3122) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/FillIoDamMStabDocFromXml.cs (.../FillIoDamMStabDocFromXml.cs) (revision 3132) @@ -32,9 +32,19 @@ { var ioMStabDamDoc = new IoMStabDamDoc(); TransferGeometryCreationOptions(xmlDamMStabDamDoc.tnsPrefixDamMStabInput.tnsbPrefixGeometryCreationOptions, ioMStabDamDoc.MStabInput.GeometryCreationOptions); + TransferModel(xmlDamMStabDamDoc.tnsPrefixDamMStabInput.tnsbPrefixModel, ioMStabDamDoc.MStabInput.Model); return ioMStabDamDoc; } + private static void TransferModel(tnsbPrefixModel xmlModel, IoModel ioModel) + { + ioModel.CalculationModel = xmlModel.CalculationModel; + ioModel.GridPosition = xmlModel.GridPosition; + ioModel.Probabilistic = xmlModel.Probabilistic; + ioModel.SearchMethod = xmlModel.SearchMethod; + ioModel.ShearStrength = xmlModel.ShearStrength; + } + private static void TransferGeometryCreationOptions(tnsbPrefixGeometryCreationOptions xmlGeometryCreationOptions, IoGeometryCreationOptions geometryCreationOptions) {