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; } } }