Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs =================================================================== diff -u -r452 -r578 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs (.../StabilityCalculator.cs) (revision 452) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs (.../StabilityCalculator.cs) (revision 578) @@ -156,11 +156,11 @@ if (profile1D != null) { plLineCreator.SoilProfile = profile1D; - plLineCreator.SoilGeometryType = SoilGeometryType.SoilGeometry1D; + plLineCreator.SoilProfileType = SoilProfileType.ProfileType1D; } else { - plLineCreator.SoilGeometryType = SoilGeometryType.SoilGeometry2D; + plLineCreator.SoilProfileType = SoilProfileType.ProfileType2D; string mapForSoilGeometries2D = location.MapForSoilGeometries2D; soilGeometry2DName = Path.Combine(Path.Combine(DamProjectData.ProjectMap, mapForSoilGeometries2D), soilGeometry2DName); plLineCreator.SoilGeometry2DName = soilGeometry2DName; @@ -259,7 +259,7 @@ // MinimalCircleDepth = this.minimalCircleDepth, // ZonesType = scenario.Location.StabilityZoneType // }; -// SoilProfile profile; +// SoilProfile1D profile; // var surfaceLine = scenario.GetMostRecentSurfaceLine(soilProfile, // Path.GetFileName(soilGeometry2DName)); // //create mstabproj using .NET, without using delphi dll and xml files @@ -397,9 +397,9 @@ // } // } -// private static SoilProfile GetSoilProfileByType(SoilProfile1D soilProfile, string mapForSoilGeometries2D, string soilGeometry2DName) +// private static SoilProfile1D GetSoilProfileByType(SoilProfile1D soilProfile, string mapForSoilGeometries2D, string soilGeometry2DName) // { -// SoilProfile profile = null; +// SoilProfile1D profile = null; // if (soilProfile != null) // { // profile = soilProfile; @@ -425,7 +425,7 @@ // } // if (mStab != null) // { -// profile = mStab.Stability.SoilProfile; +// profile = mStab.Stability.SoilProfile1D; // mStab.Dispose(); // } // } @@ -434,14 +434,14 @@ // var converter = new Converter(); // mStab = new MStabProject(); // mStab.Stability = converter.ConvertClassicMStab(fullPath); -// if (mStab.Stability.SoilProfile.Surfaces != null && mStab.Stability.SoilProfile.Surfaces.Count > 0) +// if (mStab.Stability.SoilProfile1D.Surfaces != null && mStab.Stability.SoilProfile1D.Surfaces.Count > 0) // { // // Ensure that the bottom layer of the geometry is seen as Aquifer. // // There is no other way to get aquifer information as Delphi DGS does not work with aquifers and also not // // with soiltypes so you can not derive anything from that too. -// mStab.Stability.SoilProfile.Surfaces[0].IsAquifer = true; +// mStab.Stability.SoilProfile1D.Surfaces[0].IsAquifer = true; // } -// profile = mStab.Stability.SoilProfile; +// profile = mStab.Stability.SoilProfile1D; // mStab.Dispose(); // } // } @@ -942,7 +942,7 @@ /// /// /// -// public XDocument CreateMStabXmlDoc(string mstabProjectFilename, Scenario scenario, SoilProfile soilProfile, +// public XDocument CreateMStabXmlDoc(string mstabProjectFilename, Scenario scenario, SoilProfile1D soilProfile, // string soilGeometry2DName, double riverLevel, // MStabDesignEmbankment mstabDesignEmbankment, SurfaceLine2 surfaceLine) // { @@ -952,16 +952,16 @@ // failureMechanismeParamatersMStab.Location = scenario.Location; // if (profile1D != null) // { -// failureMechanismeParamatersMStab.SoilProfile = profile1D; +// failureMechanismeParamatersMStab.SoilProfile1D = profile1D; // // 1d-geometry -// failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilGeometryType = -// SoilGeometryType.SoilGeometry1D; +// failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType = +// SoilProfileType.ProfileType1D; // } // else // { // // 2d-geometry -// failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilGeometryType = -// SoilGeometryType.SoilGeometry2D; +// failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilProfileType = +// SoilProfileType.ProfileType2D; // } // // Geometry Creation Options // failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename =