Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 843) @@ -77,7 +77,7 @@ subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile; subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside; - var failureMechanismeParamatersMStab = new FailureMechanismeParametersMStab(); + var failureMechanismeParamatersMStab = new FailureMechanismParametersMStab(); failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; failureMechanismeParamatersMStab.MStabParameters.SearchMethod = MStabSearchMethod.GeneticAlgorithm; failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.MinimalCircleDepth = 1.0; @@ -90,7 +90,7 @@ damKernelInput.SubSoilScenario = subSoilScenario; var kernelWrapper = new DamMacroStabilityInwardsKernelWrapper(); - kernelWrapper.FailureMechanismeParametersMStab = failureMechanismeParamatersMStab; + kernelWrapper.FailureMechanismParametersMStab = failureMechanismeParamatersMStab; // Prepare the wrapper. Result is input for the calculation dll IKernelDataInput damStabilityInput; Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 843) @@ -32,25 +32,25 @@ private FailureMechanismSystemType failureMechanismSystemType; private PipingModelType pipingModelType = PipingModelType.Sellmeijer4Forces; private Enum calculationModel; - private FailureMechanismeParametersMStab failureMechanismeParametersMStab; + private FailureMechanismParametersMStab failureMechanismParametersMStab; private static DamProjectType damProjectType; private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassic; public DamFailureMechanismeCalculationSpecification() { //Todo interface failureMechanismSystemType = FailureMechanismSystemType.StabilityInside; - failureMechanismeParametersMStab = new FailureMechanismeParametersMStab(); - CalculationModel = failureMechanismeParametersMStab.MStabParameters.Model; - FailureMechanismeParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; + failureMechanismParametersMStab = new FailureMechanismParametersMStab(); + CalculationModel = failureMechanismParametersMStab.MStabParameters.Model; + FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; ReadUserSettingsSlipCircleDefinition(); } [Validate] - public FailureMechanismeParametersMStab FailureMechanismeParametersMStab + public FailureMechanismParametersMStab FailureMechanismParametersMStab { - get { return failureMechanismeParametersMStab; } - set { failureMechanismeParametersMStab = value; } + get { return failureMechanismParametersMStab; } + set { failureMechanismParametersMStab = value; } } public FailureMechanismSystemType FailureMechanismSystemType @@ -72,10 +72,10 @@ switch (failureMechanismSystemType) { case FailureMechanismSystemType.StabilityInside: - failureMechanismeParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; + failureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; break; case FailureMechanismSystemType.StabilityOutside: - failureMechanismeParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; + failureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; break; case FailureMechanismSystemType.Piping: PipingModelType = oldPipingModelType; @@ -122,17 +122,17 @@ } else { - failureMechanismeParametersMStab.MStabParameters.Model = (MStabModelType)value; + failureMechanismParametersMStab.MStabParameters.Model = (MStabModelType)value; } } } public MStabModelType StabilityModelType { - get { return failureMechanismeParametersMStab.MStabParameters.Model; } + get { return failureMechanismParametersMStab.MStabParameters.Model; } set { - failureMechanismeParametersMStab.MStabParameters.Model = value; + failureMechanismParametersMStab.MStabParameters.Model = value; if (failureMechanismSystemType != FailureMechanismSystemType.Piping) { CalculationModel = value; @@ -149,7 +149,7 @@ public void Assign(DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculation) { this.FailureMechanismSystemType = damFailureMechanismeCalculation.failureMechanismSystemType; - this.FailureMechanismeParametersMStab.Assign(damFailureMechanismeCalculation.FailureMechanismeParametersMStab); + this.FailureMechanismParametersMStab.Assign(damFailureMechanismeCalculation.FailureMechanismParametersMStab); //assign interface } @@ -171,7 +171,7 @@ (this.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)) { //interface? - description += String.Format(" ({0})", this.FailureMechanismeParametersMStab.MStabParameters.Model); + description += String.Format(" ({0})", this.FailureMechanismParametersMStab.MStabParameters.Model); } return description; @@ -185,10 +185,10 @@ /// public bool IsSlipCircleDefinitionUndefined() { - bool isSlipCircleDefinitionUndefined = (failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition == null); + bool isSlipCircleDefinitionUndefined = (failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition == null); if (!isSlipCircleDefinitionUndefined) { - isSlipCircleDefinitionUndefined = (failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount == 0); + isSlipCircleDefinitionUndefined = (failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount == 0); } return isSlipCircleDefinitionUndefined; } @@ -198,27 +198,27 @@ /// public void ReadUserSettingsSlipCircleDefinition() { -// if (failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition == null) +// if (failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition == null) // { -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition = new SlipCircleDefinition(); +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition = new SlipCircleDefinition(); // } -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDefinition = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDefinition; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDistance = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDistance; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDefinition = Properties.Settings.Default.SlipCircleBishopTangentLinesDefinition; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDistance = Properties.Settings.Default.SlipCircleBishopTangentLinesDistance; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.GridSizeDetermination = Properties.Settings.Default.SlipCircleGridSizeDetermination; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointDistance; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointCount; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointDistance; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointCount; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointCount = Properties.Settings.Default.SlipCircleBishopGridVerticalPointCount; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointDistance = Properties.Settings.Default.SlipCircleBishopGridVerticalPointDistance; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointCount = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointCount; -// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointDistance; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDefinition = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDefinition; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDistance = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDistance; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDefinition = Properties.Settings.Default.SlipCircleBishopTangentLinesDefinition; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDistance = Properties.Settings.Default.SlipCircleBishopTangentLinesDistance; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.GridSizeDetermination = Properties.Settings.Default.SlipCircleGridSizeDetermination; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointDistance; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointCount; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointDistance; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointCount; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointCount = Properties.Settings.Default.SlipCircleBishopGridVerticalPointCount; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointDistance = Properties.Settings.Default.SlipCircleBishopGridVerticalPointDistance; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointCount = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointCount; +// failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointDistance; } } } Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs (.../DamMacroStabilityInput.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs (.../DamMacroStabilityInput.cs) (revision 843) @@ -61,6 +61,6 @@ /// /// The failure mechanisme paramaters m stab. /// - public FailureMechanismeParametersMStab FailureMechanismeParametersMStab { get; set; } + public FailureMechanismParametersMStab FailureMechanismParametersMStab { get; set; } } } Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs (.../TimeSerieStabilityCalculator.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs (.../TimeSerieStabilityCalculator.cs) (revision 843) @@ -219,7 +219,7 @@ damCalculation, soilDatabasePath, projectFileName); // Create the project file - CalculationHelper.CreateMStabProjectFile(damCalculation.FailureMechanismeParametersMStab, MStabExePath); + CalculationHelper.CreateMStabProjectFile(damCalculation.FailureMechanismParametersMStab, MStabExePath); stabTimeSerieEntry[entry].Add(projectFileName); //((TimeSerieEntry)entry).MStabProjectPaths.Add(projectFileName); Fisheye: Tag 843 refers to a dead (removed) revision in file `dam engine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismeParametersMStab.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs (.../DamRunner.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs (.../DamRunner.cs) (revision 843) @@ -124,7 +124,7 @@ rwScenariosCalculation.PipingModelType = damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType; rwScenariosCalculation.MStabParameters = damProjectData.DamProjectCalculationSpecification.CurrentSpecification - .FailureMechanismeParametersMStab.MStabParameters; + .FailureMechanismParametersMStab.MStabParameters; EvaluationJob evaluationJob = damProjectData.GetEvaluationJob(); RemoveLogMessages(evaluationJob); Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 843) @@ -107,11 +107,11 @@ if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.CurrentSpecification != null) { var curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification; - if (curSpec.FailureMechanismeParametersMStab != null && curSpec.FailureMechanismeParametersMStab.MStabParameters != null) + if (curSpec.FailureMechanismParametersMStab != null && curSpec.FailureMechanismParametersMStab.MStabParameters != null) { input.StabilityParameters = new StabilityParameters(); - input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.FailureMechanismeParametersMStab.MStabParameters.SearchMethod); - var slipCircleDefinition = curSpec.FailureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition; + input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.FailureMechanismParametersMStab.MStabParameters.SearchMethod); + var slipCircleDefinition = curSpec.FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition; if (slipCircleDefinition != null) { input.StabilityParameters.GridDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.GridSizeDetermination); Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 843) @@ -44,13 +44,13 @@ /// /// /// - /// + /// /// /// public static XDocument CreateMStabXmlDoc(string mstabProjectFilename, DesignScenario scenario, SoilGeometryProbability subSoilScenario, MStabDesignEmbankment mstabDesignEmbankment, - double requiredSafetyFactor, FailureMechanismeParametersMStab failureMechanismeParametersMStab, + double requiredSafetyFactor, FailureMechanismParametersMStab failureMechanismParametersMStab, out List errorMessages) { @@ -60,86 +60,86 @@ ConsistencyCheck(scenario, profile1D, soilGeometry2DName); - failureMechanismeParametersMStab.Location = scenario.Location; + failureMechanismParametersMStab.Location = scenario.Location; if (profile1D != null) { - failureMechanismeParametersMStab.SoilProfile = profile1D; + failureMechanismParametersMStab.SoilProfile = profile1D; // 1d-geometry - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType = SoilProfileType.ProfileType1D; } else { // 2d-geometry - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType = SoilProfileType.ProfileTypeStiFile; } // Geometry Creation Options - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename = soilGeometry2DName; - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike = scenario.Location.DikeEmbankmentMaterial; - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder = scenario.Location.ShoulderEmbankmentMaterial; - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments = scenario.Location.IsUseOriginalPLLineAssignments; - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.IsDesign = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsDesign = (mstabDesignEmbankment != null); - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin = -scenario.Location.XSoilGeometry2DOrigin; - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.PLLineAssignment = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.PLLineAssignment = CalculationHelper.PLLineCreationMethod2PLLineAssignment(scenario.Location.ModelParametersForPLLines.PLLineCreationMethod); if (scenario.Location.IntrusionVerticalWaterPressure != null) - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType = scenario.Location.IntrusionVerticalWaterPressure.Value; - failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.PenetrationLength = + failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.PenetrationLength = scenario.Location.ModelParametersForPLLines.PenetrationLength; // End of Geometry Creation Options // Design options - failureMechanismeParametersMStab.Design = mstabDesignEmbankment; + failureMechanismParametersMStab.Design = mstabDesignEmbankment; - failureMechanismeParametersMStab.SurfaceLine = scenario.Location.SurfaceLine; - failureMechanismeParametersMStab.RiverLevel = scenario.RiverLevel; - failureMechanismeParametersMStab.DikeTableHeight = + failureMechanismParametersMStab.SurfaceLine = scenario.Location.SurfaceLine; + failureMechanismParametersMStab.RiverLevel = scenario.RiverLevel; + failureMechanismParametersMStab.DikeTableHeight = scenario.DikeTableHeight ?? scenario.Location.SurfaceLine.GetDefaultDikeTableHeight() ?? 0; - failureMechanismeParametersMStab.TrafficLoad = scenario.Location.StabilityOptions.TrafficLoad ?? 0; + failureMechanismParametersMStab.TrafficLoad = scenario.Location.StabilityOptions.TrafficLoad ?? 0; // Horizontal balance; TODO: Combine with code in StabilityCalculation - if (failureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.HorizontalBalance) + if (failureMechanismParametersMStab.MStabParameters.Model == MStabModelType.HorizontalBalance) { if (profile1D == null) { throw new DamFailureMechanismeCalculatorException( "Model horizontal balance does not support 2d-geometries"); } - failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea = new HorizontalBalanceArea(); - failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.XLeft = + failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea = new HorizontalBalanceArea(); + failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea.XLeft = scenario.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X; - failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.XRight = + failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea.XRight = scenario.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X; - failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.YTop = scenario.RiverLevel; - failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.YBottom = + failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea.YTop = scenario.RiverLevel; + failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea.YBottom = profile1D.InBetweenAquiferLayer?.TopLevel ?? profile1D.BottomAquiferLayer.TopLevel; int planeCount = - (int)(Math.Round((failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.YTop - - failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.YBottom) / 0.25)); - failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.PlaneCount = Math.Min(planeCount, 50); + (int)(Math.Round((failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea.YTop - + failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea.YBottom) / 0.25)); + failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea.PlaneCount = Math.Min(planeCount, 50); } // Zonestype is ZoneAreas; TODO: Combine with code in StabilityCalculation var dikeTopAtPolder = scenario.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); if ( - failureMechanismeParametersMStab.MStabParameters.CalculationOptions.ZonesType.Equals( + failureMechanismParametersMStab.MStabParameters.CalculationOptions.ZonesType.Equals( MStabZonesType.ZoneAreas)) { double? dikeTableHeight = scenario.DikeTableHeight ?? scenario.Location.SurfaceLine.GetDefaultDikeTableHeight() ?? null; if (!dikeTableHeight.HasValue) throw new DamFailureMechanismeCalculatorException("Surface line has no dike table height."); - failureMechanismeParametersMStab.MStabParameters.ZoneAreas = new MStabZoneAreas + failureMechanismParametersMStab.MStabParameters.ZoneAreas = new MStabZoneAreas { DikeTableHeight = dikeTableHeight.Value, SafetyFactorZone1A = requiredSafetyFactor, @@ -150,18 +150,18 @@ }; if (scenario.Location.StabilityOptions?.ZoneAreaRestSlopeCrestWidth != null) { - failureMechanismeParametersMStab.MStabParameters.ZoneAreas.DikeTableWidth = scenario.Location.StabilityOptions.ZoneAreaRestSlopeCrestWidth.Value; + failureMechanismParametersMStab.MStabParameters.ZoneAreas.DikeTableWidth = scenario.Location.StabilityOptions.ZoneAreaRestSlopeCrestWidth.Value; } } - if (failureMechanismeParametersMStab.MStabParameters.CalculationOptions.ZonesType.Equals(MStabZonesType.ForbiddenZone)) + if (failureMechanismParametersMStab.MStabParameters.CalculationOptions.ZonesType.Equals(MStabZonesType.ForbiddenZone)) { - failureMechanismeParametersMStab.MStabParameters.ForbiddenZone = CreateForbiddenZone(scenario, scenario.Location.SurfaceLine); + failureMechanismParametersMStab.MStabParameters.ForbiddenZone = CreateForbiddenZone(scenario, scenario.Location.SurfaceLine); } // Make sure riverlevel is correct with respect to surfaceline double riverLevelLow = double.NaN; - if (failureMechanismeParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left && scenario.RiverLevelLow.HasValue) + if (failureMechanismParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left && scenario.RiverLevelLow.HasValue) { riverLevelLow = scenario.RiverLevelLow.Value; } @@ -184,16 +184,16 @@ var waterLevel = riverLevelHigh.Value; UpliftSituation upliftSituation; - failureMechanismeParametersMStab.PLLines = PlLinesHelper.CreatePlLinesForStability( + failureMechanismParametersMStab.PLLines = PlLinesHelper.CreatePlLinesForStability( scenario.Location, subSoilScenario, waterLevel, soilGeometry2DName, riverLevelLow, out upliftSituation); // Slip circle definition for Uplift Van; TODO: Combine with code in StabilityCalculation - if (failureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan) + if (failureMechanismParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan) { // Determine right side of slip plane grid (right grid) // This is the location with the lowest uplift factor or, if present, the second NWO point var upliftLocationAndResult = CalculationHelper.GetLocationWithLowestUpliftFactor(currentSurfaceLine, - subSoilScenario.SoilProfile1D, soilGeometry2DName, failureMechanismeParametersMStab.PLLines, + subSoilScenario.SoilProfile1D, soilGeometry2DName, failureMechanismParametersMStab.PLLines, scenario.Location); double upliftCriterion = scenario.GetUpliftCriterionStability(scenario.Location.ModelFactors.UpliftCriterionStability); @@ -202,20 +202,20 @@ double xCoordinateLastUpliftPoint = isUplift ? upliftLocationAndResult.X : currentSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X; - failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.XCoordinateLastUpliftPoint = + failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.XCoordinateLastUpliftPoint = xCoordinateLastUpliftPoint; } - failureMechanismeParametersMStab.MStabParameters.ProjectFileName = mstabProjectFilename; - failureMechanismeParametersMStab.MStabParameters.SoilDatabaseName = scenario.Location.SoildatabaseName; + failureMechanismParametersMStab.MStabParameters.ProjectFileName = mstabProjectFilename; + failureMechanismParametersMStab.MStabParameters.SoilDatabaseName = scenario.Location.SoildatabaseName; - if (!failureMechanismeParametersMStab.IsComplete) + if (!failureMechanismParametersMStab.IsComplete) { throw new Exception("Not all required data is available"); } DamMStabAssembler assembler = new DamMStabAssembler(); - XDocument mstabXML = assembler.CreateDataTransferObject(failureMechanismeParametersMStab); + XDocument mstabXML = assembler.CreateDataTransferObject(failureMechanismParametersMStab); return mstabXML; } Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs (.../CalculationHelper.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs (.../CalculationHelper.cs) (revision 843) @@ -65,7 +65,7 @@ var damCalculation = GetCalculationSpecification(arg, fileName); // Create the project file - CreateMStabProjectFile(damCalculation.FailureMechanismeParametersMStab, arg.StabilityExePath); + CreateMStabProjectFile(damCalculation.FailureMechanismParametersMStab, arg.StabilityExePath); return fileName; } @@ -107,8 +107,8 @@ PLLines plLines, MStabParameters mstabParameters, MStabModelType model, DamFailureMechanismeCalculationSpecification damCalculation, string soilDatabasePath, string projectFileName) { - damCalculation.FailureMechanismeParametersMStab = - new FailureMechanismeParametersMStab + damCalculation.FailureMechanismParametersMStab = + new FailureMechanismParametersMStab { Location = location, SurfaceLine = location.SurfaceLine, @@ -133,12 +133,12 @@ }; if (location.StabilityOptions?.TrafficLoad != null) { - damCalculation.FailureMechanismeParametersMStab.TrafficLoad = location.StabilityOptions.TrafficLoad.Value; + damCalculation.FailureMechanismParametersMStab.TrafficLoad = location.StabilityOptions.TrafficLoad.Value; } - damCalculation.FailureMechanismeParametersMStab.MStabParameters.GridPosition = + damCalculation.FailureMechanismParametersMStab.MStabParameters.GridPosition = failureMechanismType == FailureMechanismSystemType.StabilityOutside ? MStabGridPosition.Left : MStabGridPosition.Right; - MStabParameters parameters = damCalculation.FailureMechanismeParametersMStab.MStabParameters; + MStabParameters parameters = damCalculation.FailureMechanismParametersMStab.MStabParameters; parameters.GeometryCreationOptions.PLLineAssignment = PLLineCreationMethod2PLLineAssignment(location.ModelParametersForPLLines.PLLineCreationMethod); if (location.IsUseOriginalPLLineAssignments) parameters.GeometryCreationOptions.PLLineAssignment = PLLineAssignment.OrginalPLLines; @@ -193,7 +193,7 @@ if (parameters.CalculationOptions.ZonesType.Equals(MStabZonesType.ForbiddenZone)) { - var surfaceLine = damCalculation.FailureMechanismeParametersMStab.SurfaceLine; + var surfaceLine = damCalculation.FailureMechanismParametersMStab.SurfaceLine; double maxZoneX = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X + location.StabilityOptions.ForbiddenZoneFactor.Value * (surfaceLine.GetDikeToeInward().X - surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X); parameters.ForbiddenZone = new MStabForbiddenZone @@ -401,11 +401,11 @@ /// Create and write the XML definiton file for the MStab project /// Call the stability agent to create the stability project file /// - internal static void CreateMStabProjectFile(FailureMechanismeParametersMStab failureMechanismeParametersMStab, string stabilityExePath) + internal static void CreateMStabProjectFile(FailureMechanismParametersMStab failureMechanismParametersMStab, string stabilityExePath) { // var assembler = new DamMStabAssembler(); -// XDocument xDocument = assembler.CreateDataTransferObject(failureMechanismeParametersMStab); -// var fileName = failureMechanismeParametersMStab.MStabParameters.ProjectFileName + ".xml"; +// XDocument xDocument = assembler.CreateDataTransferObject(failureMechanismParametersMStab); +// var fileName = failureMechanismParametersMStab.MStabParameters.ProjectFileName + ".xml"; // xDocument.Save(fileName); // // // call the stability agent to create a MStab specific (xml) file Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 843) @@ -359,7 +359,7 @@ liftvanCalculationSpecification.Assign(calculationSpecification); liftvanCalculationSpecification.CalculationModel = MStabModelType.UpliftVan; // Make sure check on uplift is performed before doing UpliftVan calculation - liftvanCalculationSpecification.FailureMechanismeParametersMStab.IsStabilityCheckOnUplift = true; + liftvanCalculationSpecification.FailureMechanismParametersMStab.IsStabilityCheckOnUplift = true; // First perform calculate Bishop CalculateOneCalculationTypeForScenario(scenario, bishopCalculationSpecification, analysisType); @@ -409,7 +409,7 @@ if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) { - StabilityCalculator.ModelSubDirectory = damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.MStabParameters.Model.ToString(); + StabilityCalculator.ModelSubDirectory = damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.Model.ToString(); } try @@ -578,7 +578,7 @@ private bool IsBishopResult(DesignResult calculationResult) { return ((calculationResult.DamFailureMechanismeCalculation.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) && - (calculationResult.DamFailureMechanismeCalculation.FailureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.Bishop)); + (calculationResult.DamFailureMechanismeCalculation.FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.Bishop)); } /// @@ -591,7 +591,7 @@ private bool IsUpliftVanResult(DesignResult calculationResult) { return ((calculationResult.DamFailureMechanismeCalculation.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) && - (calculationResult.DamFailureMechanismeCalculation.FailureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan)); + (calculationResult.DamFailureMechanismeCalculation.FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan)); } /// @@ -625,7 +625,7 @@ if ((bishopCalculationResults.Any()) && (upliftVanCalculationResults.Any())) { var bishopLiftvancalculation = bishopCalculationResults[0].DamFailureMechanismeCalculation.Clone(); - bishopLiftvancalculation.FailureMechanismeParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan; + bishopLiftvancalculation.FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan; foreach (var bishopCalculationRecord in bishopCalculationResults) { DesignResult liftVanCalculationResult = (from calculationResult in upliftVanCalculationResults Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs (.../Geometry2DDataCreator.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs (.../Geometry2DDataCreator.cs) (revision 843) @@ -117,7 +117,7 @@ } var soilGeometry = new SoilGeometry(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName); - var failureMechanismeParamatersMStab = new FailureMechanismeParametersMStab(); + var failureMechanismeParamatersMStab = new FailureMechanismParametersMStab(); PLLines plLines = new PLLines(); var plLine = new PLLine(); IList geometryPoints = location.SurfaceLine.Geometry.Points; Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamCalculation.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamCalculation.cs (.../DamCalculation.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamCalculation.cs (.../DamCalculation.cs) (revision 843) @@ -256,7 +256,7 @@ locationJob.Location, locationCounter, ProjectDataDirectory, - failureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.MStabParameters, + failureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters, null); locationJob.LocationResult.StabilityTimeSerie = safefactorsTimeSerie; safefactorsTimeSerie.LocationId = locationJob.Location.Name; Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs (.../StabilityCalculator.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs (.../StabilityCalculator.cs) (revision 843) @@ -51,15 +51,15 @@ private double requiredSafetyFactor; private string mstabProgramPath; private string slopeWProgramPath; - private FailureMechanismeParametersMStab failureMechanismeParametersMStab; + private FailureMechanismParametersMStab failureMechanismParametersMStab; private IList gaugePLLines; private IList gauges; private string stabilityProjectFilename = ""; private List errorMessages = new List(); public const string StabilitySubDir = @"Stability\"; - public StabilityCalculator(FailureMechanismeParametersMStab failureMechanismeParamatersMStab, + public StabilityCalculator(FailureMechanismParametersMStab failureMechanismParamatersMStab, ProgramType programType, ModelParametersForPLLines modelParametersForPLLines, double trafficLoad, double minimalCircleDepth, double requiredSafetyFactor, string mstabProgramPath, string slopeWProgramPath, @@ -73,11 +73,11 @@ this.requiredSafetyFactor = requiredSafetyFactor; this.mstabProgramPath = mstabProgramPath; this.slopeWProgramPath = slopeWProgramPath; - // need to have own instance of failureMechanismeParamatersMStab because the calculation - // makes changes to this object (e.g. failureMechanismeParamatersMStab.PLLines) + // need to have own instance of failureMechanismParamatersMStab because the calculation + // makes changes to this object (e.g. failureMechanismParamatersMStab.PLLines) // This will not function correctly when the calculations are performed // multi threaded (MWDAM-568) - this.failureMechanismeParametersMStab = failureMechanismeParametersMStab.Clone(); + this.failureMechanismParametersMStab = failureMechanismParametersMStab.Clone(); this.gaugePLLines = gaugePLLines; this.gauges = gauges; this.SoilList = soilList; @@ -144,7 +144,7 @@ plLineCreator.SurfaceLine = surfaceLine; plLineCreator.WaterLevelRiverHigh = waterlevel; plLineCreator.WaterLevelRiverLow = waterlevelLow; - plLineCreator.IsUseLowWaterLevel = (failureMechanismeParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left); + plLineCreator.IsUseLowWaterLevel = (failureMechanismParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left); plLineCreator.WaterLevelPolder = location.PolderLevel; plLineCreator.HeadInPLLine2 = location.HeadPl2; plLineCreator.HeadInPLLine3 = location.HeadPl3; @@ -233,7 +233,7 @@ // private void AddForbiddenZoneToMstabProject(MStabProject mStabProject, Scenario scenario, SurfaceLine2 surfaceLine) // { -// if (failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.ZonesType.Equals( +// if (failureMechanismParamatersMStab.MStabParameters.CalculationOptions.ZonesType.Equals( // MStabZonesType.ForbiddenZone)) // { // CreateForbiddenZone(scenario, surfaceLine); @@ -255,7 +255,7 @@ // dotNetMstabProjectResults.Dispose(); // dotNetMstabProjectResults = null; // } -// failureMechanismeParamatersMStab.MStabParameters.CalculationOptions = new MStabCalculationOptions +// failureMechanismParamatersMStab.MStabParameters.CalculationOptions = new MStabCalculationOptions // { // MinimalCircleDepth = this.minimalCircleDepth, // ZonesType = scenario.Location.StabilityZoneType @@ -271,7 +271,7 @@ // // var parameterValues = GetStabilityProjectParameterValues(); // var stabilityProjectObjectCreator = new StabilityProjectObjectCreator(); -// MStabProject mStabProject = stabilityProjectObjectCreator.CreateMacroStabilityProject(scenario, profile, failureMechanismeParamatersMStab, riverLevel, parameterValues); +// MStabProject mStabProject = stabilityProjectObjectCreator.CreateMacroStabilityProject(scenario, profile, failureMechanismParamatersMStab, riverLevel, parameterValues); // AddForbiddenZoneToMstabProject(mStabProject, scenario, surfaceLine); // RunStabilityCalculationWtiKernel(mStabProject); // return; @@ -285,7 +285,7 @@ // var parameterValues = GetStabilityProjectParameterValues(); // var stabilityProjectObjectCreator = new StabilityProjectObjectCreator(); // MStabProject mStabProject = stabilityProjectObjectCreator.CreateMacroStabilityProject(scenario, -// profile, failureMechanismeParamatersMStab, riverLevel, parameterValues); +// profile, failureMechanismParamatersMStab, riverLevel, parameterValues); // AddForbiddenZoneToMstabProject(mStabProject, scenario, surfaceLine); // var projectString = SaveStabilityProjectFileToString(mStabProject); // @@ -373,23 +373,23 @@ // private void AddMissingSlipPlaneConstraintInfo(SlipplaneConstraints slipPlaneConstraints) // { // slipPlaneConstraints.CreateZones = -// failureMechanismeParamatersMStab.MStabParameters.ZonesType == MStabZonesType.ForbiddenZone; +// failureMechanismParamatersMStab.MStabParameters.ZonesType == MStabZonesType.ForbiddenZone; // if (slipPlaneConstraints.CreateZones) // { // slipPlaneConstraints.SlipPlaneMinDepth = minimalCircleDepth; // -// if (failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone.IsXEntryMaxUsed) +// if (failureMechanismParamatersMStab.MStabParameters.ForbiddenZone.IsXEntryMaxUsed) // { -// slipPlaneConstraints.XEntryMax = failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone.XEntryMax; +// slipPlaneConstraints.XEntryMax = failureMechanismParamatersMStab.MStabParameters.ForbiddenZone.XEntryMax; // } // else // { // slipPlaneConstraints.XEntryMax = double.NaN; // } // -// if (failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone.IsXEntryMinUsed) +// if (failureMechanismParamatersMStab.MStabParameters.ForbiddenZone.IsXEntryMinUsed) // { -// slipPlaneConstraints.XEntryMin = failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone.XEntryMin; +// slipPlaneConstraints.XEntryMin = failureMechanismParamatersMStab.MStabParameters.ForbiddenZone.XEntryMin; // } // else // { @@ -593,7 +593,7 @@ // public void Calculate(Scenario scenario, SoilProfile1D soilProfile, string soilGeometry2DName, // int iterationIndex, MStabDesignEmbankment mstabDesignEmbankment) // { -// failureMechanismeParamatersMStab.MStabParameters.IsProbabilistic = ((this.ProbabilisticType == +// failureMechanismParamatersMStab.MStabParameters.IsProbabilistic = ((this.ProbabilisticType == // ProbabilisticType.Probabilistic) || // (this.ProbabilisticType == // ProbabilisticType @@ -631,9 +631,9 @@ // mStabResults = stabilityServiceAgent.ExtractStabilityResults(stabilityProjectFilename); // mStabResults = SetMStabAdministrationResults(mStabResults, iterationIndex, calculationName); // DetermineMStabResultsEntryPoint(ref mStabResults, -// failureMechanismeParamatersMStab.MStabParameters.GridPosition); +// failureMechanismParamatersMStab.MStabParameters.GridPosition); // DetermineMStabResultsExitPoint(ref mStabResults, -// failureMechanismeParamatersMStab.MStabParameters.GridPosition); +// failureMechanismParamatersMStab.MStabParameters.GridPosition); // scenario.SetMStabResults(soilProfile, Path.GetFileName(soilGeometry2DName), mStabResults); // } // else Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs (.../DAMFailureMechanismeCalculator.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs (.../DAMFailureMechanismeCalculator.cs) (revision 843) @@ -398,7 +398,7 @@ private void ConsistencyCheckStabilityPerScenario(DesignScenario scenario) { // If outward stability calculation then low waterlevel is required - if (damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left) + if (damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left) { if (!scenario.RiverLevelLow.HasValue) { @@ -430,7 +430,7 @@ // location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope; // using (var stabilityCalculator = // new StabilityCalculator( -// damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab, +// damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab, // programType, // modelParametersForPLLines, // location.TrafficLoad, @@ -527,9 +527,9 @@ { bool isUplift = upliftSituation.HasValue && upliftSituation.Value.IsUplift; bool isSkipCalculation = (!isUplift && - damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.IsStabilityCheckOnUplift && + damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.IsStabilityCheckOnUplift && (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) && - (damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan)); + (damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan)); return !isSkipCalculation; } @@ -895,7 +895,7 @@ // PLLineCreationMethod = location.PLLineCreationMethod // }; // using (var stabilityCalculator = -// new StabilityCalculator(damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab, +// new StabilityCalculator(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab, // programType, // modelParametersForPLLines, // location.TrafficLoad, Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 843) @@ -105,9 +105,9 @@ var curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification; if (curSpec != null) { - curSpec.FailureMechanismeParametersMStab = new FailureMechanismeParametersMStab(); - curSpec.FailureMechanismeParametersMStab.MStabParameters = new MStabParameters(); - var curStabParamas = curSpec.FailureMechanismeParametersMStab.MStabParameters; + curSpec.FailureMechanismParametersMStab = new FailureMechanismParametersMStab(); + curSpec.FailureMechanismParametersMStab.MStabParameters = new MStabParameters(); + var curStabParamas = curSpec.FailureMechanismParametersMStab.MStabParameters; curStabParamas.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod); curStabParamas.SlipCircleDefinition = new SlipCircleDefinition(); var slipCircleDefinition = curStabParamas.SlipCircleDefinition; Index: dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 843) @@ -74,7 +74,7 @@ - + Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 843) @@ -37,7 +37,7 @@ /// /// public class DamMStabAssembler : - DtoDocumentAssembler + DtoDocumentAssembler { #region Constant declarations @@ -173,15 +173,15 @@ /// /// /// - /// + /// /// - public override XDocument CreateDataTransferObject(FailureMechanismeParametersMStab failureMechanismeParametersMStab) + public override XDocument CreateDataTransferObject(FailureMechanismParametersMStab failureMechanismParametersMStab) { - XDocument doc = base.CreateDataTransferObject(failureMechanismeParametersMStab); + XDocument doc = base.CreateDataTransferObject(failureMechanismParametersMStab); XNamespace tns = ElementNamespace; - Location location = failureMechanismeParametersMStab.Location; + Location location = failureMechanismParametersMStab.Location; // Todo: Sheetpiling should be done correctly (SheetpilePointLevel vs SheetpileLength) // For now: disable this //if (location.SheetPileLength > 0.0) @@ -191,7 +191,7 @@ // sheetPiling.XCoordinate = location.SheetPilePoint.X; // sheetPiling.YCoordinate = location.SheetPilePoint.Y; // sheetPiling.ZCoordinate = location.SheetPilePoint.Z; - // damFailureMechanismeCalculation.FailureMechanismeParametersMStab.MStabParameters.SheetPiling = + // damFailureMechanismeCalculation.FailureMechanismParametersMStab.MStabParameters.SheetPiling = // sheetPiling; //} @@ -203,91 +203,91 @@ doc.Root.Add(new XAttribute(XNamespace.Xmlns + "tnsb", tnsb.NamespaceName)); // Soil database - inputElement.Add(new XAttribute(XmlAttributeMStabFileName,failureMechanismeParametersMStab.MStabParameters.ProjectFileName)); - inputElement.Add(new XAttribute(XmlAttributeSoilDBName, failureMechanismeParametersMStab.MStabParameters.SoilDatabaseName)); + inputElement.Add(new XAttribute(XmlAttributeMStabFileName,failureMechanismParametersMStab.MStabParameters.ProjectFileName)); + inputElement.Add(new XAttribute(XmlAttributeSoilDBName, failureMechanismParametersMStab.MStabParameters.SoilDatabaseName)); // Surface line - XElement surfaceLineElement = GetSurfaceLineElement(failureMechanismeParametersMStab, tnsb); + XElement surfaceLineElement = GetSurfaceLineElement(failureMechanismParametersMStab, tnsb); inputElement.Add(surfaceLineElement); // Surface line - XElement characteristicPointsElement = GetCharacteristicPointsElement(failureMechanismeParametersMStab, tnsb); + XElement characteristicPointsElement = GetCharacteristicPointsElement(failureMechanismParametersMStab, tnsb); inputElement.Add(characteristicPointsElement); // External PL lines - XElement externalPLLinesElement = GetExternalPlLinesElement(failureMechanismeParametersMStab, tnsb); + XElement externalPLLinesElement = GetExternalPlLinesElement(failureMechanismParametersMStab, tnsb); inputElement.Add(externalPLLinesElement); // Model - XElement modelElement = GetModelElement(failureMechanismeParametersMStab, tnsb); + XElement modelElement = GetModelElement(failureMechanismParametersMStab, tnsb); inputElement.Add(modelElement); // Zone Area - if (failureMechanismeParametersMStab.MStabParameters.ZoneAreas != null) + if (failureMechanismParametersMStab.MStabParameters.ZoneAreas != null) { - XElement zoneAreasElement = GetZoneAreasElement(failureMechanismeParametersMStab.MStabParameters.ZoneAreas, tnsb); + XElement zoneAreasElement = GetZoneAreasElement(failureMechanismParametersMStab.MStabParameters.ZoneAreas, tnsb); inputElement.Add(zoneAreasElement); } // Forbidden zone - if (failureMechanismeParametersMStab.MStabParameters.ForbiddenZone != null) + if (failureMechanismParametersMStab.MStabParameters.ForbiddenZone != null) { XElement forbiddenZoneElement = - GetForbiddenZoneElement(failureMechanismeParametersMStab.MStabParameters.ForbiddenZone, tnsb); + GetForbiddenZoneElement(failureMechanismParametersMStab.MStabParameters.ForbiddenZone, tnsb); inputElement.Add(forbiddenZoneElement); } // Traffic load if ( - failureMechanismeParametersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadInside) && - failureMechanismeParametersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadOutside)) + failureMechanismParametersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadInside) && + failureMechanismParametersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadOutside)) { - XElement trafficLoadElement = GetTrafficLoadElement(failureMechanismeParametersMStab, tnsb); + XElement trafficLoadElement = GetTrafficLoadElement(failureMechanismParametersMStab, tnsb); inputElement.Add(trafficLoadElement); } // Calculation Options - if (failureMechanismeParametersMStab.MStabParameters.CalculationOptions != + if (failureMechanismParametersMStab.MStabParameters.CalculationOptions != null) { - XElement calculationOptionsElement = GetCalculationOptionsElement(failureMechanismeParametersMStab, tnsb); + XElement calculationOptionsElement = GetCalculationOptionsElement(failureMechanismParametersMStab, tnsb); inputElement.Add(calculationOptionsElement); } // GeometryCreationOptions Options - if (failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions != null) + if (failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions != null) { - XElement geometryCreationOptionsElement = GetGeometryCreationOptionsElement(failureMechanismeParametersMStab, tnsb); + XElement geometryCreationOptionsElement = GetGeometryCreationOptionsElement(failureMechanismParametersMStab, tnsb); inputElement.Add(geometryCreationOptionsElement); } // SheetPiling - if (failureMechanismeParametersMStab.MStabParameters.SheetPiling != null) + if (failureMechanismParametersMStab.MStabParameters.SheetPiling != null) { - XElement sheetPilingElement = GetSheetPilingElement(failureMechanismeParametersMStab.MStabParameters.SheetPiling, tnsb); + XElement sheetPilingElement = GetSheetPilingElement(failureMechanismParametersMStab.MStabParameters.SheetPiling, tnsb); inputElement.Add(sheetPilingElement); } // Horizontal Balance Area - if (failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea != null) + if (failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea != null) { XElement horizontalBalanceAreaElement = - GetHorizontalBalanceAreaElement(failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea, tnsb); + GetHorizontalBalanceAreaElement(failureMechanismParametersMStab.MStabParameters.HorizontalBalanceArea, tnsb); inputElement.Add(horizontalBalanceAreaElement); } // Slip Circle Definition - if (failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition != null) + if (failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition != null) { XElement slipCircleDefinitionElement = GetSlipCircleDefinitionElement( - failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition, tnsb); + failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition, tnsb); inputElement.Add(slipCircleDefinitionElement); } // Design data - if (failureMechanismeParametersMStab.Design != null) + if (failureMechanismParametersMStab.Design != null) { - XElement designElement = GetDesignElement(failureMechanismeParametersMStab, tnsb); + XElement designElement = GetDesignElement(failureMechanismParametersMStab, tnsb); inputElement.Add(designElement); } @@ -399,19 +399,19 @@ /// /// Assembles the pl lines /// - /// + /// /// /// private static XElement GetExternalPlLinesElement( - FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb) + FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { XElement externalPLLinesElement = null; - if (failureMechanismeParametersMStab.PLLines != null) + if (failureMechanismParametersMStab.PLLines != null) { externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines); foreach (PLLineType plLineType in Enum.GetValues(typeof(PLLineType))) { - PLLine line = failureMechanismeParametersMStab.PLLines.Lines[plLineType]; + PLLine line = failureMechanismParametersMStab.PLLines.Lines[plLineType]; var PLLineElement = new XElement(tnsb + XmlElementPLLine); externalPLLinesElement.Add(PLLineElement); PLLineElement.Add(new XAttribute(XmlAttributeIsPhreatic, line.IsPhreatic)); @@ -426,16 +426,16 @@ } } // #zant properties missing #Bka: Dupuit is not to be used in this version so that is ok -// if (failureMechanismeParametersMStab.DupuitPLLines != null) +// if (failureMechanismParametersMStab.DupuitPLLines != null) // { // externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines); // for (int plLineIndex = 0; // plLineIndex < -// failureMechanismeParametersMStab.DupuitPLLines.PLLines.Count; +// failureMechanismParametersMStab.DupuitPLLines.PLLines.Count; // plLineIndex++) // { -// PLLine line = failureMechanismeParametersMStab.DupuitPLLines.PLLines[plLineIndex]; -// line.IsPhreatic = (plLineIndex == failureMechanismeParametersMStab.DupuitPLLines.PLLines.Count - 1); +// 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); @@ -457,14 +457,14 @@ /// /// Assembles the surface line element /// - /// + /// /// /// private static XElement GetSurfaceLineElement( - FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb) + FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { var surfaceLineElement = new XElement(tnsb + XmlElementSurfaceLine); - foreach (GeometryPoint point in failureMechanismeParametersMStab.SurfaceLine.Geometry.Points) + foreach (GeometryPoint point in failureMechanismParametersMStab.SurfaceLine.Geometry.Points) { var surfacePointElement = new XElement(tnsb + XmlElementSurfacePoint); surfacePointElement.Add(new XAttribute(XmlAttributeXCoord, point.X)); @@ -477,16 +477,16 @@ /// /// Assembles the characteristic points element /// - /// + /// /// /// private static XElement GetCharacteristicPointsElement( - FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb) + FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { var characteristicPointsElement = new XElement(tnsb + XmlElementCharacteristicPoints); foreach (CharacteristicPointType characteristicPointType in Enum.GetValues(typeof(CharacteristicPointType))) { - GeometryPoint point = failureMechanismeParametersMStab.SurfaceLine.CharacteristicPoints.GetGeometryPoint(characteristicPointType); + GeometryPoint point = failureMechanismParametersMStab.SurfaceLine.CharacteristicPoints.GetGeometryPoint(characteristicPointType); if (point != null) { var characteristicPointElement = new XElement(tnsb + XmlElementCharacteristicPoint); @@ -504,52 +504,52 @@ /// /// Assembles the model element /// - /// + /// /// /// private static XElement GetModelElement( - FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb) + FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { return new XElement(tnsb + XmlElementModel, - new XAttribute(XmlAttributeCalculationModel, failureMechanismeParametersMStab.MStabParameters.Model), - new XAttribute(XmlAttributeShearStrength, failureMechanismeParametersMStab.MStabParameters.ShearStrength), - new XAttribute(XmlAttributeProbabilistic, failureMechanismeParametersMStab.MStabParameters.IsProbabilistic), - new XAttribute(XmlAttributeSearchMethod, failureMechanismeParametersMStab.MStabParameters.SearchMethod), - new XAttribute(XmlAttributeGridPosition, failureMechanismeParametersMStab.MStabParameters.GridPosition.ToString().ToLower()) + new XAttribute(XmlAttributeCalculationModel, failureMechanismParametersMStab.MStabParameters.Model), + new XAttribute(XmlAttributeShearStrength, failureMechanismParametersMStab.MStabParameters.ShearStrength), + new XAttribute(XmlAttributeProbabilistic, failureMechanismParametersMStab.MStabParameters.IsProbabilistic), + new XAttribute(XmlAttributeSearchMethod, failureMechanismParametersMStab.MStabParameters.SearchMethod), + new XAttribute(XmlAttributeGridPosition, failureMechanismParametersMStab.MStabParameters.GridPosition.ToString().ToLower()) ); } /// /// Assembles the traffic load element /// - /// + /// /// /// private static XElement GetTrafficLoadElement( - FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb) + FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { return new XElement(tnsb + XmlElementTrafficLoad, - new XAttribute(XmlAttributeXCoordinateAtRiver, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeXCoordinateAtRiver, failureMechanismParametersMStab. SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X), - new XAttribute(XmlAttributeXCoordinateAtPolder, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeXCoordinateAtPolder, failureMechanismParametersMStab. SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X), - new XAttribute(XmlAttributeLoad, failureMechanismeParametersMStab.TrafficLoad) + new XAttribute(XmlAttributeLoad, failureMechanismParametersMStab.TrafficLoad) ); } /// /// Assembles the calculation options element /// - /// + /// /// /// private static XElement GetCalculationOptionsElement( - FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb) + FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { return new XElement(tnsb + XmlElementCalculationOptions, - new XAttribute(XmlAttributeMinimalCircleDepth, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeMinimalCircleDepth, failureMechanismParametersMStab. MStabParameters.CalculationOptions.MinimalCircleDepth), - new XAttribute(XmlAttributeZonesType, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeZonesType, failureMechanismParametersMStab. MStabParameters.CalculationOptions.ZonesType.ToString()) ); } @@ -571,54 +571,54 @@ /// /// Assembles the GeometryCreationOptions element /// - /// + /// /// /// private static XElement GetGeometryCreationOptionsElement( - FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb) + FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { - string soilGeometryName = failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename; + string soilGeometryName = failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename; soilGeometryName = (soilGeometryName == null ? "" : soilGeometryName); - string materialForDike = failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike; + string materialForDike = failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike; materialForDike = (materialForDike == null ? "" : materialForDike); - string materialForShoulder = failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder; + string materialForShoulder = failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder; materialForShoulder = (materialForShoulder == null ? "" : materialForShoulder); return new XElement(tnsb + XmlElementGeometryCreationOptions, new XAttribute(XmlAttributeSoilGeometryType, - ConvertSoilProfileTypeToClassicType(failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType)), + ConvertSoilProfileTypeToClassicType(failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType)), new XAttribute(XmlAttributeSoilGeometry2DFilename, soilGeometryName), - new XAttribute(XmlAttributeXOffsetSoilGeometry2DOrigin, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeXOffsetSoilGeometry2DOrigin, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin), new XAttribute(XmlAttributeMaterialForDike, materialForDike), new XAttribute(XmlAttributeMaterialForShoulder, materialForShoulder), - new XAttribute(XmlAttributeIsUseOriginalPLLineAssignments, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeIsUseOriginalPLLineAssignments, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments), - new XAttribute(XmlAttributeIsUseOriginalCalculationOptions, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeIsUseOriginalCalculationOptions, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.IsUseOriginalCalculationOptions), - new XAttribute(XmlAttributeIsDrySituation, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeIsDrySituation, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.IsDrySituation), - new XAttribute(XmlAttributePLLineAssignment, failureMechanismeParametersMStab. + new XAttribute(XmlAttributePLLineAssignment, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.PLLineAssignment), - new XAttribute(XmlAttributeIntrusionVerticalWaterPressure, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeIntrusionVerticalWaterPressure, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType), - new XAttribute(XmlAttributePenetrationLength, failureMechanismeParametersMStab. + new XAttribute(XmlAttributePenetrationLength, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.PenetrationLength), - new XAttribute(XmlAttributeIsDesign, failureMechanismeParametersMStab. + new XAttribute(XmlAttributeIsDesign, failureMechanismParametersMStab. MStabParameters.GeometryCreationOptions.IsDesign)); } /// /// /// - /// + /// /// /// private static XElement GetDesignElement( - FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb) + FailureMechanismParametersMStab failureMechanismParametersMStab, XNamespace tnsb) { - string embankmentMaterialname = failureMechanismeParametersMStab.Design.EmbankmentMaterialname; + string embankmentMaterialname = failureMechanismParametersMStab.Design.EmbankmentMaterialname; embankmentMaterialname = (embankmentMaterialname == null ? "" : embankmentMaterialname); - string previousGeometry2DFilename = failureMechanismeParametersMStab.Design.PreviousGeometry2DFilename; + string previousGeometry2DFilename = failureMechanismParametersMStab.Design.PreviousGeometry2DFilename; previousGeometry2DFilename = (previousGeometry2DFilename == null ? "" : previousGeometry2DFilename); return new XElement(tnsb + XmlElementDesign, Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 843) @@ -53,7 +53,7 @@ /// /// The failure mechanisme paramaters mstab. /// - public FailureMechanismeParametersMStab FailureMechanismeParametersMStab { get; set; } + public FailureMechanismParametersMStab FailureMechanismParametersMStab { get; set; } /// /// Gets or sets the index of the iteration. @@ -84,14 +84,14 @@ if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityOutside) { // Make sure the gridposition is Left. - FailureMechanismeParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; + FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; var damMacroStabilityInput = new DamMacroStabilityInput() { DGeoStabilityExePath = Path.Combine(damMacroStabilityFolder, dGeoStabilityExe), DGeoStabilityInputFileName = DamMacroStabilityUtils.GetStabilityInputFileName(damKernelInput, iterationIndex, - FailureMechanismeParametersMStab.MStabParameters.Model, FailureMechanismeParametersMStab.ProjectWorkingPath), - FailureMechanismeParametersMStab = FailureMechanismeParametersMStab + FailureMechanismParametersMStab.MStabParameters.Model, FailureMechanismParametersMStab.ProjectWorkingPath), + FailureMechanismParametersMStab = FailureMechanismParametersMStab }; kernelDataInput = damMacroStabilityInput; @@ -188,7 +188,7 @@ XDocument mstabXml = MStabXmlDoc.CreateMStabXmlDoc(stabilityProjectFilename, scenario, subSoilScenario, null, requiredSafetyFactor.Value, - kernelDataInput.FailureMechanismeParametersMStab, out errorMessages); + kernelDataInput.FailureMechanismParametersMStab, out errorMessages); mstabXml.Save(stabilityProjectFilename + ".xml"); return mstabXml; Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 843) @@ -123,7 +123,7 @@ { // Note: DamProjectCalculationSpecification created and filled by FillAnalysisSpecification var curspec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification; - curspec.FailureMechanismeParametersMStab = new FailureMechanismeParametersMStab + curspec.FailureMechanismParametersMStab = new FailureMechanismParametersMStab { MStabParameters = new MStabParameters { Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismeParametersMStab.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismeParametersMStab.cs (.../FailureMechanismeParametersMStab.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismeParametersMStab.cs (.../FailureMechanismParametersMStab.cs) (revision 843) @@ -26,12 +26,12 @@ namespace Deltares.DamEngine.Data.General { - public class FailureMechanismeParametersMStab : IAssignable, ICloneable + public class FailureMechanismParametersMStab : IAssignable, ICloneable { /// /// Additinal specifications/settings of calculation using MStab /// - public FailureMechanismeParametersMStab() + public FailureMechanismParametersMStab() { this.MStabParameters = new MStabParameters(); this.IsStabilityCheckOnUplift = false; @@ -79,40 +79,40 @@ /// /// Performs the Assignment /// - /// - public void Assign(FailureMechanismeParametersMStab failureMechanismeParametersMStab) + /// + public void Assign(FailureMechanismParametersMStab failureMechanismParametersMStab) { - this.ProjectWorkingPath = failureMechanismeParametersMStab.ProjectWorkingPath; - this.DGeoStabilityExePath = failureMechanismeParametersMStab.DGeoStabilityExePath; + this.ProjectWorkingPath = failureMechanismParametersMStab.ProjectWorkingPath; + this.DGeoStabilityExePath = failureMechanismParametersMStab.DGeoStabilityExePath; - this.Location = failureMechanismeParametersMStab.Location; - this.SurfaceLine = failureMechanismeParametersMStab.SurfaceLine; - this.SoilProfile = failureMechanismeParametersMStab.SoilProfile; - this.SoilGeometry2DName = failureMechanismeParametersMStab.SoilGeometry2DName; - this.PLLines = failureMechanismeParametersMStab.PLLines; + this.Location = failureMechanismParametersMStab.Location; + this.SurfaceLine = failureMechanismParametersMStab.SurfaceLine; + this.SoilProfile = failureMechanismParametersMStab.SoilProfile; + this.SoilGeometry2DName = failureMechanismParametersMStab.SoilGeometry2DName; + this.PLLines = failureMechanismParametersMStab.PLLines; - this.RiverLevel = failureMechanismeParametersMStab.RiverLevel; - this.DikeTableHeight = failureMechanismeParametersMStab.DikeTableHeight; - this.MaxWaterLevel = failureMechanismeParametersMStab.MaxWaterLevel; - this.RiverLevelDecimateHeight = failureMechanismeParametersMStab.RiverLevelDecimateHeight; - this.RequiredProbabilityOfFailure = failureMechanismeParametersMStab.RequiredProbabilityOfFailure; - this.TrafficLoad = failureMechanismeParametersMStab.TrafficLoad; ; - this.Design = failureMechanismeParametersMStab.Design; + 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.Design = failureMechanismParametersMStab.Design; - this.MStabParameters.Assign(failureMechanismeParametersMStab.MStabParameters); + this.MStabParameters.Assign(failureMechanismParametersMStab.MStabParameters); } /// /// Clones the object. /// - /// FailureMechanismeParametersMStab - public FailureMechanismeParametersMStab Clone() + /// FailureMechanismParametersMStab + public FailureMechanismParametersMStab Clone() { - FailureMechanismeParametersMStab failureMechanismeParametersMStab = new FailureMechanismeParametersMStab(); - failureMechanismeParametersMStab.MStabParameters = this.MStabParameters.Clone(); - failureMechanismeParametersMStab.Assign(this); + FailureMechanismParametersMStab failureMechanismParametersMStab = new FailureMechanismParametersMStab(); + failureMechanismParametersMStab.MStabParameters = this.MStabParameters.Clone(); + failureMechanismParametersMStab.Assign(this); - return failureMechanismeParametersMStab; + return failureMechanismParametersMStab; } } Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 843) @@ -71,7 +71,7 @@ subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile; subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside; - var failureMechanismeParamatersMStab = new FailureMechanismeParametersMStab(); + var failureMechanismeParamatersMStab = new FailureMechanismParametersMStab(); failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; failureMechanismeParamatersMStab.MStabParameters.SearchMethod = MStabSearchMethod.GeneticAlgorithm; failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.MinimalCircleDepth = 1.0; Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 843) @@ -45,7 +45,7 @@ /// /// The failure mechanisme paramaters mstab. /// - public FailureMechanismeParametersMStab FailureMechanismeParametersMStab { get; set; } + public FailureMechanismParametersMStab FailureMechanismParametersMStab { get; set; } /// /// Prepares the specified dam kernel input. @@ -67,7 +67,7 @@ kernelDataOutput = damMacroStabilityOutput; if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside) { - var model = FailureMechanismeParametersMStab.MStabParameters.Model; + var model = FailureMechanismParametersMStab.MStabParameters.Model; if (model == MStabModelType.BishopUpliftVan) { // if current model is BishopUpliftVan then set to Bishop for proper name/path for inputfile @@ -76,14 +76,14 @@ var damMacroStabilityInput = new DamMacroStabilityInput() { - DGeoStabilityExePath = FailureMechanismeParametersMStab.DGeoStabilityExePath, + DGeoStabilityExePath = FailureMechanismParametersMStab.DGeoStabilityExePath, DGeoStabilityInputFileName = DamMacroStabilityUtils.GetStabilityInputFileName( - damKernelInput, iterationIndex, model, FailureMechanismeParametersMStab.ProjectWorkingPath), - FailureMechanismeParametersMStab = FailureMechanismeParametersMStab + damKernelInput, iterationIndex, model, FailureMechanismParametersMStab.ProjectWorkingPath), + FailureMechanismParametersMStab = FailureMechanismParametersMStab }; // Check the model to see what is to be calculted and how many calculations are required - switch (FailureMechanismeParametersMStab.MStabParameters.Model) + switch (FailureMechanismParametersMStab.MStabParameters.Model) { case MStabModelType.Bishop: case MStabModelType.UpliftVan: @@ -97,7 +97,7 @@ // if so, both upliftvan and bishop are to be prepared, calculated and worst case is to be determined damMacroStabilityInput.DGeoStabilityInputFileNameSecondModel = DamMacroStabilityUtils.GetStabilityInputFileName(damKernelInput, iterationIndex, - MStabModelType.UpliftVan, FailureMechanismeParametersMStab.ProjectWorkingPath); + MStabModelType.UpliftVan, FailureMechanismParametersMStab.ProjectWorkingPath); // if not, only Bishop calculation so leave SecondModel empty. break; } @@ -159,7 +159,7 @@ // When there are two calculations to be performed (BishopUpliftVan), make sure the first one is Bishop if (!string.IsNullOrEmpty(input.DGeoStabilityInputFileNameSecondModel)) { - input.FailureMechanismeParametersMStab.MStabParameters.Model = MStabModelType.Bishop; + input.FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.Bishop; } // start (first) calculation @@ -175,7 +175,7 @@ var inputFileName = input.DGeoStabilityInputFileName; // set proper name and model input.DGeoStabilityInputFileName = input.DGeoStabilityInputFileNameSecondModel; - input.FailureMechanismeParametersMStab.MStabParameters.Model = MStabModelType.UpliftVan; + input.FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.UpliftVan; try { var stabilityOutputItemSecondModel = ExcecuteCalculation(kernelDataInput); @@ -188,7 +188,7 @@ { // reset name and model input.DGeoStabilityInputFileName = inputFileName; - input.FailureMechanismeParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan; + input.FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan; } } } @@ -243,7 +243,7 @@ XDocument mstabXml = MStabXmlDoc.CreateMStabXmlDoc(stabilityProjectFilename, scenario, subSoilScenario, null, requiredSafetyFactor.Value, - kernelDataInput.FailureMechanismeParametersMStab, out errorMessages); + kernelDataInput.FailureMechanismParametersMStab, out errorMessages); mstabXml.Save(stabilityProjectFilename + ".xml"); return mstabXml; Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs (.../DesignCalculator.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs (.../DesignCalculator.cs) (revision 843) @@ -128,12 +128,12 @@ case FailureMechanismSystemType.StabilityOutside: kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper(); var damMacroStabilityOutwardsKernelWrapper = (DamMacroStabilityOutwardsKernelWrapper) kernelWrapper; - damMacroStabilityOutwardsKernelWrapper.FailureMechanismeParametersMStab = currentSpecification.FailureMechanismeParametersMStab; + damMacroStabilityOutwardsKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab; break; case FailureMechanismSystemType.StabilityInside: kernelWrapper = new DamMacroStabilityInwardsKernelWrapper(); var damMacroStabilityKernelWrapper = (DamMacroStabilityInwardsKernelWrapper) kernelWrapper; - damMacroStabilityKernelWrapper.FailureMechanismeParametersMStab = currentSpecification.FailureMechanismeParametersMStab; + damMacroStabilityKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab; break; case FailureMechanismSystemType.Piping: switch (currentSpecification.PipingModelType) Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs =================================================================== diff -u -r842 -r843 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs (.../RWScenariosCalculation.cs) (revision 842) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs (.../RWScenariosCalculation.cs) (revision 843) @@ -436,9 +436,9 @@ // calculator.GetSpecification(this.evaluationJob.DikeName, soilDatabaseName, job.Location, new SoilGeometry(job.SoilGeometryProbability.SoilProfile1D, null), // (MStabModelType)job.MstabModelOption, job.LoadSituation, job.DikeDrySensitivity, job.HydraulicShortcutType, MStabParameters); // -// calculator.SaveToFile(damCalculation.FailureMechanismeParametersMStab); +// calculator.SaveToFile(damCalculation.FailureMechanismParametersMStab); -// string inputFile = damCalculation.FailureMechanismeParametersMStab.MStabParameters.ProjectFileName; +// string inputFile = damCalculation.FailureMechanismParametersMStab.MStabParameters.ProjectFileName; // // job.BaseFileName = inputFile.Replace(DamProject.ProjectWorkingPath, @"").Replace(".sti", ""); @@ -460,7 +460,7 @@ } else { -// job.RwResultType = (damCalculation.FailureMechanismeParametersMStab.MStabParameters.IsProbabilistic ? RWResultType.ProbabilityOfFailure : RWResultType.SafetyFactor); +// job.RwResultType = (damCalculation.FailureMechanismParametersMStab.MStabParameters.IsProbabilistic ? RWResultType.ProbabilityOfFailure : RWResultType.SafetyFactor); job.SafetyFactor = double.NaN; job.ProbabilityOfFailure = double.NaN; }