Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r4540 -r5453
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 5453)
@@ -124,19 +124,27 @@
- GetPointSegmentIncluding(): Eindwaarde is kleiner dan de startwaarde
-
+ GetPointSegmentIncluding(): Eindwaarde is kleiner dan de startwaarde
+
- Bestandsnaam is ongeldig. Het bevat ofwel ongeldige karakters, of het is leeg. Geef een geldige naam op.
-
+ Bestandsnaam is ongeldig. Het bevat ofwel ongeldige karakters, of het is leeg. Geef een geldige naam op.
+
- GetCotangentOfInnerSlope heeft karakteristiek punt insteek berm of dijk teen polderzijde nodig.
-
+ GetCotangentOfInnerSlope heeft karakteristiek punt insteek berm of dijk teen polderzijde nodig.
+
- GetCotangentOfInnerSlope heeft karakteristiek punt bovenkant dijk binnenkant nodig.
-
-
- Bij het samenstellen van de aquifer laag voor 1D profiel {0} hebben de samen te voegen lagen verschillende interpolatie methoden hetgeen niet is toegestaan.
-
+ GetCotangentOfInnerSlope heeft karakteristiek punt bovenkant dijk binnenkant nodig.
+
+
+ Bij het samenstellen van de aquifer laag voor 1D profiel {0} hebben de samen te voegen lagen verschillende interpolatie methoden hetgeen niet is toegestaan.
+
+
+ Locatie {0} heeft geen segment gedefinieerd.
+
+
+ Locatie {0} heeft geen grondprofielen gedefinieerd.
+
+
+ Een piping berekening met een 2D grondprofiel wordt niet ondersteund.
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.resx
===================================================================
diff -u -r4540 -r5453
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.resx (.../Resources.resx) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.resx (.../Resources.resx) (revision 5453)
@@ -124,19 +124,27 @@
- The file name is not valid. Maybe due to a null or empty string and or invalid characters. Please use a valid file name
-
+ The file name is not valid. Maybe due to a null or empty string and or invalid characters. Please use a valid file name
+
- GetCotangentOfInnerSlope requires either of characteristic points ShoulderBaseInside or DikeToeAtPolder to be defined.
-
+ GetCotangentOfInnerSlope requires either of characteristic points ShoulderBaseInside or DikeToeAtPolder to be defined.
+
- GetCotangentOfInnerSlope requires characteristic point DikeTopAtPolder to be defined.
-
+ GetCotangentOfInnerSlope requires characteristic point DikeTopAtPolder to be defined.
+
- GetPointSegmentIncluding(): End value is smaller than the start value
-
-
- In combining the aquifer layer for 1D profile {0}, different water pressure interpolation models are used in the layers concerned which is not allowed.
-
+ GetPointSegmentIncluding(): End value is smaller than the start value
+
+
+ In combining the aquifer layer for 1D profile {0}, different water pressure interpolation models are used in the layers concerned which is not allowed.
+
+
+ Location {0} has no segment defined.
+
+
+ Location {0} has no soil profiles defined.
+
+
+ A piping calculation with a 2D soil profile is not supported.
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r3522 -r5453
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5453)
@@ -126,5 +126,32 @@
"ationModel", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to Location {0} has no segment defined.
+ ///
+ internal static string LocationHasNoSegmentDefined {
+ get {
+ return ResourceManager.GetString("LocationHasNoSegmentDefined", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Location {0} has no soil profiles defined.
+ ///
+ internal static string LocationHasNoSoilProfilesDefined {
+ get {
+ return ResourceManager.GetString("LocationHasNoSoilProfilesDefined", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to A piping calculation with a 2D soil profile is not supported.
+ ///
+ internal static string PipingWith2DGeometryIsNotSupported {
+ get {
+ return ResourceManager.GetString("PipingWith2DGeometryIsNotSupported", resourceCulture);
+ }
+ }
}
}
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r5426 -r5453
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 5426)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 5453)
@@ -312,10 +312,10 @@
string validationMessages = engineInterface.Validate();
Assert.Multiple(() =>
{
- Assert.That(validationMessages, Does.Contain("A piping calculation with a 2D-geometry is not supported."));
+ Assert.That(validationMessages, Does.Contain("A piping calculation with a 2D soil profile is not supported."));
Assert.That(engineInterface.DamProjectData.CalculationMessages, Has.Count.EqualTo(1));
});
- Assert.That(engineInterface.DamProjectData.CalculationMessages[0].Message, Does.Contain("A piping calculation with a 2D-geometry is not supported."));
+ Assert.That(engineInterface.DamProjectData.CalculationMessages[0].Message, Does.Contain("A piping calculation with a 2D soil profile is not supported."));
}
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs
===================================================================
diff -u -r5431 -r5453
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 5431)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 5453)
@@ -29,6 +29,7 @@
using Deltares.DamEngine.Data.General.Sensors;
using Deltares.DamEngine.Data.General.TimeSeries;
using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Data.Properties;
using Deltares.DamEngine.Data.Standard;
using Deltares.DamEngine.Data.Standard.Language;
using Deltares.DamEngine.Data.Standard.Logging;
@@ -261,17 +262,17 @@
if (location.Segment == null)
{
- throw new DikeException("Location " + location.Name + " has no segment defined");
+ throw new DikeException(string.Format(Resources.LocationHasNoSegmentDefined, location.Name));
}
if (location.Segment.SoilProfileProbabilities.Count < 1)
{
- throw new DikeException("Location " + location.Name + " has no soil profiles defined");
+ throw new DikeException(string.Format(Resources.LocationHasNoSoilProfilesDefined, location.Name));
}
if (location.Segment.SoilProfileProbabilities[0].SoilProfile2D != null)
{
- throw new DikeException("A piping calculation with a 2D-geometry is not supported.");
+ throw new DikeException(Resources.PipingWith2DGeometryIsNotSupported);
}
}