Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs
===================================================================
diff -u -r6086 -r6100
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 6086)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 6100)
@@ -361,7 +361,7 @@
private readonly SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateHorizontalSurfaceLine(20, leftCoordinate, rightCoordinate);
[TestCase(IntrusionVerticalWaterPressureType.Standard, -9.999, 6, 2)]
- //[TestCase(IntrusionVerticalWaterPressureType.Linear, 20.000, 6, 2)] //#bka nakijken
+ [TestCase(IntrusionVerticalWaterPressureType.Linear, 20.000, 6, 2)]
[TestCase(IntrusionVerticalWaterPressureType.HydroStatic, 10.001, 6, 2)]
[TestCase(IntrusionVerticalWaterPressureType.FullHydroStatic, -35.000, 1, 0)]
[TestCase(IntrusionVerticalWaterPressureType.SemiTimeDependent, -9.999, 7, 3, penetrationLength)]
@@ -459,7 +459,7 @@
}
[TestCase(IntrusionVerticalWaterPressureType.Standard, -24.999)]
- //[TestCase(IntrusionVerticalWaterPressureType.Linear, 20.000)] //Bka nakijken
+ [TestCase(IntrusionVerticalWaterPressureType.Linear, 20.000)]
[TestCase(IntrusionVerticalWaterPressureType.HydroStatic, 10.001)]
[TestCase(IntrusionVerticalWaterPressureType.FullHydroStatic, -35.000)]
[TestCase(IntrusionVerticalWaterPressureType.SemiTimeDependent, -24.999)]
@@ -563,9 +563,6 @@
soilProfile.Geometry.Surfaces.Add(aquifer7B.GeometrySurface);
soilProfile.Geometry.Surfaces.Add(aquifer7C.GeometrySurface);
- soilProfile.Geometry.SurfaceLine.CalcPoints.Add(new Point2D(leftCoordinate, 20));
- soilProfile.Geometry.SurfaceLine.CalcPoints.Add(new Point2D(rightCoordinate, 20));
-
return soilProfile;
}
}
@@ -939,25 +936,6 @@
};
}
- ///
- /// Creates a rectangular .
- ///
- ///
- ///
- ///
- ///
- ///
- /// A rectangular .
- private static SoilLayer2D CreateRectangularSoilLayer2D(double topCoord, double bottomCoord, double leftCoord, double rightCoord, bool isAquifer)
- { //#Bka: This is very wrong!!!! See the FactoryForSoilProfiles, you must provide a soilprofile to be able to add pints, curves etc!!
- var topLeftPoint = new Point2D(leftCoord, topCoord);
- var topRightPoint = new Point2D(rightCoord, topCoord);
- var bottomRightPoint = new Point2D(rightCoord, bottomCoord);
- var bottomLeftPoint = new Point2D(leftCoord, bottomCoord);
-
- return CreateSoilLayer2D(topLeftPoint, topRightPoint, bottomRightPoint, bottomLeftPoint, isAquifer);
- }
-
private static void AssertGeometry(IEnumerable expectedPoints, IEnumerable actualPoints)
{
int expectedNrOfPoints = expectedPoints.Count();