Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs
===================================================================
diff -u -r6518 -r6679
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 6518)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 6679)
@@ -307,6 +307,15 @@
designScenario.LocationScenarioID)));
}
+ if (prepareResult == PrepareResult.NoUplift)
+ {
+ calculationMessages.Add(new LogMessage(LogMessageType.Info, null,
+ string.Format(Resources.DesignCalculatorPrepareNoUplift,
+ location.Name,
+ soiProfileProbability,
+ designScenario.LocationScenarioID)));
+ }
+
if (prepareResult == PrepareResult.Failed)
{
calculationMessages.Add(new LogMessage(LogMessageType.Error, null,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
===================================================================
diff -u -r6300 -r6679
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6300)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6679)
@@ -142,7 +142,7 @@
}
///
- /// Looks up a localized string similar to Location {0} Profile {1} Scenario {2} is not relevant (different calculator or no uplift at using stabilty UpliftVan)..
+ /// Looks up a localized string similar to Location {0} Profile {1} Scenario {2} is not relevant (different calculator or no uplift at using piping).
///
internal static string DesignCalculatorPrepareNotRelevant {
get {
@@ -151,6 +151,15 @@
}
///
+ /// Looks up a localized string similar to Location {0} Profile {1} Scenario {2} is not calculated because there is no uplift at using stability UpliftVan.
+ ///
+ internal static string DesignCalculatorPrepareNoUplift {
+ get {
+ return ResourceManager.GetString("DesignCalculatorPrepareNoUplift", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Validation failed for location '{0}', subsoil scenario '{1}', design scenario '{2}'.
///
internal static string DesignCalculatorValidationFailed {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r6300 -r6679
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 6300)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 6679)
@@ -301,6 +301,9 @@
Geen segmenten met faalmechanisme {0} aanwezig
- Locatie {0} Profiel {1} Scenario {2} is niet relevant (ander berekeningstype of geen uplift bij gebruik UpliftVan).
-
+ Locatie {0} Profiel {1} Scenario {2} is niet relevant (ander berekeningstype of geen uplift bij gebruik van piping).
+
+
+ Locatie {0} Profiel {1} Scenario {2} is niet berekend omdat er geen uplift is bij gebruik van UpliftVan.
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx
===================================================================
diff -u -r6404 -r6679
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 6404)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 6679)
@@ -305,6 +305,9 @@
No segments with failure mechanism {0} present
- Location {0} Profile {1} Scenario {2} is not relevant (different calculator or no uplift at using piping or stability UpliftVan).
+ Location {0} Profile {1} Scenario {2} is not relevant (different calculator or no uplift at using piping).
+
+ Location {0} Profile {1} Scenario {2} is not calculated because there is no uplift at using stability UpliftVan.
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs
===================================================================
diff -u -r6404 -r6679
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs (.../IKernelWrapper.cs) (revision 6404)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs (.../IKernelWrapper.cs) (revision 6679)
@@ -40,7 +40,8 @@
{
Successful,
Failed,
- NotRelevant
+ NotRelevant,
+ NoUplift
}
///
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r6676 -r6679
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 6676)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 6679)
@@ -122,7 +122,7 @@
if (FailureMechanismParametersMStab.MStabParameters.Model == StabilityModelType.UpliftVan && !upliftSituation.IsUplift)
{
- return PrepareResult.NotRelevant;
+ return PrepareResult.NoUplift;
}
FailureMechanismParametersMStab.MStabParameters.Model = model;