Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/locations.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/locations.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/locations.csv (revision 4693) @@ -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: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx =================================================================== diff -u -r4654 -r4693 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx (.../ShearStrengthModelsComparison.damx) (revision 4654) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx (.../ShearStrengthModelsComparison.damx) (revision 4693) @@ -1,5 +1,5 @@  - + @@ -18,238 +18,275 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + + @@ -258,58 +295,58 @@ - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + @@ -322,170 +359,170 @@ - + - + - + - - + + - - - - - - - + + + + + + + - + - + - + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -496,651 +533,715 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + - + + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - + - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - + - - + + - - - + + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/characteristicpoints.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/characteristicpoints.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/characteristicpoints.csv (revision 4693) @@ -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: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj =================================================================== diff -u -r4539 -r4693 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 4693) @@ -79,6 +79,12 @@ + + PreserveNewest + + + PreserveNewest + Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.defx =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.defx (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.defx (revision 4693) @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/surfacelines.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/surfacelines.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/surfacelines.csv (revision 4693) @@ -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: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx (revision 4693) @@ -0,0 +1,1441 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soilprofiles.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soilprofiles.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soilprofiles.csv (revision 4693) @@ -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: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/segments.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/segments.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/segments.csv (revision 4693) @@ -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: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/scenarios.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/scenarios.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/scenarios.csv (revision 4693) @@ -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: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/modelparameters.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/modelparameters.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/modelparameters.csv (revision 4693) @@ -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: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs =================================================================== diff -u -r4654 -r4693 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 4654) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ShearStrengthModelsTests.cs (.../ShearStrengthModelsTests.cs) (revision 4693) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using System.IO; using Deltares.Dam.Data; using Deltares.Dam.TestHelper; using Deltares.Standard; @@ -32,13 +33,18 @@ { private const double tolerance6Decimals = 0.00000051; + /// + /// This test compares the safety factor calculated with the 3 shear strength models: Mohr-Coulomb, Sigma-Tau and Shansep. + /// - 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 + /// Expected is that both shear strength models Mohr-Coulomb and SigmTau return the same result. + /// But Shansep should return a higher safety factor because the VerticalEffectiveStress is higher than the NormalEffectiveStress. + /// [Test] - [Category("Work_In_Progress")] - [Ignore("will succeed when MWDAM-2082 and MWDAM-2093 are solved")] - public void TestShearStrengthModelsComparison() + public void GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned() { - var projectFilename = @"..\..\TestData\ShearStrengthModelsTests\ShearStrengthModelsComparison.damx"; - + var projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\ShearStrengthModelsTests\ShearStrengthModelsComparison.damx"); List allCalculationResults = ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, true, 1); Assert.That(allCalculationResults, Has.Count.EqualTo(3)); @@ -48,7 +54,6 @@ { Assert.That(allCalculationResults[i].LocationName, Is.EqualTo("Comparison Mohr-Coulomb SigmaTau and SHANSEP")); Assert.That(allCalculationResults[i].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); - Assert.That(allCalculationResults[i].SafetyFactor, Is.EqualTo(2.099733).Within(tolerance6Decimals)); Assert.That(allCalculationResults[i].ResultMessage, Is.EqualTo("")); Assert.That(allCalculationResults[i].Notes, Is.EqualTo("")); }); @@ -57,15 +62,28 @@ Assert.Multiple(() => { Assert.That(allCalculationResults[0].ProfileName, Is.EqualTo("MohrCoulombMaterial")); + Assert.That(allCalculationResults[0].SafetyFactor, Is.EqualTo(2.099733).Within(tolerance6Decimals)); Assert.That(allCalculationResults[1].ProfileName, Is.EqualTo("SigmaTauMaterial")); + Assert.That(allCalculationResults[1].SafetyFactor, Is.EqualTo(2.099733).Within(tolerance6Decimals)); Assert.That(allCalculationResults[2].ProfileName, Is.EqualTo("ShansepMaterial")); + Assert.That(allCalculationResults[2].SafetyFactor, Is.EqualTo(2.672868).Within(tolerance6Decimals)); }); } + /// + /// This test uses the same data as test GivenSoilProfilesWithDifferentShearStrengthModelWhenRunningThenExpectedResultsAreReturned, + /// 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] - public void GivenInvalidSigmaTauCurveNotStartingAt0WhenCalculatingReturnsCalculationError() + [Category("Work_In_Progress")] + [Ignore("unexpected error message occurs, will be solved in MWDAM-2123")] + public void GivenInvalidSigmaTauCurveNotStartingAt0WhenCalculatingReturnsCalculationErrorMessage() { - // todo MWDAM-2061 + var projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\ShearStrengthModelsTests\InvalidSigmaTauCurveNotStartingAt0.damx"); + List allCalculationResults = ComputeHelper.ComputeStabilityProject(projectFilename, MStabModelType.Bishop, true, 1); + Assert.That(allCalculationResults, Has.Count.EqualTo(2)); + Assert.That(allCalculationResults[1].CalculationResult, Is.EqualTo(CalculationResult.RunFailed)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv (revision 4693) @@ -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: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/sigmataucurves.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/sigmataucurves.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/sigmataucurves.csv (revision 4693) @@ -0,0 +1,3 @@ +sigma_tau_curve_name;sigma;tau +Curve1;2;5 +Curve1;400;405