Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs =================================================================== diff -u -r820 -r821 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs (.../DamMacroStabilityKernelWrapper.cs) (revision 820) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs (.../DamMacroStabilityKernelWrapper.cs) (revision 821) @@ -159,19 +159,28 @@ { DamMacroStabilityOutput damMacroStabilityOutput = (DamMacroStabilityOutput) kernelDataOutput; messages = new List(); - + var input = (DamMacroStabilityInput)kernelDataInput; + + // 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; + } + // start (first) calculation var stabilityOutputItem = ExcecuteCalculation(kernelDataInput); if (stabilityOutputItem != null) { damMacroStabilityOutput.StabilityOutputItems.Add(stabilityOutputItem); } - // now check if second calculation is needed, if so perform it. - var input = (DamMacroStabilityInput) kernelDataInput; + + // now check if second calculation for BishopUpliftVan is needed, if so perform it. if (!string.IsNullOrEmpty(input.DGeoStabilityInputFileNameSecondModel)) { var inputFileName = input.DGeoStabilityInputFileName; + // set proper name and model input.DGeoStabilityInputFileName = input.DGeoStabilityInputFileNameSecondModel; + input.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.UpliftVan; try { var stabilityOutputItemSecondModel = ExcecuteCalculation(kernelDataInput); @@ -182,7 +191,9 @@ } finally { + // reset name and model input.DGeoStabilityInputFileName = inputFileName; + input.FailureMechanismeParamatersMStab.MStabParameters.Model = MStabModelType.BishopUpliftVan; } } }