Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 4000)
@@ -41,7 +41,7 @@
public UpliftSituation DetermineStabilityUplift(DamKernelInput damKernelInput, bool useRivelLevelLow)
{
UpliftSituation upliftSituation;
- var plLines = DeterminePlLinesForStability(damKernelInput, useRivelLevelLow, out upliftSituation);
+ PlLines plLines = DeterminePlLinesForStability(damKernelInput, useRivelLevelLow, out upliftSituation);
upliftSituation.IsUplift = DetermineIsUplift(plLines, damKernelInput.Location, damKernelInput.SubSoilScenario);
return upliftSituation;
}
@@ -53,20 +53,21 @@
/// if set to true [use rivel level low].
/// The uplift situation.
/// pl lines
- public PlLines DeterminePlLinesForStability(DamKernelInput damKernelInput, bool useRivelLevelLow,
- out UpliftSituation upliftSituation)
+ public PlLines DeterminePlLinesForStability(DamKernelInput damKernelInput, bool useRivelLevelLow,
+ out UpliftSituation upliftSituation)
{
- var riverLevel = damKernelInput.RiverLevelHigh;
+ double riverLevel = damKernelInput.RiverLevelHigh;
double? riverLevelLow = null;
if (useRivelLevelLow)
{
riverLevelLow = damKernelInput.RiverLevelLow;
}
- SensorPlLineCreatorSettings sensorPlLineCreatorSettings = new SensorPlLineCreatorSettings();
+
+ var sensorPlLineCreatorSettings = new SensorPlLineCreatorSettings();
sensorPlLineCreatorSettings.SensorLocation = damKernelInput.Location.SensorLocation;
sensorPlLineCreatorSettings.DateTime = damKernelInput.TimeStepDateTime;
- var plLines = PlLinesHelper.CreatePlLinesForStability(damKernelInput.Location, damKernelInput.SubSoilScenario, riverLevel,
- riverLevelLow, sensorPlLineCreatorSettings, out upliftSituation);
+ PlLines plLines = PlLinesHelper.CreatePlLinesForStability(damKernelInput.Location, damKernelInput.SubSoilScenario, riverLevel,
+ riverLevelLow, sensorPlLineCreatorSettings, out upliftSituation);
return plLines;
}
@@ -79,19 +80,23 @@
/// true if there is uplift
public bool DetermineIsUplift(PlLines plLines, Location location, SoilGeometryProbability subSoilScenario)
{
- if (plLines == null) return false;
- var upliftCriterion = location.ModelFactors.UpliftCriterionStability;
- var surfaceLineWithNewHeight = location.SurfaceLine;
- var upliftFactor = GetLowestUpliftFactor(surfaceLineWithNewHeight,
- subSoilScenario.SoilProfile1D, subSoilScenario.FullStiFileName,
- subSoilScenario.SoilProfile2D, plLines, location);
+ if (plLines == null)
+ {
+ return false;
+ }
+
+ double upliftCriterion = location.ModelFactors.UpliftCriterionStability;
+ SurfaceLine2 surfaceLineWithNewHeight = location.SurfaceLine;
+ double? upliftFactor = GetLowestUpliftFactor(surfaceLineWithNewHeight,
+ subSoilScenario.SoilProfile1D, subSoilScenario.FullStiFileName,
+ subSoilScenario.SoilProfile2D, plLines, location);
return upliftFactor < upliftCriterion;
}
private double? GetLowestUpliftFactor(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile1D, string soilGeometry2DName,
- SoilProfile2D soilProfile2D, PlLines plLines, Location location)
+ SoilProfile2D soilProfile2D, PlLines plLines, Location location)
{
- var upliftLocationDeterminator = new UpliftLocationDeterminator()
+ var upliftLocationDeterminator = new UpliftLocationDeterminator
{
SurfaceLine = surfaceLine,
SoilProfile = soilProfile1D,
@@ -105,6 +110,5 @@
UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAtWithLowestUpliftFactor();
return upliftLocationAndResult?.UpliftFactor;
}
-
}
-}
+}
\ No newline at end of file