Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r1233 -r1236 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 1233) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 1236) @@ -280,6 +280,7 @@ { var stabilityOutputItem = new DamMacroStabilityOutputItem(); stabilityOutputItem.StabilityModelType = input.FailureMechanismParametersMStab.MStabParameters.Model; + stabilityOutputItem.ProjectFileName = input.DGeoStabilityInputFileName; var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone { SafetyFactor = results[0].Zone1.SafetyFactor, @@ -377,13 +378,14 @@ DamMacroStabilityUtils.ThrowWhenMacroStabilityDamKernelInputNull(damKernelInput); DamMacroStabilityOutput damMacroStabilityOutput = kernelDataOutput as DamMacroStabilityOutput; DamMacroStabilityUtils.ThrowWhenMacroStabilityKernelOutputNull(damMacroStabilityOutput); - + designResults = new List(); if (damMacroStabilityOutput.StabilityOutputItems.Count > 0) { var damMacroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[0]; if (damMacroStabilityOutputItem != null) { + damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName = damMacroStabilityOutputItem.ProjectFileName; var designResult = NewDesignResult(damKernelInput, designScenario); FillDesignResult(damMacroStabilityOutputItem, designResult); designResult.StabilityDesignResults.NumberOfIterations = lastIterationIndex; @@ -400,6 +402,7 @@ var damMacroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[1]; if (damMacroStabilityOutputItem != null) { + damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName = damMacroStabilityOutputItem.ProjectFileName; var designResult = NewDesignResult(damKernelInput, designScenario); FillDesignResult(damMacroStabilityOutputItem, designResult); designResult.StabilityDesignResults.NumberOfIterations = lastIterationIndex; @@ -439,6 +442,7 @@ var macroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[index]; if (macroStabilityOutputItem != null) { + damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName = macroStabilityOutputItem.ProjectFileName; var overallResult = NewDesignResult(damKernelInput, designScenario); FillDesignResult(macroStabilityOutputItem, overallResult); overallResult.StabilityDesignResults.UpliftSituation = damMacroStabilityOutput.UpliftSituation; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs =================================================================== diff -u -r1181 -r1236 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 1181) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 1236) @@ -137,6 +137,7 @@ switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType) { case FailureMechanismSystemType.StabilityInside: + case FailureMechanismSystemType.HorizontalBalance: case FailureMechanismSystemType.StabilityOutside: profileName = soilGeometry2DName; baseFileName = damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs =================================================================== diff -u -r1217 -r1236 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 1217) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 1236) @@ -209,7 +209,8 @@ damKernelInput.DamFailureMechanismeCalculationSpecification.AssessmentScenarioJobSettings, out errorMessages); mstabXml.Save(stabilityProjectFilename + ".xml"); - + damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName = + kernelDataInput.FailureMechanismParametersMStab.MStabParameters.ProjectFileName; return mstabXml; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r1234 -r1236 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 1234) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs (.../DamMacroStabilityInwardsKernelWrapperTests.cs) (revision 1236) @@ -155,7 +155,8 @@ Assert.AreEqual(expectedOutputValues.Count, results.Count); for (int index = 0; index < expectedOutputValues.Count; index++) { - Assert.AreEqual(expectedOutputValues[0], results[0].StabilityDesignResults.SafetyFactor, diff); + Assert.AreEqual(expectedOutputValues[index], results[index].StabilityDesignResults.SafetyFactor, diff); + Assert.IsNotEmpty(results[index].BaseFileName); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs =================================================================== diff -u -r1219 -r1236 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1219) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1236) @@ -228,7 +228,8 @@ { throw new Exception(Resources.MStabXmlDoc_NotAllDataAvailable); } - + // Make sure projectfilename is returned + inputFailureMechanismParametersMStab.MStabParameters.ProjectFileName = mstabProjectFilename; DamMStabAssembler assembler = new DamMStabAssembler(); XDocument mstabXml = assembler.CreateDataTransferObject(failureMechanismParametersMStab); return mstabXml; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs =================================================================== diff -u -r1212 -r1236 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 1212) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 1236) @@ -148,6 +148,7 @@ Assert.AreEqual(2.935, results[0].StabilityDesignResults.SafetyFactor, diff); Assert.AreEqual("", results[0].StabilityDesignResults.ResultMessage); Assert.AreEqual(CalculationResult.Succeeded, results[0].CalculationResult); + Assert.IsNotEmpty(results[0].BaseFileName); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs =================================================================== diff -u -r1175 -r1236 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs (.../DamMacroStabilityOutputItem.cs) (revision 1175) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/DamMacroStabilityOutputItem.cs (.../DamMacroStabilityOutputItem.cs) (revision 1236) @@ -76,5 +76,13 @@ /// The type of the stability model. /// public MStabModelType StabilityModelType { get; set; } + + /// + /// Gets or sets the name of the project file. + /// + /// + /// The name of the project file. + /// + public string ProjectFileName { get; set; } } }