Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfiles/soils.csv =================================================================== diff -u -r5412 -r5414 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfiles/soils.csv (.../soils.csv) (revision 5412) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfiles/soils.csv (.../soils.csv) (revision 5414) @@ -2,6 +2,4 @@ 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; -Dike material;#CB6DC2;Clay;17.00;17.00;5.00;45.00;0.01;1e-05;MohrCoulomb;0;0;0; - Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv =================================================================== diff -u -r5412 -r5414 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv (.../soils.csv) (revision 5412) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/soils.csv (.../soils.csv) (revision 5414) @@ -2,6 +2,4 @@ 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; -Dike material;#CB6DC2;Clay;17.00;17.00;5.00;45.00;0.01;1e-05;MohrCoulomb;0;0;0; - Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx =================================================================== diff -u -r5412 -r5414 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx (.../ShearStrengthModelsComparison.damx) (revision 5412) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/ShearStrengthModelsComparison.damx (.../ShearStrengthModelsComparison.damx) (revision 5414) @@ -1,26 +1,26 @@  - + - + - + - + - + - + - + - + @@ -32,7 +32,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -287,92 +287,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -382,418 +348,407 @@ - - - + + + - + - - + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - + - + - + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -836,7 +791,7 @@ - + @@ -887,114 +842,114 @@ - - + + - - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - + - - + + - - - - - + + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx =================================================================== diff -u -r5412 -r5414 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx (.../InvalidSigmaTauCurveNotStartingAt0.damx) (revision 5412) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/InvalidSigmaTauCurveNotStartingAt0.damx (.../InvalidSigmaTauCurveNotStartingAt0.damx) (revision 5414) @@ -1,988 +1,907 @@  - - - - - - + + + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - + - - - + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - + - + - + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - + + + + + - + + + + + + - + - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfiles/locations.csv =================================================================== diff -u -r5412 -r5414 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfiles/locations.csv (.../locations.csv) (revision 5412) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfiles/locations.csv (.../locations.csv) (revision 5414) @@ -1,2 +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;Dike material;Dike material;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;Dike material;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 +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/csvfile_InvalidSigmaTauCurve/locations.csv =================================================================== diff -u -r5412 -r5414 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/locations.csv (.../locations.csv) (revision 5412) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/TestData/ShearStrengthModelsTests/csvfile_InvalidSigmaTauCurve/locations.csv (.../locations.csv) (revision 5414) @@ -1,2 +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;Dike material;Dike material;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;Dike material;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 +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