Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -r990386c78ced95081f33d9c1d1c5829c080db6b2 -r90e21bc14fca4b8e3ab195ea1d77a5fde0fcb9f7 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision 990386c78ced95081f33d9c1d1c5829c080db6b2) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision 90e21bc14fca4b8e3ab195ea1d77a5fde0fcb9f7) @@ -83,30 +83,30 @@ return new MacroStabilityInwardsCalculationConfigurationReader(xmlFilePath); } - protected override ICalculation ParseReadCalculation(MacroStabilityInwardsCalculationConfiguration calculationConfiguration) + protected override ICalculation ParseReadCalculation(MacroStabilityInwardsCalculationConfiguration readCalculation) { var calculation = new MacroStabilityInwardsCalculationScenario { - Name = calculationConfiguration.Name + Name = readCalculation.Name }; - if (TrySetHydraulicBoundaryData(calculationConfiguration, calculation) - && TrySetSurfaceLine(calculationConfiguration, calculation) - && TrySetStochasticSoilModel(calculationConfiguration, calculation) - && TrySetStochasticSoilProfile(calculationConfiguration, calculation) - && TrySetScenarioParameters(calculationConfiguration.Scenario, calculation) - && TrySetTangentLineZTopBottom(calculationConfiguration, calculation) - && TrySetTangentLineNumber(calculationConfiguration, calculation) - && TrySetGrids(calculationConfiguration, calculation)) + if (TrySetHydraulicBoundaryData(readCalculation, calculation) + && TrySetSurfaceLine(readCalculation, calculation) + && TrySetStochasticSoilModel(readCalculation, calculation) + && TrySetStochasticSoilProfile(readCalculation, calculation) + && TrySetScenarioParameters(readCalculation.Scenario, calculation) + && TrySetTangentLineZTopBottom(readCalculation, calculation) + && TrySetTangentLineNumber(readCalculation, calculation) + && TrySetGrids(readCalculation, calculation)) { - SetSimpleProperties(calculationConfiguration, calculation.InputParameters); + SetSimpleProperties(readCalculation, calculation.InputParameters); - SetZoningBoundariesDeterminationType(calculationConfiguration, calculation.InputParameters); - SetDikeSoilScenario(calculationConfiguration, calculation.InputParameters); - SetGridDeterminationType(calculationConfiguration, calculation.InputParameters); - SetTangentLineDeterminationType(calculationConfiguration, calculation.InputParameters); - SetMacroStabilityInwardsLocationInput(calculationConfiguration.LocationInputDaily, calculation.InputParameters.LocationInputDaily); - SetMacroStabilityInwardsLocationInputExtreme(calculationConfiguration.LocationInputExtreme, calculation.InputParameters.LocationInputExtreme); + SetZoningBoundariesDeterminationType(readCalculation, calculation.InputParameters); + SetDikeSoilScenario(readCalculation, calculation.InputParameters); + SetGridDeterminationType(readCalculation, calculation.InputParameters); + SetTangentLineDeterminationType(readCalculation, calculation.InputParameters); + SetMacroStabilityInwardsLocationInput(readCalculation.LocationInputDaily, calculation.InputParameters.LocationInputDaily); + SetMacroStabilityInwardsLocationInputExtreme(readCalculation.LocationInputExtreme, calculation.InputParameters.LocationInputExtreme); return calculation; }