Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationImporter.cs =================================================================== diff -u -rc26decf7d5782696eb120ad34b1dccf675eec193 -r214457ab765b5adc9c4b6df04e34f97ebe11fb8e --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationImporter.cs (.../PipingCalculationConfigurationImporter.cs) (revision c26decf7d5782696eb120ad34b1dccf675eec193) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationImporter.cs (.../PipingCalculationConfigurationImporter.cs) (revision 214457ab765b5adc9c4b6df04e34f97ebe11fb8e) @@ -25,7 +25,6 @@ using Core.Common.Base.Data; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.IO.Configurations; using Ringtoets.Common.IO.Configurations.Helpers; using Ringtoets.Common.IO.Configurations.Import; using Ringtoets.Piping.Data; @@ -92,7 +91,7 @@ && TryReadStochasticSoilModel(calculationConfiguration, pipingCalculation) && TryReadStochasticSoilProfile(calculationConfiguration, pipingCalculation) && TryReadStochasts(calculationConfiguration, pipingCalculation) - && TryReadScenario(calculationConfiguration, pipingCalculation)) + && TrySetScenarioParameters(calculationConfiguration.Scenario, pipingCalculation)) { return pipingCalculation; } @@ -343,36 +342,5 @@ (i, s) => i.PhreaticLevelExit = s, Log); } - - private bool TryReadScenario(PipingCalculationConfiguration calculationConfiguration, ICalculationScenario scenario) - { - ScenarioConfiguration scenarioConfiguration = calculationConfiguration.Scenario; - if (scenarioConfiguration == null) - { - return true; - } - - bool hasContribution = scenarioConfiguration.Contribution.HasValue; - bool hasRelevance = scenarioConfiguration.IsRelevant.HasValue; - - if (!hasContribution && !hasRelevance) - { - Log.LogCalculationConversionError("Er is voor scenario geen contributie of relevantie opgegeven.", - scenario.Name); - return false; - } - - if (hasContribution) - { - scenario.Contribution = (RoundedDouble) scenarioConfiguration.Contribution.Value; - } - - if (hasRelevance) - { - scenario.IsRelevant = scenarioConfiguration.IsRelevant.Value; - } - - return true; - } } } \ No newline at end of file