Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r4272 -r4294
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 4272)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 4294)
@@ -21,8 +21,8 @@
..\..\lib\StixWriter\Deltares.StixFileWriter.dll
-
- ..\..\lib\FailureMechanisms\WtiPipingMerged\Deltares.WTIPiping.Merged.dll
+
+ ..\..\lib\FailureMechanisms\WtiPiping\Deltares.WTIPiping.dll
@@ -35,4 +35,7 @@
2022.1.277
+
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r4185 -r4294
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 4185)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 4294)
@@ -7,8 +7,8 @@
..\..\lib\FailureMechanisms\MacroStabilityCSharpWrapperDeterministicSigned\Deltares.MacroStability.CSharpWrapper.dll
-
- ..\..\lib\FailureMechanisms\WtiPipingMerged\Deltares.WTIPiping.Merged.dll
+
+ ..\..\lib\FailureMechanisms\WtiPiping\Deltares.WTIPiping.dll
Index: DamEngine/trunk/lib/FailureMechanisms/WtiPiping/Deltares.WTIPiping.dll
===================================================================
diff -u
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs
===================================================================
diff -u -r4229 -r4294
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 4229)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 4294)
@@ -440,7 +440,6 @@
var pipingPoint = new PipingPoint
{
X = surfaceLineCharacteristicPoint.X,
- Y = surfaceLineCharacteristicPoint.Y,
Z = surfaceLineCharacteristicPoint.Z,
Type = ConvertToPipingPointType(surfaceLineCharacteristicPoint.CharacteristicPointType)
};
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs
===================================================================
diff -u -r4272 -r4294
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 4272)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 4294)
@@ -200,24 +200,20 @@
SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForWtiPiping(true);
PipingSurfaceLine surfaceLinePiping = kernelWrapper.ConvertToPipingSurfaceLine(surfaceLine);
Assert.AreEqual(12, surfaceLinePiping.Points.Count);
- // Check some coodinates and types
+ // Check some coordinates and types
Assert.AreEqual(34.5, surfaceLinePiping.Points[2].X, diff);
- Assert.AreEqual(0, surfaceLinePiping.Points[2].Y, diff);
Assert.AreEqual(5, surfaceLinePiping.Points[2].Z, diff);
Assert.AreEqual(PipingCharacteristicPointType.None, surfaceLinePiping.Points[2].Type);
Assert.AreEqual(38.5, surfaceLinePiping.Points[4].X, diff);
- Assert.AreEqual(0, surfaceLinePiping.Points[4].Y, diff);
Assert.AreEqual(5, surfaceLinePiping.Points[4].Z, diff);
Assert.AreEqual(PipingCharacteristicPointType.None, surfaceLinePiping.Points[4].Type);
Assert.AreEqual(58.5, surfaceLinePiping.Points[7].X, diff);
- Assert.AreEqual(0, surfaceLinePiping.Points[7].Y, diff);
Assert.AreEqual(0, surfaceLinePiping.Points[7].Z, diff);
Assert.AreEqual(PipingCharacteristicPointType.DitchDikeSide, surfaceLinePiping.Points[7].Type);
Assert.AreEqual(61.5, surfaceLinePiping.Points[9].X, diff);
- Assert.AreEqual(0, surfaceLinePiping.Points[9].Y, diff);
Assert.AreEqual(-1, surfaceLinePiping.Points[9].Z, diff);
Assert.AreEqual(PipingCharacteristicPointType.BottomDitchPolderSide, surfaceLinePiping.Points[9].Type);
}
Index: DamEngine/trunk/lib/FailureMechanisms/WtiPipingMerged/Deltares.WTIPiping.Merged.dll
===================================================================
diff -u -r1957 -r4294
Binary files differ
Fisheye: Tag 4294 refers to a dead (removed) revision in file `DamEngine/trunk/lib/FailureMechanisms/WtiPipingMerged/Read Me.txt'.
Fisheye: No comparison available. Pass `N' to diff?