Index: DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/OutSoils.csv =================================================================== diff -u -r4677 -r4694 --- DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/OutSoils.csv (.../OutSoils.csv) (revision 4677) +++ DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/OutSoils.csv (.../OutSoils.csv) (revision 4694) @@ -1,10 +1,10 @@ soil_name;soil_color;soil_type;saturated_unit_weight;unsaturated_unit_weight;cohesion;friction_angle;diameter_d70;permeability_x;shear_strength_model;pop;sigma_tau_curve_name -1 zand dijk;#FFFFFF;Sand;16.50;16.00;1.00;26.00;210.00;0.21;MohrCoulomb;10.00;Curve (2) -1Agrond dijk klei en zand;#FFFFFF;Clay;16.50;16.00;1.00;26.00;210.00;0.21;MohrCoulomb;10.00; -1Bberm (rijp m. erosbest);#FFFFFF;Clay;18.00;17.50;2.00;23.00;210.00;0.21;SigmaTauTable;10.00;Curve (1) -1_wl_Zand;#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;0.21;MohrCoulomb;10.00; -1_wl_Zand (0);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;0.21;MohrCoulomb;10.00; -1_wl_Zand (1);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;0.21;SHANSEP;10.00; -1_Zand;#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;0.21;MohrCoulomb;10.00; -1_Zand (0);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;0.21;MohrCoulomb;10.00; -1_Zand (1);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;0.21;MohrCoulomb;10.00; +1 zand dijk;#FFFFFF;Sand;16.50;16.00;1.00;26.00;210.00;1.00000E-03;MohrCoulomb;10.00;Curve (2) +1Agrond dijk klei en zand;#FFFFFF;Clay;16.50;16.00;1.00;26.00;210.00;1.00000E-03;MohrCoulomb;10.00; +1Bberm (rijp m. erosbest);#FFFFFF;Clay;18.00;17.50;2.00;23.00;210.00;1.00000E-03;SigmaTauTable;10.00;Curve (1) +1_wl_Zand;#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00; +1_wl_Zand (0);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00; +1_wl_Zand (1);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;SHANSEP;10.00; +1_Zand;#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00; +1_Zand (0);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00; +1_Zand (1);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00; Index: DamClients/DamUI/trunk/utils/PythonScripts/mdb_to_csv_converter.py =================================================================== diff -u -r4677 -r4694 --- DamClients/DamUI/trunk/utils/PythonScripts/mdb_to_csv_converter.py (.../mdb_to_csv_converter.py) (revision 4677) +++ DamClients/DamUI/trunk/utils/PythonScripts/mdb_to_csv_converter.py (.../mdb_to_csv_converter.py) (revision 4694) @@ -57,7 +57,7 @@ cohesion = tab_separated_line[8] friction_angle = tab_separated_line[9] diameter_d70 = tab_separated_line[38] - permeability_x = str(float(tab_separated_line[38]) / 1000) + permeability_x = tab_separated_line[14] shear_strength_model = fetch_shear_strength_model(tab_separated_line[22]) pop = tab_separated_line[15] sigma_tau_curve_name = tab_separated_line[20] Index: DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/InSoils.csv =================================================================== diff -u -r4677 -r4694 --- DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/InSoils.csv (.../InSoils.csv) (revision 4677) +++ DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/InSoils.csv (.../InSoils.csv) (revision 4694) @@ -1,10 +1,10 @@ -;Soil name ;Soil type [-] ;Is aquifer ;Gamma- unsat [kN/m³] ;Gamma- sat [kN/m³] ;Gamma- dry [kN/m³] ;Cohesion (c') [kN/m²] ;Friction angle (phi) [degree] ;Standard deviation cohesion [kN/m²] ;Standard deviation phi [degree] ;Distribution cohesion [-] ;Distribution phi [-] ;Permeability Kx [m/s] ;Pre-overburden pressure (POP) [kN/m²] ;RR [-] ;Use probabilistic defaults ;Standard deviation POP [kN/m²] ;Distribution POP [-] ;Stress table ;BondStress table ;Shear strength ;Design partial cohesion [-] ;Design std dev cohesion [-] ;Design partial phi [-] ;Design std dev phi [-] ;Design partial stress table [-] ;Design std dev stress table [-] ;Design partial POP [-] ;Design std dev POP [-] ;Design partial RRatio [-] ;Design std dev RRatio [-] ;Soil group ;Standard deviation press pn [kN/m²] ;Distribution stress table [-] ;Distribution hydraulic pressure [-] ;Correlation coefficient c-phi [-] ;Particle diameter D70 [µm] ;White's constant [-] ;Bedding angle [degree] ;Excess porewater pressure (delta u) [kN/m²] ;Pore pressure factor (alpha) [-] ;Traffic Load Degree of Consolidation [%] ;Standard deviation Permeability Kx [m/s] ;Distribution Permeability Kx ;Standard devation Particle diameter D70 [µm] ;Distribution Particle diameter D70 ;Standard deviation White's constant [-] ;Distribution White's constant ;Standard deviation Bedding angle [degree] ;Distribution Bedding angle -1;1 zand dijk;Sand;0;16;16.5;0.01;1;26;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;Curve (2);;Default;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;100;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal -2;1Agrond dijk klei en zand;Clay;0;16;16.5;0.01;1;26;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;;;C phi;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;0;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal -3;1Bberm (rijp m. erosbest);Clay;0;17.5;18;0.01;2;23;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;Curve (1);;Stress table;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;0;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal -4;1_wl_Zand;Sand;1;18.4;18.4;0.01;0;32.3;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;;;Pseudo values;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;100;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal -5;1_wl_Zand (0);Sand;1;18.4;18.4;0.01;0;32.3;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;;;Su measured;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;100;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal -6;1_wl_Zand (1);Sand;1;18.4;18.4;0.01;0;32.3;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;;;Su calculated with POP;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;100;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal -7;1_Zand;Sand;0;18.4;18.4;0.01;0;32.3;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;;;Su gradient;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;100;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal -8;1_Zand (0);Sand;0;18.4;18.4;0.01;0;32.3;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;;;Su calculated with yield stress;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;100;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal -9;1_Zand (1);Sand;0;18.4;18.4;0.01;0;32.3;0;0;Log normal;Log normal;1.00E-03;10;1;1;0;Normal;;;Su calculated DOV;1.25;-1.65;1.1;-1.65;1.15;-1.65;1.1;-1.65;1;0;0;0.2;Log normal;Log normal;0;210;0.25;37;0;1;100;0.00E+00;Log normal;0;Log normal;0;Log normal;0;Log normal +   Soil name Soil type [-] Is aquifer Gamma- unsat [kN/m³] Gamma- sat [kN/m³] Gamma- dry [kN/m³] Cohesion (c') [kN/m²] Friction angle (phi) [degree] Standard deviation cohesion [kN/m²] Standard deviation phi [degree] Distribution cohesion [-] Distribution phi [-] Permeability Kx [m/s] Pre-overburden pressure (POP) [kN/m²] RR [-] Use probabilistic defaults Standard deviation POP [kN/m²] Distribution POP [-] Stress table BondStress table Shear strength Design partial cohesion [-] Design std dev cohesion [-] Design partial phi [-] Design std dev phi [-] Design partial stress table [-] Design std dev stress table [-] Design partial POP [-] Design std dev POP [-] Design partial RRatio [-] Design std dev RRatio [-] Soil group Standard deviation press pn [kN/m²] Distribution stress table [-] Distribution hydraulic pressure [-] Correlation coefficient c-phi [-] Particle diameter D70 [µm] White's constant [-] Bedding angle [degree] Excess porewater pressure (delta u) [kN/m²] Pore pressure factor (alpha) [-] Traffic Load Degree of Consolidation [%] Standard deviation Permeability Kx [m/s] Distribution Permeability Kx Standard devation Particle diameter D70 [µm] Distribution Particle diameter D70 Standard deviation White's constant [-] Distribution White's constant Standard deviation Bedding angle [degree] Distribution Bedding angle +1 1 zand dijk Sand 0 16.00 16.50 0.01 1.00 26.00 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal Curve (2) Default 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 100.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal +2 1Agrond dijk klei en zand Clay 0 16.00 16.50 0.01 1.00 26.00 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal C phi 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 0.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal +3 1Bberm (rijp m. erosbest) Clay 0 17.50 18.00 0.01 2.00 23.00 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal Curve (1) Stress table 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 0.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal +4 1_wl_Zand Sand 1 18.40 18.40 0.01 0.00 32.30 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal Pseudo values 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 100.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal +5 1_wl_Zand (0) Sand 1 18.40 18.40 0.01 0.00 32.30 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal Su measured 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 100.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal +6 1_wl_Zand (1) Sand 1 18.40 18.40 0.01 0.00 32.30 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal Su calculated with POP 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 100.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal +7 1_Zand Sand 0 18.40 18.40 0.01 0.00 32.30 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal Su gradient 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 100.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal +8 1_Zand (0) Sand 0 18.40 18.40 0.01 0.00 32.30 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal Su calculated with yield stress 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 100.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal +9 1_Zand (1) Sand 0 18.40 18.40 0.01 0.00 32.30 0.00 0.00 Log normal Log normal 1.00000E-03 10.00 1.0000000 1 0.00 Normal Su calculated DOV 1.25 -1.65 1.10 -1.65 1.15 -1.65 1.10 -1.65 1.00 0.00 0 0.20 Log normal Log normal 0.00 210.00 0.250 37.0 0.00 1.00 100.00 0.00000E+00 Log normal 0.0000 Log normal 0.0000 Log normal 0.0000 Log normal