Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r4053 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4053)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4417)
@@ -389,14 +389,6 @@
///
public static ShearStrengthModelKernel ConvertToMacroStabilityShearStrengthModel(ShearStrengthModel damShearStrengthModel)
{
- if (damShearStrengthModel == ShearStrengthModel.SuCalculatedWithYield || damShearStrengthModel == ShearStrengthModel.None ||
- damShearStrengthModel == ShearStrengthModel.PseudoValues || damShearStrengthModel == ShearStrengthModel.StressTable ||
- damShearStrengthModel == ShearStrengthModel.SuGradient || damShearStrengthModel == ShearStrengthModel.SuMeasured ||
- damShearStrengthModel == ShearStrengthModel.CPhiOrSuCalculated)
- {
- throw new ArgumentException($"Cannot convert dam ShearStrengthModel: {damShearStrengthModel}");
- }
-
var translationTable = new Dictionary
{
{
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingBlighWithoutUplift.xml
===================================================================
diff -u -r4234 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingBlighWithoutUplift.xml (.../PipingBlighWithoutUplift.xml) (revision 4234)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingBlighWithoutUplift.xml (.../PipingBlighWithoutUplift.xml) (revision 4417)
@@ -737,18 +737,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs
===================================================================
diff -u -r4052 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs (.../ShearStrengthModel.cs) (revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/ShearStrengthModel.cs (.../ShearStrengthModel.cs) (revision 4417)
@@ -27,47 +27,11 @@
public enum ShearStrengthModel
{
///
- /// The none
- ///
- None = 1,
-
- ///
/// The C Phi model
///
- CPhi = 2,
+ CPhi = 1,
- ///
- /// The stress table model
+ /// The Su calculated model (with POP)
///
- StressTable = 3,
-
- ///
- /// The pseudo values model
- ///
- PseudoValues = 4,
-
- ///
- /// The Su measured model
- ///
- SuMeasured = 5,
-
- ///
- /// The Su calculated model
- ///
- SuCalculated = 6,
-
- ///
- /// The Su gradient
- ///
- SuGradient = 7,
-
- ///
- /// The Su calculated yield model
- ///
- SuCalculatedWithYield = 8,
-
- ///
- /// C Phi or Su calculated model dependent if below or above phreatic line
- ///
- CPhiOrSuCalculated = 9
+ SuCalculated = 2
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r4414 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 4414)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 4417)
@@ -519,8 +519,7 @@
soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : double.NaN;
soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ? ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : null;
soil.UseDefaultShearStrengthModel = inputSoil.UseDefaultShearStrengthModelSpecified ? inputSoil.UseDefaultShearStrengthModel : null;
- if (soil.UseDefaultShearStrengthModel.HasValue && soil.UseDefaultShearStrengthModel.Value &&
- soil.ShearStrengthModel == ShearStrengthModel.None)
+ if (soil.UseDefaultShearStrengthModel.HasValue && soil.UseDefaultShearStrengthModel.Value)
{
soil.ShearStrengthModel = ShearStrengthModel.CPhi;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/WtiPipingSellmeijerRevisedWithoutUplift.xml
===================================================================
diff -u -r4234 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/WtiPipingSellmeijerRevisedWithoutUplift.xml (.../WtiPipingSellmeijerRevisedWithoutUplift.xml) (revision 4234)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/WtiPipingSellmeijerRevisedWithoutUplift.xml (.../WtiPipingSellmeijerRevisedWithoutUplift.xml) (revision 4417)
@@ -737,18 +737,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Index: DamEngine/trunk/doc/Dam Engine - Functional Design/UseStabKernel.tex
===================================================================
diff -u -r3675 -r4417
--- DamEngine/trunk/doc/Dam Engine - Functional Design/UseStabKernel.tex (.../UseStabKernel.tex) (revision 3675)
+++ DamEngine/trunk/doc/Dam Engine - Functional Design/UseStabKernel.tex (.../UseStabKernel.tex) (revision 4417)
@@ -91,11 +91,7 @@
The DAM engine must be able to make stability calculations with following shear strength models:
\begin{itemize}
\item C-Phi
- \item Stress tables
- \item Cu calculated (with default inital surface level of D-Geo Stability; toplayer)
- \item Cu measured
- \item Cu gradient
- \item Pseudo values
+ \item Su calculated (with default initial surface level of D-Geo Stability; toplayer)
\end{itemize}
This shear strength models are defined in the soil parameters per layer.
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r4052 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 4052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 4417)
@@ -3318,31 +3318,10 @@
public enum SoilShearStrengthModel
{
///
- None,
-
- ///
CPhi,
-
+
///
- StressTable,
-
- ///
- PseudoValues,
-
- ///
- SuMeasured,
-
- ///
- SuCalculated,
-
- ///
- SuGradient,
-
- ///
- SuCalculatedWithYield,
-
- ///
- CPhiOrSuCalculated
+ SuCalculated
}
///
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r4373 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4373)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4417)
@@ -1102,31 +1102,10 @@
var translationTable = new Dictionary
{
{
- ShearStrengthModel.None, SoilShearStrengthModel.None
- },
- {
ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi
},
{
- ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable
- },
- {
- ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues
- },
- {
- ShearStrengthModel.SuMeasured, SoilShearStrengthModel.SuMeasured
- },
- {
ShearStrengthModel.SuCalculated, SoilShearStrengthModel.SuCalculated
- },
- {
- ShearStrengthModel.SuGradient, SoilShearStrengthModel.SuGradient
- },
- {
- ShearStrengthModel.SuCalculatedWithYield, SoilShearStrengthModel.SuCalculatedWithYield
- },
- {
- ShearStrengthModel.CPhiOrSuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated
}
};
return translationTable[shearStrengthModel];
@@ -1199,32 +1178,11 @@
var translationTable = new Dictionary
{
{
- SoilShearStrengthModel.None, ShearStrengthModel.None
- },
- {
SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi
},
{
- SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable
- },
- {
- SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues
- },
- {
- SoilShearStrengthModel.SuMeasured, ShearStrengthModel.SuMeasured
- },
- {
SoilShearStrengthModel.SuCalculated, ShearStrengthModel.SuCalculated
- },
- {
- SoilShearStrengthModel.SuGradient, ShearStrengthModel.SuGradient
- },
- {
- SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.SuCalculatedWithYield
- },
- {
- SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrSuCalculated
- }
+ }
};
return translationTable[soilShearStrengthModel];
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r4373 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4373)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4417)
@@ -329,15 +329,8 @@
}
[Test]
- [TestCase(ShearStrengthModel.None, SoilShearStrengthModel.None)]
[TestCase(ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi)]
- [TestCase(ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable)]
- [TestCase(ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues)]
- [TestCase(ShearStrengthModel.SuMeasured, SoilShearStrengthModel.SuMeasured)]
[TestCase(ShearStrengthModel.SuCalculated, SoilShearStrengthModel.SuCalculated)]
- [TestCase(ShearStrengthModel.SuGradient, SoilShearStrengthModel.SuGradient)]
- [TestCase(ShearStrengthModel.SuCalculatedWithYield, SoilShearStrengthModel.SuCalculatedWithYield)]
- [TestCase(ShearStrengthModel.CPhiOrSuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated)]
public void CanConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel, SoilShearStrengthModel soilShearStrengthModel)
{
Assert.AreEqual(soilShearStrengthModel, ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel));
@@ -360,15 +353,8 @@
}
[Test]
- [TestCase(SoilShearStrengthModel.None, ShearStrengthModel.None)]
[TestCase(SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi)]
- [TestCase(SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable)]
- [TestCase(SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues)]
- [TestCase(SoilShearStrengthModel.SuMeasured, ShearStrengthModel.SuMeasured)]
[TestCase(SoilShearStrengthModel.SuCalculated, ShearStrengthModel.SuCalculated)]
- [TestCase(SoilShearStrengthModel.SuGradient, ShearStrengthModel.SuGradient)]
- [TestCase(SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.SuCalculatedWithYield)]
- [TestCase(SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrSuCalculated)]
public void CanConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel, ShearStrengthModel shearStrengthModel)
{
Assert.AreEqual(shearStrengthModel, ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel));
Index: DamEngine/trunk/xsd/DamSoil.xsd
===================================================================
diff -u -r2951 -r4417
--- DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 2951)
+++ DamEngine/trunk/xsd/DamSoil.xsd (.../DamSoil.xsd) (revision 4417)
@@ -14,15 +14,8 @@
-
-
-
-
-
-
-
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml
===================================================================
diff -u -r4000 -r4417
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml (.../InputFile.xml) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml (.../InputFile.xml) (revision 4417)
@@ -203,16 +203,16 @@