Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideBishopGrid1OutputFile.xml
===================================================================
diff -u -r6109 -r6120
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideBishopGrid1_UseLocationDataOutputFile.xml
===================================================================
diff -u -r6109 -r6120
Binary files differ
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanGrid1OutputFile.xml
===================================================================
diff -u -r6109 -r6120
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanGrid1OutputFile.xml (.../CalculateStabilityInsideUpliftVanGrid1OutputFile.xml) (revision 6109)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanGrid1OutputFile.xml (.../CalculateStabilityInsideUpliftVanGrid1OutputFile.xml) (revision 6120)
@@ -4,6 +4,8 @@
< R e s u l t s >
+ < O p e r a t i o n a l S t a t i c D a t a F a i l u r e M e c h a n i s m S y s t e m T y p e = " S t a b i l i t y I n s i d e " S t a b i l i t y M o d e l = " U p l i f t V a n " S e a r c h A l g o r i t h m = " G r i d " / >
+
< O p e r a t i o n a l L o c a t i o n s S t a t i c D a t a x s i : n i l = " t r u e " / >
< O p e r a t i o n a l O u t p u t T i m e S e r i e s >
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml
===================================================================
diff -u -r6109 -r6120
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml (.../CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml) (revision 6109)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/Profile1DTests/CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml (.../CalculateStabilityInsideUpliftVanBeeSwarm1OutputFile.xml) (revision 6120)
@@ -4,6 +4,8 @@
< R e s u l t s >
+ < O p e r a t i o n a l S t a t i c D a t a F a i l u r e M e c h a n i s m S y s t e m T y p e = " S t a b i l i t y I n s i d e " S t a b i l i t y M o d e l = " U p l i f t V a n " S e a r c h A l g o r i t h m = " G r i d " / >
+
< O p e r a t i o n a l L o c a t i o n s S t a t i c D a t a x s i : n i l = " t r u e " / >
< O p e r a t i o n a l O u t p u t T i m e S e r i e s >
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r6065 -r6120
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6065)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 6120)
@@ -1457,4 +1457,46 @@
};
return translationTable[waternetOptionsDikeSoilScenario];
}
+
+ ///
+ /// Converts the type FailureMechanismSystemType from Dam Engine type to output object type.
+ ///
+ /// Type of failure mechanism.
+ /// Type of the output object.
+ public static OperationalStaticDataFailureMechanismSystemType ConvertToOutputOperationalFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType)
+ {
+ var translationTable = new Dictionary
+ {
+ {
+ FailureMechanismSystemType.StabilityInside, OperationalStaticDataFailureMechanismSystemType.StabilityInside
+ },
+ {
+ FailureMechanismSystemType.StabilityOutside, OperationalStaticDataFailureMechanismSystemType.StabilityOutside
+ }
+ };
+ return translationTable[failureMechanismSystemType];
+ }
+
+ ///
+ /// Converts the type MStabModelType from Dam Engine type to output object type.
+ ///
+ /// Type of failure mechanism.
+ /// Type of the output object.
+ public static OperationalStaticDataStabilityModel ConvertToOutputOperationalStabilityModel(MStabModelType stabilityModelType)
+ {
+ var translationTable = new Dictionary
+ {
+ {
+ MStabModelType.Bishop, OperationalStaticDataStabilityModel.Bishop
+ },
+ {
+ MStabModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan
+ },
+ {
+ MStabModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan
+ }
+ };
+ return translationTable[stabilityModelType];
+ }
+
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r6109 -r6120
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6109)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 6120)
@@ -57,7 +57,7 @@
};
CreateCalculationMessages(damProjectData, output);
CreateDesignResultsOutput(damProjectData, output);
- CreateLocationResultsOutput(damProjectData, output);
+ CreateOperationalResultsOutput(damProjectData, output);
return output;
}
@@ -432,6 +432,22 @@
}
}
+ private static void CreateOperationalResultsOutput(DamProjectData damProjectData, Output output)
+ {
+ if (damProjectData.DamProjectCalculationSpecification.CurrentSpecification is
+ { FailureMechanismSystemType: FailureMechanismSystemType.StabilityInside or FailureMechanismSystemType.StabilityOutside })
+ {
+ output.Results.OperationalStaticData = new OperationalStaticData
+ {
+ FailureMechanismSystemType = ConversionHelper.ConvertToOutputOperationalFailureMechanismSystemType(
+ damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType),
+ StabilityModel = ConversionHelper.ConvertToOutputOperationalStabilityModel(
+ damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType)
+ };
+ }
+ CreateLocationResultsOutput(damProjectData, output);
+ }
+
private static void CreateLocationResultsOutput(DamProjectData damProjectData, Output output)
{
// Calculation results (per location)
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs
===================================================================
diff -u -r6109 -r6120
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6109)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 6120)
@@ -21,6 +21,8 @@
using System;
using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
using Deltares.DamEngine.Data.General;
using Deltares.DamEngine.Data.General.Results;
using Deltares.DamEngine.Data.General.TimeSeries;
@@ -106,6 +108,10 @@
{
DesignCalculations = new List()
};
+ damProjectData.DamProjectCalculationSpecification = new DamProjectCalculationSpecification();
+ damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(new DamFailureMechanismeCalculationSpecification());
+ damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside;
+ damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop;
for (var i = 0; i < designResultsCount; i++)
{
var result = new DesignResult("location " + i, "Scenario " + (i * 2))