Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r841 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 841)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 842)
@@ -53,7 +53,7 @@
///
/// The failure mechanisme paramaters mstab.
///
- public FailureMechanismeParamatersMStab FailureMechanismeParamatersMStab { get; set; }
+ public FailureMechanismeParametersMStab FailureMechanismeParametersMStab { 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.
- FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
+ FailureMechanismeParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
var damMacroStabilityInput = new DamMacroStabilityInput()
{
DGeoStabilityExePath = Path.Combine(damMacroStabilityFolder, dGeoStabilityExe),
DGeoStabilityInputFileName = DamMacroStabilityUtils.GetStabilityInputFileName(damKernelInput, iterationIndex,
- FailureMechanismeParamatersMStab.MStabParameters.Model, FailureMechanismeParamatersMStab.ProjectWorkingPath),
- FailureMechanismeParamatersMStab = FailureMechanismeParamatersMStab
+ FailureMechanismeParametersMStab.MStabParameters.Model, FailureMechanismeParametersMStab.ProjectWorkingPath),
+ FailureMechanismeParametersMStab = FailureMechanismeParametersMStab
};
kernelDataInput = damMacroStabilityInput;
@@ -188,7 +188,7 @@
XDocument mstabXml = MStabXmlDoc.CreateMStabXmlDoc(stabilityProjectFilename, scenario, subSoilScenario,
null, requiredSafetyFactor.Value,
- kernelDataInput.FailureMechanismeParamatersMStab, out errorMessages);
+ kernelDataInput.FailureMechanismeParametersMStab, out errorMessages);
mstabXml.Save(stabilityProjectFilename + ".xml");
return mstabXml;
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;
}
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs
===================================================================
diff -u -r669 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs (.../DAMFailureMechanismeCalculator.cs) (revision 669)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs (.../DAMFailureMechanismeCalculator.cs) (revision 842)
@@ -398,7 +398,7 @@
private void ConsistencyCheckStabilityPerScenario(DesignScenario scenario)
{
// If outward stability calculation then low waterlevel is required
- if (damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters.GridPosition == MStabGridPosition.Left)
+ if (damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left)
{
if (!scenario.RiverLevelLow.HasValue)
{
@@ -430,7 +430,7 @@
// location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope;
// using (var stabilityCalculator =
// new StabilityCalculator(
-// damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab,
+// damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab,
// programType,
// modelParametersForPLLines,
// location.TrafficLoad,
@@ -527,9 +527,9 @@
{
bool isUplift = upliftSituation.HasValue && upliftSituation.Value.IsUplift;
bool isSkipCalculation = (!isUplift &&
- damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.IsStabilityCheckOnUplift &&
+ damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.IsStabilityCheckOnUplift &&
(damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) &&
- (damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters.Model == MStabModelType.UpliftVan));
+ (damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan));
return !isSkipCalculation;
}
@@ -895,7 +895,7 @@
// PLLineCreationMethod = location.PLLineCreationMethod
// };
// using (var stabilityCalculator =
-// new StabilityCalculator(damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab,
+// new StabilityCalculator(damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab,
// programType,
// modelParametersForPLLines,
// location.TrafficLoad,
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs
===================================================================
diff -u -r773 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs (.../CalculationHelper.cs) (revision 773)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs (.../CalculationHelper.cs) (revision 842)
@@ -65,7 +65,7 @@
var damCalculation = GetCalculationSpecification(arg, fileName);
// Create the project file
- CreateMStabProjectFile(damCalculation.FailureMechanismeParamatersMStab, arg.StabilityExePath);
+ CreateMStabProjectFile(damCalculation.FailureMechanismeParametersMStab, arg.StabilityExePath);
return fileName;
}
@@ -107,8 +107,8 @@
PLLines plLines, MStabParameters mstabParameters, MStabModelType model,
DamFailureMechanismeCalculationSpecification damCalculation, string soilDatabasePath, string projectFileName)
{
- damCalculation.FailureMechanismeParamatersMStab =
- new FailureMechanismeParamatersMStab
+ damCalculation.FailureMechanismeParametersMStab =
+ new FailureMechanismeParametersMStab
{
Location = location,
SurfaceLine = location.SurfaceLine,
@@ -133,12 +133,12 @@
};
if (location.StabilityOptions?.TrafficLoad != null)
{
- damCalculation.FailureMechanismeParamatersMStab.TrafficLoad = location.StabilityOptions.TrafficLoad.Value;
+ damCalculation.FailureMechanismeParametersMStab.TrafficLoad = location.StabilityOptions.TrafficLoad.Value;
}
- damCalculation.FailureMechanismeParamatersMStab.MStabParameters.GridPosition =
+ damCalculation.FailureMechanismeParametersMStab.MStabParameters.GridPosition =
failureMechanismType == FailureMechanismSystemType.StabilityOutside ? MStabGridPosition.Left : MStabGridPosition.Right;
- MStabParameters parameters = damCalculation.FailureMechanismeParamatersMStab.MStabParameters;
+ MStabParameters parameters = damCalculation.FailureMechanismeParametersMStab.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.FailureMechanismeParamatersMStab.SurfaceLine;
+ var surfaceLine = damCalculation.FailureMechanismeParametersMStab.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(FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, string stabilityExePath)
+ internal static void CreateMStabProjectFile(FailureMechanismeParametersMStab failureMechanismeParametersMStab, string stabilityExePath)
{
// var assembler = new DamMStabAssembler();
-// XDocument xDocument = assembler.CreateDataTransferObject(failureMechanismeParamatersMStab);
-// var fileName = failureMechanismeParamatersMStab.MStabParameters.ProjectFileName + ".xml";
+// XDocument xDocument = assembler.CreateDataTransferObject(failureMechanismeParametersMStab);
+// var fileName = failureMechanismeParametersMStab.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/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs
===================================================================
diff -u -r826 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs (.../DamMacroStabilityInput.cs) (revision 826)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityInput.cs (.../DamMacroStabilityInput.cs) (revision 842)
@@ -61,6 +61,6 @@
///
/// The failure mechanisme paramaters m stab.
///
- public FailureMechanismeParamatersMStab FailureMechanismeParamatersMStab { get; set; }
+ public FailureMechanismeParametersMStab FailureMechanismeParametersMStab { get; set; }
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r811 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 811)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs (.../FillXmlInputFromDam.cs) (revision 842)
@@ -107,11 +107,11 @@
if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.CurrentSpecification != null)
{
var curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
- if (curSpec.FailureMechanismeParamatersMStab != null && curSpec.FailureMechanismeParamatersMStab.MStabParameters != null)
+ if (curSpec.FailureMechanismeParametersMStab != null && curSpec.FailureMechanismeParametersMStab.MStabParameters != null)
{
input.StabilityParameters = new StabilityParameters();
- input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.FailureMechanismeParamatersMStab.MStabParameters.SearchMethod);
- var slipCircleDefinition = curSpec.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition;
+ input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.FailureMechanismeParametersMStab.MStabParameters.SearchMethod);
+ var slipCircleDefinition = curSpec.FailureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition;
if (slipCircleDefinition != null)
{
input.StabilityParameters.GridDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.GridSizeDetermination);
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
===================================================================
diff -u -r826 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 826)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs (.../DamMStabAssembler.cs) (revision 842)
@@ -37,7 +37,7 @@
///
///
public class DamMStabAssembler :
- DtoDocumentAssembler
+ DtoDocumentAssembler
{
#region Constant declarations
@@ -173,15 +173,15 @@
///
///
///
- ///
+ ///
///
- public override XDocument CreateDataTransferObject(FailureMechanismeParamatersMStab failureMechanismeParamatersMStab)
+ public override XDocument CreateDataTransferObject(FailureMechanismeParametersMStab failureMechanismeParametersMStab)
{
- XDocument doc = base.CreateDataTransferObject(failureMechanismeParamatersMStab);
+ XDocument doc = base.CreateDataTransferObject(failureMechanismeParametersMStab);
XNamespace tns = ElementNamespace;
- Location location = failureMechanismeParamatersMStab.Location;
+ Location location = failureMechanismeParametersMStab.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.FailureMechanismeParamatersMStab.MStabParameters.SheetPiling =
+ // damFailureMechanismeCalculation.FailureMechanismeParametersMStab.MStabParameters.SheetPiling =
// sheetPiling;
//}
@@ -203,91 +203,91 @@
doc.Root.Add(new XAttribute(XNamespace.Xmlns + "tnsb", tnsb.NamespaceName));
// Soil database
- inputElement.Add(new XAttribute(XmlAttributeMStabFileName,failureMechanismeParamatersMStab.MStabParameters.ProjectFileName));
- inputElement.Add(new XAttribute(XmlAttributeSoilDBName, failureMechanismeParamatersMStab.MStabParameters.SoilDatabaseName));
+ inputElement.Add(new XAttribute(XmlAttributeMStabFileName,failureMechanismeParametersMStab.MStabParameters.ProjectFileName));
+ inputElement.Add(new XAttribute(XmlAttributeSoilDBName, failureMechanismeParametersMStab.MStabParameters.SoilDatabaseName));
// Surface line
- XElement surfaceLineElement = GetSurfaceLineElement(failureMechanismeParamatersMStab, tnsb);
+ XElement surfaceLineElement = GetSurfaceLineElement(failureMechanismeParametersMStab, tnsb);
inputElement.Add(surfaceLineElement);
// Surface line
- XElement characteristicPointsElement = GetCharacteristicPointsElement(failureMechanismeParamatersMStab, tnsb);
+ XElement characteristicPointsElement = GetCharacteristicPointsElement(failureMechanismeParametersMStab, tnsb);
inputElement.Add(characteristicPointsElement);
// External PL lines
- XElement externalPLLinesElement = GetExternalPlLinesElement(failureMechanismeParamatersMStab, tnsb);
+ XElement externalPLLinesElement = GetExternalPlLinesElement(failureMechanismeParametersMStab, tnsb);
inputElement.Add(externalPLLinesElement);
// Model
- XElement modelElement = GetModelElement(failureMechanismeParamatersMStab, tnsb);
+ XElement modelElement = GetModelElement(failureMechanismeParametersMStab, tnsb);
inputElement.Add(modelElement);
// Zone Area
- if (failureMechanismeParamatersMStab.MStabParameters.ZoneAreas != null)
+ if (failureMechanismeParametersMStab.MStabParameters.ZoneAreas != null)
{
- XElement zoneAreasElement = GetZoneAreasElement(failureMechanismeParamatersMStab.MStabParameters.ZoneAreas, tnsb);
+ XElement zoneAreasElement = GetZoneAreasElement(failureMechanismeParametersMStab.MStabParameters.ZoneAreas, tnsb);
inputElement.Add(zoneAreasElement);
}
// Forbidden zone
- if (failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone != null)
+ if (failureMechanismeParametersMStab.MStabParameters.ForbiddenZone != null)
{
XElement forbiddenZoneElement =
- GetForbiddenZoneElement(failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone, tnsb);
+ GetForbiddenZoneElement(failureMechanismeParametersMStab.MStabParameters.ForbiddenZone, tnsb);
inputElement.Add(forbiddenZoneElement);
}
// Traffic load
if (
- failureMechanismeParamatersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadInside) &&
- failureMechanismeParamatersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadOutside))
+ failureMechanismeParametersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadInside) &&
+ failureMechanismeParametersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadOutside))
{
- XElement trafficLoadElement = GetTrafficLoadElement(failureMechanismeParamatersMStab, tnsb);
+ XElement trafficLoadElement = GetTrafficLoadElement(failureMechanismeParametersMStab, tnsb);
inputElement.Add(trafficLoadElement);
}
// Calculation Options
- if (failureMechanismeParamatersMStab.MStabParameters.CalculationOptions !=
+ if (failureMechanismeParametersMStab.MStabParameters.CalculationOptions !=
null)
{
- XElement calculationOptionsElement = GetCalculationOptionsElement(failureMechanismeParamatersMStab, tnsb);
+ XElement calculationOptionsElement = GetCalculationOptionsElement(failureMechanismeParametersMStab, tnsb);
inputElement.Add(calculationOptionsElement);
}
// GeometryCreationOptions Options
- if (failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions != null)
+ if (failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions != null)
{
- XElement geometryCreationOptionsElement = GetGeometryCreationOptionsElement(failureMechanismeParamatersMStab, tnsb);
+ XElement geometryCreationOptionsElement = GetGeometryCreationOptionsElement(failureMechanismeParametersMStab, tnsb);
inputElement.Add(geometryCreationOptionsElement);
}
// SheetPiling
- if (failureMechanismeParamatersMStab.MStabParameters.SheetPiling != null)
+ if (failureMechanismeParametersMStab.MStabParameters.SheetPiling != null)
{
- XElement sheetPilingElement = GetSheetPilingElement(failureMechanismeParamatersMStab.MStabParameters.SheetPiling, tnsb);
+ XElement sheetPilingElement = GetSheetPilingElement(failureMechanismeParametersMStab.MStabParameters.SheetPiling, tnsb);
inputElement.Add(sheetPilingElement);
}
// Horizontal Balance Area
- if (failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea != null)
+ if (failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea != null)
{
XElement horizontalBalanceAreaElement =
- GetHorizontalBalanceAreaElement(failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea, tnsb);
+ GetHorizontalBalanceAreaElement(failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea, tnsb);
inputElement.Add(horizontalBalanceAreaElement);
}
// Slip Circle Definition
- if (failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition != null)
+ if (failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition != null)
{
XElement slipCircleDefinitionElement = GetSlipCircleDefinitionElement(
- failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition, tnsb);
+ failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition, tnsb);
inputElement.Add(slipCircleDefinitionElement);
}
// Design data
- if (failureMechanismeParamatersMStab.Design != null)
+ if (failureMechanismeParametersMStab.Design != null)
{
- XElement designElement = GetDesignElement(failureMechanismeParamatersMStab, tnsb);
+ XElement designElement = GetDesignElement(failureMechanismeParametersMStab, tnsb);
inputElement.Add(designElement);
}
@@ -399,19 +399,19 @@
///
/// Assembles the pl lines
///
- ///
+ ///
///
///
private static XElement GetExternalPlLinesElement(
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb)
{
XElement externalPLLinesElement = null;
- if (failureMechanismeParamatersMStab.PLLines != null)
+ if (failureMechanismeParametersMStab.PLLines != null)
{
externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines);
foreach (PLLineType plLineType in Enum.GetValues(typeof(PLLineType)))
{
- PLLine line = failureMechanismeParamatersMStab.PLLines.Lines[plLineType];
+ PLLine line = failureMechanismeParametersMStab.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 (failureMechanismeParamatersMStab.DupuitPLLines != null)
+// if (failureMechanismeParametersMStab.DupuitPLLines != null)
// {
// externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines);
// for (int plLineIndex = 0;
// plLineIndex <
-// failureMechanismeParamatersMStab.DupuitPLLines.PLLines.Count;
+// failureMechanismeParametersMStab.DupuitPLLines.PLLines.Count;
// plLineIndex++)
// {
-// PLLine line = failureMechanismeParamatersMStab.DupuitPLLines.PLLines[plLineIndex];
-// line.IsPhreatic = (plLineIndex == failureMechanismeParamatersMStab.DupuitPLLines.PLLines.Count - 1);
+// PLLine line = failureMechanismeParametersMStab.DupuitPLLines.PLLines[plLineIndex];
+// line.IsPhreatic = (plLineIndex == failureMechanismeParametersMStab.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(
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb)
{
var surfaceLineElement = new XElement(tnsb + XmlElementSurfaceLine);
- foreach (GeometryPoint point in failureMechanismeParamatersMStab.SurfaceLine.Geometry.Points)
+ foreach (GeometryPoint point in failureMechanismeParametersMStab.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(
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb)
{
var characteristicPointsElement = new XElement(tnsb + XmlElementCharacteristicPoints);
foreach (CharacteristicPointType characteristicPointType in Enum.GetValues(typeof(CharacteristicPointType)))
{
- GeometryPoint point = failureMechanismeParamatersMStab.SurfaceLine.CharacteristicPoints.GetGeometryPoint(characteristicPointType);
+ GeometryPoint point = failureMechanismeParametersMStab.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(
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb)
{
return new XElement(tnsb + XmlElementModel,
- new XAttribute(XmlAttributeCalculationModel, failureMechanismeParamatersMStab.MStabParameters.Model),
- new XAttribute(XmlAttributeShearStrength, failureMechanismeParamatersMStab.MStabParameters.ShearStrength),
- new XAttribute(XmlAttributeProbabilistic, failureMechanismeParamatersMStab.MStabParameters.IsProbabilistic),
- new XAttribute(XmlAttributeSearchMethod, failureMechanismeParamatersMStab.MStabParameters.SearchMethod),
- new XAttribute(XmlAttributeGridPosition, failureMechanismeParamatersMStab.MStabParameters.GridPosition.ToString().ToLower())
+ 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())
);
}
///
/// Assembles the traffic load element
///
- ///
+ ///
///
///
private static XElement GetTrafficLoadElement(
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb)
{
return new XElement(tnsb + XmlElementTrafficLoad,
- new XAttribute(XmlAttributeXCoordinateAtRiver, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeXCoordinateAtRiver, failureMechanismeParametersMStab.
SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X),
- new XAttribute(XmlAttributeXCoordinateAtPolder, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeXCoordinateAtPolder, failureMechanismeParametersMStab.
SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X),
- new XAttribute(XmlAttributeLoad, failureMechanismeParamatersMStab.TrafficLoad)
+ new XAttribute(XmlAttributeLoad, failureMechanismeParametersMStab.TrafficLoad)
);
}
///
/// Assembles the calculation options element
///
- ///
+ ///
///
///
private static XElement GetCalculationOptionsElement(
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb)
{
return new XElement(tnsb + XmlElementCalculationOptions,
- new XAttribute(XmlAttributeMinimalCircleDepth, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeMinimalCircleDepth, failureMechanismeParametersMStab.
MStabParameters.CalculationOptions.MinimalCircleDepth),
- new XAttribute(XmlAttributeZonesType, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeZonesType, failureMechanismeParametersMStab.
MStabParameters.CalculationOptions.ZonesType.ToString())
);
}
@@ -571,54 +571,54 @@
///
/// Assembles the GeometryCreationOptions element
///
- ///
+ ///
///
///
private static XElement GetGeometryCreationOptionsElement(
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb)
{
- string soilGeometryName = failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename;
+ string soilGeometryName = failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename;
soilGeometryName = (soilGeometryName == null ? "" : soilGeometryName);
- string materialForDike = failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike;
+ string materialForDike = failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike;
materialForDike = (materialForDike == null ? "" : materialForDike);
- string materialForShoulder = failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder;
+ string materialForShoulder = failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder;
materialForShoulder = (materialForShoulder == null ? "" : materialForShoulder);
return new XElement(tnsb + XmlElementGeometryCreationOptions,
new XAttribute(XmlAttributeSoilGeometryType,
- ConvertSoilProfileTypeToClassicType(failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType)),
+ ConvertSoilProfileTypeToClassicType(failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType)),
new XAttribute(XmlAttributeSoilGeometry2DFilename, soilGeometryName),
- new XAttribute(XmlAttributeXOffsetSoilGeometry2DOrigin, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeXOffsetSoilGeometry2DOrigin, failureMechanismeParametersMStab.
MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin),
new XAttribute(XmlAttributeMaterialForDike, materialForDike),
new XAttribute(XmlAttributeMaterialForShoulder, materialForShoulder),
- new XAttribute(XmlAttributeIsUseOriginalPLLineAssignments, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeIsUseOriginalPLLineAssignments, failureMechanismeParametersMStab.
MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments),
- new XAttribute(XmlAttributeIsUseOriginalCalculationOptions, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeIsUseOriginalCalculationOptions, failureMechanismeParametersMStab.
MStabParameters.GeometryCreationOptions.IsUseOriginalCalculationOptions),
- new XAttribute(XmlAttributeIsDrySituation, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeIsDrySituation, failureMechanismeParametersMStab.
MStabParameters.GeometryCreationOptions.IsDrySituation),
- new XAttribute(XmlAttributePLLineAssignment, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributePLLineAssignment, failureMechanismeParametersMStab.
MStabParameters.GeometryCreationOptions.PLLineAssignment),
- new XAttribute(XmlAttributeIntrusionVerticalWaterPressure, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeIntrusionVerticalWaterPressure, failureMechanismeParametersMStab.
MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType),
- new XAttribute(XmlAttributePenetrationLength, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributePenetrationLength, failureMechanismeParametersMStab.
MStabParameters.GeometryCreationOptions.PenetrationLength),
- new XAttribute(XmlAttributeIsDesign, failureMechanismeParamatersMStab.
+ new XAttribute(XmlAttributeIsDesign, failureMechanismeParametersMStab.
MStabParameters.GeometryCreationOptions.IsDesign));
}
///
///
///
- ///
+ ///
///
///
private static XElement GetDesignElement(
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab, XNamespace tnsb)
{
- string embankmentMaterialname = failureMechanismeParamatersMStab.Design.EmbankmentMaterialname;
+ string embankmentMaterialname = failureMechanismeParametersMStab.Design.EmbankmentMaterialname;
embankmentMaterialname = (embankmentMaterialname == null ? "" : embankmentMaterialname);
- string previousGeometry2DFilename = failureMechanismeParamatersMStab.Design.PreviousGeometry2DFilename;
+ string previousGeometry2DFilename = failureMechanismeParametersMStab.Design.PreviousGeometry2DFilename;
previousGeometry2DFilename = (previousGeometry2DFilename == null ? "" : previousGeometry2DFilename);
return new XElement(tnsb + XmlElementDesign,
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs
===================================================================
diff -u -r841 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 841)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs (.../MStabXmlDocTests.cs) (revision 842)
@@ -71,7 +71,7 @@
subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile;
subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
- var failureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
+ var failureMechanismeParamatersMStab = new FailureMechanismeParametersMStab();
failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right;
failureMechanismeParamatersMStab.MStabParameters.SearchMethod = MStabSearchMethod.GeneticAlgorithm;
failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.MinimalCircleDepth = 1.0;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs
===================================================================
diff -u -r595 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs (.../TimeSerieStabilityCalculator.cs) (revision 595)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs (.../TimeSerieStabilityCalculator.cs) (revision 842)
@@ -219,7 +219,7 @@
damCalculation, soilDatabasePath, projectFileName);
// Create the project file
- CalculationHelper.CreateMStabProjectFile(damCalculation.FailureMechanismeParamatersMStab, MStabExePath);
+ CalculationHelper.CreateMStabProjectFile(damCalculation.FailureMechanismeParametersMStab, MStabExePath);
stabTimeSerieEntry[entry].Add(projectFileName);
//((TimeSerieEntry)entry).MStabProjectPaths.Add(projectFileName);
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs
===================================================================
diff -u -r773 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs (.../RWScenariosCalculation.cs) (revision 773)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs (.../RWScenariosCalculation.cs) (revision 842)
@@ -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.FailureMechanismeParamatersMStab);
+// calculator.SaveToFile(damCalculation.FailureMechanismeParametersMStab);
-// string inputFile = damCalculation.FailureMechanismeParamatersMStab.MStabParameters.ProjectFileName;
+// string inputFile = damCalculation.FailureMechanismeParametersMStab.MStabParameters.ProjectFileName;
//
// job.BaseFileName = inputFile.Replace(DamProject.ProjectWorkingPath, @"").Replace(".sti", "");
@@ -460,7 +460,7 @@
}
else
{
-// job.RwResultType = (damCalculation.FailureMechanismeParamatersMStab.MStabParameters.IsProbabilistic ? RWResultType.ProbabilityOfFailure : RWResultType.SafetyFactor);
+// job.RwResultType = (damCalculation.FailureMechanismeParametersMStab.MStabParameters.IsProbabilistic ? RWResultType.ProbabilityOfFailure : RWResultType.SafetyFactor);
job.SafetyFactor = double.NaN;
job.ProbabilityOfFailure = double.NaN;
}
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismeParamatersMStab.cs
===================================================================
diff -u -r839 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismeParamatersMStab.cs (.../FailureMechanismeParamatersMStab.cs) (revision 839)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismeParamatersMStab.cs (.../FailureMechanismeParametersMStab.cs) (revision 842)
@@ -26,12 +26,12 @@
namespace Deltares.DamEngine.Data.General
{
- public class FailureMechanismeParamatersMStab : IAssignable, ICloneable
+ public class FailureMechanismeParametersMStab : IAssignable, ICloneable
{
///
/// Additinal specifications/settings of calculation using MStab
///
- public FailureMechanismeParamatersMStab()
+ public FailureMechanismeParametersMStab()
{
this.MStabParameters = new MStabParameters();
this.IsStabilityCheckOnUplift = false;
@@ -79,40 +79,40 @@
///
/// Performs the Assignment
///
- ///
- public void Assign(FailureMechanismeParamatersMStab failureMechanismeParamatersMStab)
+ ///
+ public void Assign(FailureMechanismeParametersMStab failureMechanismeParametersMStab)
{
- this.ProjectWorkingPath = failureMechanismeParamatersMStab.ProjectWorkingPath;
- this.DGeoStabilityExePath = failureMechanismeParamatersMStab.DGeoStabilityExePath;
+ this.ProjectWorkingPath = failureMechanismeParametersMStab.ProjectWorkingPath;
+ this.DGeoStabilityExePath = failureMechanismeParametersMStab.DGeoStabilityExePath;
- this.Location = failureMechanismeParamatersMStab.Location;
- this.SurfaceLine = failureMechanismeParamatersMStab.SurfaceLine;
- this.SoilProfile = failureMechanismeParamatersMStab.SoilProfile;
- this.SoilGeometry2DName = failureMechanismeParamatersMStab.SoilGeometry2DName;
- this.PLLines = failureMechanismeParamatersMStab.PLLines;
+ this.Location = failureMechanismeParametersMStab.Location;
+ this.SurfaceLine = failureMechanismeParametersMStab.SurfaceLine;
+ this.SoilProfile = failureMechanismeParametersMStab.SoilProfile;
+ this.SoilGeometry2DName = failureMechanismeParametersMStab.SoilGeometry2DName;
+ this.PLLines = failureMechanismeParametersMStab.PLLines;
- this.RiverLevel = failureMechanismeParamatersMStab.RiverLevel;
- this.DikeTableHeight = failureMechanismeParamatersMStab.DikeTableHeight;
- this.MaxWaterLevel = failureMechanismeParamatersMStab.MaxWaterLevel;
- this.RiverLevelDecimateHeight = failureMechanismeParamatersMStab.RiverLevelDecimateHeight;
- this.RequiredProbabilityOfFailure = failureMechanismeParamatersMStab.RequiredProbabilityOfFailure;
- this.TrafficLoad = failureMechanismeParamatersMStab.TrafficLoad; ;
- this.Design = failureMechanismeParamatersMStab.Design;
+ 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.MStabParameters.Assign(failureMechanismeParamatersMStab.MStabParameters);
+ this.MStabParameters.Assign(failureMechanismeParametersMStab.MStabParameters);
}
///
/// Clones the object.
///
- /// FailureMechanismeParamatersMStab
- public FailureMechanismeParamatersMStab Clone()
+ /// FailureMechanismeParametersMStab
+ public FailureMechanismeParametersMStab Clone()
{
- FailureMechanismeParamatersMStab failureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
- failureMechanismeParamatersMStab.MStabParameters = this.MStabParameters.Clone();
- failureMechanismeParamatersMStab.Assign(this);
+ FailureMechanismeParametersMStab failureMechanismeParametersMStab = new FailureMechanismeParametersMStab();
+ failureMechanismeParametersMStab.MStabParameters = this.MStabParameters.Clone();
+ failureMechanismeParametersMStab.Assign(this);
- return failureMechanismeParamatersMStab;
+ return failureMechanismeParametersMStab;
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r762 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 762)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 842)
@@ -74,7 +74,7 @@
-
+
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs
===================================================================
diff -u -r773 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs (.../StabilityCalculator.cs) (revision 773)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs (.../StabilityCalculator.cs) (revision 842)
@@ -51,15 +51,15 @@
private double requiredSafetyFactor;
private string mstabProgramPath;
private string slopeWProgramPath;
- private FailureMechanismeParamatersMStab failureMechanismeParamatersMStab;
+ private FailureMechanismeParametersMStab failureMechanismeParametersMStab;
private IList gaugePLLines;
private IList gauges;
private string stabilityProjectFilename = "";
private List errorMessages = new List();
public const string StabilitySubDir = @"Stability\";
- public StabilityCalculator(FailureMechanismeParamatersMStab failureMechanismeParamatersMStab,
+ public StabilityCalculator(FailureMechanismeParametersMStab failureMechanismeParamatersMStab,
ProgramType programType,
ModelParametersForPLLines modelParametersForPLLines, double trafficLoad, double minimalCircleDepth,
double requiredSafetyFactor, string mstabProgramPath, string slopeWProgramPath,
@@ -77,7 +77,7 @@
// makes changes to this object (e.g. failureMechanismeParamatersMStab.PLLines)
// This will not function correctly when the calculations are performed
// multi threaded (MWDAM-568)
- this.failureMechanismeParamatersMStab = failureMechanismeParamatersMStab.Clone();
+ this.failureMechanismeParametersMStab = failureMechanismeParametersMStab.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 = (failureMechanismeParamatersMStab.MStabParameters.GridPosition == MStabGridPosition.Left);
+ plLineCreator.IsUseLowWaterLevel = (failureMechanismeParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left);
plLineCreator.WaterLevelPolder = location.PolderLevel;
plLineCreator.HeadInPLLine2 = location.HeadPl2;
plLineCreator.HeadInPLLine3 = location.HeadPl3;
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r813 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 813)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 842)
@@ -105,9 +105,9 @@
var curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
if (curSpec != null)
{
- curSpec.FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
- curSpec.FailureMechanismeParamatersMStab.MStabParameters = new MStabParameters();
- var curStabParamas = curSpec.FailureMechanismeParamatersMStab.MStabParameters;
+ curSpec.FailureMechanismeParametersMStab = new FailureMechanismeParametersMStab();
+ curSpec.FailureMechanismeParametersMStab.MStabParameters = new MStabParameters();
+ var curStabParamas = curSpec.FailureMechanismeParametersMStab.MStabParameters;
curStabParamas.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod);
curStabParamas.SlipCircleDefinition = new SlipCircleDefinition();
var slipCircleDefinition = curStabParamas.SlipCircleDefinition;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs
===================================================================
diff -u -r826 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs (.../DesignCalculator.cs) (revision 826)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs (.../DesignCalculator.cs) (revision 842)
@@ -128,12 +128,12 @@
case FailureMechanismSystemType.StabilityOutside:
kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
var damMacroStabilityOutwardsKernelWrapper = (DamMacroStabilityOutwardsKernelWrapper) kernelWrapper;
- damMacroStabilityOutwardsKernelWrapper.FailureMechanismeParamatersMStab = currentSpecification.FailureMechanismeParamatersMStab;
+ damMacroStabilityOutwardsKernelWrapper.FailureMechanismeParametersMStab = currentSpecification.FailureMechanismeParametersMStab;
break;
case FailureMechanismSystemType.StabilityInside:
kernelWrapper = new DamMacroStabilityInwardsKernelWrapper();
var damMacroStabilityKernelWrapper = (DamMacroStabilityInwardsKernelWrapper) kernelWrapper;
- damMacroStabilityKernelWrapper.FailureMechanismeParamatersMStab = currentSpecification.FailureMechanismeParamatersMStab;
+ damMacroStabilityKernelWrapper.FailureMechanismeParametersMStab = currentSpecification.FailureMechanismeParametersMStab;
break;
case FailureMechanismSystemType.Piping:
switch (currentSpecification.PipingModelType)
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
===================================================================
diff -u -r841 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 841)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 842)
@@ -44,13 +44,13 @@
///
///
///
- ///
+ ///
///
///
public static XDocument CreateMStabXmlDoc(string mstabProjectFilename, DesignScenario scenario,
SoilGeometryProbability subSoilScenario,
MStabDesignEmbankment mstabDesignEmbankment,
- double requiredSafetyFactor, FailureMechanismeParamatersMStab failureMechanismeParamatersMStab,
+ double requiredSafetyFactor, FailureMechanismeParametersMStab failureMechanismeParametersMStab,
out List errorMessages)
{
@@ -60,86 +60,86 @@
ConsistencyCheck(scenario, profile1D, soilGeometry2DName);
- failureMechanismeParamatersMStab.Location = scenario.Location;
+ failureMechanismeParametersMStab.Location = scenario.Location;
if (profile1D != null)
{
- failureMechanismeParamatersMStab.SoilProfile = profile1D;
+ failureMechanismeParametersMStab.SoilProfile = profile1D;
// 1d-geometry
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType =
SoilProfileType.ProfileType1D;
}
else
{
// 2d-geometry
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType =
SoilProfileType.ProfileTypeStiFile;
}
// Geometry Creation Options
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename =
soilGeometry2DName;
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike =
scenario.Location.DikeEmbankmentMaterial;
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder =
scenario.Location.ShoulderEmbankmentMaterial;
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments =
scenario.Location.IsUseOriginalPLLineAssignments;
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.IsDesign =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.IsDesign =
(mstabDesignEmbankment != null);
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin =
-scenario.Location.XSoilGeometry2DOrigin;
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.PLLineAssignment =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.PLLineAssignment =
CalculationHelper.PLLineCreationMethod2PLLineAssignment(scenario.Location.ModelParametersForPLLines.PLLineCreationMethod);
if (scenario.Location.IntrusionVerticalWaterPressure != null)
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType =
scenario.Location.IntrusionVerticalWaterPressure.Value;
- failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.PenetrationLength =
+ failureMechanismeParametersMStab.MStabParameters.GeometryCreationOptions.PenetrationLength =
scenario.Location.ModelParametersForPLLines.PenetrationLength;
// End of Geometry Creation Options
// Design options
- failureMechanismeParamatersMStab.Design = mstabDesignEmbankment;
+ failureMechanismeParametersMStab.Design = mstabDesignEmbankment;
- failureMechanismeParamatersMStab.SurfaceLine = scenario.Location.SurfaceLine;
- failureMechanismeParamatersMStab.RiverLevel = scenario.RiverLevel;
- failureMechanismeParamatersMStab.DikeTableHeight =
+ failureMechanismeParametersMStab.SurfaceLine = scenario.Location.SurfaceLine;
+ failureMechanismeParametersMStab.RiverLevel = scenario.RiverLevel;
+ failureMechanismeParametersMStab.DikeTableHeight =
scenario.DikeTableHeight ?? scenario.Location.SurfaceLine.GetDefaultDikeTableHeight() ?? 0;
- failureMechanismeParamatersMStab.TrafficLoad = scenario.Location.StabilityOptions.TrafficLoad ?? 0;
+ failureMechanismeParametersMStab.TrafficLoad = scenario.Location.StabilityOptions.TrafficLoad ?? 0;
// Horizontal balance; TODO: Combine with code in StabilityCalculation
- if (failureMechanismeParamatersMStab.MStabParameters.Model == MStabModelType.HorizontalBalance)
+ if (failureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.HorizontalBalance)
{
if (profile1D == null)
{
throw new DamFailureMechanismeCalculatorException(
"Model horizontal balance does not support 2d-geometries");
}
- failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea = new HorizontalBalanceArea();
- failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea.XLeft =
+ failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea = new HorizontalBalanceArea();
+ failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.XLeft =
scenario.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X;
- failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea.XRight =
+ failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.XRight =
scenario.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X;
- failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea.YTop = scenario.RiverLevel;
- failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea.YBottom =
+ failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.YTop = scenario.RiverLevel;
+ failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.YBottom =
profile1D.InBetweenAquiferLayer?.TopLevel ?? profile1D.BottomAquiferLayer.TopLevel;
int planeCount =
- (int)(Math.Round((failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea.YTop -
- failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea.YBottom) / 0.25));
- failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea.PlaneCount = Math.Min(planeCount, 50);
+ (int)(Math.Round((failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.YTop -
+ failureMechanismeParametersMStab.MStabParameters.HorizontalBalanceArea.YBottom) / 0.25));
+ failureMechanismeParametersMStab.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 (
- failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.ZonesType.Equals(
+ failureMechanismeParametersMStab.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.");
- failureMechanismeParamatersMStab.MStabParameters.ZoneAreas = new MStabZoneAreas
+ failureMechanismeParametersMStab.MStabParameters.ZoneAreas = new MStabZoneAreas
{
DikeTableHeight = dikeTableHeight.Value,
SafetyFactorZone1A = requiredSafetyFactor,
@@ -150,18 +150,18 @@
};
if (scenario.Location.StabilityOptions?.ZoneAreaRestSlopeCrestWidth != null)
{
- failureMechanismeParamatersMStab.MStabParameters.ZoneAreas.DikeTableWidth = scenario.Location.StabilityOptions.ZoneAreaRestSlopeCrestWidth.Value;
+ failureMechanismeParametersMStab.MStabParameters.ZoneAreas.DikeTableWidth = scenario.Location.StabilityOptions.ZoneAreaRestSlopeCrestWidth.Value;
}
}
- if (failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.ZonesType.Equals(MStabZonesType.ForbiddenZone))
+ if (failureMechanismeParametersMStab.MStabParameters.CalculationOptions.ZonesType.Equals(MStabZonesType.ForbiddenZone))
{
- failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone = CreateForbiddenZone(scenario, scenario.Location.SurfaceLine);
+ failureMechanismeParametersMStab.MStabParameters.ForbiddenZone = CreateForbiddenZone(scenario, scenario.Location.SurfaceLine);
}
// Make sure riverlevel is correct with respect to surfaceline
double riverLevelLow = double.NaN;
- if (failureMechanismeParamatersMStab.MStabParameters.GridPosition == MStabGridPosition.Left && scenario.RiverLevelLow.HasValue)
+ if (failureMechanismeParametersMStab.MStabParameters.GridPosition == MStabGridPosition.Left && scenario.RiverLevelLow.HasValue)
{
riverLevelLow = scenario.RiverLevelLow.Value;
}
@@ -184,16 +184,16 @@
var waterLevel = riverLevelHigh.Value;
UpliftSituation upliftSituation;
- failureMechanismeParamatersMStab.PLLines = PlLinesHelper.CreatePlLinesForStability(
+ failureMechanismeParametersMStab.PLLines = PlLinesHelper.CreatePlLinesForStability(
scenario.Location, subSoilScenario, waterLevel, soilGeometry2DName, riverLevelLow, out upliftSituation);
// Slip circle definition for Uplift Van; TODO: Combine with code in StabilityCalculation
- if (failureMechanismeParamatersMStab.MStabParameters.Model == MStabModelType.UpliftVan)
+ if (failureMechanismeParametersMStab.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, failureMechanismeParamatersMStab.PLLines,
+ subSoilScenario.SoilProfile1D, soilGeometry2DName, failureMechanismeParametersMStab.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;
- failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.XCoordinateLastUpliftPoint =
+ failureMechanismeParametersMStab.MStabParameters.SlipCircleDefinition.XCoordinateLastUpliftPoint =
xCoordinateLastUpliftPoint;
}
- failureMechanismeParamatersMStab.MStabParameters.ProjectFileName = mstabProjectFilename;
- failureMechanismeParamatersMStab.MStabParameters.SoilDatabaseName = scenario.Location.SoildatabaseName;
+ failureMechanismeParametersMStab.MStabParameters.ProjectFileName = mstabProjectFilename;
+ failureMechanismeParametersMStab.MStabParameters.SoilDatabaseName = scenario.Location.SoildatabaseName;
- if (!failureMechanismeParamatersMStab.IsComplete)
+ if (!failureMechanismeParametersMStab.IsComplete)
{
throw new Exception("Not all required data is available");
}
DamMStabAssembler assembler = new DamMStabAssembler();
- XDocument mstabXML = assembler.CreateDataTransferObject(failureMechanismeParamatersMStab);
+ XDocument mstabXML = assembler.CreateDataTransferObject(failureMechanismeParametersMStab);
return mstabXML;
}
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r838 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 838)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 842)
@@ -77,7 +77,7 @@
subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile;
subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
- var failureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
+ var failureMechanismeParamatersMStab = new FailureMechanismeParametersMStab();
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.FailureMechanismeParamatersMStab = failureMechanismeParamatersMStab;
+ kernelWrapper.FailureMechanismeParametersMStab = failureMechanismeParamatersMStab;
// Prepare the wrapper. Result is input for the calculation dll
IKernelDataInput damStabilityInput;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs
===================================================================
diff -u -r452 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs (.../DamRunner.cs) (revision 452)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs (.../DamRunner.cs) (revision 842)
@@ -124,7 +124,7 @@
rwScenariosCalculation.PipingModelType = damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType;
rwScenariosCalculation.MStabParameters =
damProjectData.DamProjectCalculationSpecification.CurrentSpecification
- .FailureMechanismeParamatersMStab.MStabParameters;
+ .FailureMechanismeParametersMStab.MStabParameters;
EvaluationJob evaluationJob = damProjectData.GetEvaluationJob();
RemoveLogMessages(evaluationJob);
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs
===================================================================
diff -u -r826 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs (.../Geometry2DDataCreator.cs) (revision 826)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DDataCreator.cs (.../Geometry2DDataCreator.cs) (revision 842)
@@ -117,7 +117,7 @@
}
var soilGeometry = new SoilGeometry(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName);
- var failureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
+ var failureMechanismeParamatersMStab = new FailureMechanismeParametersMStab();
PLLines plLines = new PLLines();
var plLine = new PLLine();
IList geometryPoints = location.SurfaceLine.Geometry.Points;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r841 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 841)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 842)
@@ -45,7 +45,7 @@
///
/// The failure mechanisme paramaters mstab.
///
- public FailureMechanismeParamatersMStab FailureMechanismeParamatersMStab { get; set; }
+ public FailureMechanismeParametersMStab FailureMechanismeParametersMStab { get; set; }
///
/// Prepares the specified dam kernel input.
@@ -67,7 +67,7 @@
kernelDataOutput = damMacroStabilityOutput;
if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside)
{
- var model = FailureMechanismeParamatersMStab.MStabParameters.Model;
+ var model = FailureMechanismeParametersMStab.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 = FailureMechanismeParamatersMStab.DGeoStabilityExePath,
+ DGeoStabilityExePath = FailureMechanismeParametersMStab.DGeoStabilityExePath,
DGeoStabilityInputFileName = DamMacroStabilityUtils.GetStabilityInputFileName(
- damKernelInput, iterationIndex, model, FailureMechanismeParamatersMStab.ProjectWorkingPath),
- FailureMechanismeParamatersMStab = FailureMechanismeParamatersMStab
+ damKernelInput, iterationIndex, model, FailureMechanismeParametersMStab.ProjectWorkingPath),
+ FailureMechanismeParametersMStab = FailureMechanismeParametersMStab
};
// Check the model to see what is to be calculted and how many calculations are required
- switch (FailureMechanismeParamatersMStab.MStabParameters.Model)
+ switch (FailureMechanismeParametersMStab.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, FailureMechanismeParamatersMStab.ProjectWorkingPath);
+ MStabModelType.UpliftVan, FailureMechanismeParametersMStab.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.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.Bishop;
+ input.FailureMechanismeParametersMStab.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.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.UpliftVan;
+ input.FailureMechanismeParametersMStab.MStabParameters.Model = MStabModelType.UpliftVan;
try
{
var stabilityOutputItemSecondModel = ExcecuteCalculation(kernelDataInput);
@@ -188,7 +188,7 @@
{
// reset name and model
input.DGeoStabilityInputFileName = inputFileName;
- input.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan;
+ input.FailureMechanismeParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan;
}
}
}
@@ -243,7 +243,7 @@
XDocument mstabXml = MStabXmlDoc.CreateMStabXmlDoc(stabilityProjectFilename, scenario, subSoilScenario,
null, requiredSafetyFactor.Value,
- kernelDataInput.FailureMechanismeParamatersMStab, out errorMessages);
+ kernelDataInput.FailureMechanismeParametersMStab, out errorMessages);
mstabXml.Save(stabilityProjectFilename + ".xml");
return mstabXml;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs
===================================================================
diff -u -r773 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 773)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs (.../DamProjectCalculator.cs) (revision 842)
@@ -359,7 +359,7 @@
liftvanCalculationSpecification.Assign(calculationSpecification);
liftvanCalculationSpecification.CalculationModel = MStabModelType.UpliftVan;
// Make sure check on uplift is performed before doing UpliftVan calculation
- liftvanCalculationSpecification.FailureMechanismeParamatersMStab.IsStabilityCheckOnUplift = true;
+ liftvanCalculationSpecification.FailureMechanismeParametersMStab.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.FailureMechanismeParamatersMStab.MStabParameters.Model.ToString();
+ StabilityCalculator.ModelSubDirectory = damFailureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.MStabParameters.Model.ToString();
}
try
@@ -578,7 +578,7 @@
private bool IsBishopResult(DesignResult calculationResult)
{
return ((calculationResult.DamFailureMechanismeCalculation.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) &&
- (calculationResult.DamFailureMechanismeCalculation.FailureMechanismeParamatersMStab.MStabParameters.Model == MStabModelType.Bishop));
+ (calculationResult.DamFailureMechanismeCalculation.FailureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.Bishop));
}
///
@@ -591,7 +591,7 @@
private bool IsUpliftVanResult(DesignResult calculationResult)
{
return ((calculationResult.DamFailureMechanismeCalculation.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) &&
- (calculationResult.DamFailureMechanismeCalculation.FailureMechanismeParamatersMStab.MStabParameters.Model == MStabModelType.UpliftVan));
+ (calculationResult.DamFailureMechanismeCalculation.FailureMechanismeParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan));
}
///
@@ -625,7 +625,7 @@
if ((bishopCalculationResults.Any()) && (upliftVanCalculationResults.Any()))
{
var bishopLiftvancalculation = bishopCalculationResults[0].DamFailureMechanismeCalculation.Clone();
- bishopLiftvancalculation.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan;
+ bishopLiftvancalculation.FailureMechanismeParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan;
foreach (var bishopCalculationRecord in bishopCalculationResults)
{
DesignResult liftVanCalculationResult = (from calculationResult in upliftVanCalculationResults
Fisheye: Tag 842 refers to a dead (removed) revision in file `dam engine/trunk/src/Deltares.DamEngine.Data/General/FailureMechanismeParamatersMStab.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r789 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 789)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 842)
@@ -123,7 +123,7 @@
{
// Note: DamProjectCalculationSpecification created and filled by FillAnalysisSpecification
var curspec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
- curspec.FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab
+ curspec.FailureMechanismeParametersMStab = new FailureMechanismeParametersMStab
{
MStabParameters = new MStabParameters
{
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamCalculation.cs
===================================================================
diff -u -r452 -r842
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamCalculation.cs (.../DamCalculation.cs) (revision 452)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamCalculation.cs (.../DamCalculation.cs) (revision 842)
@@ -256,7 +256,7 @@
locationJob.Location,
locationCounter,
ProjectDataDirectory,
- failureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters,
+ failureMechanismeCalculationSpecification.FailureMechanismeParametersMStab.MStabParameters,
null);
locationJob.LocationResult.StabilityTimeSerie = safefactorsTimeSerie;
safefactorsTimeSerie.LocationId = locationJob.Location.Name;