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
floodmodeller_api/test/test_data/EX3_DAT_expected.json CHANGED
@@ -17,6 +17,8 @@
17
17
  "backup_csv_path": "C:\\Users\\PIERCEJA\\AppData\\Local\\Temp\\floodmodeller_api_backup\\file-backups.csv"
18
18
  }
19
19
  },
20
+ "connectors": {},
21
+ "controls": {},
20
22
  "_raw_data": [
21
23
  "Example file model of river with bridge",
22
24
  "#REVISION#1",
@@ -8554,7 +8556,8 @@
8554
8556
  "Section Area": {},
8555
8557
  "Cd Part Full": {},
8556
8558
  "Cd Full": {},
8557
- "Drowning Coefficient": {}
8559
+ "Drowning Coefficient": {},
8560
+ "X": {}
8558
8561
  }
8559
8562
  }
8560
8563
  }
@@ -10441,7 +10444,8 @@
10441
10444
  "Section Area": {},
10442
10445
  "Cd Part Full": {},
10443
10446
  "Cd Full": {},
10444
- "Drowning Coefficient": {}
10447
+ "Drowning Coefficient": {},
10448
+ "X": {}
10445
10449
  }
10446
10450
  }
10447
10451
  }
floodmodeller_api/test/test_data/EX6_DAT_expected.json CHANGED
@@ -16728,20 +16728,16 @@
16728
16728
  }
16729
16729
  },
16730
16730
  "conduits": {},
16731
+ "controls": {},
16731
16732
  "losses": {},
16732
- "_unsupported": {
16733
- "P0000 (JUNCTION)": {
16734
- "API Class": "floodmodeller_api.units.unsupported.UNSUPPORTED",
16733
+ "_unsupported": {},
16734
+ "connectors": {
16735
+ "P0000": {
16736
+ "API Class": "floodmodeller_api.units.connectors.JUNCTION",
16735
16737
  "Object Attributes": {
16736
16738
  "_label_len": 12,
16737
16739
  "_name": "P0000",
16738
- "_unit": "JUNCTION",
16739
16740
  "_subtype": "OPEN",
16740
- "_raw_block": [
16741
- "JUNCTION",
16742
- "OPEN",
16743
- "P0000 P0000a P0000c"
16744
- ],
16745
16741
  "comment": "",
16746
16742
  "labels": [
16747
16743
  "P0000",
@@ -16750,18 +16746,12 @@
16750
16746
  ]
16751
16747
  }
16752
16748
  },
16753
- "P11951A (JUNCTION)": {
16754
- "API Class": "floodmodeller_api.units.unsupported.UNSUPPORTED",
16749
+ "P11951A": {
16750
+ "API Class": "floodmodeller_api.units.connectors.JUNCTION",
16755
16751
  "Object Attributes": {
16756
16752
  "_label_len": 12,
16757
16753
  "_name": "P11951A",
16758
- "_unit": "JUNCTION",
16759
16754
  "_subtype": "OPEN",
16760
- "_raw_block": [
16761
- "JUNCTION",
16762
- "OPEN",
16763
- "P11951A P11951U P11951q"
16764
- ],
16765
16755
  "comment": "",
16766
16756
  "labels": [
16767
16757
  "P11951A",
@@ -16770,18 +16760,12 @@
16770
16760
  ]
16771
16761
  }
16772
16762
  },
16773
- "P44865J (JUNCTION)": {
16774
- "API Class": "floodmodeller_api.units.unsupported.UNSUPPORTED",
16763
+ "P44865J": {
16764
+ "API Class": "floodmodeller_api.units.connectors.JUNCTION",
16775
16765
  "Object Attributes": {
16776
16766
  "_label_len": 12,
16777
16767
  "_name": "P44865J",
16778
- "_unit": "JUNCTION",
16779
16768
  "_subtype": "OPEN",
16780
- "_raw_block": [
16781
- "JUNCTION",
16782
- "OPEN",
16783
- "P44865J P44865U P44865O"
16784
- ],
16785
16769
  "comment": "",
16786
16770
  "labels": [
16787
16771
  "P44865J",
@@ -16833,17 +16817,11 @@
16833
16817
  }
16834
16818
  },
16835
16819
  {
16836
- "API Class": "floodmodeller_api.units.unsupported.UNSUPPORTED",
16820
+ "API Class": "floodmodeller_api.units.connectors.JUNCTION",
16837
16821
  "Object Attributes": {
16838
16822
  "_label_len": 12,
16839
16823
  "_name": "P0000",
16840
- "_unit": "JUNCTION",
16841
16824
  "_subtype": "OPEN",
16842
- "_raw_block": [
16843
- "JUNCTION",
16844
- "OPEN",
16845
- "P0000 P0000a P0000c"
16846
- ],
16847
16825
  "comment": "",
16848
16826
  "labels": [
16849
16827
  "P0000",
@@ -18985,17 +18963,11 @@
18985
18963
  }
18986
18964
  },
18987
18965
  {
18988
- "API Class": "floodmodeller_api.units.unsupported.UNSUPPORTED",
18966
+ "API Class": "floodmodeller_api.units.connectors.JUNCTION",
18989
18967
  "Object Attributes": {
18990
18968
  "_label_len": 12,
18991
18969
  "_name": "P11951A",
18992
- "_unit": "JUNCTION",
18993
18970
  "_subtype": "OPEN",
18994
- "_raw_block": [
18995
- "JUNCTION",
18996
- "OPEN",
18997
- "P11951A P11951U P11951q"
18998
- ],
18999
18971
  "comment": "",
19000
18972
  "labels": [
19001
18973
  "P11951A",
@@ -24568,17 +24540,11 @@
24568
24540
  }
24569
24541
  },
24570
24542
  {
24571
- "API Class": "floodmodeller_api.units.unsupported.UNSUPPORTED",
24543
+ "API Class": "floodmodeller_api.units.connectors.JUNCTION",
24572
24544
  "Object Attributes": {
24573
24545
  "_label_len": 12,
24574
24546
  "_name": "P44865J",
24575
- "_unit": "JUNCTION",
24576
24547
  "_subtype": "OPEN",
24577
- "_raw_block": [
24578
- "JUNCTION",
24579
- "OPEN",
24580
- "P44865J P44865U P44865O"
24581
- ],
24582
24548
  "comment": "",
24583
24549
  "labels": [
24584
24550
  "P44865J",