Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r613 -r614 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 613) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 614) @@ -87,13 +87,13 @@ input.AnalysisType = ConversionHelper.ConvertToInputAnalysisType(DamProjectCalculationSpecification.SelectedAnalysisType); } - input.PipingModelTypeSpecified = (input.FailureMechanismSystemType == ConversionHelper.inputFailureMechanismPiping); + input.PipingModelTypeSpecified = (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismPiping); if (input.PipingModelTypeSpecified) { input.PipingModelType = ConversionHelper.ConvertToInputPipingModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType); } - input.StabilityModelTypeSpecified = (input.FailureMechanismSystemType == ConversionHelper.inputFailureMechanismStabilityInside) || (input.FailureMechanismSystemType == ConversionHelper.inputFailureMechanismStabilityOutside); + input.StabilityModelTypeSpecified = (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityInside) || (input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityOutside); if (input.StabilityModelTypeSpecified) { input.StabilityModelType = ConversionHelper.ConvertToInputStabilityModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType); Index: dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r613 -r614 --- dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 613) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 614) @@ -319,10 +319,10 @@ return translationTable[soilGeometryType]; } - public const int inputFailureMechanismStabilityInside = 0; - public const int inputFailureMechanismStabilityOutside = 1; - public const int inputFailureMechanismPiping = 2; - public const int inputFailureMechanismHorizontalBalance = 3; + public const int InputFailureMechanismStabilityInside = 0; + public const int InputFailureMechanismStabilityOutside = 1; + public const int InputFailureMechanismPiping = 2; + public const int InputFailureMechanismHorizontalBalance = 3; /// /// Converts the Dam failure mechanism type to the input failure mechanism type . /// @@ -332,10 +332,10 @@ { var translationTable = new Dictionary() { - {FailureMechanismSystemType.StabilityInside, inputFailureMechanismStabilityInside}, - {FailureMechanismSystemType.StabilityOutside, inputFailureMechanismStabilityOutside}, - {FailureMechanismSystemType.Piping, inputFailureMechanismPiping}, - {FailureMechanismSystemType.HorizontalBalance, inputFailureMechanismHorizontalBalance} + {FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside}, + {FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside}, + {FailureMechanismSystemType.Piping, InputFailureMechanismPiping}, + {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance} }; return translationTable[segmentFailureMechanismType]; } @@ -349,10 +349,10 @@ { var translationTable = new Dictionary() { - {inputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside}, - {inputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside}, - {inputFailureMechanismPiping, FailureMechanismSystemType.Piping}, - {inputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance} + {InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside}, + {InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside}, + {InputFailureMechanismPiping, FailureMechanismSystemType.Piping}, + {InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance} }; return translationTable[failureMechanismSystemType]; } Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r613 -r614 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 613) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 614) @@ -27,7 +27,6 @@ using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamEngine.Io.XmlInput; -using ConversionException = Deltares.DamEngine.Data.Standard.ConversionException; using Location = Deltares.DamEngine.Data.General.Location; using Segment = Deltares.DamEngine.Data.General.Segment; using Soil = Deltares.DamEngine.Io.XmlInput.Soil; @@ -65,7 +64,7 @@ TransferSoilProfiles2D(input.SoilProfiles2D, dike.SoilProfiles2D, dike.SoilList); TransferSegments(input.Segments, damProjectData.Segments); TransferLocations(input.Locations, dike.Locations, dike.SurfaceLines2, damProjectData.Segments); - PostProcess(input, damProjectData); + PostProcess(damProjectData); return damProjectData; } @@ -129,9 +128,8 @@ /// /// Postprocess: connect all objects /// - /// The input. /// The project. - private static void PostProcess(Input input, DamProjectData project) + private static void PostProcess(DamProjectData project) { // find proper profiles for segments foreach (var segment in project.Segments)