Index: DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/locations.csv =================================================================== diff -u -r5147 -r5854 --- DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/locations.csv (.../locations.csv) (revision 5147) +++ DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/locations.csv (.../locations.csv) (revision 5854) @@ -1,6 +1,6 @@ location_id;dikering_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;polderlevel;head_pl2;head_pl3;grass_quality;direction;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;baggerdiepte;minimal_circle_depth;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;detrimentfactor -DAMStandard;Actualisatie;RK210-560;1;198384.4;503776.3;0;-15;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 -SemiTimeDependent;Actualisatie;RK210-560;1;198384.4;503776.3;0;-15;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 -Linear;Actualisatie;RK210-560;1;198384.4;503776.3;0;-15;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 -Hydrostatic;Actualisatie;RK210-560;1;198384.4;503776.3;0;-15;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 -FullHydrostatic;Actualisatie;RK210-560;1;198384.4;503776.3;0;-15;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 \ No newline at end of file +DAMStandard;Actualisatie;RK210-560;1;198384.4;503776.3;0;-5;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 +SemiTimeDependent;Actualisatie;RK210-560;1;198384.4;503776.3;0;-5;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 +Linear;Actualisatie;RK210-560;1;198384.4;503776.3;0;-5;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 +Hydrostatic;Actualisatie;RK210-560;1;198384.4;503776.3;0;-5;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 +FullHydrostatic;Actualisatie;RK210-560;1;198384.4;503776.3;0;-5;-5.6;-7;1;1;clay;clay;0.5;0.6;0;0;0;0;0;1;0.23;0.23;0.2;10;1.8;1.8;5;5;0.9 \ No newline at end of file Index: DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/segments.csv =================================================================== diff -u -r5147 -r5854 --- DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/segments.csv (.../segments.csv) (revision 5147) +++ DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/segments.csv (.../segments.csv) (revision 5854) @@ -1,4 +1,4 @@ -segment_id;soilgeometry2D_name;probability;calculation_type -1;SoilProfile_NoInbetweenAquifer.stix;35.00;Stability -1;SoilProfile_OneInbetweenAquifer.stix;33.00;Stability -1;SoilProfile_TwoInbetweenAquifers.stix;32.00;Stability +segment_id;soilprofile_id;probability;calculation_type +1;SoilProfile_NoInbetweenAquifer;35.00;Stability +1;SoilProfile_OneInbetweenAquifer;33.00;Stability +1;SoilProfile_TwoInbetweenAquifers;32.00;Stability Fisheye: Tag 5854 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/modelparameters.csv'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/soilprofiles.csv =================================================================== diff -u --- DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/soilprofiles.csv (revision 0) +++ DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/soilprofiles.csv (revision 5854) @@ -0,0 +1,21 @@ +soilprofile_id;top_level;soil_name;is_aquifer +SoilProfile_NoInbetweenAquifer;6;clay;false +SoilProfile_NoInbetweenAquifer;-2;sand;true +SoilProfile_NoInbetweenAquifer;-2.5;clay;false +SoilProfile_NoInbetweenAquifer;-10;sand;true +SoilProfile_OneInbetweenAquifer;-9;clay;false +SoilProfile_OneInbetweenAquifer;-10;sand;true +SoilProfile_OneInbetweenAquifer;-13;sand;true +SoilProfile_OneInbetweenAquifer;-16;clay;false +SoilProfile_OneInbetweenAquifer;-20;clay;false +SoilProfile_OneInbetweenAquifer;-25;sand;true +SoilProfile_OneInbetweenAquifer;-30;sand;true +SoilProfile_TwoInbetweenAquifers;-9;clay;false +SoilProfile_TwoInbetweenAquifers;-10;sand;true +SoilProfile_TwoInbetweenAquifers;-13;clay;false +SoilProfile_TwoInbetweenAquifers;-16;sand;true +SoilProfile_TwoInbetweenAquifers;-20;sand;true +SoilProfile_TwoInbetweenAquifers;-25;clay;false +SoilProfile_TwoInbetweenAquifers;-30;sand;true + + Fisheye: Tag 5854 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/TestWaternet_v24_1DProfile.damx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5854 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/csvfiles/aquifers.csv'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/TestWaternet_1DProfile.defx =================================================================== diff -u --- DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/TestWaternet_1DProfile.defx (revision 0) +++ DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/TestWaternet_1DProfile.defx (revision 5854) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Fisheye: Tag 5418 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/test/TestDataForTestDocument/WaternetCreator/TestWaternet_1DProfile.damx'. Fisheye: No comparison available. Pass `N' to diff?