Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DeltaDijkZoneringInwards.xml
===================================================================
diff -u -r2810 -r3180
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DeltaDijkZoneringInwards.xml (.../DeltaDijkZoneringInwards.xml) (revision 2810)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/DeltaDijkZoneringInwards.xml (.../DeltaDijkZoneringInwards.xml) (revision 3180)
@@ -1,15 +1,22 @@
-
+
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -36,59 +43,59 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -31245,5 +31252,63 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r3088 -r3180
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 3088)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 3180)
@@ -144,7 +144,7 @@
}
// Add curves
- var curvesDictionary = new Dictionary();
+ var curvesDictionary = new Dictionary();
kernelSoilProfile.Geometry.Curves = new List();
foreach (var damCurve in damSoilProfile2D.Geometry.Curves)
{
@@ -157,9 +157,9 @@
}
// Add loops
- var loopsDictionary = new Dictionary();
+ var loopsDictionary = new Dictionary();
kernelSoilProfile.Geometry.Loops = new List();
- foreach (var damLoop in damSoilProfile2D.Geometry.Loops)
+ foreach (var damLoop in damSoilProfile2D.Surfaces.Select(surf => surf.GeometrySurface.OuterLoop))
{
var kernelLoop = new Loop();
kernelLoop.Curves = new List();
@@ -172,15 +172,16 @@
}
// Add geometry surfaces
- var geometrySurfacesDictionary = new Dictionary();
+ var geometrySurfacesDictionary = new Dictionary();
kernelSoilProfile.Geometry.Surfaces = new List();
- foreach (var damSurface in damSoilProfile2D.Geometry.Surfaces)
+ foreach (var damSurface in damSoilProfile2D.Surfaces)
{
var kernelGeometrySurface = new Surface();
- kernelGeometrySurface.OuterLoop = loopsDictionary[damSurface.OuterLoop];
- geometrySurfacesDictionary.Add(damSurface, kernelGeometrySurface);
- kernelGeometrySurface.InnerLoops = new List(damSurface.InnerLoops.Count);
- foreach (var damSurfaceInnerLoop in damSurface.InnerLoops)
+ GeometrySurface damGeometrySurface = damSurface.GeometrySurface;
+ kernelGeometrySurface.OuterLoop = loopsDictionary[damGeometrySurface.OuterLoop];
+ geometrySurfacesDictionary.Add(damGeometrySurface, kernelGeometrySurface);
+ kernelGeometrySurface.InnerLoops = new List(damGeometrySurface.InnerLoops.Count);
+ foreach (var damSurfaceInnerLoop in damGeometrySurface.InnerLoops)
{
kernelGeometrySurface.InnerLoops.Add(loopsDictionary[damSurfaceInnerLoop]);
}
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r2888 -r3180
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 2888)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 3180)
@@ -361,6 +361,7 @@
const string fileName = @"TestFiles\DeltaDijkZoneringInwards.xml";
string inputString = File.ReadAllText(fileName);
+ inputString = ChangeInputModel(inputString, InputStabilityModelType.Bishop);
inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DeltaDijk normal.geometries2D.0\");
@@ -423,6 +424,7 @@
const string fileName = @"TestFiles\DeltaDijkZoneringInwardsZone2.xml";
string inputString = File.ReadAllText(fileName);
+ inputString = ChangeInputModel(inputString, InputStabilityModelType.Bishop);
inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DeltaDijk normal.geometries2D.0\");
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r3079 -r3180
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3079)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3180)
@@ -165,7 +165,7 @@
};
// Convert the soilsurfacesoilprofile to a SoilProfile2D to be able to edit it properly.
var soilProfile2DNew = soilSurfaceProfile.ConvertToSoilProfile2D();
- soilProfile2D = soilProfile2DNew;
+ subSoilScenario.SoilProfile2D = soilProfile2DNew;
}
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/WaterpressureInterpolationModel.cs
===================================================================
diff -u -r1974 -r3180
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/WaterpressureInterpolationModel.cs (.../WaterpressureInterpolationModel.cs) (revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/WaterpressureInterpolationModel.cs (.../WaterpressureInterpolationModel.cs) (revision 3180)
@@ -30,12 +30,12 @@
///
/// Automatic interpolation
///
- Automatic=1,
+ Automatic=0,
///
/// Hydrostatic interpolation
///
- Hydrostatic=2
+ Hydrostatic=1
}
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs
===================================================================
diff -u -r2884 -r3180
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 2884)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 3180)
@@ -54,10 +54,10 @@
switch (currentSpecification.StabilityModelType)
{
case MStabModelType.Bishop:
- case MStabModelType.UpliftVan:
case MStabModelType.BishopUpliftVan:
// TODO: Hook this up with the new MacroStability kernel wrapper
break;
+ case MStabModelType.UpliftVan:
case MStabModelType.UpliftVanWti:
kernelWrapper = new MacroStabilityInwardsKernelWrapper();
var wtiMacroStabilityInwardsKernelWrapper = (MacroStabilityInwardsKernelWrapper)kernelWrapper;