Index: DamClients/DamUI/branches/Sliding/src/Dam/Data/CsvExportData.cs
===================================================================
diff -u -r1303 -r1304
--- DamClients/DamUI/branches/Sliding/src/Dam/Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1303)
+++ DamClients/DamUI/branches/Sliding/src/Dam/Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1304)
@@ -93,6 +93,8 @@
private string resultMessage = "";
private int numberOfIterations;
private MStabModelType? stabilityModel;
+ private double? sliding;
+ private double? overtopping;
private ResultEvaluation resultEvaluation = ResultEvaluation.NotEvaluated;
private string notes = "";
@@ -1659,7 +1661,10 @@
break;
case FailureMechanismSystemType.Piping:
res = PipingFactor;
- break;
+ break;
+ case FailureMechanismSystemType.Sliding:
+ res = 1;
+ break;
}
return res;
}
@@ -2062,6 +2067,43 @@
}
}
+ [CsvExportColumn("Sliding", 200)]
+ [Label("Sliding")]
+ [Format("F3")]
+ [PropertyOrder(15, 7)]
+ [Unit(UnitType.Length)]
+ [ReadOnly(true)]
+
+ public double? Sliding
+ {
+ get
+ {
+ return sliding;
+ }
+ set
+ {
+ sliding = value;
+ }
+ }
+
+ [CsvExportColumn("Overtopping", 201)]
+ [Label("Overtopping")]
+ [Format("F3")]
+ [PropertyOrder(15, 8)]
+ [Unit(UnitType.Length)]
+ [ReadOnly(true)]
+ public double? Overtopping
+ {
+ get
+ {
+ return overtopping;
+ }
+ set
+ {
+ overtopping = value;
+ }
+ }
+
///
/// Copies the result file.
///
Index: DamClients/DamUI/branches/Sliding/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r1303 -r1304
--- DamClients/DamUI/branches/Sliding/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 1303)
+++ DamClients/DamUI/branches/Sliding/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 1304)
@@ -121,6 +121,10 @@
{
CreateDesignResultsStabilityOutput(designResult, desResult);
}
+ if (designResult.SlidingDesignResults != null)
+ {
+ CreateDesignResultsSlidingOutput(designResult, desResult);
+ }
if (desResult.Scenario != null)
{
desResult.Scenario.CalculationResult = desResult.CalculationResult;
@@ -256,6 +260,13 @@
}
}
+ private static void CreateDesignResultsSlidingOutput(DesignResult designResult, CsvExportData desResult)
+ {
+ desResult.ResultMessage = string.Empty;
+ if (designResult.SlidingDesignResults.SlidingSpecified) desResult.Sliding = designResult.SlidingDesignResults.Sliding;
+ if (designResult.SlidingDesignResults.OvertoppingSpecified) desResult.Overtopping = designResult.SlidingDesignResults.Overtopping;
+ }
+
private static void CreateLocationResultsOutput(Output output, DamProjectData damProjectData)
{
// Calculation results (per location)
Index: DamClients/DamUI/branches/Sliding/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r1303 -r1304
--- DamClients/DamUI/branches/Sliding/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 1303)
+++ DamClients/DamUI/branches/Sliding/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 1304)
@@ -773,9 +773,6 @@
// and event for a non existing designCalculationsControl. For now just ignore this error until it is clear
// how DAM should handle "old" results.
}
-
-
-
}
}
}
Index: DamEngine/trunk/release/Deltares.DamEngine.Interface.dll
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Calculators.dll
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Data.dll
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Interface.pdb
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Io.dll
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamClients/DamUI/branches/Sliding/src/Dam/Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r1303 -r1304
--- DamClients/DamUI/branches/Sliding/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1303)
+++ DamClients/DamUI/branches/Sliding/src/Dam/Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1304)
@@ -330,6 +330,7 @@
public const int InputFailureMechanismStabilityOutside = 1;
public const int InputFailureMechanismPiping = 2;
public const int InputFailureMechanismHorizontalBalance = 3;
+ public const int InputFailureMechanismSliding = 4;
///
/// Converts the Dam failure mechanism type to the input failure mechanism type .
///
@@ -342,7 +343,8 @@
{FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside},
{FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside},
{FailureMechanismSystemType.Piping, InputFailureMechanismPiping},
- {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance}
+ {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance},
+ {FailureMechanismSystemType.Sliding, InputFailureMechanismSliding}
};
return translationTable[segmentFailureMechanismType];
}
Index: DamEngine/trunk/release/Deltares.DamEngine.Calculators.pdb
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Version.dll
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamClients/DamUI/branches/Sliding/src/Dam/Data/DAMEnumerations.cs
===================================================================
diff -u -r1303 -r1304
--- DamClients/DamUI/branches/Sliding/src/Dam/Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1303)
+++ DamClients/DamUI/branches/Sliding/src/Dam/Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1304)
@@ -108,7 +108,8 @@
StabilityOutside,
Piping,
HorizontalBalance,
- FlowSlide
+ FlowSlide,
+ Sliding
}
public enum MStabModelType
@@ -134,6 +135,11 @@
Wti2017
};
+ public enum SlidingModelType
+ {
+ All,
+ };
+
public enum FlowSlideModelType
{
All,
Index: DamEngine/trunk/release/Deltares.DamEngine.Version.pdb
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Data.pdb
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamEngine/trunk/release/Deltares.DamEngine.Io.pdb
===================================================================
diff -u -r1287 -r1304
Binary files differ
Index: DamClients/DamUI/branches/Sliding/src/Dam/Forms/DamGeometryEditor.cs
===================================================================
diff -u -r1303 -r1304
--- DamClients/DamUI/branches/Sliding/src/Dam/Forms/DamGeometryEditor.cs (.../DamGeometryEditor.cs) (revision 1303)
+++ DamClients/DamUI/branches/Sliding/src/Dam/Forms/DamGeometryEditor.cs (.../DamGeometryEditor.cs) (revision 1304)
@@ -94,13 +94,13 @@
return new[]
{
FailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityOutside,
- FailureMechanismSystemType.Piping
+ FailureMechanismSystemType.Piping, FailureMechanismSystemType.Sliding,
};
case DamProjectType.Assessment:
return new[]
{
FailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.Piping,
- FailureMechanismSystemType.HorizontalBalance
+ FailureMechanismSystemType.HorizontalBalance, FailureMechanismSystemType.Sliding
};
case DamProjectType.Design:
{
Index: DamClients/DamUI/branches/Sliding/src/Dam/Data/UISupport/ConfigurationManager.cs
===================================================================
diff -u -r1303 -r1304
--- DamClients/DamUI/branches/Sliding/src/Dam/Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 1303)
+++ DamClients/DamUI/branches/Sliding/src/Dam/Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 1304)
@@ -188,8 +188,11 @@
availableList.Add((MStabModelType) i);
break;
case FailureMechanismSystemType.FlowSlide:
- availableList.Add((FlowSlideModelType) i);
+ availableList.Add((FlowSlideModelType)i);
break;
+ case FailureMechanismSystemType.Sliding:
+ availableList.Add((SlidingModelType)i);
+ break;
}
}
}
@@ -256,6 +259,10 @@
this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available;
this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassic, DamProjectType.Assessment, ProbabilisticType.Deterministic, FailureMechanismSystemType.Sliding, (int) SlidingModelType.All] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassic, DamProjectType.Calamity, ProbabilisticType.Deterministic, FailureMechanismSystemType.Sliding, (int)SlidingModelType.All] = ConfigurationStatus.Available;
+ this[StabilityKernelType.DamClassic, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.Sliding, (int)SlidingModelType.All] = ConfigurationStatus.Available;
+
this[StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
this[StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
this[StabilityKernelType.DamClassicDotNet, DamProjectType.Design, ProbabilisticType.Deterministic, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;