Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/sutables.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/sutables.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/sutables.csv (revision 5882)
@@ -0,0 +1,6 @@
+su_table_name;sigma;su
+SuTable1;0;5
+SuTable1;1000;1005
+SuTable2;2;15
+SuTable2;1000;15
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/surfacelines.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/surfacelines.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/surfacelines.csv (revision 5882)
@@ -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/csvfiles_InvalidSuTable/scenarios.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/scenarios.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/scenarios.csv (revision 5882)
@@ -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/IntegrationTests/ShearStrengthModelsTests.cs
===================================================================
diff -u -r5833 -r5882
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 5833)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 5882)
@@ -94,7 +94,7 @@
///
/// 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.
+ /// except for the sigma-tau curve which 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]
@@ -125,5 +125,41 @@
Assert.That(output.Results.CalculationMessages[5].Message1, Is.EqualTo("The first sigma value must be 0 for sigma/tau table "));
});
}
+
+ ///
+ /// This test uses the same data as test GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned,
+ /// except for the su table nr. 2 which starts at 2 instead of 0.
+ /// Expected is that the soil profile SuTableCsttTau returns no result and that a clear calculation error message is displayed.
+ ///
+ [Test]
+ public void GivenInvalidSuTableNotStartingAt0WhenCalculatingReturnsCalculationErrorMessage()
+ {
+ const string fileName = @"TestFiles\ShearStrengthModelsTests\InputFileInvalidSuTableNotStartingAt0.xml";
+ string inputString = File.ReadAllText(fileName);
+
+ Output output = GeneralHelper.RunAfterInputValidation(inputString);
+
+ Assert.That(output.Results.CalculationResults, Has.Length.EqualTo(6));
+ Assert.Multiple(() =>
+ {
+ Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("MohrCoulombPhi0"));
+ Assert.That(output.Results.CalculationResults[1].ProfileName, Is.EqualTo("SigmaTauCsttTau"));
+ Assert.That(output.Results.CalculationResults[2].ProfileName, Is.EqualTo("MohrCoulombPhi45"));
+ Assert.That(output.Results.CalculationResults[3].ProfileName, Is.EqualTo("SigmaTauPhi45"));
+ Assert.That(output.Results.CalculationResults[4].ProfileName, Is.EqualTo("ShansepPhi45"));
+ Assert.That(output.Results.CalculationResults[5].ProfileName, Is.EqualTo("SuTablePhi45"));
+ Assert.That(output.Results.CalculationMessages, Has.Length.EqualTo(359));
+ });
+
+ Assert.Multiple(() =>
+ {
+ Assert.That(output.Results.CalculationMessages[8].MessageType, Is.EqualTo(MessageMessageType.Error));
+ Assert.That(output.Results.CalculationMessages[8].Message1, Is.EqualTo("Validation failed for location 'Comparison models (constant tau)', subsoil scenario 'SuTableCsttSu', design scenario '1'"));
+ Assert.That(output.Results.CalculationMessages[9].MessageType, Is.EqualTo(MessageMessageType.Error));
+ Assert.That(output.Results.CalculationMessages[9].Message1, Is.EqualTo("Su table first point must have an effective stress of 0"));
+ Assert.That(output.Results.CalculationMessages[10].MessageType, Is.EqualTo(MessageMessageType.Error));
+ Assert.That(output.Results.CalculationMessages[10].Message1, Is.EqualTo("Su table first point must have an effective stress of 0"));
+ });
+ }
}
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/modelparameters.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/modelparameters.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/modelparameters.csv (revision 5882)
@@ -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/csvfiles_InvalidSuTable/segments.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/segments.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/segments.csv (revision 5882)
@@ -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/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/soils.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/soils.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/soils.csv (revision 5882)
@@ -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/InvalidSuTableNotStartingAt0.defx
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSuTableNotStartingAt0.defx (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSuTableNotStartingAt0.defx (revision 5882)
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileInvalidSuTableNotStartingAt0.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileInvalidSuTableNotStartingAt0.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InputFileInvalidSuTableNotStartingAt0.xml (revision 5882)
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/characteristicpoints.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/characteristicpoints.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/characteristicpoints.csv (revision 5882)
@@ -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_InvalidSuTable/locations.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/locations.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/locations.csv (revision 5882)
@@ -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/InvalidSuTableNotStartingAt0.damx
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSuTableNotStartingAt0.damx (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/InvalidSuTableNotStartingAt0.damx (revision 5882)
@@ -0,0 +1,1998 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r5865 -r5882
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5865)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5882)
@@ -236,6 +236,9 @@
PreserveNewest
+
+ PreserveNewest
+
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/soilprofiles.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/soilprofiles.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/soilprofiles.csv (revision 5882)
@@ -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/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/sigmataucurves.csv
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/sigmataucurves.csv (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/ShearStrengthModelsTests/csvfiles_InvalidSuTable/sigmataucurves.csv (revision 5882)
@@ -0,0 +1,6 @@
+sigma_tau_curve_name;sigma;tau
+Curve1;0;5
+Curve1;400;405
+Curve2;0;15
+Curve2;400;15
+