Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r4540 -r4565
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 4565)
@@ -345,7 +345,7 @@
3.9.0
- 23.2.1.6
+ 24.1.0.48
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r4540 -r4565
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 4565)
@@ -81,7 +81,7 @@
3.9.0
- 23.2.1.6
+ 24.1.0.48
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r4556 -r4565
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 4556)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 4565)
@@ -32,7 +32,7 @@
24.1.1.43
- 23.2.1.6
+ 24.1.0.48
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r4540 -r4565
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4565)
@@ -346,6 +346,10 @@
//UsePop = true,
//WhitesConstant = 0.00,
};
+ damSoil.SigmaTauCurve = new SigmaTauCurve();
+
+ // TODO Add damSoil.SigmaTauCurve.Points based on soil.SigmaTauTable (to be implemented)
+
if (soil.Dilatancy.AlmostEquals(soil.FrictionAngle, tolerance))
{
damSoil.DilatancyType = DilatancyType.Phi;
@@ -378,6 +382,9 @@
},
{
ShearStrengthModelKernel.Shansep, ShearStrengthModel.SuCalculated
+ },
+ {
+ ShearStrengthModelKernel.SigmaTauTable, ShearStrengthModel.SigmaTauCurve
}
};
return translationTable[kernelShearStrengthModel];
@@ -396,6 +403,9 @@
},
{
ShearStrengthModel.SuCalculated, ShearStrengthModelKernel.Shansep
+ },
+ {
+ ShearStrengthModel.SigmaTauCurve, ShearStrengthModelKernel.SigmaTauTable
}
};
return translationTable[damShearStrengthModel];