Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs
===================================================================
diff -u -r404 -r406
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs (.../DAMFailureMechanismeCalculator.cs) (revision 404)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs (.../DAMFailureMechanismeCalculator.cs) (revision 406)
@@ -141,8 +141,6 @@
return SelectStabilityProbabilities(soilProfileProbabilities);
case FailureMechanismSystemType.Piping:
return SelectPipingProbabilities(soilProfileProbabilities);
-// case FailureMechanismSystemType.FlowSlide:
-// return SelectFlowSlideProbabilities(soilProfileProbabilities);
}
return null;
}
@@ -209,9 +207,6 @@
// case FailureMechanismSystemType.Piping:
// CalculatePipingForScenario(scenario);
// break;
-// case FailureMechanismSystemType.FlowSlide:
-// CalculateFlowSlideForScenario(scenario);
-// break;
// }
}
@@ -522,114 +517,6 @@
// }
///
- /// Calculates failuremechanism flowslide for scenario.
- ///
- /// The scenario.
-// private void CalculateFlowSlideForScenario(Scenario scenario)
-// {
-// try
-// {
-// var validSoilProfileProbabilities = SelectFlowSlideProbabilities(scenario.Location.Segment.SoilProfileProbabilities);
-// if (validSoilProfileProbabilities.Count == 0)
-// {
-// throw new DamFailureMechanismeCalculatorException(String.Format("No profiles to calcutate for location {0}", scenario.Location.Name));
-// }
-// foreach (var soilProfileProbability in validSoilProfileProbabilities)
-// {
-// try
-// {
-// if (soilProfileProbability.SoilProfile == null)
-// {
-// throw new DamFailureMechanismeCalculatorException(String.Format("Soilprofile is not 1D for location {0}",
-// scenario.Location.Name));
-// }
-// var flowSlideCalculations = new FlowSlideCalculations();
-// using (var flowSlideProject = CreateFlowSlideProject(scenario, soilProfileProbability))
-// {
-// string calculationName = StabilityCalculator.DetermineCalculationFilename(scenario.Location.Name, scenario.LocationScenarioID,
-// soilProfileProbability.SoilGeometryName, 0);
-// WriteFlowSlideProjectToFile(flowSlideProject, calculationName);
-//
-// flowSlideCalculations.RunCalculation(flowSlideProject);
-// double safetyFactor = flowSlideProject.ResultOverallFactor;
-// scenario.SetSafetyFactorFlowSlide(soilProfileProbability.SoilProfile, soilProfileProbability.SoilGeometry2DName, safetyFactor);
-// }
-// }
-// catch (DamFailureMechanismeCalculatorException calculatorException)
-// {
-// string errorMessage = "FAIL: " + calculatorException.Message;
-// Exception innerException = calculatorException.InnerException;
-// while (innerException != null)
-// {
-// errorMessage = errorMessage + ";" + innerException.Message;
-// innerException = innerException.InnerException;
-// }
-// scenario.SetResultMessage(soilProfileProbability.SoilProfile,
-// soilProfileProbability.SoilGeometry2DName, errorMessage);
-//
-// calculatorException.Scenario = scenario;
-// throw calculatorException;
-// }
-// }
-// }
-// catch (Exception exception)
-// {
-// scenario.Errors.Add(exception.Message);
-// Exception innerException = exception.InnerException;
-// while (innerException != null)
-// {
-// scenario.Errors.Add(innerException.Message);
-// innerException = innerException.InnerException;
-// }
-// }
-// }
-
- ///
- /// Creates the flowslide project.
- ///
- /// The scenario.
- /// The soil profile probability.
- ///
-// private static FlowSlideProject CreateFlowSlideProject(Scenario scenario, SoilGeometryProbability soilProfileProbability)
-// {
-// var flowSlideProject = new FlowSlideProject();
-// flowSlideProject.FlowSlideCalculationParameters.UseFlowSlideCalculation = UseFlowSlideCalculation.Global;
-// flowSlideProject.SurfaceLine2 = scenario.Location.LocalXZSurfaceLine2;
-// flowSlideProject.SoilProfile = soilProfileProbability.SoilProfile;
-// flowSlideProject.Soils.Clear();
-// var projectSoils = new List();
-// foreach (var layer in soilProfileProbability.SoilProfile.Layers)
-// {
-// if (!projectSoils.Exists(T => layer.Soil.Name.Equals(T.Name)))
-// {
-// projectSoils.Add(layer.Soil);
-// flowSlideProject.Soils.Add(layer.Soil);
-// }
-// }
-// flowSlideProject.FlowSlideCalculationParameters.CalculationParametersGeneral.Waterlevel = scenario.RiverLevel;
-// return flowSlideProject;
-// }
-
- ///
- /// Writes the flowslide project to file.
- ///
- /// The flow slide project.
- /// Name of the calculation.
-// private void WriteFlowSlideProjectToFile(FlowSlideProject flowSlideProject, string calculationName)
-// {
-// string flowslideCalculationDirectory = Path.Combine(CalculationBaseDirectory, @"Flowslide\");
-// if (!Directory.Exists(flowslideCalculationDirectory))
-// {
-// Directory.CreateDirectory(flowslideCalculationDirectory);
-// }
-// string filenameExtension = ".fsx";
-// string fileName = calculationName + filenameExtension;
-// string flowslideProjectFilename = Path.Combine(flowslideCalculationDirectory, fileName);
-// var xmlSerializer = new XmlSerializer();
-// xmlSerializer.Serialize(flowSlideProject, flowslideProjectFilename);
-// }
-
- ///
/// Selects the soilProfileProbabilities for piping.
///
/// The soil profile probabilities.
@@ -1036,9 +923,6 @@
// RedesignSurfaceLinePipingShoulder(damFailureMechanismeCalculationSpecification.PipingModelType,
// scenario, ref safetyFactor, ref surfaceLine);
// break;
-// case FailureMechanismSystemType.FlowSlide:
-// RedesignSurfaceLineFlowSlide(scenario, safetyFactor, ref surfaceLine);
-// break;
// }
// }
// }
@@ -1906,17 +1790,6 @@
// }
///
- /// Redesigns the surface line flow slide.
- ///
- /// The scenario.
- /// The safety factor.
- /// The surface line.
- private void RedesignSurfaceLineFlowSlide(DesignScenario scenario, double? safetyFactor, ref SurfaceLine2 surfaceLine)
- {
- throw new DamFailureMechanismeCalculatorException("Geometry adaption not supported for Flowslide");
- }
-
- ///
/// Check if a stability redesign is required
///
///