Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs =================================================================== diff -u -r5321 -r5330 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5321) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs (.../MacroStabilityCommonHelper.cs) (revision 5330) @@ -422,12 +422,9 @@ { double penetrationLength = damKernelInput.Location.ModelParametersForPlLines.PenetrationLength; IntrusionVerticalWaterPressureType? pressureType = damKernelInput.Location.IntrusionVerticalWaterPressure; + + ThrowWhenSoilProfile2DIsNull(damKernelInput.SubSoilScenario); - if (damKernelInput.SubSoilScenario.SoilProfile2D == null) - { - throw new ArgumentNullException(nameof(damKernelInput.SubSoilScenario), @"SoilProfile2D cannot be null."); - } - if (damKernelInput.SubSoilScenario.SoilProfile1D != null) { SurfaceLine2 surfaceLine = damKernelInput.Location.SurfaceLine; @@ -457,10 +454,7 @@ private static void ValidateForCombineSoilProfile2DWithSurfaceLine(SoilGeometryProbability subSoilScenario, SurfaceLine2 surfaceLine2, Soil dikeEmbankmentSoil) { - if (subSoilScenario.SoilProfile2D == null) - { - throw new ArgumentNullException(nameof(subSoilScenario), @"SoilProfile2D cannot be null."); - } + ThrowWhenSoilProfile2DIsNull(subSoilScenario); if (surfaceLine2 == null) { @@ -638,4 +632,12 @@ return Path.Combine(Path.GetDirectoryName(fileNameForCalc) ?? string.Empty, $"{Path.GetFileNameWithoutExtension(fileNameForCalc)}_{suffix}{extension}"); } + + private static void ThrowWhenSoilProfile2DIsNull(SoilGeometryProbability subSoilScenario) + { + if (subSoilScenario.SoilProfile2D == null) + { + throw new ArgumentNullException(nameof(subSoilScenario), @"SoilProfile2D cannot be null."); + } + } } \ No newline at end of file