Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r7020 -r7021 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 7020) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 7021) @@ -264,20 +264,26 @@ designResults = new List(); MacroStabilityOutputItem macroStabilityOutputItem = ProperMacroStabilityResultsItem(macroStabilityOutput, 0); - AddDesignResult(damKernelInput, designScenario, designResults, macroStabilityOutputItem, macroStabilityOutput); bool isUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.UpliftVan; if (isUpliftVan && macroStabilityOutputItem == null && !macroStabilityOutput!.UpliftSituation.IsUplift) { AddDesignResultNoRun(damKernelInput, designScenario, designResults, macroStabilityOutput); } + else + { + AddDesignResult(damKernelInput, designScenario, designResults, macroStabilityOutputItem, macroStabilityOutput); + } bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.BishopUpliftVan; if (isBishopUpliftVan) { var isUplift = true; macroStabilityOutputItem = ProperMacroStabilityResultsItem(macroStabilityOutput, 1); - AddDesignResult(damKernelInput, designScenario, designResults, macroStabilityOutputItem, macroStabilityOutput); + if (macroStabilityOutputItem != null) + { + AddDesignResult(damKernelInput, designScenario, designResults, macroStabilityOutputItem, macroStabilityOutput); + } // If no uplift therefore no UpliftVan calculation was made. So add a fictive (empty) design result. if (macroStabilityOutputItem == null && !macroStabilityOutput!.UpliftSituation.IsUplift) { Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs =================================================================== diff -u -r7007 -r7021 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 7007) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 7021) @@ -124,14 +124,14 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(2)); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3)); Assert.Multiple(() => { Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("MohrCoulombMaterial")); Assert.That(output.Results.CalculationResults[0].CalculationResult, Is.EqualTo(ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded))); - Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("ShansepMaterial")); - Assert.That(output.Results.CalculationResults[1].CalculationResult, Is.EqualTo(ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded))); + Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("ShansepMaterial")); + Assert.That(output.Results.CalculationResults[2].CalculationResult, Is.EqualTo(ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded))); }); Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1)); Assert.Multiple(() => @@ -168,15 +168,16 @@ Output output = GeneralHelper.RunAfterInputValidation(inputString); - Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(6)); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(7)); Assert.Multiple(() => { Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("MohrCoulombPhi0")); Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("SigmaTauCsttTau")); - Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("MohrCoulombPhi45")); - Assert.That(output.Results.CalculationResults[3].ProfileName, Is.EqualTo("SigmaTauPhi45")); - Assert.That(output.Results.CalculationResults[4].ProfileName, Is.EqualTo("ShansepPhi45")); - Assert.That(output.Results.CalculationResults[5].ProfileName, Is.EqualTo("SuTablePhi45")); + Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("SuTableCsttSu")); + Assert.That(output.Results.CalculationResults[3].ProfileName, Is.EqualTo("MohrCoulombPhi45")); + Assert.That(output.Results.CalculationResults[4].ProfileName, Is.EqualTo("SigmaTauPhi45")); + Assert.That(output.Results.CalculationResults[5].ProfileName, Is.EqualTo("ShansepPhi45")); + Assert.That(output.Results.CalculationResults[6].ProfileName, Is.EqualTo("SuTablePhi45")); Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1)); });