Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r4933 -r5514
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(.../Translations.xml)	(revision 4933)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(.../Translations.xml)	(revision 5514)
@@ -133,7 +133,7 @@
     <Translation ID="PlLineOffsetBelowDikeTopAtRiverDescription" en-US="PL1 offset below top dike (riverside)"
                  nl-NL="Ligging freatisch vlak (buitenwaterstand minus deze waarde) onder de buitenkruin"/>
     <Translation ID="PenetrationLength" en-US="Penetration length" nl-NL="Indringingslengte"/>
-    <Translation ID="PenetrationLengthDescription" en-US="Penetration Length (for PL4)"
+    <Translation ID="PenetrationLengthDescription" en-US="Penetration length (for PL2)"
                  nl-NL="Indringingslengte (voor PN2)"/>
     <Translation ID="DampingFactorPL4" en-US="Damping factor PL4" nl-NL="Dempingsfactor PL4"/>
     <Translation ID="DampingFactorPL4Description" en-US="Damping factor PL4" nl-NL="Dempingsfactor PL4"/>
@@ -276,9 +276,7 @@
     <Translation ID="Damping factor PL3" en-US="Damping factor PL3" nl-NL="Dempingsfactor PL3"/>
     <Translation ID="Damping factor PL4" en-US="Damping factor PL4" nl-NL="Dempingsfactor PL4"/>
     <Translation ID="Dike embankment material" en-US="Dike embankment material" nl-NL="Ophoog material dijk"/>
-    <Translation ID="Shoulder embankment material" en-US="Shoulder embankment material" nl-NL="Ophoog material berm"/>
-    <Translation ID="Penetration Length (for PL4)" en-US="Penetration Length (for PL2)"
-                 nl-NL="Indringingslengte (voor PL2)"/>
+    <Translation ID="Shoulder embankment material" en-US="Shoulder embankment material" nl-NL="Ophoog material berm"/>   
     <Translation ID="Shoulder growth slope for stability design" en-US="Shoulder growth slope for stability design"
                  nl-NL="Berm ontwikkelingsratio voor automatische stabiliteitsberm generatie"/>
     <Translation ID="Shoulder growth delta X for stability design" en-US="Shoulder growth delta X for stability design"
@@ -654,9 +652,13 @@
                  nl-NL="Nieuwe helling binnenzijde mag niet kleiner zijn dan {0}"/>
     <Translation ID="UseNewDikeSlopeOutside" en-US="Use new slope outside" nl-NL="Gebruik nieuwe helling buitenzijde"/>
     <Translation ID="NewDikeSlopeOutside" en-US="New slope outside" nl-NL="Nieuwe helling buitenzijde"/>
-    <Translation ID="UseOfPenetrationLengthError"
-                 en-US="Penetration length > {0} with 2D soil geometries can only be used when 'Intrusion vertical water pressure' is set to 'Semi time dependent'"
-                 nl-NL="Penetratie lengte > {0} met 2D grond opbouw kan alleen gebruikt worden als voor 'Verloop waterspanning' gekozen is voor 'semi tijdsafhankelijk'"/>
+    <Translation ID="UseOfPenetrationLengthWithoutSemiTimeDependentModel"
+                 en-US="For the selected '{0}' ({1}) even if the penetration length is more than 0, no penetration zone associated to PL2 will be generated in the waternet."
+                 nl-NL="Voor het geselecteerde '{0}' ({1}) wordt er, zelfs als de indringingslengte groter is dan 0, geen aan PL2 gekoppelde indringingszone in het waternet gegenereerd."/>
+    <Translation ID="UseOfSemiTimeDependentModelWithoutPenetrationLength"
+                 en-US="The selected '{0}' is {1} however the  penetration length is 0. Therefore no penetration zone associated to PL2 will be generated in the waternet."
+                 nl-NL="Het geselecteerde '{0}' is {1} maar de indringingslengte is 0. Daarom wordt er geen indringingszone gekoppeld aan PL2 gegenereerd in het waternet."/>
+
     <Translation ID="NewDikeSlopeOutsideRangeError" en-US="New slope outside may not be less than {0}"
                  nl-NL="Nieuwe helling buitenzijde mag niet kleiner zijn dan {0}"/>
     <Translation ID="UseNewShoulderTopSlope" en-US="Use new top slope shoulder"
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs
===================================================================
diff -u -r4625 -r5514
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs	(.../LocationTest.cs)	(revision 4625)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs	(.../LocationTest.cs)	(revision 5514)
@@ -21,6 +21,7 @@
 
 using System.Collections.Generic;
 using Deltares.Dam.Data;
+using Deltares.Standard.Language;
 using NUnit.Framework;
 
 namespace Deltares.Dam.Tests
@@ -77,5 +78,46 @@
             Assert.That(actualLocation.StabilityShoulderGrowDeltaX, Is.EqualTo(stabilityShoulderGrowDeltaX));
             Assert.That(actualLocation.StabilitySlopeAdaptionDeltaX, Is.EqualTo(stabilitySlopeAdaptionDeltaX));
         }
+        
+        [Test]
+        [TestCase(0,IntrusionVerticalWaterPressureType.Standard, "")]
+        [TestCase(0, IntrusionVerticalWaterPressureType.HydroStatic, "")]
+        [TestCase(0, IntrusionVerticalWaterPressureType.FullHydroStatic, "")]
+        [TestCase(0, IntrusionVerticalWaterPressureType.Linear, "")]
+        [TestCase(0, IntrusionVerticalWaterPressureType.SemiTimeDependent, "UseOfSemiTimeDependentModelWithoutPenetrationLength")]
+        [TestCase(1,IntrusionVerticalWaterPressureType.Standard, "UseOfPenetrationLengthWithoutSemiTimeDependentModel")]
+        [TestCase(1, IntrusionVerticalWaterPressureType.HydroStatic, "UseOfPenetrationLengthWithoutSemiTimeDependentModel")]
+        [TestCase(1, IntrusionVerticalWaterPressureType.FullHydroStatic, "UseOfPenetrationLengthWithoutSemiTimeDependentModel")]
+        [TestCase(1, IntrusionVerticalWaterPressureType.Linear, "UseOfPenetrationLengthWithoutSemiTimeDependentModel")]
+        [TestCase(1, IntrusionVerticalWaterPressureType.SemiTimeDependent, "")]
+        public void GivenPenetrationLengthWithIntrusionVerticalWaterPressureType_WhenValidating_ReturnsExpectedWarning(double penetrationLength, IntrusionVerticalWaterPressureType model, string expectedWarning)
+        {
+            
+            var location = new Location();
+            location.IntrusionVerticalWaterPressure = model;
+            location.PenetrationLength = penetrationLength;
+            
+            Standard.Validation.ValidationResult[] validationResults = location.ValidateLocationUseOfPenetrationLength();
+
+            if (expectedWarning == "")
+            {
+                Assert.That(validationResults, Has.Length.EqualTo(0));
+            }
+            else
+            {
+                Assert.Multiple(() =>
+                {
+                    Assert.That(validationResults, Has.Length.EqualTo(1));
+                    Assert.That(validationResults[0].MessageType, Is.EqualTo(Standard.Validation.ValidationResultType.Warning));
+                    
+                    string header = LocalizationManager.GetTranslatedText(typeof(Location), "IntrusionVerticalWaterPressure");
+                    string selectedModel = LocalizationManager.GetTranslatedText(typeof(Location), model.ToString());
+                    string message = string.Format(LocalizationManager.GetTranslatedText(typeof(Location), expectedWarning), [header, selectedModel]);
+                    Assert.That(validationResults[0].Text, Is.EqualTo(message));
+                    
+                });
+            }
+
+        }
     }
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r5133 -r5514
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 5133)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 5514)
@@ -1745,21 +1745,23 @@
     [Validate]
     public ValidationResult[] ValidateLocationUseOfPenetrationLength()
     {
-        if (PenetrationLength > 0)
+        string header = LocalizationManager.GetTranslatedText(this, "IntrusionVerticalWaterPressure");
+        string selectedModel = LocalizationManager.GetTranslatedText(this, IntrusionVerticalWaterPressure.ToString());
+        if ((PenetrationLength > 0) && (IntrusionVerticalWaterPressure != IntrusionVerticalWaterPressureType.SemiTimeDependent))
         {
-            // It may be used on 1D geometries
-            if (!String.IsNullOrEmpty(Segment.GetMostProbableGeometry2DName(FailureMechanismSystemType.StabilityInside)))
+            return new[]
             {
-                // It may be used on 2D geometries only if condition below  is true
-                if (IntrusionVerticalWaterPressure != IntrusionVerticalWaterPressureType.SemiTimeDependent)
-                {
-                    return new[]
-                    {
-                        new ValidationResult(ValidationResultType.Error, String.Format(LocalizationManager.GetTranslatedText(this, "UseOfPenetrationLengthError"), penetrationLenghtMinValue), this, "PenetrationLength", "AssignMinValue", this)
-                    };
-                }
-            }
+                new ValidationResult(ValidationResultType.Warning, String.Format(LocalizationManager.GetTranslatedText(this, "UseOfPenetrationLengthWithoutSemiTimeDependentModel"), [header, selectedModel]), this, "PenetrationLength", "AssignMinValue", this)
+            };
         }
+        
+        if ((PenetrationLength == 0) && (IntrusionVerticalWaterPressure == IntrusionVerticalWaterPressureType.SemiTimeDependent))
+        {
+            return new[]
+            {
+                new ValidationResult(ValidationResultType.Warning, String.Format(LocalizationManager.GetTranslatedText(this, "UseOfSemiTimeDependentModelWithoutPenetrationLength"), [header, selectedModel]), this)
+            };
+        }
 
         return new ValidationResult[0];
     }
@@ -2050,7 +2052,7 @@
     /// </value>
     [Unit(UnitType.Length)]
     [Label("Penetration length")]
-    [Description("Penetration Length (for PL4)")]
+    [Description("Penetration length (for PL2)")]
     [Format("F3")]
     [Category(WaterCategory)]
     [Minimum(0.0)]