Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx =================================================================== diff -u -r5452 -r5456 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 5452) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 5456) @@ -282,11 +282,11 @@ Er is niet voldoende informatie over het ondergrondprofiel (Profiel 1D, Profiel 2D of Ophoogmateriaal dijk) beschikbaar om de PL-lijnen te maken. - - De onderste laag is geen (continue) watervoerende laag in ondergrondprofiel '{0}'. + + De onderste laag is geen (doorlopende) watervoerende laag in ondergrondprofiel '{0}'. - - Ten minste één losse watervoerende laag aanwezig. + + Ten minste één niet doorlopende watervoerende laag aanwezig. Het ondergrondprofiel bevat geen watervoerende laag. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs =================================================================== diff -u -r5452 -r5456 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs (.../SoilProfileValidatorTests.cs) (revision 5452) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs (.../SoilProfileValidatorTests.cs) (revision 5456) @@ -236,7 +236,7 @@ Assert.That(() => soilProfileValidator.ValidateSoilProfileForPlLinesCreator(), Throws.InstanceOf().With.Message.EqualTo (generalMessage - + "De onderste laag is geen (continue) watervoerende laag in ondergrondprofiel 'SoilProfileValidatorTest'.")); + + "De onderste laag is geen (doorlopende) watervoerende laag in ondergrondprofiel 'SoilProfileValidatorTest'.")); } /// @@ -288,7 +288,7 @@ Assert.That(() => soilProfileValidator.ValidateSoilProfileForPlLinesCreator(), Throws.InstanceOf().With.Message.EqualTo (generalMessage - + "De onderste laag is geen (continue) watervoerende laag in ondergrondprofiel 'SoilProfileTest'.")); + + "De onderste laag is geen (doorlopende) watervoerende laag in ondergrondprofiel 'SoilProfileTest'.")); } /// @@ -349,7 +349,7 @@ Assert.That(() => soilProfileValidator.ValidateSoilProfileForPlLinesCreator(), Throws.InstanceOf().With.Message.EqualTo (generalMessage - + "Ten minste één losse watervoerende laag aanwezig.")); + + "Ten minste één niet doorlopende watervoerende laag aanwezig.")); } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs =================================================================== diff -u -r5452 -r5456 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs (.../SoilProfileValidator.cs) (revision 5452) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SoilProfileValidator.cs (.../SoilProfileValidator.cs) (revision 5456) @@ -55,15 +55,15 @@ ThrowIfInsufficientSoilGeometryData(); ThrowsIfNoLayerWithType(LayerType.Aquifer); ThrowsIfNoLayerWithType(LayerType.Aquitard); - ThrowIfNoBottomAquifer(); - ThrowIfIsolatedInBetweenAquifer(); + ThrowIfNoContinuousBottomAquifer(); + ThrowIfDiscontinuousInBetweenAquifer(); } /// /// Check if the lowest layer is a continuous aquifer. /// /// - private void ThrowIfNoBottomAquifer() + private void ThrowIfNoContinuousBottomAquifer() { bool isNoBottomAquifer; if (SoilProfileType == SoilProfileType.ProfileType1D) @@ -83,7 +83,7 @@ if (isNoBottomAquifer) { throw new PlLinesCreatorException(Resources.SoilProfileValidator_General - + string.Format(Resources.SoilProfileValidator_NoBottomAquiferLayer, SoilProfile2D.Name)); + + string.Format(Resources.SoilProfileValidator_NoContinuousBottomAquiferLayer, SoilProfile2D.Name)); } } @@ -92,7 +92,7 @@ /// aquifers from left to right of the geometry or of the surface line. /// /// - private void ThrowIfIsolatedInBetweenAquifer() + private void ThrowIfDiscontinuousInBetweenAquifer() { if (SoilProfileType != SoilProfileType.ProfileType2D) { @@ -102,7 +102,7 @@ if (SoilProfile2DHelper.IsAtLeastOneIsolatedInBetweenAquiferPresent(SoilProfile2D)) { throw new PlLinesCreatorException(Resources.SoilProfileValidator_General - + string.Format(Resources.SoilProfileValidator_IsolatedAquiferPresent, SoilProfile2D.Name)); + + string.Format(Resources.SoilProfileValidator_DiscontinuousAquiferPresent, SoilProfile2D.Name)); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs =================================================================== diff -u -r5427 -r5456 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5427) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5456) @@ -327,18 +327,15 @@ } } - /// - /// Looks up a localized string similar to The deepest layer is not an aquifer in soilprofile '{0}'.. - /// - internal static string SoilProfileValidator_NoBottomAquiferLayer { + internal static string SoilProfileValidator_NoContinuousBottomAquiferLayer { get { - return ResourceManager.GetString("SoilProfileValidator_NoBottomAquiferLayer", resourceCulture); + return ResourceManager.GetString("SoilProfileValidator_NoContinuousBottomAquiferLayer", resourceCulture); } } - internal static string SoilProfileValidator_IsolatedAquiferPresent { + internal static string SoilProfileValidator_DiscontinuousAquiferPresent { get { - return ResourceManager.GetString("SoilProfileValidator_IsolatedAquiferPresent", resourceCulture); + return ResourceManager.GetString("SoilProfileValidator_DiscontinuousAquiferPresent", resourceCulture); } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx =================================================================== diff -u -r5452 -r5456 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 5452) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 5456) @@ -280,11 +280,11 @@ Not enough soil geometry information (SoilProfile1D, SoilProfile2D or DikeEmbankmentMaterial) available to create the PL-lines. - + The deepest layer is not a (continuous) aquifer in soil profile '{0}'. - - At least one isolated aquifer is present. + + At least one discontinuous aquifer is present. The soil profile contains no aquifer layer.