Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r6675 -r6697 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6675) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 6697) @@ -124,10 +124,10 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used - Output output = GeneralHelper.RunAfterInputValidation(inputString, false); + Output output = GeneralHelper.RunAfterInputValidation(inputString); Assert.Multiple(() => { - Assert.That(output.Results.CalculationResults, Is.Null); + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(1)); Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(1)); }); } @@ -586,14 +586,16 @@ Output output = GeneralHelper.RunAfterInputValidation(engineInterface); // one location is calculated with 3 1D profiles - // However, profile 6-4-1-A-1-F_3_s has no UpliftVan occuring and thus has no result - Assert.That(output.Results.CalculationResults.Length, Is.EqualTo(2)); + // However, profile 6-4-1-A-1-F_3_s has no UpliftVan occuring and thus has result NoRun + Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(3)); Assert.Multiple(() => { Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("6-4-1-A-1-F")); Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("6-4-1-A-1-F_1_s")); Assert.That(output.Results.CalculationResults[1].LocationName, Is.EqualTo("6-4-1-A-1-F")); Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("6-4-1-A-1-F_2_s")); + Assert.That(output.Results.CalculationResults[2].LocationName, Is.EqualTo("6-4-1-A-1-F")); + Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("6-4-1-A-1-F_3_s")); }); DesignResult result = output.Results.CalculationResults[0]; @@ -615,6 +617,12 @@ Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(expectedSafetyFactor2).Within(tolerance)); Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.Succeeded)); }); + result = output.Results.CalculationResults[2]; + Assert.Multiple(() => + { + Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(0.0).Within(tolerance)); + Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.NoRun)); + }); var fileList = new List { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs =================================================================== diff -u -r6679 -r6697 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 6679) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 6697) @@ -314,6 +314,8 @@ location.Name, soiProfileProbability, designScenario.LocationScenarioID))); + kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, "", out List results); + designResults.AddRange(results); } if (prepareResult == PrepareResult.Failed) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r6688 -r6697 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 6688) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 6697) @@ -259,7 +259,10 @@ bool isUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.UpliftVan; if (isUpliftVan) { - + if (macroStabilityOutputItem == null && !macroStabilityOutput!.UpliftSituation.IsUplift) + { + AddDesignResultNoRun(damKernelInput, designScenario, designResults, macroStabilityOutput); + } } bool isBishopUpliftVan = FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.BishopUpliftVan; @@ -498,7 +501,7 @@ designResultUpliftNoRun.CalculationResult = CalculationResult.NoRun; designResultUpliftNoRun.SafetyFactor = null; designResultUpliftNoRun.StabilityDesignResults.UpliftSituation = macroStabilityOutput.UpliftSituation; - if (designResults[0].CalculationSubDir != null) + if (designResults.Count > 0 && designResults[0].CalculationSubDir != null) { designResultUpliftNoRun.CalculationSubDir = designResults.Count == 1 ? designResults[0].CalculationSubDir.Replace(StabilityModelType.Bishop.ToString(), StabilityModelType.UpliftVan.ToString()) : ""; }