Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs =================================================================== diff -u -r1285 -r1286 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1285) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1286) @@ -24,8 +24,8 @@ using System.Diagnostics; using System.IO; using System.Linq; -using System.Text.RegularExpressions; using Deltares.DamEngine.Calculators.KernelWrappers.Common; +using Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon; using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces; using Deltares.DamEngine.Calculators.Properties; using Deltares.DamEngine.Data.General; @@ -370,6 +370,7 @@ currentSpecification.AssessmentScenarioJobSettings.DikeDrySensitivity = job.DikeDrySensitivity; currentSpecification.AssessmentScenarioJobSettings.HydraulicShortcutType = job.HydraulicShortcutType; var calculator = CreateKernelWrapper(currentSpecification); + var boezemLevelHbp = job.Location.BoezemLevelHbp; var boezemLevelLbp = job.Location.BoezemLevelLbp; // Adapt used waterlevel(s) when needed @@ -464,13 +465,18 @@ List messages; calculator.Execute(kernelDataInput, kernelDataOutput, out messages); job.CalculationResult = CalculationResult.Succeeded; - if (job.CalculationResult == CalculationResult.Succeeded) { string resultMessage = ""; List results; calculator.PostProcess(damKernelInput, kernelDataOutput, null, resultMessage, out results); - + var stbOutput = kernelDataOutput as DamMacroStabilityOutput; + if (stbOutput != null) + { + var inputfile = stbOutput.StabilityOutputItems[0].ProjectFileName; + inputfile = inputfile.Replace(damKernelInput.CalculationDir, @"").Replace(".sti", ""); + job.BaseFileName = inputfile; + } if (results[0].SafetyFactor != null) { job.SafetyFactor = results[0].SafetyFactor.Value;