Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r747 -r809 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 747) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 809) @@ -267,7 +267,7 @@ } } - + private static void CreateDesignResultsStabilityOutput(DesignResult desResult, Data.General.Results.DesignResult designResult) { desResult.StabilityDesignResults = new DesignResultStabilityDesignResults() Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r747 -r809 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 747) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 809) @@ -25,7 +25,6 @@ using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Io.XmlOutput; -using SurfaceLine = Deltares.DamEngine.Io.XmlInput.SurfaceLine; namespace Deltares.DamEngine.Interface { @@ -101,7 +100,7 @@ model = PipingModelType.Wti2017; desResult.PipingDesignResults = new Data.General.Results.PipingDesignResults(model) { - ResultMessage = designResult.PipingDesignResults.ResultMessage + ResultMessage = designResult.PipingDesignResults.ResultMessage }; if (designResult.PipingDesignResults.RedesignedSurfaceLine != null) { @@ -164,7 +163,7 @@ surfaceLine.AddCharacteristicPoint(geometryPoint, ConversionHelper.ConvertToDamPointType(inputPoint.PointType)); } } - + private static void CreateDesignResultsStabilityOutput(DesignResult designResult, Data.General.Results.DesignResult desResult) { desResult.StabilityDesignResults = new Data.General.Results.StabilityDesignResults() Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r789 -r809 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 789) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 809) @@ -112,7 +112,7 @@ curStabParamas.SlipCircleDefinition = new SlipCircleDefinition(); var slipCircleDefinition = curStabParamas.SlipCircleDefinition; slipCircleDefinition.GridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.GridDetermination); - + if (input.StabilityParameters.BishopTangentLinesDefinitionSpecified) { slipCircleDefinition.BishopTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.BishopTangentLinesDefinition); @@ -176,7 +176,7 @@ if (input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistanceSpecified) { slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistance; - } + } } } } @@ -244,7 +244,7 @@ segmentSoilProfileProbability.SoilProfile2D = FindSoilProfile2DByName(project.Dike.SoilProfiles2D, segmentSoilProfileProbability.SoilProfile2DName); } - } + } } // Set locations for scenarios @@ -273,16 +273,16 @@ soil.DiameterD90 = inputSoil.DiameterD90Specified ? inputSoil.DiameterD90 : double.NaN; soil.PermeabKx = inputSoil.PermeabKxSpecified ? inputSoil.PermeabKx : double.NaN; soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : double.NaN; - soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? - (ShearStrengthModel?) ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : null; - soil.DefaultShearStrengthModel = inputSoil.DefaultShearStrengthModelSpecified ? - (bool?) inputSoil.DefaultShearStrengthModel : null; - soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : double.NaN; + soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? + (ShearStrengthModel?)ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : null; + soil.DefaultShearStrengthModel = inputSoil.DefaultShearStrengthModelSpecified ? + (bool?)inputSoil.DefaultShearStrengthModel : null; + soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : double.NaN; soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : double.NaN; soil.Ocr = inputSoil.OcrSpecified ? inputSoil.Ocr : double.NaN; soil.SlopeRestProfile = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : double.NaN; soil.DilatancyType = inputSoil.DilatancyTypeSpecified ? - (DilatancyType?) ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : null; + (DilatancyType?)ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : null; soils.Add(soil); } } @@ -332,15 +332,15 @@ location.ModelParametersForPLLines.DampingFactorPL4 = waternetOptions.DampingFactorPL3; location.ModelParametersForPLLines.DampingFactorPL3 = waternetOptions.DampingFactorPL4; location.ModelParametersForPLLines.PenetrationLength = waternetOptions.PenetrationLength; - location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?) waternetOptions.Pl1BelowCrestMiddle : null); + location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?)waternetOptions.Pl1BelowCrestMiddle : null); location.UsePlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrestSpecified; location.PlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrest; - location.PlLineOffsetDryBelowDikeCrestMiddle = (waternetOptions.DryPl1BelowCrestMiddleSpecified ? (double?) waternetOptions.DryPl1BelowCrestMiddle : null); + location.PlLineOffsetDryBelowDikeCrestMiddle = (waternetOptions.DryPl1BelowCrestMiddleSpecified ? (double?)waternetOptions.DryPl1BelowCrestMiddle : null); location.UsePlLineOffsetDryFactorBelowShoulderCrest = waternetOptions.DryPl1FactorBelowShoulderCrestSpecified; location.PlLineOffsetDryFactorBelowShoulderCrest = waternetOptions.DryPl1FactorBelowShoulderCrest; - location.HeadPl2 = (waternetOptions.HeadPl2Specified ? (double?) waternetOptions.HeadPl2 : null); - location.HeadPl3 = (waternetOptions.HeadPl3Specified ? (double?) waternetOptions.HeadPl3 : null); - location.HeadPl4 = (waternetOptions.HeadPl4Specified ? (double?) waternetOptions.HeadPl4 : null); + location.HeadPl2 = (waternetOptions.HeadPl2Specified ? (double?)waternetOptions.HeadPl2 : null); + location.HeadPl3 = (waternetOptions.HeadPl3Specified ? (double?)waternetOptions.HeadPl3 : null); + location.HeadPl4 = (waternetOptions.HeadPl4Specified ? (double?)waternetOptions.HeadPl4 : null); location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor; location.PlLineOffsetBelowDikeTopAtRiver = waternetOptions.Pl1BelowCrestRiverside; location.PlLineOffsetBelowDikeTopAtPolder = waternetOptions.Pl1BelowCrestPolderside; @@ -433,7 +433,7 @@ } } - private static void TransferSoilProfiles1D(Io.XmlInput.SoilProfile1D[] inputSoilProfiles1D, + private static void TransferSoilProfiles1D(Io.XmlInput.SoilProfile1D[] inputSoilProfiles1D, IList dikeSoilProfiles, SoilList soils) { if (inputSoilProfiles1D != null) @@ -446,7 +446,7 @@ soilProfile1D.BottomLevel = inputSoilProfile1D.BottomLevel; AddLayers1D(inputSoilProfile1D, soilProfile1D, soils); dikeSoilProfiles.Add(soilProfile1D); - } + } } } @@ -541,7 +541,7 @@ } } - private static void TransferSegments(Io.XmlInput.Segment[] inputSegments, IList segments ) + private static void TransferSegments(Io.XmlInput.Segment[] inputSegments, IList segments) { for (int i = 0; i < inputSegments.Length; i++) { @@ -572,22 +572,22 @@ switch (soilGeometryProbability.SoilProfileType) { case SoilProfileType.ProfileType1D: - { - soilGeometryProbability.SoilProfile1DName = inputSoilGeometryProbability.SoilProfileName; - break; - } + { + soilGeometryProbability.SoilProfile1DName = inputSoilGeometryProbability.SoilProfileName; + break; + } case SoilProfileType.ProfileType2D: - { - soilGeometryProbability.SoilProfile2DName = inputSoilGeometryProbability.SoilProfileName; - break; - } + { + soilGeometryProbability.SoilProfile2DName = inputSoilGeometryProbability.SoilProfileName; + break; + } case SoilProfileType.ProfileTypeStiFile: { soilGeometryProbability.StiFileName = inputSoilGeometryProbability.SoilProfileName; break; } } - + segment.SoilProfileProbabilities.Add(soilGeometryProbability); } } Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r793 -r809 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 793) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 809) @@ -148,7 +148,7 @@ input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistanceSpecified = true; input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistance = slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance; } - } + } } } @@ -177,7 +177,7 @@ { foreach (var surfaceLine in damProjectData.Dike.SurfaceLines2) { - if ((surfaceLine.CharacteristicPoints == null) || (surfaceLine.CharacteristicPoints.Count < 1)) + if ((surfaceLine.CharacteristicPoints == null) || (surfaceLine.CharacteristicPoints.Count < 1)) { throw new NullReferenceException(string.Format(Resources.NoCharacteristicPointsInSurfaceLineProject, surfaceLine.Name)); } @@ -224,7 +224,7 @@ inputSoil.PermeabKx = soil.PermeabKx; inputSoil.WhitesConstantSpecified = !double.IsNaN(soil.WhitesConstant); inputSoil.WhitesConstant = soil.WhitesConstant; - inputSoil.ShearStrengthModelSpecified = (soil.ShearStrengthModel != null); + inputSoil.ShearStrengthModelSpecified = (soil.ShearStrengthModel != null); if (inputSoil.ShearStrengthModelSpecified) { inputSoil.ShearStrengthModel = ConversionHelper.ConvertToSoilShearStrengthModel(soil.ShearStrengthModel.Value); @@ -281,7 +281,7 @@ { var location = dikeLocations[i]; - var inputLocation = new Io.XmlInput.Location(); + var inputLocation = new Io.XmlInput.Location(); inputLocation.Name = location.Name; inputLocation.SurfaceLineName = location.SurfaceLine.Name; inputLocation.SegmentName = location.Segment.Name; @@ -317,7 +317,7 @@ var designOptions = new LocationDesignOptions(); designOptions.RedesignDikeHeight = location.RedesignDikeHeight; designOptions.RedesignDikeShoulder = location.RedesignDikeShoulder; - designOptions.ShoulderEmbankmentMaterial = location.ShoulderEmbankmentMaterial; + designOptions.ShoulderEmbankmentMaterial = location.ShoulderEmbankmentMaterial; designOptions.StabilityShoulderGrowSlope = location.StabilityShoulderGrowSlope; designOptions.StabilityShoulderGrowDeltaX = location.StabilityShoulderGrowDeltaX; designOptions.StabilitySlopeAdaptionDeltaX = location.StabilitySlopeAdaptionDeltaX; @@ -437,7 +437,7 @@ }; AddLayers1D(soilProfile1D, inputSoilProfile1D); inputSoilProfiles1D[i] = inputSoilProfile1D; - } + } } private static void AddLayers1D(SoilProfile1D soilProfile1D, Io.XmlInput.SoilProfile1D inputSoilProfile1D) @@ -476,7 +476,7 @@ } } - private static void AddPreconsolidationStresses(SoilProfile2D soilProfile2D, Io.XmlInput.SoilProfile2D inputSoilProfile2D ) + private static void AddPreconsolidationStresses(SoilProfile2D soilProfile2D, Io.XmlInput.SoilProfile2D inputSoilProfile2D) { if (soilProfile2D.PreconsolidationStresses != null) { @@ -522,7 +522,7 @@ X = loop.Points[j].X, Z = loop.Points[j].Z }; - inputLayer.Surface.OuterLoop[j] = point; + inputLayer.Surface.OuterLoop[j] = point; } var innerloop = layer.GeometrySurface.InnerLoops.FirstOrDefault(); if (innerloop != null) @@ -538,7 +538,7 @@ inputLayer.Surface.Innerloop[j] = point; } } - inputSoilProfile2D.Layers2D[i] = inputLayer; + inputSoilProfile2D.Layers2D[i] = inputLayer; } } } @@ -581,20 +581,20 @@ switch (soilGeometryProbability.SoilProfileType) { case SoilProfileType.ProfileType1D: - { - inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilProfile1DName; - break; - } + { + inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilProfile1DName; + break; + } case SoilProfileType.ProfileType2D: - { - inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilProfile2DName; - break; - } + { + inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilProfile2DName; + break; + } case SoilProfileType.ProfileTypeStiFile: - { - inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.StiFileName; - break; - } + { + inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.StiFileName; + break; + } } inputSegment.SoilGeometryProbability[i] = inputSoilGeometryProbability;