Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r599 -r842 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 599) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 842) @@ -32,25 +32,25 @@ private FailureMechanismSystemType failureMechanismSystemType; private PipingModelType pipingModelType = PipingModelType.Sellmeijer4Forces; private Enum calculationModel; - private FailureMechanismeParamatersMStab failureMechanismeParamatersMStab; + private FailureMechanismeParametersMStab failureMechanismeParametersMStab; private static DamProjectType damProjectType; private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassic; public DamFailureMechanismeCalculationSpecification() { //Todo interface failureMechanismSystemType = FailureMechanismSystemType.StabilityInside; - failureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab(); - CalculationModel = failureMechanismeParamatersMStab.MStabParameters.Model; - FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; + failureMechanismeParametersMStab = new FailureMechanismeParametersMStab(); + CalculationModel = failureMechanismeParametersMStab.MStabParameters.Model; + FailureMechanismeParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; ReadUserSettingsSlipCircleDefinition(); } [Validate] - public FailureMechanismeParamatersMStab FailureMechanismeParamatersMStab + public FailureMechanismeParametersMStab FailureMechanismeParametersMStab { - get { return failureMechanismeParamatersMStab; } - set { failureMechanismeParamatersMStab = value; } + get { return failureMechanismeParametersMStab; } + set { failureMechanismeParametersMStab = value; } } public FailureMechanismSystemType FailureMechanismSystemType @@ -72,10 +72,10 @@ switch (failureMechanismSystemType) { case FailureMechanismSystemType.StabilityInside: - failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; + failureMechanismeParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right; break; case FailureMechanismSystemType.StabilityOutside: - failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; + failureMechanismeParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; break; case FailureMechanismSystemType.Piping: PipingModelType = oldPipingModelType; @@ -122,17 +122,17 @@ } else { - failureMechanismeParamatersMStab.MStabParameters.Model = (MStabModelType)value; + failureMechanismeParametersMStab.MStabParameters.Model = (MStabModelType)value; } } } public MStabModelType StabilityModelType { - get { return failureMechanismeParamatersMStab.MStabParameters.Model; } + get { return failureMechanismeParametersMStab.MStabParameters.Model; } set { - failureMechanismeParamatersMStab.MStabParameters.Model = value; + failureMechanismeParametersMStab.MStabParameters.Model = value; if (failureMechanismSystemType != FailureMechanismSystemType.Piping) { CalculationModel = value; @@ -149,7 +149,7 @@ public void Assign(DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculation) { this.FailureMechanismSystemType = damFailureMechanismeCalculation.failureMechanismSystemType; - this.FailureMechanismeParamatersMStab.Assign(damFailureMechanismeCalculation.FailureMechanismeParamatersMStab); + this.FailureMechanismeParametersMStab.Assign(damFailureMechanismeCalculation.FailureMechanismeParametersMStab); //assign interface } @@ -171,7 +171,7 @@ (this.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)) { //interface? - description += String.Format(" ({0})", this.FailureMechanismeParamatersMStab.MStabParameters.Model); + description += String.Format(" ({0})", this.FailureMechanismeParametersMStab.MStabParameters.Model); } return description; @@ -185,10 +185,10 @@ /// public bool IsSlipCircleDefinitionUndefined() { - bool isSlipCircleDefinitionUndefined = (failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition == null); + bool isSlipCircleDefinitionUndefined = (failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition == null); if (!isSlipCircleDefinitionUndefined) { - isSlipCircleDefinitionUndefined = (failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount == 0); + isSlipCircleDefinitionUndefined = (failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount == 0); } return isSlipCircleDefinitionUndefined; } @@ -198,27 +198,27 @@ /// public void ReadUserSettingsSlipCircleDefinition() { -// if (failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition == null) +// if (failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition == null) // { -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition = new SlipCircleDefinition(); +// failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition = new SlipCircleDefinition(); // } -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDefinition = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDefinition; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDistance = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDistance; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDefinition = Properties.Settings.Default.SlipCircleBishopTangentLinesDefinition; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDistance = Properties.Settings.Default.SlipCircleBishopTangentLinesDistance; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.GridSizeDetermination = Properties.Settings.Default.SlipCircleGridSizeDetermination; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointDistance; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointCount; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointDistance; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointCount; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointCount = Properties.Settings.Default.SlipCircleBishopGridVerticalPointCount; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointDistance = Properties.Settings.Default.SlipCircleBishopGridVerticalPointDistance; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointCount = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointCount; -// failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointDistance; +// 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; } } }