Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs
===================================================================
diff -u -r6404 -r6851
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 6404)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 6851)
@@ -44,10 +44,11 @@
/// The water level river low.
/// The sensor pl line creator settings.
/// The uplift situation.
+ /// The warning message.
/// The created Pl-lines
public static PlLines CreatePlLinesForStability(Location location, SoilGeometryProbability subSoilScenario,
double waterLevel, double? waterLevelRiverLow, SensorPlLineCreatorSettings sensorPlLineCreatorSettings,
- out UpliftSituation upliftSituation)
+ out UpliftSituation upliftSituation, out string warningMessage)
{
PlLines plLines = null;
upliftSituation = new UpliftSituation();
@@ -56,7 +57,7 @@
case PlLineCreationMethod.ExpertKnowledgeLinearInDike:
case PlLineCreationMethod.ExpertKnowledgeRRD:
plLines = CreatePlLinesForStabilityExpertKnowledge(location, subSoilScenario,
- waterLevel, waterLevelRiverLow, out upliftSituation);
+ waterLevel, waterLevelRiverLow, out upliftSituation, out warningMessage);
break;
case PlLineCreationMethod.Sensors:
plLines = CreatePlLinesForStabilitySensors(location, sensorPlLineCreatorSettings);
@@ -65,6 +66,7 @@
throw new NotImplementedException($@"Pl-line creation method '{location.ModelParametersForPlLines.PlLineCreationMethod}' is not implemented");
}
+ warningMessage = null;
return plLines;
}
@@ -101,9 +103,11 @@
/// The location.
/// The soil profile.
/// The water level.
+ /// The warning message.
///
- public static PlLines CreatePlLinesForPiping(DateTime timeStepDateTime, Location location, SoilProfile1D soilProfile, double waterLevel)
+ public static PlLines CreatePlLinesForPiping(DateTime timeStepDateTime, Location location, SoilProfile1D soilProfile, double waterLevel, out string warningMessage)
{
+ warningMessage = null;
var plLinesCreator = new PlLinesCreator.PlLinesCreator
{
WaterLevelRiverHigh = waterLevel,
@@ -131,7 +135,7 @@
}
else
{
- plLines = plLinesCreator.CreateAllPlLines(location);
+ plLines = plLinesCreator.CreateAllPlLines(location, out warningMessage);
}
return plLines;
@@ -145,10 +149,13 @@
/// The water level.
/// The water level river low.
/// The uplift situation.
+ /// The warning message.
/// The created Pl-lines
private static PlLines CreatePlLinesForStabilityExpertKnowledge(Location location, SoilGeometryProbability subSoilScenario,
- double waterLevel, double? waterLevelRiverLow, out UpliftSituation upliftSituation)
+ double waterLevel, double? waterLevelRiverLow, out UpliftSituation upliftSituation,
+ out string warningMessage)
{
+ warningMessage = null;
var plLinesCreator = new PlLinesCreator.PlLinesCreator
{
WaterLevelRiverLow = waterLevelRiverLow,
@@ -176,7 +183,7 @@
SoilList = location.SoilList
};
- PlLines plLines = plLinesCreator.CreateAllPlLines(location);
+ PlLines plLines = plLinesCreator.CreateAllPlLines(location, out warningMessage);
upliftSituation = new UpliftSituation
{
Pl3HeadAdjusted = plLinesCreator.Pl3HeadAdjusted,
@@ -187,6 +194,7 @@
Pl4MinUplift = plLinesCreator.Pl4MinUplift,
IsUplift = false // must be determined later on; just to avoid compiler error
};
+
return plLines;
}
}
\ No newline at end of file