Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs =================================================================== diff -u -r1184 -r1185 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs (.../RegionalScenariosCalculationTests.cs) (revision 1184) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/RegionalAssessment/RegionalScenariosCalculationTests.cs (.../RegionalScenariosCalculationTests.cs) (revision 1185) @@ -67,7 +67,7 @@ // engineInterface.DamProjectData.LocationJobs[0].Location.ModelFactors.UpliftCriterionStability = 1.2; // engineInterface.DamProjectData.LocationJobs[0].Location.ModelFactors.UpliftCriterionPiping = 1.2; - engineInterface.DamProjectData.MaxCalculationCores = 7; + engineInterface.DamProjectData.MaxCalculationCores = 1; string outputString = engineInterface.Run(); Assert.IsNotNull(outputString); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs =================================================================== diff -u -r1184 -r1185 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1184) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1185) @@ -369,14 +369,14 @@ currentSpecification.FailureMechanismSystemType = job.FailureMechanismType; currentSpecification.PipingModelType = job.PipingModelOption; var calculator = CreateKernelWrapper(currentSpecification); - // For piping waterlevel needs to be set here + // For piping waterlevel needs to be set here. Piping kernel only uses waterlevelhigh which is set from BoezemLevelHbp. switch (job.LoadSituation) { - case LoadSituation.Dry: + case LoadSituation.Dry: job.Location.BoezemLevelHbp = job.Location.BoezemLevelLbp; break; - case LoadSituation.Wet: - job.Location.BoezemLevelLbp = job.Location.BoezemLevelHbp; + case LoadSituation.Wet: + job.Location.BoezemLevelHbp = job.Location.BoezemLevelTp; break; } PerformJob(job, calculator, currentSpecification); @@ -433,7 +433,7 @@ return kernelWrapper; } - private List CreateKernelWrapperforJob(IKernelWrapper kernelWrapper, ScenarioType scenarioType, + private List CreateKernelWrapperforJob(IKernelWrapper kernelWrapper, FailureMechanismSystemType failureMechanismType, ScenarioType scenarioType, Location location, SoilGeometryProbability soilGeometryProbability, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput, out DamKernelInput damKernelInput) { @@ -449,6 +449,7 @@ damKernelInput.RiverLevelHigh = damKernelInput.Location.BoezemLevelHbp; damKernelInput.RiverLevelLow = damKernelInput.Location.BoezemLevelLbp; damKernelInput.FilenamePrefix = string.Format("Loc({0})_Sce({1})", location.Name, scenarioType); + damKernelInput.SubSoilScenario.SegmentFailureMechanismType = failureMechanismType; PrepareResult prepareResult = kernelWrapper.Prepare(damKernelInput, 0, out kernelDataInput, out kernelDataOutput); // Sometimes the kernelDataInput is not created (p.e when soilprofileprobablility is meant for @@ -544,7 +545,7 @@ { runningJobs[calculator] = job; } - var calculationCreationMessages = CreateKernelWrapperforJob(calculator, job.ScenarioType, job.Location, job.SoilGeometryProbability, + var calculationCreationMessages = CreateKernelWrapperforJob(calculator, job.FailureMechanismType, job.ScenarioType, job.Location, job.SoilGeometryProbability, out kernelDataInput, out kernelDataOutput, out damKernelInput); // Check if prepare is ok