Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd
===================================================================
diff -u -r5722 -r5724
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 5722)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd (.../DamMStabInputDefinition.xsd) (revision 5724)
@@ -223,6 +223,7 @@
+
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r4813 -r5724
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4813)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5724)
@@ -104,14 +104,19 @@
public const int InputGridTypeSpecified = 1;
///
- /// The input tangent lines on boundaty lines
+ /// The input tangent lines on boundary lines
///
- public const int InputTangentLinesOnBoundatyLines = 0;
+ public const int InputTangentLinesOnBoundaryLines = 0;
///
/// The input tangent lines specified
///
public const int InputTangentLinesSpecified = 1;
+
+ ///
+ /// The input tangent lines automatic
+ ///
+ public const int InputTangentLinesAutomatic = 2;
///
/// The load situation dry
@@ -1222,10 +1227,13 @@
var translationTable = new Dictionary
{
{
- TangentLinesDefinition.OnBoundaryLines, InputGridTypeAutomatic
+ TangentLinesDefinition.OnBoundaryLines, InputTangentLinesOnBoundaryLines
},
{
- TangentLinesDefinition.Specified, InputGridTypeSpecified
+ TangentLinesDefinition.Specified, InputTangentLinesSpecified
+ },
+ {
+ TangentLinesDefinition.Automatic, InputTangentLinesAutomatic
}
};
return translationTable[tangentLineType];
@@ -1241,10 +1249,13 @@
var translationTable = new Dictionary
{
{
- InputGridTypeAutomatic, TangentLinesDefinition.OnBoundaryLines
+ InputTangentLinesOnBoundaryLines, TangentLinesDefinition.OnBoundaryLines
},
{
- InputGridTypeSpecified, TangentLinesDefinition.Specified
+ InputTangentLinesSpecified, TangentLinesDefinition.Specified
+ },
+ {
+ InputTangentLinesAutomatic, TangentLinesDefinition.Automatic
}
};
return translationTable[tangentLineType];
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r4653 -r5724
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4653)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5724)
@@ -322,16 +322,18 @@
}
[Test]
- [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesOnBoundatyLines)]
+ [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesOnBoundaryLines)]
[TestCase(TangentLinesDefinition.Specified, ConversionHelper.InputTangentLinesSpecified)]
+ [TestCase(TangentLinesDefinition.Automatic, ConversionHelper.InputTangentLinesAutomatic)]
public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, int inputTangentLineType)
{
Assert.That(ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType), Is.EqualTo(inputTangentLineType));
}
[Test]
- [TestCase(ConversionHelper.InputTangentLinesOnBoundatyLines, TangentLinesDefinition.OnBoundaryLines)]
+ [TestCase(ConversionHelper.InputTangentLinesOnBoundaryLines, TangentLinesDefinition.OnBoundaryLines)]
[TestCase(ConversionHelper.InputTangentLinesSpecified, TangentLinesDefinition.Specified)]
+ [TestCase(ConversionHelper.InputTangentLinesAutomatic, TangentLinesDefinition.Automatic)]
public void CanConvertToTangentLinesDefinition(int inputTangentLineType, TangentLinesDefinition tangentLineType)
{
Assert.That(ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType), Is.EqualTo(tangentLineType));
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r5711 -r5724
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5711)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5724)
@@ -33,7 +33,8 @@
public enum TangentLinesDefinition
{
OnBoundaryLines = 0,
- Specified = 1
+ Specified = 1,
+ Automatic = 2
}
public enum GridSizeDetermination