Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs =================================================================== diff -u -r670 -r739 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 670) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 739) @@ -156,7 +156,7 @@ DesignScenario scenario, SoilProfile1D soilProfile, string soilGeometry2DName, AnalysisType analysisType) { locationName = scenario.Location.Name; - scenarioName = scenario.LocationScenarioID; // terughalen vanuit csvexport indien echt nodig + scenarioName = scenario.LocationScenarioID; baseFileName = ""; DamFailureMechanismeCalculation = damFailureMechanismeCalculationSpecification; Scenario = scenario; Index: dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs =================================================================== diff -u -r694 -r739 --- dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 694) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs (.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs) (revision 739) @@ -49,14 +49,24 @@ const double diff = 0.0001; - var designScenario = new DesignScenario(); - designScenario.Location = new Location(); - designScenario.RiverLevel = 1.0; - designScenario.ModelFactors.UpliftCriterionPiping = 1.0; + var location = new Location("Location 1") + { + SurfaceLine = CreateSurfaceLineTutorial1() + }; - var location = new Location(); - location.SurfaceLine = CreateSurfaceLineTutorial1(); + var designScenario = new DesignScenario + { + LocationScenarioID = "1", + Location = location, + RiverLevel = 1.0, + ModelFactors = + { + UpliftCriterionPiping = 1.0 + } + }; + + var subSoilScenario = new SoilGeometryProbability(); subSoilScenario.SoilProfile1D = CreatePipingSellmeijerProfileWithOneSandlayer(); subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.Piping; @@ -90,6 +100,11 @@ // Fill the design results DesignResult result; kernelWrapper.PostProcess(damKernelInput, damPipingOutput, "", out result); + Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType); + Assert.AreEqual(PipingModelType.Sellmeijer4Forces, result.DamFailureMechanismeCalculation.PipingModelType); + Assert.IsNotNullOrEmpty(result.LocationName); + Assert.IsNotNullOrEmpty(result.ScenarioName); + Assert.IsNotNullOrEmpty(result.ProfileName); Assert.AreEqual(11.899117458988471, result.PipingDesignResults.Sellmeijer4ForcesFactor, diff); Assert.AreEqual(4.7596469835953883, result.PipingDesignResults.Sellmeijer4ForcesHcritical, diff); } Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs =================================================================== diff -u -r720 -r739 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs (.../DamPipingSellmeijer4ForcesKernelWrapper.cs) (revision 720) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs (.../DamPipingSellmeijer4ForcesKernelWrapper.cs) (revision 739) @@ -220,10 +220,14 @@ } string soilProfile2DName = ""; - var d = new DamFailureMechanismeCalculationSpecification(); + var damFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification() + { + FailureMechanismSystemType = FailureMechanismSystemType.Piping, + PipingModelType = PipingModelType.Sellmeijer4Forces + }; var designScenario = damKernelInput.DesignScenario; var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D; - designResult = new DesignResult(d, designScenario, soilProfile1D, soilProfile2DName, AnalysisType.NoAdaption); + designResult = new DesignResult(damFailureMechanismeCalculationSpecification, designScenario, soilProfile1D, soilProfile2DName, AnalysisType.NoAdaption); designResult.CalculationResult = damPipingOutput.CalculationResult; var pipingDesignResults = new PipingDesignResults(PipingModelType.Sellmeijer4Forces);