Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs
===================================================================
diff -u -r680 -r686
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 680)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 686)
@@ -21,10 +21,11 @@
/// The location.
/// The soil profile.
/// The water level.
+ /// The uplift situation.
///
- public static PLLines CreatePlLines(Location location, SoilProfile1D soilProfile, double waterLevel)
+ public static PLLines CreatePlLines(Location location, SoilProfile1D soilProfile, double waterLevel, out UpliftSituation upliftSituation)
{
- var plLineCreator = new PLLinesCreator
+ var plLinesCreator = new PLLinesCreator
{
WaterLevelRiverHigh = waterLevel,
SurfaceLine = location.SurfaceLine,
@@ -43,7 +44,15 @@
IsHydraulicShortcut = false, // TODO: Regional
XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin
};
- return plLineCreator.CreateAllPLLines(location);
+ var plLines = plLinesCreator.CreateAllPLLines(location);
+ upliftSituation.Pl3HeadAdjusted = plLinesCreator.Pl3HeadAdjusted;
+ upliftSituation.Pl3LocationXMinUplift = plLinesCreator.Pl3LocationXMinUplift;
+ upliftSituation.Pl3MinUplift = plLinesCreator.Pl3MinUplift;
+ upliftSituation.Pl4HeadAdjusted = plLinesCreator.Pl4HeadAdjusted;
+ upliftSituation.Pl4LocationXMinUplift = plLinesCreator.Pl4LocationXMinUplift;
+ upliftSituation.Pl4MinUplift = plLinesCreator.Pl4MinUplift;
+ upliftSituation.IsUplift = false; // must be determined later on; just to avoid compiler error
+ return plLines;
}
}