Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs
===================================================================
diff -u -r4540 -r5380
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs (.../Sensor.cs) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Sensor.cs (.../Sensor.cs) (revision 5380)
@@ -38,11 +38,11 @@
#region Business Rules
///
- /// Specication to test if the value of the candidate is valid
+ /// Specification to test if the value of the candidate is valid
///
-// internal class ContiansAtLeastOneItem : PredicateSpecification>
+// internal class ContainsAtLeastOneItem : PredicateSpecification>
// {
-// public ContiansAtLeastOneItem()
+// public ContainsAtLeastOneItem()
// : base(x => x.Any())
// {
// Description = "The sensor should contain at least one PL Line mapping.";
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs
===================================================================
diff -u -r5296 -r5380
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 5296)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 5380)
@@ -131,7 +131,6 @@
public double Pl3MinUplift { get; private set; }
public double Pl3HeadAdjusted { get; private set; }
public double Pl3LocationXMinUplift { get; private set; }
-
public double Pl4MinUplift { get; private set; }
public double Pl4HeadAdjusted { get; private set; }
public double Pl4LocationXMinUplift { get; private set; }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs
===================================================================
diff -u -r4928 -r5380
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 4928)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 5380)
@@ -41,9 +41,7 @@
/// The location.
/// The sub soil scenario.
/// The water level.
- /// Name of the soil geometry2 d.
/// The water level river low.
- /// The regional assessment scenario job settings.
/// The sensor pl line creator settings.
/// The uplift situation.
/// The created Pl-lines
@@ -74,7 +72,6 @@
/// Creates the pl lines for stability sensors.
///
/// The location.
- /// The sub soil scenario.
/// The sensor pl-line creator settings.
///
public static PlLines CreatePlLinesForStabilitySensors(Location location, SensorPlLineCreatorSettings sensorPlLineCreatorSettings)
@@ -106,8 +103,8 @@
/// The water level river low.
/// The uplift situation.
/// The created Pl-lines
- public static PlLines CreatePlLinesForStabilityExpertKnowledge(Location location, SoilGeometryProbability subSoilScenario,
- double waterLevel, double? waterLevelRiverLow, out UpliftSituation upliftSituation)
+ private static PlLines CreatePlLinesForStabilityExpertKnowledge(Location location, SoilGeometryProbability subSoilScenario,
+ double waterLevel, double? waterLevelRiverLow, out UpliftSituation upliftSituation)
{
var plLinesCreator = new PlLinesCreator.PlLinesCreator
{
@@ -155,6 +152,7 @@
///
/// Creates the pl lines.
///
+ /// The time step in date time format.
/// The location.
/// The soil profile.
/// The water level.
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs
===================================================================
diff -u -r4540 -r5380
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 5380)
@@ -33,20 +33,6 @@
public class UpliftHelper
{
///
- /// Determines the stability uplift situation.
- ///
- /// The dam kernel input.
- /// if set to true [use rivel level low].
- /// The uplift situation
- public UpliftSituation DetermineStabilityUplift(DamKernelInput damKernelInput, bool useRivelLevelLow)
- {
- UpliftSituation upliftSituation;
- PlLines plLines = DeterminePlLinesForStability(damKernelInput, useRivelLevelLow, out upliftSituation);
- upliftSituation.IsUplift = DetermineIsUplift(plLines, damKernelInput.Location, damKernelInput.SubSoilScenario);
- return upliftSituation;
- }
-
- ///
/// Determines the pl lines for stability.
///
/// The dam kernel input.
@@ -68,6 +54,8 @@
sensorPlLineCreatorSettings.DateTime = damKernelInput.TimeStepDateTime;
PlLines plLines = PlLinesHelper.CreatePlLinesForStability(damKernelInput.Location, damKernelInput.SubSoilScenario, riverLevel,
riverLevelLow, sensorPlLineCreatorSettings, out upliftSituation);
+ upliftSituation.IsUplift = DetermineIsUplift(plLines, damKernelInput.Location, damKernelInput.SubSoilScenario);
+
return plLines;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r5372 -r5380
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 5372)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 5380)
@@ -111,7 +111,6 @@
// Determine whether there is uplift
var upliftHelper = new UpliftHelper();
PlLines plLines = upliftHelper.DeterminePlLinesForStability(damKernelInput, useRiverLevelLow, out UpliftSituation upliftSituation);
- upliftSituation.IsUplift = upliftHelper.DetermineIsUplift(plLines, damKernelInput.Location, damKernelInput.SubSoilScenario);
macroStabilityOutput.UpliftSituation = upliftSituation;
Waternet waterNet = MacroStabilityCommonHelper.CreateWaternet(damKernelInput, plLines);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs
===================================================================
diff -u -r5144 -r5380
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 5144)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 5380)
@@ -23,8 +23,8 @@
using Deltares.DamEngine.Calculators.KernelWrappers.Common;
using Deltares.DamEngine.Calculators.Tests.KernelWrappers.TestHelpers;
using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.PlLines;
using Deltares.DamEngine.Data.Geotechnics;
-using Deltares.DamEngine.TestHelpers;
using Deltares.DamEngine.TestHelpers.Factories;
using NUnit.Framework;
@@ -34,7 +34,7 @@
public class UpliftHelperTests
{
[Test]
- public void TestDetermineStabilityUpliftWithSoilProfile2D()
+ public void TestDetermineUpliftSituationWithSoilProfile2D()
{
SoilProfile2D soilProfile2D = DamEngineDataTestFactory.CreateSoilProfile2D(null);
@@ -46,11 +46,11 @@
damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2;
var upliftHelper = new UpliftHelper();
- UpliftSituation upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false);
+ upliftHelper.DeterminePlLinesForStability(damKernelInput, false, out UpliftSituation upliftSituation);
Assert.That(upliftSituation.IsUplift, Is.True);
damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8;
- upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false);
+ upliftHelper.DeterminePlLinesForStability(damKernelInput, false, out upliftSituation);
Assert.That(upliftSituation.IsUplift, Is.False);
}