Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv (revision 5833)
@@ -0,0 +1,5 @@
+soil_name;soil_color;soil_type;saturated_unit_weight;unsaturated_unit_weight;cohesion;friction_angle;diameter_d70;permeability_x;shear_strength_model;strength_increase_exponent;ratio_su_pc;pop;sigma_tau_curve_name
+coh 5 phi 45;#CB6DC2;Clay;17.00;17.00;5.00;45.00;0.01;1e-05;MohrCoulomb;0;0;0;
+stress table with coh 5 phi 45;#61BB9A;Clay;17.00;17.00;0;0;0.01;1e-05;SigmaTauTable;0;0;0;Curve1
+Su with POP is coh;#616CBB;Clay;17.00;17.00;0;0;0.01;1e-05;SHANSEP;1;1;5;
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/scenarios.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/scenarios.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/scenarios.csv (revision 5833)
@@ -0,0 +1,2 @@
+location_id;location_scenario_id;water_height;dike_table_height;safety_factor_stability_inner_slope
+Comparison Mohr-Coulomb SigmaTau and SHANSEP;1;3,8;57;6,07;1,1
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/modelparameters.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/modelparameters.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/modelparameters.csv (revision 5833)
@@ -0,0 +1,2 @@
+indringingslengte;verkeersbelasting;dempingsfactor_pl3;dempingsfactor_pl4;safety_factor_stability_inner_slope;safety_factor_piping
+1;13;0.3;0.3;1.19;1
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/sigmataucurves.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/sigmataucurves.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/sigmataucurves.csv (revision 5833)
@@ -0,0 +1,3 @@
+sigma_tau_curve_name;sigma;tau
+Curve1;2;5
+Curve1;400;405
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/scenarios.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/scenarios.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/scenarios.csv (revision 5833)
@@ -0,0 +1,3 @@
+location_id;location_scenario_id;water_height;dike_table_height;safety_factor_stability_inner_slope
+Comparison models (not constant tau);1;3,8;57;6,07;1,1
+Comparison models (constant tau);1;3,8;57;6,07;1,1
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/surfacelines.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/surfacelines.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/surfacelines.csv (revision 5833)
@@ -0,0 +1,3 @@
+Profielnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel);;;;;;;A20;A21;A22;A23;A24;A25;A26;A27;A28;A29;A30;A31;A32;A33;A34;A35;A36;A37;A38;A39;A40;A41;A42;A43;A44;A45;A46;A47;A48;A49;A50;A51;A52;A53;A54;A55;
+16-1-1-C-3-Z;0;18,93;0;1;-23,00;0,00;1,00;-12,68;0,00;1,00;-12,66;0,00;1,01;-12,65;0,00;1,01;0,01;0,00;6,07;4,50;0,00;6,07;7,00;0,00;6,07;7,50;0,00;6,07;18,93;0,00;1,50;19,03;0,00;1,50;19,18;0,00;1,40;22,18;0,00;1,40;22,23;0,00;1,35;22,28;0,00;1,35;22,33;0,00;1,40;52,00;0,00;1,40
+25-2-2-A-1-A;0;14,48;0;1;-23,00;0,00;0,27;-13,09;0,00;0,27;-13,06;0,00;0,28;-13,05;0,00;0,28;0,01;0,00;4,01;0,50;0,00;4,01;3,00;0,00;4,01;3,50;0,00;4,01;14,48;0,00;0,35;14,58;0,00;0,35;14,78;0,00;0,25;17,78;0,00;0,25;17,83;0,00;0,20;17,88;0,00;0,20;17,93;0,00;0,25;48,00;0,00;0,25
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/segments.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/segments.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/segments.csv (revision 5833)
@@ -0,0 +1,4 @@
+segment_id;soilprofile_id;probability;calculation_type
+1043;MohrCoulombMaterial;33.33;Stability
+1043;SigmaTauMaterial;33.33;Stability
+1043;ShansepMaterial;33.34;Stability
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/segments.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/segments.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/segments.csv (revision 5833)
@@ -0,0 +1,8 @@
+segment_id;soilprofile_id;probability;calculation_type
+1043;MohrCoulombPhi45;10.00;Stability
+1043;SigmaTauPhi45;20.00;Stability
+1043;ShansepPhi45;30.00;Stability
+1043;SuTablePhi45;40.00;Stability
+1033;MohrCoulombPhi0;33.33;Stability
+1033;SigmaTauCsttTau;33.33;Stability
+1033;SuTableCsttSu;33.34;Stability
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r5729 -r5833
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5729)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5833)
@@ -224,6 +224,12 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/sigmataucurves.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/sigmataucurves.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/sigmataucurves.csv (revision 5833)
@@ -0,0 +1,6 @@
+sigma_tau_curve_name;sigma;tau
+Curve1;0;5
+Curve1;400;405
+Curve2;0;15
+Curve2;400;15
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/soilprofiles.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/soilprofiles.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/soilprofiles.csv (revision 5833)
@@ -0,0 +1,15 @@
+soilprofile_id;top_level;soil_name;soiltype;is_aquifer
+MohrCoulombPhi45;60;coh 5 phi 45;klei;FALSE
+MohrCoulombPhi45;1;coh 5 phi 45;klei;TRUE
+SigmaTauPhi45;60;stress table with coh 5 phi 45;klei;FALSE
+SigmaTauPhi45;1;stress table with coh 5 phi 45;klei;TRUE
+ShansepPhi45;60;Su with POP is coh;klei;FALSE
+ShansepPhi45;1;Su with POP is coh;klei;TRUE
+SuTablePhi45;60;Su table with coh 5 phi 45;klei;FALSE
+SuTablePhi45;1;Su table with coh 5 phi 45;klei;TRUE
+MohrCoulombPhi0;60;coh 15 phi 0;klei;FALSE
+MohrCoulombPhi0;1;coh 15 phi 0;klei;TRUE
+SigmaTauCsttTau;60;stress table with cstt tau;klei;FALSE
+SigmaTauCsttTau;1;stress table with cstt tau;klei;TRUE
+SuTableCsttSu;60;Su table with cstt Su;klei;FALSE
+SuTableCsttSu;1;Su table with cstt Su;klei;TRUE
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs (revision 5833)
@@ -0,0 +1,129 @@
+// Copyright (C) Stichting Deltares 2024. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.IO;
+using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Interface;
+using Deltares.DamEngine.Io.XmlOutput;
+using Deltares.DamEngine.TestHelpers;
+using NUnit.Framework;
+
+namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
+{
+ [TestFixture]
+ public class ShearStrengthModelsTests
+ {
+ private const double tolerance6Decimals = 0.00000051;
+
+ ///
+ /// This test compares the safety factor calculated with the different in 2 cases:
+ /// - CASE 1: The shear stress is not constant but almost equals in the 4 following shear strength models:
+ /// - Mohr-Coulomb (c=5, phi=psi=45) leading to a shear stress of Tau = 5 + NormalEffectiveStress
+ /// - SigmaTau table with one segment line (0, 5)-(400, 405) equivalent to Mohr-Coulomb
+ /// - SHANSEP (m=S=1, POP=5) leading to a shear stress of Tau = 5 + VerticalEffectiveStress
+ /// - SuTable with one segment line (0, 5)-(1000, 1005) equivalent to Shansep
+ /// Expected is that both shear strength models Mohr-Coulomb and SigmaTau return the same result.
+ /// However, due to the "cut-off" method (reduction of the bottom angle of the slices when too high) which applies to
+ /// Mohr-Coulomb but not SigmaTau table, a small difference in the safety factor is expected.
+ /// But SHANSEP should return a higher safety factor because the VerticalEffectiveStress is higher than the NormalEffectiveStress.
+ /// Both shear strength models SHANSEP and SigmaTau should return the same result.
+ /// - CASE 2: The shear stress is constant in the 3 following shear strength models:
+ /// - Mohr-Coulomb (c=15, phi=psi=0) leading to a shear stress of Tau = 15
+ /// - SigmaTau table with one segment line (0, 15)-(400, 15) leading to Tau = 15
+ /// - SuTable with one segment line (0, 15)-(1000, 15) leading to Tau = 15
+ /// Expected is that the 3 models return the same result.
+ ///
+ [Test]
+ public void GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned()
+ {
+ const string fileName = @"TestFiles\ShearStrengthModelsTests\InputFileShearStrengthModelsComparison.xml";
+ string inputString = File.ReadAllText(fileName);
+
+ Output output = GeneralHelper.RunAfterInputValidation(inputString);
+
+ Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(7));
+ for (var i = 0; i < 7; i++)
+ {
+ Assert.Multiple(() =>
+ {
+ Assert.That(output.Results.CalculationResults[i].CalculationResult, Is.EqualTo(ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded)));
+ Assert.That(output.Results.CalculationResults[i].StabilityDesignResults.ResultMessage, Is.EqualTo(""));
+ });
+ }
+
+ Assert.Multiple(() =>
+ {
+ Assert.That(output.Results.CalculationResults[0].LocationName, Is.EqualTo("Comparison models (constant tau)"));
+ Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("MohrCoulombPhi0"));
+ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.080048).Within(tolerance6Decimals));
+ Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("SigmaTauCsttTau"));
+ Assert.That(output.Results.CalculationResults[1].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.080048).Within(tolerance6Decimals));
+ Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("SuTableCsttSu"));
+ Assert.That(output.Results.CalculationResults[2].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.080048).Within(tolerance6Decimals));
+
+ Assert.That(output.Results.CalculationResults[3].LocationName, Is.EqualTo("Comparison models (not constant tau)"));
+ Assert.That(output.Results.CalculationResults[3].ProfileName, Is.EqualTo("MohrCoulombPhi45"));
+ Assert.That(output.Results.CalculationResults[3].StabilityDesignResults.SafetyFactor, Is.EqualTo(3.064123).Within(tolerance6Decimals));
+ Assert.That(output.Results.CalculationResults[4].ProfileName, Is.EqualTo("SigmaTauPhi45"));
+ Assert.That(output.Results.CalculationResults[4].StabilityDesignResults.SafetyFactor, Is.EqualTo(3.066645).Within(tolerance6Decimals));
+ Assert.That(output.Results.CalculationResults[5].ProfileName, Is.EqualTo("ShansepPhi45"));
+ Assert.That(output.Results.CalculationResults[5].StabilityDesignResults.SafetyFactor, Is.EqualTo(3.484979).Within(tolerance6Decimals));
+ Assert.That(output.Results.CalculationResults[6].ProfileName, Is.EqualTo("SuTablePhi45"));
+ Assert.That(output.Results.CalculationResults[6].StabilityDesignResults.SafetyFactor, Is.EqualTo(3.484979).Within(tolerance6Decimals));
+ });
+ }
+
+ ///
+ /// This test uses the same data as location "Comparison models (not constant tau)" in test
+ /// GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned (without SuTable),
+ /// except for the sigma-tau curve starts at 2 instead of 0.
+ /// Expected is that the soil profile SigmaTauMaterial returns no result and that a clear calculation error message is displayed.
+ ///
+ [Test]
+ public void GivenInvalidSigmaTauCurveNotStartingAt0WhenCalculatingReturnsCalculationErrorMessage()
+ {
+ const string fileName = @"TestFiles\ShearStrengthModelsTests\InputFileInvalidSigmaTauCurveNotStartingAt0.xml";
+ string inputString = File.ReadAllText(fileName);
+
+ Output output = GeneralHelper.RunAfterInputValidation(inputString);
+
+ Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(2));
+ Assert.Multiple(() =>
+ {
+ Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("MohrCoulombMaterial"));
+ Assert.That(output.Results.CalculationResults[0].CalculationResult, Is.EqualTo(ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded)));
+
+ Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("ShansepMaterial"));
+ Assert.That(output.Results.CalculationResults[1].CalculationResult, Is.EqualTo(ConversionHelper.ConvertToOutputCalculationResult(CalculationResult.Succeeded)));
+ });
+ Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(9));
+ Assert.Multiple(() =>
+ {
+ Assert.That(output.Results.CalculationMessages[3].MessageType, Is.EqualTo(MessageMessageType.Error));
+ Assert.That(output.Results.CalculationMessages[3].Message1, Is.EqualTo("Validation failed for location 'Comparison Mohr-Coulomb SigmaTau and SHANSEP', subsoil scenario 'SigmaTauMaterial', design scenario '1'"));
+ Assert.That(output.Results.CalculationMessages[4].MessageType, Is.EqualTo(MessageMessageType.Error));
+ Assert.That(output.Results.CalculationMessages[4].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
+ Assert.That(output.Results.CalculationMessages[5].MessageType, Is.EqualTo(MessageMessageType.Error));
+ Assert.That(output.Results.CalculationMessages[5].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
+ });
+ }
+ }
+}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/characteristicpoints.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/characteristicpoints.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/characteristicpoints.csv (revision 5833)
@@ -0,0 +1,3 @@
+Profielnaam;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Insteek sloot dijkzijde;Y_Insteek_sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;Volgnummer
+16-1-1-C-3-Z;-23,00;0,00;1,00;-12,68;0,00;1,00;-12,66;0,00;1,01;-12,65;0,00;1,01;0,00;0,00;5,66;0,01;0,00;6,07;4,50;0,00;6,07;7,00;0,00;6,07;7,50;0,00;6,07;18,93;0,00;1,50;19,03;0,00;1,50;19,18;0,00;1,40;22,18;0,00;1,40;22,23;0,00;1,35;22,28;0,00;1,35;22,33;0,00;1,40;52,00;0,00;1,40;1
+25-2-2-A-1-A;-23;0;0,27;-13,09;0;0,27;-13,06;0;0,28;-13,05;0;0,28;0;0;4,23;0,01;0;4,01;0,5;0;4,01;3;0;4,01;3,5;0;4,01;14,48;0;0,35;14,58;0;0,35;14,78;0;0,25;17,78;0;0,25;17,83;0;0,2;17,88;0;0,2;17,93;0;0,25;48;0;0,25;2
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileShearStrengthModelsComparison.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileShearStrengthModelsComparison.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileShearStrengthModelsComparison.xml (revision 5833)
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/soils.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/soils.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/soils.csv (revision 5833)
@@ -0,0 +1,12 @@
+soil_name;soil_color;soil_type;saturated_unit_weight;unsaturated_unit_weight;cohesion;friction_angle;diameter_d70;permeability_x;shear_strength_model;strength_increase_exponent;ratio_su_pc;pop;sigma_tau_curve_name;su_table_name
+coh 5 phi 45;#CB6DC2;Clay;17.00;17.00;5.00;45.00;0.01;1e-05;MohrCoulomb;0;0;0;;;
+stress table with coh 5 phi 45;#61BB9A;Clay;17.00;17.00;0;0;0.01;1e-05;SigmaTauTable;0;0;0;Curve1;;
+Su with POP is coh;#616CBB;Clay;17.00;17.00;0;0;0.01;1e-05;SHANSEP;1;1;5;;;
+Su table with coh 5 phi 45;#613CBB;Clay;17.00;17.00;0;0;0.01;1e-05;SuTable;0;0;0;;SuTable1
+coh 15 phi 0;#CB6DC2;Clay;17.00;17.00;15.00;0.00;0.01;1e-05;MohrCoulomb;0;0;0;;;
+stress table with cstt tau;#61BB9A;Clay;17.00;17.00;0;0;0.01;1e-05;SigmaTauTable;0;0;0;Curve2;;
+Su table with cstt Su;#613CBB;Clay;17.00;17.00;0;0;0.01;1e-05;SuTable;0;0;0;;SuTable2
+
+
+
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileInvalidSigmaTauCurveNotStartingAt0.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileInvalidSigmaTauCurveNotStartingAt0.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileInvalidSigmaTauCurveNotStartingAt0.xml (revision 5833)
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.defx
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.defx (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.defx (revision 5833)
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx (revision 5833)
@@ -0,0 +1,1070 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/surfacelines.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/surfacelines.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/surfacelines.csv (revision 5833)
@@ -0,0 +1,3 @@
+Profielnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel);;;;;;;A20;A21;A22;A23;A24;A25;A26;A27;A28;A29;A30;A31;A32;A33;A34;A35;A36;A37;A38;A39;A40;A41;A42;A43;A44;A45;A46;A47;A48;A49;A50;A51;A52;A53;A54;A55;
+16-1-1-C-3-Z;0;18,93;0;1;-23,00;0,00;1,00;-12,68;0,00;1,00;-12,66;0,00;1,01;-12,65;0,00;1,01;0,01;0,00;6,07;4,50;0,00;6,07;7,00;0,00;6,07;7,50;0,00;6,07;18,93;0,00;1,50;19,03;0,00;1,50;19,18;0,00;1,40;22,18;0,00;1,40;22,23;0,00;1,35;22,28;0,00;1,35;22,33;0,00;1,40;52,00;0,00;1,40
+25-2-2-A-1-A;0;14,48;0;1;-23,00;0,00;0,27;-13,09;0,00;0,27;-13,06;0,00;0,28;-13,05;0,00;0,28;0,01;0,00;4,01;0,50;0,00;4,01;3,00;0,00;4,01;3,50;0,00;4,01;14,48;0,00;0,35;14,58;0,00;0,35;14,78;0,00;0,25;17,78;0,00;0,25;17,83;0,00;0,20;17,88;0,00;0,20;17,93;0,00;0,25;48,00;0,00;0,25
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soilprofiles.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soilprofiles.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soilprofiles.csv (revision 5833)
@@ -0,0 +1,7 @@
+soilprofile_id;top_level;soil_name;soiltype;is_aquifer
+MohrCoulombMaterial;60;coh 5 phi 45;klei;FALSE
+MohrCoulombMaterial;1;coh 5 phi 45;klei;TRUE
+SigmaTauMaterial;60;stress table with coh 5 phi 45;klei;FALSE
+SigmaTauMaterial;1;stress table with coh 5 phi 45;klei;TRUE
+ShansepMaterial;60;Su with POP is coh;klei;FALSE
+ShansepMaterial;1;Su with POP is coh;klei;TRUE
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/characteristicpoints.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/characteristicpoints.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/characteristicpoints.csv (revision 5833)
@@ -0,0 +1,3 @@
+Profielnaam;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Insteek sloot dijkzijde;Y_Insteek_sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;Volgnummer
+16-1-1-C-3-Z;-23,00;0,00;1,00;-12,68;0,00;1,00;-12,66;0,00;1,01;-12,65;0,00;1,01;0,00;0,00;5,66;0,01;0,00;6,07;4,50;0,00;6,07;7,00;0,00;6,07;7,50;0,00;6,07;18,93;0,00;1,50;19,03;0,00;1,50;19,18;0,00;1,40;22,18;0,00;1,40;22,23;0,00;1,35;22,28;0,00;1,35;22,33;0,00;1,40;52,00;0,00;1,40;1
+25-2-2-A-1-A;-23;0;0,27;-13,09;0;0,27;-13,06;0;0,28;-13,05;0;0,28;0;0;4,23;0,01;0;4,01;0,5;0;4,01;3;0;4,01;3,5;0;4,01;14,48;0;0,35;14,58;0;0,35;14,78;0;0,25;17,78;0;0,25;17,83;0;0,2;17,88;0;0,2;17,93;0;0,25;48;0;0,25;2
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/locations.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/locations.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/locations.csv (revision 5833)
@@ -0,0 +1,3 @@
+location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;dike_table_height;TL_DegreeOfConsolidation;water_height;water_height_low;water_height_decimerings_hoogte;max_waterheight
+Comparison models (not constant tau);16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0,9;0,2;13,056;0,9;0,8;1;1;klei;klei2;1;2;3;12;TRUE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;3,5;10,12;3,6;3,7;3,8;3,9
+Comparison models (constant tau);16-1-1-C-3-Z;1033;124330;441312;1;16-1-1-C-3-Z;0,9;0,2;13,056;0,9;0,8;1;1;klei;klei2;1;2;3;12;TRUE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;3,5;10,12;3,6;3,7;3,8;3,9
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/sutables.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/sutables.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles/sutables.csv (revision 5833)
@@ -0,0 +1,6 @@
+su_table_name;sigma;su
+SuTable1;0;5
+SuTable1;1000;1005
+SuTable2;0;15
+SuTable2;1000;15
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx (revision 5833)
@@ -0,0 +1,1898 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/ShearStrengthModelsComparison.defx
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/ShearStrengthModelsComparison.defx (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/ShearStrengthModelsComparison.defx (revision 5833)
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/locations.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/locations.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/locations.csv (revision 5833)
@@ -0,0 +1,2 @@
+location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;dike_table_height;TL_DegreeOfConsolidation;water_height;water_height_low;water_height_decimerings_hoogte;max_waterheight
+Comparison Mohr-Coulomb SigmaTau and SHANSEP;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0,9;0,2;13,056;0,9;0,8;1;1;klei;klei2;1;2;3;12;TRUE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;3,5;10,12;3,6;3,7;3,8;3,9
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/modelparameters.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/modelparameters.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/modelparameters.csv (revision 5833)
@@ -0,0 +1,2 @@
+indringingslengte;verkeersbelasting;dempingsfactor_pl3;dempingsfactor_pl4;safety_factor_stability_inner_slope;safety_factor_piping
+1;13;0.3;0.3;1.19;1