Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs =================================================================== diff -u -r2634 -r2635 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 2634) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 2635) @@ -81,7 +81,7 @@ for (int subSoilScenarioIndex = 0; subSoilScenarioIndex < location.Segment.SoilProfileProbabilities.Count; subSoilScenarioIndex++) { // Check if the subSoilScenario is applicable for the failuremechanism that is being calculated - if (location.Segment.SoilProfileProbabilities[subSoilScenarioIndex].SegmentFailureMechanismType.Value.In( + if (location.Segment.SoilProfileProbabilities[subSoilScenarioIndex].SegmentFailureMechanismType.Value.In( ConversionHelper.ConvertToSegmentFailureMechanismType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType), SegmentFailureMechanismType.All)) { @@ -142,6 +142,7 @@ task.CalculationMap, task.FailureMechanismeCalculationSpecification, task.DesignResults, task.CalculationMessages); Debug.WriteLine("End calculation Location '{0}', soilprofile '{1}'", task.Location, task.SoiProfileProbability); } + private void CalculateOneScenario(Location location, SoilGeometryProbability soiProfileProbability, DesignScenario designScenario, string projectPath, string calculationMap, DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification, List designResults, List calculationMessages) @@ -174,7 +175,7 @@ SurfaceLine2 orgLocationSurfaceLine = null; try { - // Make sure that in case of AdaptGeometry (and RedesignDikeHeight), the surface line is adpted for the given DTH BEFORE the call to Prepare as + // Make sure that in case of AdaptGeometry (and RedesignDikeHeight), the surface line is adapted for the given DTH BEFORE the call to Prepare as // otherwise the Prepare will be done on the original surface line which is wrong. if (analysisType == AnalysisType.AdaptGeometry && damKernelInput.Location.RedesignDikeHeight) { @@ -184,7 +185,7 @@ if (designScenario.DikeTableHeight > dikeHeight.Value) { orgLocationSurfaceLine = location.SurfaceLine.FullDeepClone(); - // Redesign the surfaceline to the desired Dike Tabel Height + // Redesign the surfaceline to the desired Dike Table Height var surfaceLineHeightAdapter = new SurfaceLineHeightAdapter(location.SurfaceLine, location); SurfaceLine2 adaptedSurfaceLine = @@ -201,7 +202,7 @@ PrepareResult prepareResult = kernelWrapper.Prepare(damKernelInput, 0, out kernelDataInput, out kernelDataOutput); - // Sometimes the kernelDataInput is not created (p.e when soilprofileprobablility is meant for + // Sometimes the kernelDataInput is not created (e.g. when SoilProfileProbability is meant for // stability where Piping calc is wanted). In that case, do nothing but just skip. if (prepareResult == PrepareResult.Successful) { @@ -292,16 +293,14 @@ case DesignStrategy.NoDesignPossible: throw new NotImplementedException("No design is possible for this failure mechanism"); case DesignStrategy.SlopeAdaptionBeforeShoulderAdaption: - DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption - .PerformDesignCalculationFirstSlopeAdaptionThenShoulderAdaption( - kernelWrapper, kernelDataInput, kernelDataOutput, damKernelInput, designScenario, - calculationMessages, designCalculations); + DesignCalculatorFirstSlopeAdaptionThenShoulderAdaption.PerformDesignCalculationFirstSlopeAdaptionThenShoulderAdaption( + kernelWrapper, kernelDataInput, kernelDataOutput, damKernelInput, designScenario, + calculationMessages, designCalculations); break; case DesignStrategy.OptimizedSlopeAndShoulderAdaption: - DesignCalculatorCombinedSlopeAndShoulderAdaption - .PerformDesignCalculationCombinedSlopeAdaptionAndShoulderAdaption( - kernelWrapper, kernelDataInput, kernelDataOutput, damKernelInput, designScenario, - calculationMessages, designCalculations); + DesignCalculatorCombinedSlopeAndShoulderAdaption.PerformDesignCalculationCombinedSlopeAdaptionAndShoulderAdaption( + kernelWrapper, kernelDataInput, kernelDataOutput, damKernelInput, designScenario, + calculationMessages, designCalculations); break; } }