Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs =================================================================== diff -u -r1236 -r1257 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 1236) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 1257) @@ -140,8 +140,6 @@ case FailureMechanismSystemType.HorizontalBalance: case FailureMechanismSystemType.StabilityOutside: profileName = soilGeometry2DName; - baseFileName = damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName; - baseFileName = Path.GetFileNameWithoutExtension(baseFileName); break; case FailureMechanismSystemType.Piping: profileName = soilProfile.Name; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r1251 -r1257 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 1251) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs (.../DamMacroStabilityInwardsKernelWrapper.cs) (revision 1257) @@ -385,8 +385,7 @@ var damMacroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[0]; if (damMacroStabilityOutputItem != null) { - damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName = damMacroStabilityOutputItem.ProjectFileName; - var designResult = NewDesignResult(damKernelInput, designScenario, damMacroStabilityOutputItem.StabilityModelType); + var designResult = NewDesignResult(damKernelInput, designScenario, damMacroStabilityOutputItem); FillDesignResult(damMacroStabilityOutputItem, designResult); designResult.StabilityDesignResults.NumberOfIterations = lastIterationIndex; designResult.StabilityDesignResults.UpliftSituation = damMacroStabilityOutput.UpliftSituation; @@ -402,8 +401,7 @@ var damMacroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[1]; if (damMacroStabilityOutputItem != null) { - damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName = damMacroStabilityOutputItem.ProjectFileName; - var designResult = NewDesignResult(damKernelInput, designScenario, damMacroStabilityOutputItem.StabilityModelType); + var designResult = NewDesignResult(damKernelInput, designScenario, damMacroStabilityOutputItem); FillDesignResult(damMacroStabilityOutputItem, designResult); designResult.StabilityDesignResults.NumberOfIterations = lastIterationIndex; designResult.StabilityDesignResults.UpliftSituation = damMacroStabilityOutput.UpliftSituation; @@ -442,8 +440,7 @@ var macroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[index]; if (macroStabilityOutputItem != null) { - damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName = macroStabilityOutputItem.ProjectFileName; - var overallResult = NewDesignResult(damKernelInput, designScenario, macroStabilityOutputItem.StabilityModelType); + var overallResult = NewDesignResult(damKernelInput, designScenario, macroStabilityOutputItem); FillDesignResult(macroStabilityOutputItem, overallResult); overallResult.StabilityDesignResults.UpliftSituation = damMacroStabilityOutput.UpliftSituation; overallResult.StabilityDesignResults.StabilityModelType = MStabModelType.BishopUpliftVan; @@ -597,7 +594,7 @@ } } - private DesignResult NewDesignResult(DamKernelInput damKernelInput, DesignScenario designScenario, MStabModelType model) + private DesignResult NewDesignResult(DamKernelInput damKernelInput, DesignScenario designScenario, DamMacroStabilityOutputItem macroStabilityOutputItem) { string soilProfile2DName = damKernelInput.SubSoilScenario.ToString(); var designResult = new DesignResult(damKernelInput.DamFailureMechanismeCalculationSpecification, @@ -608,9 +605,10 @@ }; var stabilityDesignResults = new StabilityDesignResults(); stabilityDesignResults.RedesignedSurfaceLine = damKernelInput.Location.SurfaceLine; + designResult.BaseFileName = Path.GetFileNameWithoutExtension(macroStabilityOutputItem.ProjectFileName); designResult.ProfileName = soilProfile2DName; designResult.StabilityDesignResults = stabilityDesignResults; - designResult.CalculationSubDir = DamMacroStabilityUtils.GetCalculationSubDir(model); + designResult.CalculationSubDir = DamMacroStabilityUtils.GetCalculationSubDir(macroStabilityOutputItem.StabilityModelType); return designResult; }