Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r380459377e7c18685753cc9bf6f67a85eeb323f6 -r21793a296d0cd97d04a07d8287878a7b9ae16145 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 380459377e7c18685753cc9bf6f67a85eeb323f6) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 21793a296d0cd97d04a07d8287878a7b9ae16145) @@ -104,30 +104,30 @@ return new ClosingStructuresCalculationConfigurationReader(xmlFilePath); } - protected override ICalculation ParseReadCalculation(ClosingStructuresCalculationConfiguration readCalculation) + protected override ICalculation ParseReadCalculation(ClosingStructuresCalculationConfiguration calculationConfiguration) { var calculation = new StructuresCalculation { - Name = readCalculation.Name + Name = calculationConfiguration.Name }; - if (TrySetStructure(readCalculation.StructureId, calculation) - && TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation) - && TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation) - && TrySetStochasts(readCalculation, calculation) - && TrySetOrientation(readCalculation, calculation) - && TrySetFailureProbabilityStructureWithErosion(readCalculation, calculation) - && TrySetFailureProbabilityOpenStructure(readCalculation, calculation) - && TrySetFailureProbabilityReparation(readCalculation, calculation) - && TrySetProbabilityOpenStructureBeforeFlooding(readCalculation, calculation) - && TrySetInflowModelType(readCalculation, calculation) - && TrySetIdenticalApertures(readCalculation, calculation) - && readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile, + if (TrySetStructure(calculationConfiguration.StructureId, calculation) + && TrySetHydraulicBoundaryLocation(calculationConfiguration.HydraulicBoundaryLocationName, calculation) + && TrySetForeshoreProfile(calculationConfiguration.ForeshoreProfileId, calculation) + && TrySetStochasts(calculationConfiguration, calculation) + && TrySetOrientation(calculationConfiguration, calculation) + && TrySetFailureProbabilityStructureWithErosion(calculationConfiguration, calculation) + && TrySetFailureProbabilityOpenStructure(calculationConfiguration, calculation) + && TrySetFailureProbabilityReparation(calculationConfiguration, calculation) + && TrySetProbabilityOpenStructureBeforeFlooding(calculationConfiguration, calculation) + && TrySetInflowModelType(calculationConfiguration, calculation) + && TrySetIdenticalApertures(calculationConfiguration, calculation) + && calculationConfiguration.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile, calculation.Name, Log)) { - SetFactorStormDurationOpenStructure(readCalculation, calculation); - SetWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters); - SetShouldIllustrationPointsBeCalculated(readCalculation, calculation); + SetFactorStormDurationOpenStructure(calculationConfiguration, calculation); + SetWaveReductionParameters(calculationConfiguration.WaveReduction, calculation.InputParameters); + SetShouldIllustrationPointsBeCalculated(calculationConfiguration, calculation); return calculation; } return null;