Skip to content

Commit

Permalink
Merge pull request #57 from minsky97/New_WQ_solver01
Browse files Browse the repository at this point in the history
New wq solver01
  • Loading branch information
mdbartos authored Nov 8, 2023
2 parents 0fc0159 + 7bc42a9 commit 0328cc5
Show file tree
Hide file tree
Showing 37 changed files with 416,027 additions and 196 deletions.
25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_Base.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S01.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S02.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S03.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S04.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S05.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S06.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S07.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S08.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S09.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_conc_input_S10.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/N_Data_flow_input.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/SWMM_result/Data_swmm_depth.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/SWMM_result/Data_swmm_flow.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/SWMM_result/Data_swmm_tss.csv

Large diffs are not rendered by default.

25,922 changes: 25,922 additions & 0 deletions data/real network/measurement_input.csv

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions data/real network/orifices.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
id,sj_0,sj_1,A,orientation,z_o,y_max,C
0,1,12,0.0929,BOTTOM,0,0.3048,0.65
1,10,13,0.0929,BOTTOM,0,0.3048,0.65
2,8,14,0.0929,BOTTOM,0,0.3048,0.65
3,4,16,0.0929,BOTTOM,0,0.3048,0.65
4,0,15,0.0929,BOTTOM,0,0.3048,0.65
5,9,17,0.0929,BOTTOM,0,0.3048,0.65
6,2,18,0.0929,BOTTOM,0,0.3048,0.65
7,3,19,0.0929,BOTTOM,0,0.3048,0.65
8,5,20,0.0929,BOTTOM,0,0.3048,0.65
9,7,21,0.0929,BOTTOM,0,0.3048,0.65
10,6,11,0.0929,BOTTOM,0,0.3048,0.65
24 changes: 24 additions & 0 deletions data/real network/superjunction_wq_params.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
K,c_0,bc
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
0,0,FALSE
24 changes: 24 additions & 0 deletions data/real network/superjunctions.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name,id,z_inv,h_0,max_depth,map_x,map_y,a,b,c,bc,storage,table
93-49743,0,266.46,0.00E+00,inf,13289643.19,271745.062,0,0,1710,FALSE,functional,*
93-49868,1,278.33,0.00E+00,inf,13288433.83,271231.033,0,0,120,FALSE,functional,*
93-49919,2,264.57,0.00E+00,inf,13289921.82,269944.177,0,0,423,FALSE,functional,*
93-49921,3,257.86,0.00E+00,inf,13290104.28,269914.509,0,0,10432,FALSE,functional,*
93-50074,4,261.6,0.00E+00,inf,13289953.88,270675.717,0,0,4672,FALSE,functional,*
93-50076,5,253.75,0.00E+00,inf,13290919.05,269463.631,0,0,10125,FALSE,functional,*
93-50077,6,246.89,0.00E+00,inf,13291897.67,269423.15,0,0,10400,FALSE,functional,*
93-50081,7,250.39,0.00E+00,inf,13291100.87,269448.455,0,0,263,FALSE,functional,*
93-50225,8,268.53,0.00E+00,inf,13289271.16,270937.709,0,0,2635,FALSE,functional,*
93-90357,9,275.54,0.00E+00,inf,13289369.65,271038.425,0,0,688,FALSE,functional,*
93-90358,10,274.62,0.00E+00,inf,13288698.69,271186.2,0,0,1308,FALSE,functional,*
Outfall,11,246,8.90E-01,inf,13292315.16,269516.328,0,0,10000,FALSE,functional,*
J13,12,278.23,0.00E+00,inf,13288488.11,271218.825,0,0,0,FALSE,functional,*
J14,13,274.62,0.00E+00,inf,13288749.21,271166.605,0,0,0,FALSE,functional,*
J15,14,268.53,0.00E+00,inf,13289299.06,270896.287,0,0,0,FALSE,functional,*
J18,15,266.46,0.00E+00,inf,13289655.39,271704.168,0,0,0,FALSE,functional,*
J19,16,261.6,0.00E+00,inf,13289999.43,270647.473,0,0,0,FALSE,functional,*
J22,17,275.54,0.00E+00,inf,13289339.85,271011.014,0,0,0,FALSE,functional,*
J23,18,264.57,0.00E+00,inf,13289960.9,269936.165,0,0,0,FALSE,functional,*
J24,19,257.86,0.00E+00,inf,13290142.42,269893.336,0,0,0,FALSE,functional,*
J25,20,253.75,0.00E+00,inf,13290956.16,269460.97,0,0,0,FALSE,functional,*
J26,21,250.39,0.00E+00,inf,13291135.63,269446.693,0,0,0,FALSE,functional,*
Outfall2,22,240,1.50E+00,inf,13292335.16,269536.328,0,0,1.00E+08,FALSE,functional,*
12 changes: 12 additions & 0 deletions data/real network/superlink_wq_params.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
K,D,c_0,D_uk,D_dk,KF_obs_point,KF_process_sigma,KF_measure_sigma
0,5,0,5,5,3,0.01,0.4
0,5,0,5,5,,,
0,5,0,5,5,,,
0,5,0,5,5,,,
0,5,0,5,5,,,
0,5,0,5,5,,,
0,5,0,5,5,,,
0,5,0,5,5,,,
0,5,0,5,5,,,
0,5,0,5,5,,,
0,5,0,5,5,,,
12 changes: 12 additions & 0 deletions data/real network/superlinks.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name,id,sj_0,sj_1,dx,shape,g1,g2,g3,g4,in_offset,out_offset,n,C,A_c,Q_0,ctrl,A_s,h_0,C_uk,C_dk,dx_uk,dx_dk,internal_links_k
0,0,15,4,339.4,circular,0.3048,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
1,1,18,3,56.3,circular,0.3048,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
2,2,19,5,283.8,circular,0.3048,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
3,3,20,7,55.6,circular,0.3048,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
4,4,21,6,243,circular,0.3048,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
5,5,12,10,81.9,circular,0.3048,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
6,6,13,8,190.2,circular,0.3048,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
7,7,14,2,362,circular,0.3048,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
8,8,17,8,42.9,circular,0.42672,0,0,0,0,0,0.01,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
9,9,16,3,193.5,circular,1.9812,0,0,0,0,0,0.013,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
10,10,11,22,50,circular,2,0,0,0,0,0,0.005,0,0,0,FALSE,1,0.00E+00,0.12,0.12,0.1,0.1,70
3 changes: 3 additions & 0 deletions data/simple network_1000m/Simple_boundary_stage.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
,0,1,2,3
0,0,0,0,0.63
3600,0,0,0,0.63
3 changes: 3 additions & 0 deletions data/simple network_1000m/Simple_superjunction_wq_params.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
K,c_0,bc
0,0,FALSE
0,0,FALSE
3 changes: 3 additions & 0 deletions data/simple network_1000m/Simple_superjunctions.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name,id,z_inv,h_0,bc,storage,a,b,c,max_depth
0,0,1,2.77E-01,FALSE,functional,0,0,0,inf
1,1,0,2.77E-01,FALSE,functional,0,0,10000000000,inf
2 changes: 2 additions & 0 deletions data/simple network_1000m/Simple_superlink_wq_params.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
K,D,c_0,D_uk,D_dk,No_of_obs_point,KF_obs_point,KF_process_sigma,KF_measure_sigma
0,5,0,5,5,2,3,0.01,0.3
2 changes: 2 additions & 0 deletions data/simple network_1000m/Simple_superlinks.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name,id,sj_0,sj_1,in_offset,out_offset,dx,n,shape,g1,g2,g3,g4,Q_0,h_0,ctrl,A_s,A_c,C,C_uk,C_dk,dx_uk,dx_dk
0,0,0,1,0,0,1000,0.035,rect_open,10,5,0,0,0.5,2.77E-01,FALSE,0,0,0,0.67,0.67,0.1,0.1
3 changes: 3 additions & 0 deletions data/simple network_100m/Simple_boundary_stage.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
,0,1,2,3
0,0,0,0,0.63
3600,0,0,0,0.63
4 changes: 4 additions & 0 deletions data/simple network_100m/Simple_superjunction_wq_params.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
K,c_0,bc
0,0,FALSE
0,0,FALSE
0,0,FALSE
4 changes: 4 additions & 0 deletions data/simple network_100m/Simple_superjunctions.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
name,id,z_inv,h_0,bc,storage,a,b,c,max_depth
0,0,0.3,6.30E-01,FALSE,functional,0,0,0,inf
1,1,0.2,6.30E-01,FALSE,functional,0,0,0,inf
2,2,0.1,6.30E-01,FALSE,functional,0,0,10000000000,inf
3 changes: 3 additions & 0 deletions data/simple network_100m/Simple_superlink_wq_params.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
K,D,c_0,D_uk,D_dk,No_of_obs_point,KF_obs_point,KF_process_sigma,KF_measure_sigma
0,0.1,0,0.1,0.1,2,3,0.01,0.3
0,0.1,0,0.1,0.1,,,,
3 changes: 3 additions & 0 deletions data/simple network_100m/Simple_superlinks.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name,id,sj_0,sj_1,in_offset,out_offset,dx,n,shape,g1,g2,g3,g4,Q_0,h_0,ctrl,A_s,A_c,C,C_uk,C_dk,dx_uk,dx_dk
0,0,0,1,0,0,100,0.035,rect_open,20,3,0,0,1,6.30E-01,FALSE,0,0,0,0.11,0.11,0.1,0.1
0,0,1,2,0,0,100,0.035,rect_open,20,3,0,0,1,6.30E-01,FALSE,0,0,0,0.11,0.11,0.1,0.1
Loading

0 comments on commit 0328cc5

Please sign in to comment.