Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r3772 -r3777 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3772) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3777) @@ -89,9 +89,9 @@ { try { - var bishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; + var isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; var model = FailureMechanismParametersMStab.MStabParameters.Model; - if (bishopUpliftVan) + if (isBishopUpliftVan) { // if current model is BishopUpliftVan then set to Bishop for proper name/path for input file model = MStabModelType.Bishop; @@ -120,7 +120,7 @@ FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan) { macroStabilityOutput.UpliftSituation = upliftSituation; - if (!upliftSituation.IsUplift) + if (!upliftSituation.IsUplift && !isBishopUpliftVan) { return PrepareResult.NotRelevant; } @@ -142,7 +142,7 @@ stabilityCalculator = new Calculator(macroStabilityInput.Input); var firstPrepareResult = PrepareKernel(stabilityCalculator, fileNameForCalculation); - if (bishopUpliftVan && upliftSituation.IsUplift && firstPrepareResult == PrepareResult.Successful) + if (isBishopUpliftVan && upliftSituation.IsUplift && firstPrepareResult == PrepareResult.Successful) { model = MStabModelType.UpliftVan; FailureMechanismParametersMStab.MStabParameters.Model = model; @@ -156,7 +156,7 @@ return PrepareKernel(stabilityCalculatorForSecondCalculation, fileNameForSecondCalculation); } - if (bishopUpliftVan) + if (isBishopUpliftVan) { // reset model FailureMechanismParametersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan; @@ -356,8 +356,8 @@ ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput); ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput); - var bishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; - if (bishopUpliftVan) + var isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; + if (isBishopUpliftVan) { macroStabilityKernelDataInput.Input.StabilityModel.ModelOption = StabilityModelOptionType.Bishop; } @@ -370,7 +370,7 @@ logMessage.Message = fileName + ": " + logMessage.Message; } - if (bishopUpliftVan) + if (isBishopUpliftVan) { macroStabilityKernelDataInput.Input.StabilityModel.ModelOption = StabilityModelOptionType.UpliftVan; PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput, @@ -432,16 +432,16 @@ } } - private void WriteStixFileBasedOnInputAndResultsSlipPlane(string filename, MacroStabilityInput input, + private void WriteStixFileBasedOnInputAndResultsSlipPlane(string fileName, MacroStabilityInput input, MacroStabilityOutput macroStabilityOutput) { if (macroStabilityOutput.CalculationResult == CalculationResult.Succeeded) { foreach (var macroStabilityOutputItem in macroStabilityOutput.StabilityOutputItems) { - macroStabilityOutputItem.CalculationPath = Path.GetDirectoryName(filename); - macroStabilityOutputItem.ProjectName = Path.GetFileName(filename); - var fileNameForCalculationAsStix = DetermineStixFilename(filename, "result"); + macroStabilityOutputItem.CalculationPath = Path.GetDirectoryName(fileName); + macroStabilityOutputItem.ProjectName = Path.GetFileName(fileName); + var fileNameForCalculationAsStix = DetermineStixFilename(fileName, "result"); var resultStixWrite = new StixWriter(); resultStixWrite.FillInfo("DAM Engine", macroStabilityOutputItem.CalculationPath, macroStabilityOutputItem.ProjectName, true); @@ -511,8 +511,8 @@ } } - var bishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; - if (bishopUpliftVan) + var isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == MStabModelType.BishopUpliftVan; + if (isBishopUpliftVan) { MacroStabilityOutputItem macroStabilityOutputItem; if (macroStabilityOutput.StabilityOutputItems.Count > 1) @@ -604,7 +604,8 @@ macroStabilityOutputItem.ActiveCenterPointRadius; designResult.StabilityDesignResults.ResultSlices = macroStabilityOutputItem.ResultSlices; - if (macroStabilityOutputItem.StabilityModelType != MStabModelType.Bishop) + if (macroStabilityOutputItem.StabilityModelType == MStabModelType.UpliftVan || + macroStabilityOutputItem.StabilityModelType == MStabModelType.BishopUpliftVan) { designResult.StabilityDesignResults.PassiveCenterPoint = macroStabilityOutputItem.PassiveCenterPoint;