Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r3520 -r3523 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3520) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3523) @@ -132,6 +132,8 @@ }; macroStabilityOutput.UpliftSituation = new UpliftSituation { IsUplift = true }; macroStabilityOutputItem.SafetyFactor = 2.34; + macroStabilityOutputItem.CalculationPath = TestFolder + "@\testpath"; + macroStabilityOutputItem.ProjectName = Path.GetFileNameWithoutExtension(inputXmlForDamEngine); macroStabilityOutput.StabilityOutputItems = new List {macroStabilityOutputItem}; macroStabilityOutput.StabilityOutputItems[0].ActiveCenterPoint = new Point2D(10,10); macroStabilityOutput.StabilityOutputItems[0].ActiveCenterPointRadius = 8; @@ -201,6 +203,8 @@ Assert.IsTrue(results.Count > 0); foreach (var result in results) { + Assert.AreEqual(Path.GetFileNameWithoutExtension(inputXmlForDamEngine), result.BaseFileName); + Assert.AreEqual(TestFolder + "@\testpath", result.CalculationSubDir); Assert.AreEqual(CalculationResult.Succeeded, result.CalculationResult); Assert.AreEqual(true, ((UpliftSituation)result.StabilityDesignResults.UpliftSituation).IsUplift); Assert.AreEqual(0, result.StabilityDesignResults.NumberOfIterations); //NumberOfIterations can not be set for this test, so always zero here @@ -365,6 +369,8 @@ Assert.IsTrue(results.Count > 0); foreach (var result in results) { + Assert.AreEqual("Loc(TestLocation)_Sce(1)_Pro(DefaultNameSoilProfile1D)", result.BaseFileName); + Assert.AreEqual("..\\Test\\Stability\\UpliftVan", result.CalculationSubDir); Assert.AreEqual(CalculationResult.Succeeded, result.CalculationResult); Assert.AreEqual(1.5211, result.StabilityDesignResults.SafetyFactor, diff); Assert.AreEqual(50.5, result.StabilityDesignResults.ActiveCenterPoint.X, diff); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r3522 -r3523 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3523) @@ -320,10 +320,10 @@ { if (macroStabilityOutputItem.StabilityModelType == MStabModelType.UpliftVan) { - var calculationPath = Path.GetDirectoryName(fileNameForCalculation); - var projectName = Path.GetFileName(fileNameForCalculation); + macroStabilityOutputItem.CalculationPath = Path.GetDirectoryName(fileNameForCalculation); + macroStabilityOutputItem.ProjectName = Path.GetFileName(fileNameForCalculation); var fileNameForCalculationAsStix = Path.ChangeExtension(fileNameForCalculation, ".stix"); - StixWriter.FillInfo("DAM Engine", calculationPath, projectName, true); + StixWriter.FillInfo("DAM Engine", macroStabilityOutputItem.CalculationPath, macroStabilityOutputItem.ProjectName, true); StixWriter.FillCalculatedDualCircle(macroStabilityOutputItem.ActiveCenterPoint.X, macroStabilityOutputItem.ActiveCenterPoint.Z, macroStabilityOutputItem.ActiveCenterPointRadius, macroStabilityOutputItem.PassiveCenterPoint.X, @@ -397,11 +397,14 @@ stabilityDesignResults.RedesignedSurfaceLine = damKernelInput.Location.SurfaceLine; designResult.ProfileName = soilProfile2DName; designResult.StabilityDesignResults = stabilityDesignResults; + designResult.CalculationSubDir = damKernelInput.CalculationDir; return designResult; } private static void FillDesignResult(MacroStabilityOutputItem macroStabilityOutputItem, DesignResult designResult) { + designResult.BaseFileName = Path.GetFileNameWithoutExtension(macroStabilityOutputItem.ProjectName); + designResult.CalculationSubDir = macroStabilityOutputItem.CalculationPath; designResult.CalculationResult = macroStabilityOutputItem.CalculationResult; designResult.StabilityDesignResults.StabilityModelType = macroStabilityOutputItem.StabilityModelType; if (designResult.CalculationResult == CalculationResult.Succeeded) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs =================================================================== diff -u -r3522 -r3523 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs (.../MacroStabilityOutputItem.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityOutputItem.cs (.../MacroStabilityOutputItem.cs) (revision 3523) @@ -30,6 +30,22 @@ public class MacroStabilityOutputItem { /// + /// Gets or sets the name of the project. + /// + /// + /// The name of the project. + /// + public string ProjectName { get; set; } + + /// + /// Gets or sets the calculation path. + /// + /// + /// The calculation path. + /// + public string CalculationPath { get; set; } + + /// /// Gets or sets the calculation result. /// ///