Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs =================================================================== diff -u -r404 -r406 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 404) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 406) @@ -124,11 +124,6 @@ Wti2017 }; - public enum FlowSlideModelType - { - All, - }; - public enum PLLineAssignment { NoPLLines, Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs =================================================================== diff -u -r404 -r406 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs (.../LocationJob.cs) (revision 404) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs (.../LocationJob.cs) (revision 406) @@ -257,28 +257,19 @@ foreach (var scenario in scenarios) { foreach (var calculationResult in scenario.CalculationResults) - { -// if (calculationResult.Calculation.Equals("FlowSlide")) #Bka: flowslide not for now! -// { -// designRequiredFactor = 1.0; // This is a hack to make FlowSlide color display correct; -// // TODO: make a good generic method to display colored results -// } - // else + { + if (calculationResult.PipingFailureProbability != null) { - if (calculationResult.PipingFailureProbability != null) + if (calculationResult.PipingFailureProbability.Value > res && + calculationResult.PipingFailureProbability.Value < DamGlobalConstants.NoRunValue) { - if (calculationResult.PipingFailureProbability.Value > res && - calculationResult.PipingFailureProbability.Value < DamGlobalConstants.NoRunValue) - { - res = calculationResult.PipingFailureProbability.Value; + res = calculationResult.PipingFailureProbability.Value; // if (calculationResult.RequiredFailureProbability != null) #Bka required value must come from input, not results // { // designRequiredFactor = calculationResult.RequiredFailureProbability.Value; // } - } } - - } + } } } if (res == double.MinValue) res = DamGlobalConstants.NoRunValue; Index: dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs =================================================================== diff -u -r404 -r406 --- dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 404) +++ dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs (.../DesignScenario.cs) (revision 406) @@ -102,8 +102,7 @@ private Dictionary failureProbabilitiesPiping; private Dictionary redesignedSurfaceLines; private Dictionary resultMessages; - private Dictionary safetyFactorsFlowSlide; - + private string locationScenarioId; private double riverLevel; private double? riverLevelLow; @@ -171,7 +170,6 @@ pipingResults = new Dictionary(); mStabResults = new Dictionary(); safetyFactorsPiping = new Dictionary(); - safetyFactorsFlowSlide = new Dictionary(); resultMessages = new Dictionary(); failureProbabilitiesStability = new Dictionary(); failureProbabilitiesPiping = new Dictionary(); @@ -886,54 +884,6 @@ } /// - /// Get Safety Factor Piping - /// - /// - /// - /// - public double? GetSafetyFactorFlowSlide(SoilProfile1D soilProfile, string soilGeometry2DName) - { - Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName); - return GetSafetyFactorFlowSlide(objectAsKey); - } - - /// - /// Get Safety Factor FlowSlide - /// - /// - /// - private double? GetSafetyFactorFlowSlide(Object objectAsKey) - { - if (objectAsKey != null) - { - return safetyFactorsFlowSlide.ContainsKey(objectAsKey) ? safetyFactorsFlowSlide[objectAsKey] : null; - } - return null; - } - - /// - /// Set Safety Factor FlowSlide - /// - /// - /// - private void SetSafetyFactorFlowSlide(Object objectAsKey, double? safetyFactor) - { - safetyFactorsFlowSlide[objectAsKey] = safetyFactor; - } - - /// - /// Set Safety Factor FlowSlide - /// - /// - /// - /// - public void SetSafetyFactorFlowSlide(SoilProfile1D soilProfile, string soilGeometry2DName, double? safetyFactor) - { - Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName); - SetSafetyFactorFlowSlide(objectAsKey, safetyFactor); - } - - /// /// Get Result Message /// /// Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs =================================================================== diff -u -r404 -r406 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 404) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs (.../DesignResult.cs) (revision 406) @@ -637,7 +637,7 @@ set { localPipingExitPointX = value; } } - public string BaseFileName // real result for all except flowslide. Is base for derived props. + public string BaseFileName // real result for all. { get { return baseFileName; } set { baseFileName = value; } 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 /// /// Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r401 -r406 --- dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 401) +++ dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 406) @@ -2478,10 +2478,7 @@ Piping, /// - HorizontalBalance, - - /// - FlowSlide, + HorizontalBalance, } /// Index: dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd =================================================================== diff -u -r404 -r406 --- dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd (.../DamRWScenarioResult.xsd) (revision 404) +++ dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd (.../DamRWScenarioResult.xsd) (revision 406) @@ -98,7 +98,6 @@ - Index: dam engine/trunk/Xsds Liquid/DamProjectCalculationSpecification.xsd =================================================================== diff -u -r345 -r406 --- dam engine/trunk/Xsds Liquid/DamProjectCalculationSpecification.xsd (.../DamProjectCalculationSpecification.xsd) (revision 345) +++ dam engine/trunk/Xsds Liquid/DamProjectCalculationSpecification.xsd (.../DamProjectCalculationSpecification.xsd) (revision 406) @@ -1,12 +1,12 @@ - +s - + - + @@ -15,7 +15,7 @@ - + @@ -24,14 +24,13 @@ - + -