Index: DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/InSoils.csv =================================================================== diff -u -r4694 -r5490 --- DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/InSoils.csv (.../InSoils.csv) (revision 4694) +++ DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/InSoils.csv (.../InSoils.csv) (revision 5490) @@ -3,8 +3,8 @@ 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 +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 10.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 20.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 50.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 Index: DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/OutSoils.csv =================================================================== diff -u -r4694 -r5490 --- DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/OutSoils.csv (.../OutSoils.csv) (revision 4694) +++ DamClients/DamUI/trunk/utils/PythonScripts/TestFiles/OutSoils.csv (.../OutSoils.csv) (revision 5490) @@ -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;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; +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;traffic_load_degree_of_consolidation +1 zand dijk;#FFFFFF;Sand;16.50;16.00;1.00;26.00;210.00;1.00000E-03;MohrCoulomb;10.00;Curve (2);100.00 +1Agrond dijk klei en zand;#FFFFFF;Clay;16.50;16.00;1.00;26.00;210.00;1.00000E-03;MohrCoulomb;10.00;;0.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);0.00 +1_wl_Zand;#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00;;100.00 +1_wl_Zand (0);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00;;10.00 +1_wl_Zand (1);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;SHANSEP;10.00;;20.00 +1_Zand;#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00;;50.00 +1_Zand (0);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00;;100.00 +1_Zand (1);#FFFFFF;Sand;18.40;18.40;0.00;32.30;210.00;1.00000E-03;MohrCoulomb;10.00;;100.00 Index: DamClients/DamUI/trunk/utils/PythonScripts/mdb_to_csv_converter.py =================================================================== diff -u -r4694 -r5490 --- DamClients/DamUI/trunk/utils/PythonScripts/mdb_to_csv_converter.py (.../mdb_to_csv_converter.py) (revision 4694) +++ DamClients/DamUI/trunk/utils/PythonScripts/mdb_to_csv_converter.py (.../mdb_to_csv_converter.py) (revision 5490) @@ -42,7 +42,7 @@ input_lines = input_file.readlines() output_header = "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" + "friction_angle;diameter_d70;permeability_x;shear_strength_model;pop;sigma_tau_curve_name;traffic_load_degree_of_consolidation" output_color = "#FFFFFF" output_file.write(output_header + "\n") @@ -61,9 +61,11 @@ shear_strength_model = fetch_shear_strength_model(tab_separated_line[22]) pop = tab_separated_line[15] sigma_tau_curve_name = tab_separated_line[20] + traffic_load_degree_of_consolidation = tab_separated_line[43] - output_line = soil_name + ";" + soil_color + ";" + soil_type + ";" + saturated_unit_weight + ";" + \ + output_line = (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 + "\n" + permeability_x + ";" + shear_strength_model + ";" + pop + ";" + sigma_tau_curve_name + ";" + + traffic_load_degree_of_consolidation + "\n") output_file.write(output_line)