Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
===================================================================
diff -u -r3522 -r3891
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs (.../DamPipingSellmeijer4ForcesKernelWrapper.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs (.../DamPipingSellmeijer4ForcesKernelWrapper.cs) (revision 3891)
@@ -69,8 +69,7 @@
var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
var location = damKernelInput.Location;
double waterLevel = damKernelInput.RiverLevelHigh;
- UpliftSituation upliftSituation;
- var plLines = PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, location, soilProfile1D, waterLevel, out upliftSituation);
+ var plLines = PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, location, soilProfile1D, waterLevel);
EvaluateUpliftSituation(damKernelInput, out kernelDataInput, plLines, waterLevel, damPipingOutput);
return PrepareResult.Successful;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs
===================================================================
diff -u -r3522 -r3891
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs (.../DamPipingHelper.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/DamPipingHelper.cs (.../DamPipingHelper.cs) (revision 3891)
@@ -75,9 +75,8 @@
ThrowHelper.ThrowIfArgumentNull(entryPoint, string.Format(Resources.NoDikeToeDefinedForLocation, location.Name));
ThrowHelper.ThrowIfArgumentNull(soilProfile.BottomAquiferLayer, string.Format(Resources.NoBottomAquiferLayer, soilProfile.Name));
- UpliftSituation upliftSituation;
plLines = PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, damKernelInput.Location, damKernelInput.SubSoilScenario.SoilProfile1D,
- damKernelInput.RiverLevelHigh, out upliftSituation);
+ damKernelInput.RiverLevelHigh);
UpliftLocationDeterminator upliftLocationDeterminator = new UpliftLocationDeterminator
{
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs
===================================================================
diff -u -r3520 -r3891
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 3891)
@@ -43,9 +43,8 @@
location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
var riverLevel = 1.0;
- UpliftSituation upliftSituation;
var timeStepDateTime = new DateTime();
- var plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel, out upliftSituation);
+ var plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel);
Assert.AreEqual(4, plLines.PlLineCount);
Assert.AreEqual(8, plLines.Lines[PlLineType.Pl1].Points.Count);
Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0]));
@@ -75,9 +74,8 @@
location.SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
var soilProfile1D = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer();
var riverLevel = 1.0;
- UpliftSituation upliftSituation;
var timeStepDateTime = new DateTime();
- var plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel, out upliftSituation);
+ var plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel);
Assert.AreEqual(4, plLines.PlLineCount);
Assert.AreEqual(8, plLines.Lines[PlLineType.Pl1].Points.Count);
Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0]));
@@ -114,9 +112,8 @@
AddLayerToSoilProfile(soilProfile1D, -5, true);
var riverLevel = 0.5;
- UpliftSituation upliftSituation;
var timeStepDateTime = new DateTime();
- var plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel, out upliftSituation);
+ var plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel);
Assert.AreEqual(4, plLines.PlLineCount);
Assert.AreEqual(8, plLines.Lines[PlLineType.Pl1].Points.Count);
Assert.IsTrue(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0]));
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs
===================================================================
diff -u -r3851 -r3891
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 3851)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 3891)
@@ -157,10 +157,8 @@
/// The location.
/// The soil profile.
/// The water level.
- /// The uplift situation.
///
- public static PlLines CreatePlLinesForPiping(DateTime timeStepDateTime, Location location, SoilProfile1D soilProfile, double waterLevel,
- out UpliftSituation upliftSituation)
+ public static PlLines CreatePlLinesForPiping(DateTime timeStepDateTime, Location location, SoilProfile1D soilProfile, double waterLevel)
{
var plLinesCreator = new PlLinesCreator.PlLinesCreator
{
@@ -193,16 +191,6 @@
plLines = plLinesCreator.CreateAllPlLines(location);
}
- upliftSituation = new UpliftSituation
- {
- Pl3HeadAdjusted = plLinesCreator.Pl3HeadAdjusted,
- Pl3LocationXMinUplift = plLinesCreator.Pl3LocationXMinUplift,
- Pl3MinUplift = plLinesCreator.Pl3MinUplift,
- Pl4HeadAdjusted = plLinesCreator.Pl4HeadAdjusted,
- Pl4LocationXMinUplift = plLinesCreator.Pl4LocationXMinUplift,
- Pl4MinUplift = plLinesCreator.Pl4MinUplift,
- IsUplift = false // must be determined later on; just to avoid compiler error
- };
return plLines;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs
===================================================================
diff -u -r3522 -r3891
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs (.../DamPipingSellmeijerVnkKernelWrapper.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapper.cs (.../DamPipingSellmeijerVnkKernelWrapper.cs) (revision 3891)
@@ -67,8 +67,7 @@
var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
var location = damKernelInput.Location;
double waterLevel = damKernelInput.RiverLevelHigh;
- UpliftSituation upliftSituation;
- var plLines = PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, location, soilProfile1D, waterLevel, out upliftSituation);
+ var plLines = PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, location, soilProfile1D, waterLevel);
EvaluateUpliftSituation(damKernelInput, out kernelDataInput, plLines, waterLevel, damPipingOutput);
return PrepareResult.Successful;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
===================================================================
diff -u -r3522 -r3891
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 3891)
@@ -81,9 +81,8 @@
{
waterLevel = location.Scenarios[0].RiverLevel;
}
- UpliftSituation upliftSituation;
var plLines =
- PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, location, soilProfile1D, waterLevel, out upliftSituation);
+ PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, location, soilProfile1D, waterLevel);
EvaluateUpliftSituation(damKernelInput, out kernelDataInput, plLines, waterLevel, damPipingOutput);
return PrepareResult.Successful;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
===================================================================
diff -u -r3522 -r3891
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs (.../DamPipingBlighKernelWrapper.cs) (revision 3891)
@@ -74,8 +74,7 @@
var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
var location = damKernelInput.Location;
double waterLevel = damKernelInput.RiverLevelHigh;
- UpliftSituation upliftSituation;
- PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, location, soilProfile1D, waterLevel, out upliftSituation);
+ PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(damKernelInput.TimeStepDateTime, location, soilProfile1D, waterLevel);
EvaluateUpliftSituation(damKernelInput, out kernelDataInput, plLines, damPipingBlighInput, waterLevel, damPipingBlighOutput);
return PrepareResult.Successful;
}