Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs =================================================================== diff -u -r452 -r578 --- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs (.../DAMFailureMechanismeCalculator.cs) (revision 452) +++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs (.../DAMFailureMechanismeCalculator.cs) (revision 578) @@ -175,7 +175,7 @@ { if (soilProfileProbability.SegmentFailureMechanismType == failureMechanismSystemType || soilProfileProbability.SegmentFailureMechanismType == null) { - scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, surfaceLine); + scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, surfaceLine); } } } @@ -354,12 +354,12 @@ // double? betaloc; // if (newSurfaceLine != null) // { -// betaloc = pipingCalculator.CalculateReliabilityIndex(scenario.Location, newSurfaceLine, soilProfileProbability.SoilProfile, waterLevel); +// betaloc = pipingCalculator.CalculateReliabilityIndex(scenario.Location, newSurfaceLine, soilProfileProbability.SoilProfile1D, waterLevel); // } // else // { -// betaloc = pipingCalculator.CalculateReliabilityIndex(scenario.Location, scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName), soilProfileProbability.SoilProfile, waterLevel); +// betaloc = pipingCalculator.CalculateReliabilityIndex(scenario.Location, scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName), soilProfileProbability.SoilProfile1D, waterLevel); // } // return betaloc; // } @@ -408,8 +408,8 @@ // case ProbabilisticType.Deterministic: // safetyFactor = pipingCalculator.CalculatePipingFactor( // scenario.Location, -// scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName), -// soilProfileProbability.SoilProfile, +// scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName), +// soilProfileProbability.SoilProfile1D, // scenario.RiverLevel); // if (pipingCalculator.UpliftLocationAndResult != null) // { @@ -429,8 +429,8 @@ // failureProbability = // pipingCalculator.CalculatePipingFailureProbability( // scenario.Location, -// scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName), -// soilProfileProbability.SoilProfile, +// scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName), +// soilProfileProbability.SoilProfile1D, // waterLevelProbabilistic); // break; // case ProbabilisticType.ProbabilisticFragility: @@ -445,15 +445,15 @@ // // if (pipingCalculationType == PipingModelType.SellmeijerVnk) // { -// scenario.SetSafetyFactorPiping(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, safetyFactor); +// scenario.SetSafetyFactorPiping(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, safetyFactor); // if (ProbabilisticType == ProbabilisticType.ProbabilisticFragility) // { -// scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, +// scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, // failureProbabilityAdvanced); // } // else // { -// scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, +// scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, // failureProbability); // } // } @@ -486,7 +486,7 @@ // break; // } // } -// scenario.SetPipingResults(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, pipingResults); +// scenario.SetPipingResults(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, pipingResults); // } // catch (DamFailureMechanismeCalculatorException calculatorException) // { @@ -497,7 +497,7 @@ // errorMessage = errorMessage + ";" + innerException.Message; // innerException = innerException.InnerException; // } -// scenario.SetResultMessage(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, errorMessage); +// scenario.SetResultMessage(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, errorMessage); // // calculatorException.Scenario = scenario; // throw calculatorException; @@ -627,12 +627,12 @@ // { // try // { -// UpliftSituation? upliftSituation = scenario.GetStabilityUpliftSituation(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName); +// UpliftSituation? upliftSituation = scenario.GetStabilityUpliftSituation(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName); // // The calculation for UpliftVan will only will done if there is Uplift // if (IsCalculationRequired(upliftSituation)) // { -// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile, GetFullSoilGeometry2DName(soilProfileProbability.SoilGeometry2DName), iter); -// MStabResults? mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName); +// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile1D, GetFullSoilGeometry2DName(soilProfileProbability.StiFileName), iter); +// MStabResults? mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName); // if ((mStabResults != null) && (AnalysisType.AdaptNWO == analysisType)) // { // // Store the NWO results @@ -658,8 +658,8 @@ // // assign original surfaceline to redesigned surfaceline (not for NWODesign as that would provide wrong surface line) // if (analysisType != AnalysisType.AdaptNWO) // { -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName, +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName, // scenario.Location.SurfaceLine2); // } // } @@ -672,8 +672,8 @@ // errorMessage = errorMessage + ";" + innerException.Message; // innerException = innerException.InnerException; // } -// scenario.SetResultMessage(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName, errorMessage); +// scenario.SetResultMessage(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName, errorMessage); // // calculatorException.Scenario = scenario; // errorCount++; @@ -1000,11 +1000,11 @@ // newSurfaceLine = newCandidate; // } // -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, newSurfaceLine); -// scenario.SetSafetyFactorPiping(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, safetyFactor); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, newSurfaceLine); +// scenario.SetSafetyFactorPiping(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, safetyFactor); // PipingResults pipingResults = GetPipingResults(safetyFactor, pipingModelType, pipingCalculator); -// scenario.SetPipingResults(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName, pipingResults); +// scenario.SetPipingResults(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName, pipingResults); // break; // } // @@ -1026,7 +1026,7 @@ // // start by checking the uplift first (if so, a newShoulderHeight can be determined). If uplift is not an issue then // // probability of failure = 0. If uplift is an issue, add a berm until uplift is no longer an issue. // double? newShoulderHeight = pipingCalculator.CalculateDesignShoulderHeight(scenario.Location, newSurfaceLine, -// soilProfileProbability.SoilProfile, waterLevel); +// soilProfileProbability.SoilProfile1D, waterLevel); // // double currentShoulderHeight = 0; // double currentShoulderWidth = 0; @@ -1075,7 +1075,7 @@ // surfaceLineShoulderAdapter.MaxShoulderLevel = maxShoulderLevel; // newSurfaceLine = surfaceLineShoulderAdapter.ConstructNewSurfaceLine(newShoulderWidth, newShoulderHeight.Value, true); // newShoulderHeight = pipingCalculator.CalculateDesignShoulderHeight(scenario.Location, newSurfaceLine, -// soilProfileProbability.SoilProfile, waterLevel); +// soilProfileProbability.SoilProfile1D, waterLevel); // finished = (pipingCalculator.UpliftLocationAndResult.X > shoulderTopInside.X); // if (newShoulderHeight != null && (!finished)) // { @@ -1110,7 +1110,7 @@ // var waterLevelProbabilistic = new ProbabilisticStruct(0.0, 0.01, (int) DistributionType.LogNormal, false); // waterLevelProbabilistic.Mean = scenario.RiverLevel; // failureProbability = pipingCalculator.CalculatePipingFailureProbability(scenario.Location, newSurfaceLine, -// soilProfileProbability.SoilProfile, waterLevelProbabilistic); +// soilProfileProbability.SoilProfile1D, waterLevelProbabilistic); // } // else // { @@ -1140,7 +1140,7 @@ // waterLevelProbabilistic.Mean = scenario.RiverLevel; // failureProbability = pipingCalculator.CalculatePipingFailureProbability( // scenario.Location, newSurfaceLine, -// soilProfileProbability.SoilProfile, waterLevelProbabilistic); +// soilProfileProbability.SoilProfile1D, waterLevelProbabilistic); // } // else // { @@ -1159,9 +1159,9 @@ // if (iterationIndex >= PipingRedesingMaxIterations) // { // // #BKA: vraag voor Ray set the results in case of failure too to provide feedback. (of niet Tom???) Voorlopig even niet. Ray was net naar huis dus nog navragen. -// // scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, +// // scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, // // failureProbability); -// // scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, +// // scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, // // newSurfaceLine); // throw new MaximumRedesignIterationsReachedException(); // } @@ -1170,30 +1170,30 @@ // } // if (failureProbability != null) // { -// scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, +// scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, // failureProbability); // } // else // { -// scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, +// scenario.SetFailureProbabilityPiping(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, // 999); // } -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, newSurfaceLine); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, newSurfaceLine); // break; // } // } // -// scenario.SetResultMessage(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, "Succes"); +// scenario.SetResultMessage(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, "Succes"); // } // catch (Exception exception) // { // string errorMessage = String.Format("Location '{0}', Soilprofile '{1}': {2}", // scenario.Location.Name, soilProfileProbability.SoilGeometryName, exception.Message); // PipingResults pipingResults = GetPipingResults(-1, pipingModelType, pipingCalculator); -// scenario.SetPipingResults(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, pipingResults); -// scenario.SetSafetyFactorPiping(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, -1); +// scenario.SetPipingResults(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, pipingResults); +// scenario.SetSafetyFactorPiping(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, -1); // scenario.Errors.Add("FAIL: " + errorMessage); -// scenario.SetResultMessage(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, "FAIL: " + errorMessage); +// scenario.SetResultMessage(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, "FAIL: " + errorMessage); // } // } // } @@ -1281,12 +1281,12 @@ // // Determine calculation filename to output piping calculation file // //pipingCalculator.PipingCalculationDirectory = GetPipingCalculationBaseDirectory(); // //string fileNameCalculation =String.Format("Calc({0})_Loc({1})_Pro({2})_Pnt({3}))", -// // pipingCalculator.CalculationModelIdentifier, scenario.Location.Name, soilProfileProbability.SoilProfile.Name, pointCount.ToString("d4")); ; +// // pipingCalculator.CalculationModelIdentifier, scenario.Location.Name, soilProfileProbability.SoilProfile1D.Name, pointCount.ToString("d4")); ; // //pipingCalculator.FilenameCalculation = Path.Combine(pipingCalculator.PipingCalculationDirectory, fileNameCalculation); // // // Calculate the piping design at the given point. This returns the required adaption (berm length and height) if any. // var pipingDesign = pipingCalculator.CalculateDesignAtPoint(scenario.Location, surfaceLine, -// soilProfileProbability.SoilProfile, +// soilProfileProbability.SoilProfile1D, // scenario.RiverLevel, point); // if (pipingDesign != null) // { @@ -1322,7 +1322,7 @@ // surfaceLineShoulderAdapter.MaxShoulderLevel = maxShoulderLevel; // SurfaceLine2 newSurfaceLine = surfaceLineShoulderAdapter.ConstructNewSurfaceLine(desiredShoulderLength, desiredShoulderHeight, true); // -// safetyFactor = pipingCalculator.CalculatePipingFactor(scenario.Location, newSurfaceLine, soilProfileProbability.SoilProfile, scenario.RiverLevel); +// safetyFactor = pipingCalculator.CalculatePipingFactor(scenario.Location, newSurfaceLine, soilProfileProbability.SoilProfile1D, scenario.RiverLevel); // if (safetyFactor < scenario.RequiredSafetyFactorPiping) // { // throw new DamFailureMechanismeCalculatorException("Deterministic Design: Piping is not safe yet."); @@ -1350,12 +1350,12 @@ // double riverLevel = 0.5*(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z + // surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z); // string soilgeometry2DFilename = null; -// if (soilProfileProbability.SoilGeometry2DName != null) +// if (soilProfileProbability.StiFileName != null) // { // soilgeometry2DFilename = -// Path.GetFullPath(Path.Combine(DamProject.ProjectMap, Path.Combine(scenario.Location.MapForSoilGeometries2D, soilProfileProbability.SoilGeometry2DName))); +// Path.GetFullPath(Path.Combine(DamProject.ProjectMap, Path.Combine(scenario.Location.MapForSoilGeometries2D, soilProfileProbability.StiFileName))); // } -// XDocument mstabXML = stabilityCalculator.CreateMStabXmlDoc(initialgeometryFile, scenario, soilProfileProbability.SoilProfile, +// XDocument mstabXML = stabilityCalculator.CreateMStabXmlDoc(initialgeometryFile, scenario, soilProfileProbability.SoilProfile1D, // soilgeometry2DFilename, riverLevel, null, surfaceLine); // mstabXML.Save(initialgeometryFile + ".xml"); // var stabilityServiceAgent = new StabilityServiceAgent(); @@ -1407,7 +1407,7 @@ // foreach (var soilProfileProbability in validSoilProfileProbabilities) // { // // The calculation for UpliftVan will only will done if there is Uplift -// UpliftSituation? upliftSituation = scenario.GetStabilityUpliftSituation(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName); +// UpliftSituation? upliftSituation = scenario.GetStabilityUpliftSituation(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName); // if (IsCalculationRequired(upliftSituation)) // { // switch (scenario.Location.StabilityDesignMethod) @@ -1458,7 +1458,7 @@ // // // Create the file with the initial geometry to be used to determine which layers have to be defined as dike embankment material // CreateInitialGeometry(scenario, stabilityCalculator, soilProfileProbability, orgSurfaceLine, out previousFilename); -// SurfaceLine2 surfaceLine = scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName).FullDeepClone(); +// SurfaceLine2 surfaceLine = scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName).FullDeepClone(); // // var mstabDesignEmbankment = new MStabDesignEmbankment // { @@ -1472,24 +1472,24 @@ // bool isRedesignRequired; // double? exitPointXCoordinate; // scenario.Location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); -// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile, -// GetFullSoilGeometry2DName(soilProfileProbability.SoilGeometry2DName), +// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile1D, +// GetFullSoilGeometry2DName(soilProfileProbability.StiFileName), // iterationIndex, mstabDesignEmbankment); // mstabDesignEmbankment.PreviousGeometry2DFilename = stabilityCalculator.StabilityProjectFilename; // mstabDesignEmbankment.EmbankmentMaterialname = location.ShoulderEmbankmentMaterial; -// MStabResults? mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName); +// MStabResults? mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName); // double? safetyFactor = mStabResults.Value.zone1.safetyFactor; -// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName); +// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName); // isRedesignRequired = IsRedesignRequired(safetyFactor, requiredSafetyFactor, betaRequired, beta); // exitPointXCoordinate = mStabResults.Value.zone1.circleSurfacePointRightXCoordinate; // // if (!isRedesignRequired && surfaceLine != null) // { // // Set redesigned surfaceline to original, so in case no redesign is needed, the original surfaceline will be returned -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName, surfaceLine); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName, surfaceLine); // } // else // { @@ -1526,7 +1526,7 @@ // throw new SurfaceLineException(validationError.Text); // } // -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, surfaceLine); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, surfaceLine); // } // else // { @@ -1539,25 +1539,25 @@ // { // throw new SurfaceLineException(validationError.Text); // } -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName, surfaceLine); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName, surfaceLine); // } // // scenario.Location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); -// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile, -// GetFullSoilGeometry2DName(soilProfileProbability.SoilGeometry2DName), +// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile1D, +// GetFullSoilGeometry2DName(soilProfileProbability.StiFileName), // iterationIndex, mstabDesignEmbankment); // -// mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName); +// mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName); // safetyFactor = mStabResults.Value.zone1.safetyFactor; -// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName); +// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName); // isRedesignRequired = IsRedesignRequired(safetyFactor, requiredSafetyFactor, betaRequired, beta); // exitPointXCoordinate = mStabResults.Value.zone1.circleSurfacePointRightXCoordinate; // } // } -// scenario.SetResultMessage(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, "Succes"); +// scenario.SetResultMessage(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, "Succes"); // } // catch (Exception exception) // { @@ -1568,13 +1568,13 @@ // errorMessage = errorMessage + ";" + innerException.Message; // innerException = innerException.InnerException; // } -// scenario.SetResultMessage(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, errorMessage); +// scenario.SetResultMessage(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, errorMessage); // // Add message to log too for output tab. // errorMessage = scenario.Location.Name + ", scenario " + scenario.LocationScenarioID + ", " + soilProfileProbability.SoilGeometryName + " " + errorMessage; // stabilityCalculator.ErrorMessages.Add(new LogMessage(LogMessageType.Error, this, errorMessage)); // scenario.CalculationResult = CalculationResult.RunFailed; // // Redesign not succesful, so no redesigned surfaceline will be returned -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, null); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, null); // } // foreach (var errorMessage in stabilityCalculator.ErrorMessages) // { @@ -1633,7 +1633,7 @@ // // // Create the file with the initial geometry to be used to determine which layers have to be defined as dike embankment material // CreateInitialGeometry(scenario, stabilityCalculator, soilProfileProbability, orgSurfaceLine, out previousFilename); -// SurfaceLine2 surfaceLine = scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName).FullDeepClone(); +// SurfaceLine2 surfaceLine = scenario.GetMostRecentSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName).FullDeepClone(); // // var mstabDesignEmbankment = new MStabDesignEmbankment // { @@ -1647,24 +1647,24 @@ // bool isRedesignRequired; // double? exitPointXCoordinate; // scenario.Location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); -// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile, -// GetFullSoilGeometry2DName(soilProfileProbability.SoilGeometry2DName), +// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile1D, +// GetFullSoilGeometry2DName(soilProfileProbability.StiFileName), // iterationIndex, mstabDesignEmbankment); // mstabDesignEmbankment.PreviousGeometry2DFilename = stabilityCalculator.StabilityProjectFilename; // mstabDesignEmbankment.EmbankmentMaterialname = location.ShoulderEmbankmentMaterial; -// MStabResults? mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName); +// MStabResults? mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName); // double? safetyFactor = mStabResults.Value.zone1.safetyFactor; -// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName); +// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName); // isRedesignRequired = IsRedesignRequired(safetyFactor, requiredSafetyFactor, betaRequired, beta); // exitPointXCoordinate = mStabResults.Value.zone1.circleSurfacePointRightXCoordinate; // // if (!isRedesignRequired && surfaceLine != null) // { // // Set redesigned surfaceline to original, so in case no redesign is needed, the original surfaceline will be returned -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName, surfaceLine); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName, surfaceLine); // } // else // { @@ -1706,20 +1706,20 @@ // { // throw new SurfaceLineException(validationError.Text); // } -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName, surfaceLine); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName, surfaceLine); // // // Recalculate new surfaceline // scenario.Location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); -// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile, -// GetFullSoilGeometry2DName(soilProfileProbability.SoilGeometry2DName), +// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile1D, +// GetFullSoilGeometry2DName(soilProfileProbability.StiFileName), // iterationIndex, mstabDesignEmbankment); -// mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName); +// mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName); // safetyFactor = mStabResults.Value.zone1.safetyFactor; // exitPointXCoordinate = mStabResults.Value.zone1.circleSurfacePointRightXCoordinate; -// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile, -// soilProfileProbability.SoilGeometry2DName); +// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile1D, +// soilProfileProbability.StiFileName); // isRedesignRequired = IsRedesignRequired(safetyFactor, requiredSafetyFactor, betaRequired, beta); // limitPointForShoulderDesign = surfaceLine.GetLimitPointForShoulderDesign(); // @@ -1752,22 +1752,22 @@ // { // throw new SurfaceLineException(validationError.Text); // } -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, surfaceLine); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, surfaceLine); // // // Recalculate new surfaceline // scenario.Location.AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(surfaceLine); -// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile, -// GetFullSoilGeometry2DName(soilProfileProbability.SoilGeometry2DName), +// stabilityCalculator.Calculate(scenario, soilProfileProbability.SoilProfile1D, +// GetFullSoilGeometry2DName(soilProfileProbability.StiFileName), // iterationIndex, mstabDesignEmbankment); -// mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName); +// mStabResults = scenario.GetMStabResults(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName); // safetyFactor = mStabResults.Value.zone1.safetyFactor; -// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName); +// beta = scenario.GetFailureProbabilityStability(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName); // isRedesignRequired = IsRedesignRequired(safetyFactor, requiredSafetyFactor, betaRequired, beta); // limitPointForShoulderDesign = surfaceLine.GetLimitPointForShoulderDesign(); // } // } // } -// scenario.SetResultMessage(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, "Succes"); +// scenario.SetResultMessage(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, "Succes"); // } // catch (Exception exception) // { @@ -1778,10 +1778,10 @@ // errorMessage = errorMessage + ";" + innerException.Message; // innerException = innerException.InnerException; // } -// scenario.SetResultMessage(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, errorMessage); +// scenario.SetResultMessage(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, errorMessage); // scenario.CalculationResult = CalculationResult.RunFailed; // // Redesign not succesful, so no redesigned surfaceline will be returned -// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, null); +// scenario.SetRedesignedSurfaceLine(soilProfileProbability.SoilProfile1D, soilProfileProbability.StiFileName, null); // } // foreach (var errorMessage in stabilityCalculator.ErrorMessages) // {