Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r6856 -r6895 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 6856) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 6895) @@ -128,7 +128,7 @@ Waternet waterNet = MacroStabilityCommonHelper.CreateWaternet(damKernelInput, plLines); - if (FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.UpliftVan + if (FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.UpliftVan && !upliftSituation.IsUplift && FailureMechanismParametersMStab.MStabParameters.IsUpliftVanRunOnlyWhenUpliftOccurs) { return PrepareResult.NoUplift; @@ -148,7 +148,7 @@ PrepareResult firstPrepareResult = MacroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation); - if (isBishopUpliftVan && (upliftSituation.IsUplift || !FailureMechanismParametersMStab.MStabParameters.IsUpliftVanRunOnlyWhenUpliftOccurs) + if (isBishopUpliftVan && (upliftSituation.IsUplift || !FailureMechanismParametersMStab.MStabParameters.IsUpliftVanRunOnlyWhenUpliftOccurs) && firstPrepareResult == PrepareResult.Successful) { model = StabilityModelType.UpliftVan; @@ -271,7 +271,7 @@ { AddDesignResultNoRun(damKernelInput, designScenario, designResults, macroStabilityOutput); } - + bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.BishopUpliftVan; if (isBishopUpliftVan) { @@ -309,7 +309,7 @@ } else { - index = 0; + index = 0; } } else if (designResults[1].CalculationResult == CalculationResult.NoRun) @@ -392,7 +392,7 @@ double fosRequired = damKernelInput.Location.CurrentScenario.RequiredSafetyFactorStabilityInnerSlope; if (macroStabilityOutput != null) { - MacroStabilityOutputItem leadingStabilityOutputItem = DetemineLeadingOutputItem(macroStabilityOutput.StabilityOutputItems); + MacroStabilityOutputItem leadingStabilityOutputItem = DetermineLeadingOutputItem(macroStabilityOutput.StabilityOutputItems); // Abort if calculation failed if ((leadingStabilityOutputItem == null) || (leadingStabilityOutputItem.CalculationResult != CalculationResult.Succeeded)) { @@ -512,6 +512,7 @@ { designResultUpliftNoRun.StabilityDesignResults.ResultMessage = Resources.MacroStabilityInwardsKernelWrapper_AddDesignResultNoRun_No_uplift; } + if (designResults.Count > 0 && designResults[0].CalculationSubDir != null) { designResultUpliftNoRun.CalculationSubDir = designResults.Count == 1 ? designResults[0].CalculationSubDir.Replace(StabilityModelType.Bishop.ToString(), StabilityModelType.UpliftVan.ToString()) : ""; @@ -538,7 +539,7 @@ } } - private static MacroStabilityOutputItem DetemineLeadingOutputItem(List stabilityOutputItems) + private static MacroStabilityOutputItem DetermineLeadingOutputItem(List stabilityOutputItems) { if (stabilityOutputItems.Count == 1) { @@ -566,14 +567,4 @@ return macroStabilityOutputItem; } - - public void AddMessageToCalculationMessages(IKernelDataOutput kernelDataOutput, List logMessages) - { - var dataOutput = (MacroStabilityOutput) kernelDataOutput; - LogMessage message = dataOutput.Message; - if (message != null) - { - logMessages.Add(message); - } - } } \ No newline at end of file