Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r4052 -r4150
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 4150)
@@ -48,15 +48,15 @@
///
/// Class with helper methods for the Macro Stability Wrappers.
///
-public static class MacroStabilityCommonHelper
+public class MacroStabilityCommonHelper
{
///
/// Ensures the soil profile2d is filled.
///
/// The sub soil scenario.
/// The surface line2.
/// The dike embankment soil.
- public static void EnsureSoilProfile2DIsFilled(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, Soil dikeEmbankmentSoil)
+ public void EnsureSoilProfile2DIsFilled(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, Soil dikeEmbankmentSoil)
{
SoilProfile2D soilProfile2D = subSoilScenario.SoilProfile2D;
if (soilProfile2D == null)
@@ -82,7 +82,7 @@
///
/// The dam kernel input.
///
- public static TrafficLoad FillTrafficLoad(DamKernelInput damKernelInput)
+ public TrafficLoad FillTrafficLoad(DamKernelInput damKernelInput)
{
TrafficLoad trafficLoad = null;
if (damKernelInput.Location.StabilityOptions != null && damKernelInput.Location.StabilityOptions.TrafficLoad.HasValue &&
@@ -106,7 +106,7 @@
///
/// The dam kernel input.
///
- public static BishopCalculationGrid FillBishopCalculationGrid(DamKernelInput damKernelInput)
+ public BishopCalculationGrid FillBishopCalculationGrid(DamKernelInput damKernelInput)
{
SlipCircleDefinition slipCircleDefinition = damKernelInput.DamFailureMechanismeCalculationSpecification
.FailureMechanismParametersMStab.MStabParameters.SlipCircleDefinition;
@@ -133,7 +133,7 @@
/// Index of the iteration.
/// The model.
///
- public static string GetStabilityInputFileName(DamKernelInput damKernelInput, int iterationIndex, MStabModelType model)
+ public string GetStabilityInputFileName(DamKernelInput damKernelInput, int iterationIndex, MStabModelType model)
{
// Assume 2D sti-file, then check on type being 1D
string soilGeometryName = damKernelInput.SubSoilScenario.SoilProfile2DName;
@@ -149,7 +149,7 @@
///
/// The dam macro stability input.
///
- public static void ThrowWhenMacroStabilityKernelInputNull(MacroStabilityKernelDataInput macroStabilityKernelDataInput)
+ public void ThrowWhenMacroStabilityKernelInputNull(MacroStabilityKernelDataInput macroStabilityKernelDataInput)
{
if (macroStabilityKernelDataInput == null)
{
@@ -162,7 +162,7 @@
///
/// The dam macro stability output.
///
- public static void ThrowWhenMacroStabilityKernelOutputNull(MacroStabilityOutput macroStabilityOutput)
+ public void ThrowWhenMacroStabilityKernelOutputNull(MacroStabilityOutput macroStabilityOutput)
{
if (macroStabilityOutput == null)
{
@@ -175,7 +175,7 @@
///
/// The dam kernel input.
///
- public static void ThrowWhenMacroStabilityDamKernelInputNull(DamKernelInput damKernelInput)
+ public void ThrowWhenMacroStabilityDamKernelInputNull(DamKernelInput damKernelInput)
{
if (damKernelInput == null)
{
@@ -189,7 +189,7 @@
/// The dam kernel input.
/// The design scenario.
///
- public static DesignResult NewDesignResult(DamKernelInput damKernelInput, DesignScenario designScenario)
+ public DesignResult NewDesignResult(DamKernelInput damKernelInput, DesignScenario designScenario)
{
var soilProfile2DName = damKernelInput.SubSoilScenario.ToString();
var designResult = new DesignResult(damKernelInput.DamFailureMechanismeCalculationSpecification,
@@ -214,7 +214,7 @@
///
/// The macro stability output item.
/// The design result.
- public static void FillDesignResult(MacroStabilityOutputItem macroStabilityOutputItem, DesignResult designResult)
+ public void FillDesignResult(MacroStabilityOutputItem macroStabilityOutputItem, DesignResult designResult)
{
designResult.BaseFileName = Path.GetFileNameWithoutExtension(macroStabilityOutputItem.ProjectName);
designResult.CalculationSubDir = macroStabilityOutputItem.CalculationPath;
@@ -246,7 +246,7 @@
/// The calculator.
/// Name of the file.
///
- public static PrepareResult PrepareKernel(Calculator calculator, string fileName)
+ public PrepareResult PrepareKernel(Calculator calculator, string fileName)
{
try
{
@@ -277,7 +277,7 @@
///
/// Zero when there are no errors, one when there are errors that prevent a calculation
///
- public static int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages)
+ public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages)
{
var macroStabilityKernelDataInput = (MacroStabilityKernelDataInput) kernelDataInput;
messages = new List();
@@ -349,7 +349,7 @@
/// Name of the file.
/// The calculator.
/// The messages.
- public static void PerformStabilityCalculation(MacroStabilityInput input, MacroStabilityOutput macroStabilityOutput,
+ public void PerformStabilityCalculation(MacroStabilityInput input, MacroStabilityOutput macroStabilityOutput,
string fileName, ICalculator calculator, out List messages)
{
macroStabilityOutput.CalculationResult = CalculationResult.NoRun;
@@ -392,7 +392,7 @@
/// Name of the soil geometry.
/// Index of the iteration.
///
- private static string DetermineCalculationFilename(string filenamePrefix, string soilGeometryName, int iterationIndex)
+ private string DetermineCalculationFilename(string filenamePrefix, string soilGeometryName, int iterationIndex)
{
string calculationName;
if (iterationIndex <= 0)
@@ -413,7 +413,7 @@
/// The model.
/// The project working path.
///
- private static string GetStabilityCalculationDirectory(MStabModelType model, string projectWorkingPath)
+ private string GetStabilityCalculationDirectory(MStabModelType model, string projectWorkingPath)
{
string calculationBaseDirectory = projectWorkingPath;
string stabilitySubDir = GetCalculationSubDir(model);
@@ -431,7 +431,7 @@
///
/// The model.
///
- private static string GetCalculationSubDir(MStabModelType model)
+ private string GetCalculationSubDir(MStabModelType model)
{
const string stabilitySubDir = @"Stability\";
var modelSubDirectory = model.ToString();
@@ -445,7 +445,7 @@
///
/// Name of the file.
/// The input.
- private static void WriteStixFileBasedOnInputAndResultsSearchGrid(string fileName, MacroStabilityInput input)
+ private void WriteStixFileBasedOnInputAndResultsSearchGrid(string fileName, MacroStabilityInput input)
{
if (!(input.StabilityModel.ModelOption == StabilityModelOptionType.UpliftVan &&
input.StabilityModel.SearchAlgorithm == SearchAlgorithm.Beeswarm))
@@ -465,7 +465,7 @@
/// Name of the file.
/// The input.
/// The macro stability output.
- private static void WriteStixFileBasedOnInputAndResultsSlipPlane(string fileName, MacroStabilityInput input,
+ private void WriteStixFileBasedOnInputAndResultsSlipPlane(string fileName, MacroStabilityInput input,
MacroStabilityOutput macroStabilityOutput)
{
if (macroStabilityOutput.CalculationResult == CalculationResult.Succeeded)
@@ -486,7 +486,7 @@
}
}
- private static void StixFileWrite(StixWriter stixWriter, string fileName, MacroStabilityInput input)
+ private void StixFileWrite(StixWriter stixWriter, string fileName, MacroStabilityInput input)
{
if (File.Exists(fileName))
{
@@ -496,7 +496,7 @@
stixWriter.WriteStixFile(fileName, input);
}
- private static string DetermineStixFilename(string fileNameForCalc, string suffix, string extension = ".stix")
+ private string DetermineStixFilename(string fileNameForCalc, string suffix, string extension = ".stix")
{
return Path.Combine(Path.GetDirectoryName(fileNameForCalc) ?? string.Empty,
$"{Path.GetFileNameWithoutExtension(fileNameForCalc)}_{suffix}{extension}");
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r4052 -r4150
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs (.../MacroStabilityOutwardsKernelWrapper.cs) (revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs (.../MacroStabilityOutwardsKernelWrapper.cs) (revision 4150)
@@ -49,8 +49,17 @@
{
private Calculator stabilityCalculator;
private string fileNameForCalculation;
+ readonly MacroStabilityCommonHelper macroStabilityCommonHelper;
///
+ /// Initializes a new instance of the class.
+ ///
+ public MacroStabilityOutwardsKernelWrapper()
+ {
+ macroStabilityCommonHelper = new MacroStabilityCommonHelper();
+ }
+
+ ///
/// Gets or sets the failure mechanism parameters for mstab.
///
///
@@ -88,7 +97,7 @@
throw new NotImplementedException();
}
- MacroStabilityCommonHelper.EnsureSoilProfile2DIsFilled(damKernelInput.SubSoilScenario, damKernelInput.Location.SurfaceLine,
+ macroStabilityCommonHelper.EnsureSoilProfile2DIsFilled(damKernelInput.SubSoilScenario, damKernelInput.Location.SurfaceLine,
damKernelInput.Location.GetDikeEmbankmentSoil());
const bool useRiverLevelLow = false;
@@ -98,12 +107,12 @@
var fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine
{
- TrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput)
+ TrafficLoad = macroStabilityCommonHelper.FillTrafficLoad(damKernelInput)
};
FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab
.MStabParameters.GridPosition = MStabGridPosition.Left;
- fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
+ fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = macroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
double left = damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).X;
double right = damKernelInput.Location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X;
@@ -113,9 +122,9 @@
Waternet waterNet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, penetrationLength, left, right);
macroStabilityInput.Input = fillMacroStabilityWrapperFromEngine.CreateMacroStabilityInput(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet);
- fileNameForCalculation = MacroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
+ fileNameForCalculation = macroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
stabilityCalculator = new Calculator(macroStabilityInput.Input);
- PrepareResult firstPrepareResult = MacroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
+ PrepareResult firstPrepareResult = macroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
return firstPrepareResult;
}
@@ -146,7 +155,7 @@
///
public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages)
{
- return MacroStabilityCommonHelper.Validate(kernelDataInput, kernelDataOutput, out messages);
+ return macroStabilityCommonHelper.Validate(kernelDataInput, kernelDataOutput, out messages);
}
///
@@ -159,10 +168,10 @@
{
var macroStabilityKernelDataInput = (MacroStabilityKernelDataInput) kernelDataInput;
var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput;
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
- MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
+ macroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
fileNameForCalculation, stabilityCalculator, out messages);
string fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation);
foreach (LogMessage logMessage in messages)
@@ -183,17 +192,17 @@
public void PostProcess(DamKernelInput damKernelInput, IKernelDataOutput kernelDataOutput, DesignScenario designScenario,
string resultMessage, out List designResults)
{
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
var macroStabilityOutput = kernelDataOutput as MacroStabilityOutput;
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
designResults = new List();
if (macroStabilityOutput?.StabilityOutputItems != null && macroStabilityOutput.StabilityOutputItems.Count > 0)
{
MacroStabilityOutputItem macroStabilityOutputItem = macroStabilityOutput.StabilityOutputItems[0];
if (macroStabilityOutputItem != null)
{
- DesignResult designResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
- MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
+ DesignResult designResult = macroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
+ macroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
designResult.StabilityDesignResults.NumberOfIterations = 0;
designResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation;
designResults.Add(designResult);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r4052 -r4150
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 4150)
@@ -50,8 +50,17 @@
private string fileNameForCalculation;
private string fileNameForSecondCalculation;
private int lastIterationIndex;
+ readonly MacroStabilityCommonHelper macroStabilityCommonHelper;
///
+ /// Initializes a new instance of the class.
+ ///
+ public MacroStabilityInwardsKernelWrapper()
+ {
+ macroStabilityCommonHelper = new MacroStabilityCommonHelper();
+ }
+
+ ///
/// Gets or sets the failure mechanism parameters for MStab.
///
///
@@ -93,7 +102,7 @@
model = MStabModelType.Bishop;
}
- MacroStabilityCommonHelper.EnsureSoilProfile2DIsFilled(damKernelInput.SubSoilScenario, damKernelInput.Location.SurfaceLine,
+ macroStabilityCommonHelper.EnsureSoilProfile2DIsFilled(damKernelInput.SubSoilScenario, damKernelInput.Location.SurfaceLine,
damKernelInput.Location.GetDikeEmbankmentSoil());
const bool useRiverLevelLow = false;
@@ -104,13 +113,13 @@
var fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine
{
- TrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput)
+ TrafficLoad = macroStabilityCommonHelper.FillTrafficLoad(damKernelInput)
};
if (FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.Bishop ||
FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan)
{
- fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
+ fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = macroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
}
if (FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.UpliftVan ||
@@ -135,22 +144,22 @@
Waternet waterNet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile1D, penetrationLength, left, right);
macroStabilityInput.Input = fillMacroStabilityWrapperFromEngine.CreateMacroStabilityInput(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet);
- fileNameForCalculation = MacroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
+ fileNameForCalculation = macroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
stabilityCalculator = new Calculator(macroStabilityInput.Input);
- PrepareResult firstPrepareResult = MacroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
+ PrepareResult firstPrepareResult = macroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
if (isBishopUpliftVan && upliftSituation.IsUplift && firstPrepareResult == PrepareResult.Successful)
{
model = MStabModelType.UpliftVan;
FailureMechanismParametersMStab.MStabParameters.Model = model;
macroStabilityInput.Input = fillMacroStabilityWrapperFromEngine.CreateMacroStabilityInput(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet);
- fileNameForSecondCalculation = MacroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
+ fileNameForSecondCalculation = macroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
// reset model
FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan;
stabilityCalculatorForSecondCalculation = new Calculator(macroStabilityInput.Input);
- return MacroStabilityCommonHelper.PrepareKernel(stabilityCalculatorForSecondCalculation, fileNameForSecondCalculation);
+ return macroStabilityCommonHelper.PrepareKernel(stabilityCalculatorForSecondCalculation, fileNameForSecondCalculation);
}
if (isBishopUpliftVan)
@@ -188,7 +197,7 @@
///
public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages)
{
- return MacroStabilityCommonHelper.Validate(kernelDataInput, kernelDataOutput, out messages);
+ return macroStabilityCommonHelper.Validate(kernelDataInput, kernelDataOutput, out messages);
}
///
@@ -201,16 +210,16 @@
{
var macroStabilityKernelDataInput = (MacroStabilityKernelDataInput) kernelDataInput;
var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput;
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan;
if (isBishopUpliftVan)
{
macroStabilityKernelDataInput.Input.StabilityModel.ModelOption = StabilityModelOptionType.Bishop;
}
- MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
+ macroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
fileNameForCalculation, stabilityCalculator, out messages);
string fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation);
foreach (LogMessage logMessage in messages)
@@ -221,7 +230,7 @@
if (isBishopUpliftVan && macroStabilityOutput.UpliftSituation.IsUplift)
{
macroStabilityKernelDataInput.Input.StabilityModel.ModelOption = StabilityModelOptionType.UpliftVan;
- MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
+ macroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
fileNameForSecondCalculation, stabilityCalculatorForSecondCalculation, out messages);
fileName = Path.GetFileNameWithoutExtension(fileNameForSecondCalculation);
foreach (LogMessage logMessage in messages)
@@ -243,9 +252,9 @@
public void PostProcess(DamKernelInput damKernelInput, IKernelDataOutput kernelDataOutput, DesignScenario designScenario,
string resultMessage, out List designResults)
{
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
var macroStabilityOutput = kernelDataOutput as MacroStabilityOutput;
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
designResults = new List();
if (macroStabilityOutput == null)
{
@@ -255,8 +264,8 @@
MacroStabilityOutputItem macroStabilityOutputItem = ProperMacroStabilityResultsItem(macroStabilityOutput, 0);
if (macroStabilityOutputItem != null)
{
- DesignResult designResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
- MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
+ DesignResult designResult = macroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
+ macroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
designResult.StabilityDesignResults.NumberOfIterations = lastIterationIndex;
designResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation;
designResults.Add(designResult);
@@ -271,8 +280,8 @@
macroStabilityOutputItem = macroStabilityOutput.StabilityOutputItems[1];
if (macroStabilityOutputItem != null)
{
- DesignResult designResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
- MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
+ DesignResult designResult = macroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
+ macroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, designResult);
designResult.StabilityDesignResults.NumberOfIterations = lastIterationIndex;
designResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation;
designResults.Add(designResult);
@@ -312,8 +321,8 @@
macroStabilityOutputItem = ProperMacroStabilityResultsItem(macroStabilityOutput, index);
if (macroStabilityOutputItem != null)
{
- DesignResult overallResult = MacroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
- MacroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, overallResult);
+ DesignResult overallResult = macroStabilityCommonHelper.NewDesignResult(damKernelInput, designScenario);
+ macroStabilityCommonHelper.FillDesignResult(macroStabilityOutputItem, overallResult);
overallResult.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation;
overallResult.StabilityDesignResults.StabilityModelType = MStabModelType.BishopUpliftVan;
designResults.Add(overallResult);
@@ -355,9 +364,9 @@
{
var macroStabilityKernelDataInput = kernelDataInput as MacroStabilityKernelDataInput;
var macroStabilityOutput = kernelDataOutput as MacroStabilityOutput;
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput);
double fosRequired = damKernelInput.Location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope;
if (macroStabilityOutput != null)
@@ -401,7 +410,7 @@
int iterationIndex, out EmbankmentDesignParameters embankmentDesignParameters)
{
var macroStabilityKernelDataInput = kernelDataInput as MacroStabilityKernelDataInput;
- MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
+ macroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
lastIterationIndex = iterationIndex;
Location location = damKernelInput.Location;