floodmodeller-api 0.5.0.post1__py3-none-any.whl → 0.5.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (119) hide show
  1. floodmodeller_api/__init__.py +11 -1
  2. floodmodeller_api/_base.py +55 -36
  3. floodmodeller_api/backup.py +15 -12
  4. floodmodeller_api/dat.py +191 -121
  5. floodmodeller_api/diff.py +4 -4
  6. floodmodeller_api/hydrology_plus/hydrology_plus_export.py +15 -14
  7. floodmodeller_api/ied.py +8 -10
  8. floodmodeller_api/ief.py +56 -42
  9. floodmodeller_api/ief_flags.py +1 -1
  10. floodmodeller_api/inp.py +7 -10
  11. floodmodeller_api/logs/lf.py +25 -26
  12. floodmodeller_api/logs/lf_helpers.py +20 -20
  13. floodmodeller_api/logs/lf_params.py +1 -5
  14. floodmodeller_api/mapping.py +11 -2
  15. floodmodeller_api/test/__init__.py +2 -2
  16. floodmodeller_api/test/conftest.py +2 -3
  17. floodmodeller_api/test/test_backup.py +2 -2
  18. floodmodeller_api/test/test_conveyance.py +13 -7
  19. floodmodeller_api/test/test_dat.py +168 -20
  20. floodmodeller_api/test/test_data/EX18_DAT_expected.json +164 -144
  21. floodmodeller_api/test/test_data/EX3_DAT_expected.json +6 -2
  22. floodmodeller_api/test/test_data/EX6_DAT_expected.json +12 -46
  23. floodmodeller_api/test/test_data/encoding_test_cp1252.dat +1081 -0
  24. floodmodeller_api/test/test_data/encoding_test_utf8.dat +1081 -0
  25. floodmodeller_api/test/test_data/integrated_bridge/AR_NoSP_NoBl_2O_NO_OneFRC.ied +33 -0
  26. floodmodeller_api/test/test_data/integrated_bridge/AR_vSP_25pc_1O.ied +32 -0
  27. floodmodeller_api/test/test_data/integrated_bridge/PL_vSP_25pc_1O.ied +34 -0
  28. floodmodeller_api/test/test_data/integrated_bridge/SBTwoFRCsStaggered.IED +32 -0
  29. floodmodeller_api/test/test_data/integrated_bridge/US_NoSP_NoBl_OR_RN.ied +28 -0
  30. floodmodeller_api/test/test_data/integrated_bridge/US_SP_NoBl_OR_frc_PT2-5_RN.ied +34 -0
  31. floodmodeller_api/test/test_data/integrated_bridge/US_fSP_NoBl_1O.ied +30 -0
  32. floodmodeller_api/test/test_data/integrated_bridge/US_nSP_NoBl_1O.ied +49 -0
  33. floodmodeller_api/test/test_data/integrated_bridge/US_vSP_NoBl_2O_Para.ied +35 -0
  34. floodmodeller_api/test/test_data/integrated_bridge.dat +40 -0
  35. floodmodeller_api/test/test_data/network.ied +2 -2
  36. floodmodeller_api/test/test_data/network_dat_expected.json +141 -243
  37. floodmodeller_api/test/test_data/network_ied_expected.json +2 -2
  38. floodmodeller_api/test/test_data/network_with_comments.ied +2 -2
  39. floodmodeller_api/test/test_data/structure_logs/EX17_expected.csv +4 -0
  40. floodmodeller_api/test/test_data/structure_logs/EX17_expected.json +69 -0
  41. floodmodeller_api/test/test_data/structure_logs/EX18_expected.csv +20 -0
  42. floodmodeller_api/test/test_data/structure_logs/EX18_expected.json +292 -0
  43. floodmodeller_api/test/test_data/structure_logs/EX6_expected.csv +4 -0
  44. floodmodeller_api/test/test_data/structure_logs/EX6_expected.json +35 -0
  45. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzn_flow.csv +182 -0
  46. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzn_fr.csv +182 -0
  47. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzn_mode.csv +182 -0
  48. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzn_stage.csv +182 -0
  49. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzn_state.csv +182 -0
  50. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzn_velocity.csv +182 -0
  51. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzx_left_fp_h.csv +182 -0
  52. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzx_left_fp_mode.csv +182 -0
  53. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzx_link_inflow.csv +182 -0
  54. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzx_max.csv +87 -0
  55. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzx_right_fp_h.csv +182 -0
  56. floodmodeller_api/test/test_data/tabular_csv_outputs/network_zzx_right_fp_mode.csv +182 -0
  57. floodmodeller_api/test/test_flowtimeprofile.py +2 -2
  58. floodmodeller_api/test/test_hydrology_plus_export.py +4 -2
  59. floodmodeller_api/test/test_ied.py +3 -3
  60. floodmodeller_api/test/test_ief.py +12 -4
  61. floodmodeller_api/test/test_inp.py +2 -2
  62. floodmodeller_api/test/test_integrated_bridge.py +159 -0
  63. floodmodeller_api/test/test_json.py +14 -13
  64. floodmodeller_api/test/test_logs_lf.py +50 -29
  65. floodmodeller_api/test/test_read_file.py +1 -0
  66. floodmodeller_api/test/test_river.py +12 -12
  67. floodmodeller_api/test/test_tool.py +8 -5
  68. floodmodeller_api/test/test_toolbox_structure_log.py +148 -158
  69. floodmodeller_api/test/test_xml2d.py +14 -16
  70. floodmodeller_api/test/test_zz.py +143 -0
  71. floodmodeller_api/to_from_json.py +9 -9
  72. floodmodeller_api/tool.py +15 -11
  73. floodmodeller_api/toolbox/example_tool.py +5 -1
  74. floodmodeller_api/toolbox/model_build/add_siltation_definition.py +13 -9
  75. floodmodeller_api/toolbox/model_build/structure_log/structure_log.py +500 -194
  76. floodmodeller_api/toolbox/model_build/structure_log_definition.py +5 -1
  77. floodmodeller_api/units/__init__.py +15 -0
  78. floodmodeller_api/units/_base.py +87 -20
  79. floodmodeller_api/units/_helpers.py +343 -0
  80. floodmodeller_api/units/boundaries.py +59 -71
  81. floodmodeller_api/units/comment.py +1 -1
  82. floodmodeller_api/units/conduits.py +57 -54
  83. floodmodeller_api/units/connectors.py +112 -0
  84. floodmodeller_api/units/controls.py +107 -0
  85. floodmodeller_api/units/conveyance.py +1 -1
  86. floodmodeller_api/units/iic.py +2 -9
  87. floodmodeller_api/units/losses.py +44 -45
  88. floodmodeller_api/units/sections.py +52 -51
  89. floodmodeller_api/units/structures.py +361 -531
  90. floodmodeller_api/units/units.py +27 -26
  91. floodmodeller_api/units/unsupported.py +5 -7
  92. floodmodeller_api/units/variables.py +2 -2
  93. floodmodeller_api/urban1d/_base.py +13 -17
  94. floodmodeller_api/urban1d/conduits.py +11 -21
  95. floodmodeller_api/urban1d/general_parameters.py +1 -1
  96. floodmodeller_api/urban1d/junctions.py +7 -11
  97. floodmodeller_api/urban1d/losses.py +13 -17
  98. floodmodeller_api/urban1d/outfalls.py +18 -22
  99. floodmodeller_api/urban1d/raingauges.py +5 -10
  100. floodmodeller_api/urban1d/subsections.py +5 -4
  101. floodmodeller_api/urban1d/xsections.py +14 -17
  102. floodmodeller_api/util.py +23 -6
  103. floodmodeller_api/validation/parameters.py +7 -3
  104. floodmodeller_api/validation/urban_parameters.py +1 -4
  105. floodmodeller_api/validation/validation.py +11 -5
  106. floodmodeller_api/version.py +1 -1
  107. floodmodeller_api/xml2d.py +27 -31
  108. floodmodeller_api/xml2d_template.py +1 -1
  109. floodmodeller_api/zz.py +539 -0
  110. {floodmodeller_api-0.5.0.post1.dist-info → floodmodeller_api-0.5.2.dist-info}/LICENSE.txt +1 -1
  111. {floodmodeller_api-0.5.0.post1.dist-info → floodmodeller_api-0.5.2.dist-info}/METADATA +30 -16
  112. {floodmodeller_api-0.5.0.post1.dist-info → floodmodeller_api-0.5.2.dist-info}/RECORD +116 -83
  113. {floodmodeller_api-0.5.0.post1.dist-info → floodmodeller_api-0.5.2.dist-info}/WHEEL +1 -1
  114. floodmodeller_api/test/test_zzn.py +0 -36
  115. floodmodeller_api/units/helpers.py +0 -123
  116. floodmodeller_api/zzn.py +0 -414
  117. /floodmodeller_api/test/test_data/{network_from_tabularCSV.csv → tabular_csv_outputs/network_zzn_max.csv} +0 -0
  118. {floodmodeller_api-0.5.0.post1.dist-info → floodmodeller_api-0.5.2.dist-info}/entry_points.txt +0 -0
  119. {floodmodeller_api-0.5.0.post1.dist-info → floodmodeller_api-0.5.2.dist-info}/top_level.txt +0 -0
@@ -0,0 +1,33 @@
1
+ BRIDGE prototype for rev 3 / No Spill data, no blockage
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ Clifton Suspension Bridge
6
+ ARCH
7
+ 1 0 0 0 0NOORIFICE 1.0
8
+ 3
9
+ 0FLAT DIA 2.5 1.100NONUNI
10
+ ALIGNED
11
+ 4
12
+ -10.000 5.000 0.035* LEFT
13
+ -10.000 0.000 0.035
14
+ 10.000 0.000 0.035
15
+ 10.000 5.000 0.035* RIGHT
16
+ 0
17
+ 0
18
+ 0
19
+ PARABOLA1
20
+ 2
21
+ 3
22
+ -7.500 5.000
23
+ -5.000 5.000
24
+ -2.500 5.000
25
+ 3
26
+ 2.500 5.000
27
+ 5.000 5.000
28
+ 7.500 5.000
29
+ 1 [FRC line - this text not read anywhere]
30
+ 4.000 5.000 2.000 1.000 1.000 0.700
31
+ 0 1.7 0.9
32
+ No blockage
33
+ 0 0.500 1.000
@@ -0,0 +1,32 @@
1
+ BRIDGE prototype for rev 3 / No Spill data, no blockage
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ Clifton Suspension Bridge
6
+ ARCH
7
+ 1 0 0 0 0ORIFICE 0.3 0.1 1 1.0
8
+ 3
9
+ 0FLAT DIA 2.5 1.100NONUNI
10
+ ALIGNED
11
+ 4
12
+ -10.000 5.000 0.035* LEFT
13
+ -10.000 0.000 0.035
14
+ 10.000 0.000 0.035
15
+ 10.000 5.000 0.035* RIGHT
16
+ 0
17
+ 0
18
+ 0
19
+ PARABOLA1
20
+ 1
21
+ 3
22
+ -5.000 5.000
23
+ 0.000 5.000
24
+ 5.000 5.000
25
+ 0 [FRC line - this text not read anywhere]
26
+ 3 1.7 0.9
27
+ -10.000 7.000 0.00 0.00
28
+ 0.000 9.000 0.00 0.00
29
+ 10.000 7.000 0.00 0.00
30
+ 25% blockage
31
+ 1 0.500 1.000
32
+ 25
@@ -0,0 +1,34 @@
1
+ BRIDGE prototype for rev 3 / No Spill data, no blockage
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ Clifton Suspension Bridge
6
+ YARNELL
7
+ 1 0 0 0 0ORIFICE 0.3 0.1 1 1.0
8
+ 3
9
+ 0FLAT DIA 2.5 1.100NONUNI
10
+ ALIGNED
11
+ 4
12
+ -10.000 5.000 0.035* LEFT
13
+ -10.000 0.000 0.035
14
+ 10.000 0.000 0.035
15
+ 10.000 5.000 0.035* RIGHT
16
+ 0
17
+ 0
18
+ 0
19
+ SLOPED
20
+ 2
21
+ 2
22
+ -7.500 5.000
23
+ -2.500 5.000
24
+ 2
25
+ 2.500 5.000
26
+ 7.500 5.000
27
+ 0 [FRC line - this text not read anywhere]
28
+ 3 1.7 0.9
29
+ -10.000 7.000 0.00 0.00
30
+ 0.000 9.000 0.00 0.00
31
+ 10.000 7.000 0.00 0.00
32
+ 25% blockage
33
+ 1 0.500 1.000
34
+ 25
@@ -0,0 +1,32 @@
1
+ BRIDGE
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ A bridge with FRCs
6
+ USBPR
7
+ 1 0 0 0 0 0 0 1
8
+ 3
9
+ 0ARCH
10
+ ALIGNED
11
+ 6
12
+ -10.000 5.000 0.035 L
13
+ -10.000 0.000 0.035
14
+ -5.000 0.000 0.035
15
+ 5.000 0.000 0.035
16
+ 10.000 0.000 0.035
17
+ 10.000 5.000 0.035 R
18
+ 0
19
+ 0
20
+ 0
21
+ PARABOLA1
22
+ 1
23
+ 3
24
+ -5.000 5.000
25
+ 0.000 5.000
26
+ 5.000 5.000
27
+ 2
28
+ 4.000 5.000 2.000 1.000 1.000 0.700
29
+ 8.000 9.000 2.000 1.000 1.000 0.700
30
+ 0
31
+ No blockage
32
+ 0
@@ -0,0 +1,28 @@
1
+ BRIDGE prototype for rev 3 / No Spill data, no blockage
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ Clifton Suspension Bridge
6
+ USBPR
7
+ 1 0 0 0 0ORIFICE 0.3 0.1 1 1.0
8
+ 3
9
+ 0FLAT DIA 2.5 1.100NONUNI
10
+ ALIGNED
11
+ 4
12
+ -10.000 5.000 0.035* LEFT
13
+ -10.000 0.000 0.035
14
+ 10.000 0.000 0.035
15
+ 10.000 5.000 0.035* RIGHT
16
+ 0
17
+ 0
18
+ 0
19
+ PARABOLA1
20
+ 1
21
+ 3
22
+ -5.000 5.000
23
+ 0.000 5.000
24
+ 5.000 5.000
25
+ 0 [FRC line - this text not read anywhere]
26
+ 0 1.7 0.8
27
+ No blockage
28
+ 0 0.500 1.000
@@ -0,0 +1,34 @@
1
+ BRIDGE 1st prototype for rev 3 / Spill data
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ Clifton Suspension Bridge
6
+ USBPR
7
+ 1 20 10 5 2ORIFICE 0.3 0.1 1 1.0
8
+ 3
9
+ 3COEFF TRIANGLE 2.5 1.100NONUNI
10
+ ALIGNED
11
+ 6
12
+ -10.000 5.000 0.035* LEFT
13
+ -10.000 0.000 0.035
14
+ -5.000 0.000 0.035
15
+ 5.000 0.000 0.035
16
+ 10.000 0.000 0.035
17
+ 10.000 5.000 0.035* RIGHT
18
+ 0
19
+ 0
20
+ 0
21
+ PARABOLA1
22
+ 1
23
+ 3
24
+ -5.000 5.000
25
+ 0.000 5.000
26
+ 5.000 5.000
27
+ 1
28
+ 4.5 6.0 3.0 0.8 0.7 0.9
29
+ 3 1.7 0.8
30
+ -10.000 7.000
31
+ 0.000 9.000
32
+ 10.000 7.000
33
+ No blockage
34
+ 0 0.500 1.000
@@ -0,0 +1,30 @@
1
+ BRIDGE prototype for rev 3 / No Spill data, no blockage
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ Clifton Suspension Bridge
6
+ USBPR
7
+ 1 0 0 0 0ORIFICE 0.3 0.1 1 1.0
8
+ 3
9
+ 0FLAT DIA 2.5 1.100NONUNI
10
+ ALIGNED
11
+ 4
12
+ -10.000 5.000 0.035* LEFT
13
+ -10.000 0.000 0.035
14
+ 10.000 0.000 0.035
15
+ 10.000 5.000 0.035* RIGHT
16
+ 0
17
+ 0
18
+ 0
19
+ PARABOLA1
20
+ 1
21
+ 3
22
+ -5.000 5.000
23
+ 0.000 5.000
24
+ 5.000 5.000
25
+ 0 [FRC line - this text not read anywhere]
26
+ 2 1.7 0.9
27
+ -10.000 8.000 0.00 0.00
28
+ 10.000 8.000 0.00 0.00
29
+ No blockage
30
+ 0 0.500 1.000
@@ -0,0 +1,49 @@
1
+ BRIDGE prototype for rev 3 / No Spill data, no blockage
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ Clifton Suspension Bridge
6
+ USBPR
7
+ 1 0 0 0 0ORIFICE 0.3 0.1 1 1.0
8
+ 3
9
+ 0FLAT DIA 2.5 1.100NONUNI
10
+ ALIGNED
11
+ 4
12
+ -10.000 5.000 0.035* LEFT
13
+ -10.000 0.000 0.035
14
+ 10.000 0.000 0.035
15
+ 10.000 5.000 0.035* RIGHT
16
+ 0
17
+ 0
18
+ 0
19
+ PARABOLA1
20
+ 1
21
+ 3
22
+ -5.000 5.000
23
+ 0.000 5.000
24
+ 5.000 5.000
25
+ 0 [FRC line - this text not read anywhere]
26
+ 21 1.7 0.9
27
+ -10.000 8.611 0.00 0.00
28
+ -9.000 7.513 0.00 0.00
29
+ -8.000 8.096 0.00 0.00
30
+ -7.000 8.151 0.00 0.00
31
+ -6.000 7.693 0.00 0.00
32
+ -5.000 7.383 0.00 0.00
33
+ -4.000 7.411 0.00 0.00
34
+ -3.000 7.009 0.00 0.00
35
+ -2.000 8.693 0.00 0.00
36
+ -1.000 8.403 0.00 0.00
37
+ 0.000 8.674 0.00 0.00
38
+ 1.000 8.616 0.00 0.00
39
+ 2.000 7.736 0.00 0.00
40
+ 3.000 8.717 0.00 0.00
41
+ 4.000 7.214 0.00 0.00
42
+ 5.000 7.194 0.00 0.00
43
+ 6.000 8.005 0.00 0.00
44
+ 7.000 8.099 0.00 0.00
45
+ 8.000 8.934 0.00 0.00
46
+ 9.000 7.068 0.00 0.00
47
+ 10.000 8.839 0.00 0.00
48
+ No blockage
49
+ 0 0.500 1.000
@@ -0,0 +1,35 @@
1
+ BRIDGE prototype for rev 3 / No Spill data, no blockage
2
+ INTEGRATED
3
+ Label11 Label12 CH0001 CH0002
4
+ 3
5
+ Clifton Suspension Bridge
6
+ USBPR
7
+ 1 0 0 0 0ORIFICE 0.3 0.1 1 1.0
8
+ 3
9
+ 0FLAT DIA 2.5 1.100NONUNI
10
+ ALIGNED
11
+ 4
12
+ -10.000 5.000 0.035* LEFT
13
+ -10.000 0.000 0.035
14
+ 10.000 0.000 0.035
15
+ 10.000 5.000 0.035* RIGHT
16
+ 0
17
+ 0
18
+ 0
19
+ PARABOLA1
20
+ 2
21
+ 3
22
+ -7.500 0.000
23
+ -5.000 5.000
24
+ -2.500 0.000
25
+ 3
26
+ 2.500 0.000
27
+ 5.000 5.000
28
+ 7.500 0.000
29
+ 0 [FRC line - this text not read anywhere]
30
+ 3 1.7 0.9
31
+ -10.000 7.000 0.00 0.00
32
+ 0.000 9.000 0.00 0.00
33
+ 10.000 7.000 0.00 0.00
34
+ No blockage
35
+ 0 0.500 1.000
@@ -0,0 +1,40 @@
1
+
2
+ #REVISION#1
3
+ 1 0.750 0.900 0.100 0.001 12SI
4
+ 10.000 0.010 0.010 0.700 0.100 0.700 0.000
5
+ RAD FILE
6
+
7
+ END GENERAL
8
+ BRIDGE prototype for rev 3 / No Spill data, no blockage
9
+ INTEGRATED
10
+ Label11 Label12 CH0001 CH0002
11
+ 3
12
+ Clifton Suspension Bridge
13
+ USBPR
14
+ 1 0 0 0 0ORIFICE 0.3 0.1 1 1.0
15
+ 3
16
+ 0FLAT DIA 2.5 1.100NONUNI
17
+ ALIGNED
18
+ 4
19
+ -10.000 5.000 0.035* LEFT
20
+ -10.000 0.000 0.035
21
+ 10.000 0.000 0.035
22
+ 10.000 5.000 0.035* RIGHT
23
+ 0
24
+ 0
25
+ 0
26
+ PARABOLA1
27
+ 1
28
+ 3
29
+ -5.000 5.000
30
+ 0.000 5.000
31
+ 5.000 5.000
32
+ 0 [FRC line - this text not read anywhere]
33
+ 2 1.7 0.9
34
+ -10.000 8.000 0.00 0.00
35
+ 10.000 8.000 0.00 0.00
36
+ No blockage
37
+ 0 0.500 1.000
38
+ INITIAL CONDITIONS
39
+ label ? flow stage froude no velocity umode ustate z
40
+ Label11 y 0.000 0.000 0.000 0.000 0.000 0.000 0.000
@@ -27,14 +27,14 @@ OBSUH
27
27
  0.000
28
28
  WINRP 0
29
29
  0
30
- QTBDY
30
+ QTBDY
31
31
  CS26
32
32
  4 0.000 0.000 seconds NOEXTEND LINEAR 0.000 0.000 OVERRIDE
33
33
  1.000 0.000
34
34
  1.000 46800.000
35
35
  0.000 47160.000
36
36
  0.000 1.000e+09
37
- QHBDY
37
+ QHBDY
38
38
  DS4
39
39
  6 0.000 LINEAR
40
40
  0.000 67.030