Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs =================================================================== diff -u -r692 -r698 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 692) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 698) @@ -144,6 +144,7 @@ if (failureMechanismeParamatersMStab.MStabParameters.GridPosition == MStabGridPosition.Left && scenario.RiverLevelLow.HasValue) { riverLevelLow = scenario.RiverLevelLow.Value; + // ToDo bka #zant: riverLevelLow is not used. In classic it was used in CreateAllPLLines } double? riverLevelHigh = riverLevel; var surfaceLevelOutside = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside); @@ -162,22 +163,15 @@ currentSurfaceLine = surfaceLine; } - //ToDo zant_xml CreateAllPLLines was changed #Bka: I could not quite retrace this to Dam classic but I believe - // ToDo zant_mxl I think a Location needs Segments for location.GetMostProbableProfile while creating Pl lines - // #Bka: a location must have a Segment otherwise it is invalid data. - // failureMechanismeParamatersMStab.PLLines = CalculationHelper.CreateAllPLLines(scenario.Location, currentSurfaceLine, - // soilProfile, soilGeometry2DName, riverLevelHigh.Value, riverLevelLow); - // #Bka: if soilGeometry2DName the type must be a sti file (2D) else it must be 1D SoilProfileType soilProfileType = SoilProfileType.ProfileType1D; if (string.IsNullOrEmpty(soilGeometry2DName)) { soilProfileType = SoilProfileType.ProfileTypeStiFile; } - var waterLevel = riverLevelHigh.Value; // What is the waterlevel? #Bka: I believe this must be riverLevelHigh.Value but check with Tom + var waterLevel = riverLevelHigh.Value; failureMechanismeParamatersMStab.PLLines = CalculationHelper.CreateAllPLLines(waterLevel, scenario.Location, soilGeometry2DName, soilProfileType); - // End of ToDo zant_xml CreateAllPLLines was changed // Slip circle definition for Uplift Van; TODO: Combine with code in StabilityCalculation if (failureMechanismeParamatersMStab.MStabParameters.Model == MStabModelType.UpliftVan) @@ -202,7 +196,6 @@ failureMechanismeParamatersMStab.MStabParameters.ProjectFileName = mstabProjectFilename; failureMechanismeParamatersMStab.MStabParameters.SoilDatabaseName = scenario.Location.SoildatabaseName; - //ToDo zant_xml Fails because PLLines are not created yet if (!failureMechanismeParamatersMStab.IsComplete) { throw new Exception("Not all required data is available"); @@ -228,8 +221,6 @@ }; } - - /// /// ///