PyPI - floodmodeller-api - Versions diffs - 0.4.2.post1__py3-none-any.whl → 0.4.4__py3-none-any.whl - Mend

floodmodeller-api 0.4.2.post1py3-none-any.whl → 0.4.4py3-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 (178) hide show

floodmodeller_api/__init__.py +8 -9
floodmodeller_api/_base.py +169 -176
floodmodeller_api/backup.py +273 -273
floodmodeller_api/dat.py +889 -831
floodmodeller_api/diff.py +136 -119
floodmodeller_api/ied.py +302 -306
floodmodeller_api/ief.py +553 -637
floodmodeller_api/ief_flags.py +253 -253
floodmodeller_api/inp.py +260 -266
floodmodeller_api/libs/libifcoremd.dll +0 -0
floodmodeller_api/libs/libifcoremt.so.5 +0 -0
floodmodeller_api/libs/libifport.so.5 +0 -0
floodmodeller_api/{libmmd.dll → libs/libimf.so} +0 -0
floodmodeller_api/libs/libintlc.so.5 +0 -0
floodmodeller_api/libs/libmmd.dll +0 -0
floodmodeller_api/libs/libsvml.so +0 -0
floodmodeller_api/libs/libzzn_read.so +0 -0
floodmodeller_api/libs/zzn_read.dll +0 -0
floodmodeller_api/logs/__init__.py +2 -2
floodmodeller_api/logs/lf.py +364 -312
floodmodeller_api/logs/lf_helpers.py +354 -352
floodmodeller_api/logs/lf_params.py +643 -529
floodmodeller_api/mapping.py +84 -0
floodmodeller_api/test/__init__.py +4 -4
floodmodeller_api/test/conftest.py +16 -8
floodmodeller_api/test/test_backup.py +117 -117
floodmodeller_api/test/test_conveyance.py +107 -0
floodmodeller_api/test/test_dat.py +222 -92
floodmodeller_api/test/test_data/All Units 4_6.DAT +1081 -1081
floodmodeller_api/test/test_data/All Units 4_6.feb +1081 -1081
floodmodeller_api/test/test_data/BRIDGE.DAT +926 -926
floodmodeller_api/test/test_data/Culvert_Inlet_Outlet.dat +36 -36
floodmodeller_api/test/test_data/Culvert_Inlet_Outlet.feb +36 -36
floodmodeller_api/test/test_data/DamBreakADI.xml +52 -52
floodmodeller_api/test/test_data/DamBreakFAST.xml +58 -58
floodmodeller_api/test/test_data/DamBreakFAST_dy.xml +53 -53
floodmodeller_api/test/test_data/DamBreakTVD.xml +55 -55
floodmodeller_api/test/test_data/DefenceBreach.xml +53 -53
floodmodeller_api/test/test_data/DefenceBreachFAST.xml +60 -60
floodmodeller_api/test/test_data/DefenceBreachFAST_dy.xml +55 -55
floodmodeller_api/test/test_data/Domain1+2_QH.xml +76 -76
floodmodeller_api/test/test_data/Domain1_H.xml +41 -41
floodmodeller_api/test/test_data/Domain1_Q.xml +41 -41
floodmodeller_api/test/test_data/Domain1_Q_FAST.xml +48 -48
floodmodeller_api/test/test_data/Domain1_Q_FAST_dy.xml +48 -48
floodmodeller_api/test/test_data/Domain1_Q_xml_expected.json +263 -0
floodmodeller_api/test/test_data/Domain1_W.xml +41 -41
floodmodeller_api/test/test_data/EX1.DAT +321 -321
floodmodeller_api/test/test_data/EX1.ext +107 -107
floodmodeller_api/test/test_data/EX1.feb +320 -320
floodmodeller_api/test/test_data/EX1.gxy +107 -107
floodmodeller_api/test/test_data/EX17.DAT +421 -422
floodmodeller_api/test/test_data/EX17.ext +213 -213
floodmodeller_api/test/test_data/EX17.feb +422 -422
floodmodeller_api/test/test_data/EX18.DAT +375 -375
floodmodeller_api/test/test_data/EX18_DAT_expected.json +3876 -0
floodmodeller_api/test/test_data/EX2.DAT +302 -302
floodmodeller_api/test/test_data/EX3.DAT +926 -926
floodmodeller_api/test/test_data/EX3_DAT_expected.json +16235 -0
floodmodeller_api/test/test_data/EX3_IEF_expected.json +61 -0
floodmodeller_api/test/test_data/EX6.DAT +2084 -2084
floodmodeller_api/test/test_data/EX6.ext +532 -532
floodmodeller_api/test/test_data/EX6.feb +2084 -2084
floodmodeller_api/test/test_data/EX6_DAT_expected.json +31647 -0
floodmodeller_api/test/test_data/Event Data Example.DAT +336 -336
floodmodeller_api/test/test_data/Event Data Example.ext +107 -107
floodmodeller_api/test/test_data/Event Data Example.feb +336 -336
floodmodeller_api/test/test_data/Linked1D2D.xml +52 -52
floodmodeller_api/test/test_data/Linked1D2DFAST.xml +53 -53
floodmodeller_api/test/test_data/Linked1D2DFAST_dy.xml +48 -48
floodmodeller_api/test/test_data/Linked1D2D_xml_expected.json +313 -0
floodmodeller_api/test/test_data/blockage.dat +50 -50
floodmodeller_api/test/test_data/blockage.ext +45 -45
floodmodeller_api/test/test_data/blockage.feb +9 -9
floodmodeller_api/test/test_data/blockage.gxy +71 -71
floodmodeller_api/test/test_data/conveyance_test.dat +165 -0
floodmodeller_api/test/test_data/conveyance_test.feb +116 -0
floodmodeller_api/test/test_data/conveyance_test.gxy +85 -0
floodmodeller_api/test/test_data/defaultUnits.dat +127 -127
floodmodeller_api/test/test_data/defaultUnits.ext +45 -45
floodmodeller_api/test/test_data/defaultUnits.feb +9 -9
floodmodeller_api/test/test_data/defaultUnits.fmpx +58 -58
floodmodeller_api/test/test_data/defaultUnits.gxy +85 -85
floodmodeller_api/test/test_data/ex3.ief +20 -20
floodmodeller_api/test/test_data/ex3.lf1 +2800 -2800
floodmodeller_api/test/test_data/ex4.DAT +1374 -1374
floodmodeller_api/test/test_data/ex4_changed.DAT +1374 -1374
floodmodeller_api/test/test_data/example1.inp +329 -329
floodmodeller_api/test/test_data/example2.inp +158 -158
floodmodeller_api/test/test_data/example3.inp +297 -297
floodmodeller_api/test/test_data/example4.inp +388 -388
floodmodeller_api/test/test_data/example5.inp +147 -147
floodmodeller_api/test/test_data/example6.inp +154 -154
floodmodeller_api/test/test_data/expected_conveyance.csv +60 -0
floodmodeller_api/test/test_data/jump.dat +176 -176
floodmodeller_api/test/test_data/network.dat +1374 -1374
floodmodeller_api/test/test_data/network.ext +45 -45
floodmodeller_api/test/test_data/network.exy +1 -1
floodmodeller_api/test/test_data/network.feb +45 -45
floodmodeller_api/test/test_data/network.ied +45 -45
floodmodeller_api/test/test_data/network.ief +20 -20
floodmodeller_api/test/test_data/network.inp +147 -147
floodmodeller_api/test/test_data/network.pxy +57 -57
floodmodeller_api/test/test_data/network.zzd +122 -122
floodmodeller_api/test/test_data/network_dat_expected.json +21837 -0
floodmodeller_api/test/test_data/network_from_tabularCSV.csv +87 -87
floodmodeller_api/test/test_data/network_ied_expected.json +287 -0
floodmodeller_api/test/test_data/rnweir.dat +9 -9
floodmodeller_api/test/test_data/rnweir.ext +45 -45
floodmodeller_api/test/test_data/rnweir.feb +9 -9
floodmodeller_api/test/test_data/rnweir.gxy +45 -45
floodmodeller_api/test/test_data/rnweir_default.dat +74 -74
floodmodeller_api/test/test_data/rnweir_default.ext +45 -45
floodmodeller_api/test/test_data/rnweir_default.feb +9 -9
floodmodeller_api/test/test_data/rnweir_default.fmpx +58 -58
floodmodeller_api/test/test_data/rnweir_default.gxy +53 -53
floodmodeller_api/test/test_data/unit checks.dat +16 -16
floodmodeller_api/test/test_ied.py +29 -29
floodmodeller_api/test/test_ief.py +136 -24
floodmodeller_api/test/test_inp.py +47 -48
floodmodeller_api/test/test_json.py +114 -0
floodmodeller_api/test/test_logs_lf.py +102 -51
floodmodeller_api/test/test_tool.py +165 -152
floodmodeller_api/test/test_toolbox_structure_log.py +234 -239
floodmodeller_api/test/test_xml2d.py +151 -156
floodmodeller_api/test/test_zzn.py +36 -34
floodmodeller_api/to_from_json.py +230 -0
floodmodeller_api/tool.py +332 -329
floodmodeller_api/toolbox/__init__.py +5 -5
floodmodeller_api/toolbox/example_tool.py +45 -45
floodmodeller_api/toolbox/model_build/__init__.py +2 -2
floodmodeller_api/toolbox/model_build/add_siltation_definition.py +100 -98
floodmodeller_api/toolbox/model_build/structure_log/__init__.py +1 -1
floodmodeller_api/toolbox/model_build/structure_log/structure_log.py +287 -289
floodmodeller_api/toolbox/model_build/structure_log_definition.py +76 -76
floodmodeller_api/units/__init__.py +10 -10
floodmodeller_api/units/_base.py +214 -212
floodmodeller_api/units/boundaries.py +467 -467
floodmodeller_api/units/comment.py +52 -55
floodmodeller_api/units/conduits.py +382 -402
floodmodeller_api/units/conveyance.py +301 -0
floodmodeller_api/units/helpers.py +123 -131
floodmodeller_api/units/iic.py +107 -101
floodmodeller_api/units/losses.py +305 -306
floodmodeller_api/units/sections.py +465 -446
floodmodeller_api/units/structures.py +1690 -1683
floodmodeller_api/units/units.py +93 -104
floodmodeller_api/units/unsupported.py +44 -44
floodmodeller_api/units/variables.py +87 -89
floodmodeller_api/urban1d/__init__.py +11 -11
floodmodeller_api/urban1d/_base.py +188 -179
floodmodeller_api/urban1d/conduits.py +93 -85
floodmodeller_api/urban1d/general_parameters.py +58 -58
floodmodeller_api/urban1d/junctions.py +81 -79
floodmodeller_api/urban1d/losses.py +81 -74
floodmodeller_api/urban1d/outfalls.py +114 -110
floodmodeller_api/urban1d/raingauges.py +111 -111
floodmodeller_api/urban1d/subsections.py +92 -98
floodmodeller_api/urban1d/xsections.py +147 -144
floodmodeller_api/util.py +119 -21
floodmodeller_api/validation/parameters.py +660 -660
floodmodeller_api/validation/urban_parameters.py +388 -404
floodmodeller_api/validation/validation.py +110 -108
floodmodeller_api/version.py +1 -1
floodmodeller_api/xml2d.py +632 -673
floodmodeller_api/xml2d_template.py +37 -37
floodmodeller_api/zzn.py +414 -363
{floodmodeller_api-0.4.2.post1.dist-info → floodmodeller_api-0.4.4.dist-info}/LICENSE.txt +13 -13
{floodmodeller_api-0.4.2.post1.dist-info → floodmodeller_api-0.4.4.dist-info}/METADATA +85 -82
floodmodeller_api-0.4.4.dist-info/RECORD +185 -0
{floodmodeller_api-0.4.2.post1.dist-info → floodmodeller_api-0.4.4.dist-info}/WHEEL +1 -1
floodmodeller_api/libifcoremd.dll +0 -0
floodmodeller_api/test/test_data/EX3.bmp +0 -0
floodmodeller_api/test/test_data/test_output.csv +0 -87
floodmodeller_api/zzn_read.dll +0 -0
floodmodeller_api-0.4.2.post1.dist-info/RECORD +0 -164
{floodmodeller_api-0.4.2.post1.dist-info → floodmodeller_api-0.4.4.dist-info}/entry_points.txt +0 -0
{floodmodeller_api-0.4.2.post1.dist-info → floodmodeller_api-0.4.4.dist-info}/top_level.txt +0 -0

floodmodeller_api/test/test_data/rnweir_default.dat CHANGED Viewed

@@ -1,74 +1,74 @@
-#REVISION#1
-        24     0.750     0.900     0.100     0.001        12SI
-    10.000     0.010     0.010     0.700     0.100     0.700     0.000
-RAD FILE
-END GENERAL
-RNWEIR
-Default
-     1.000     0.000     0.000     0.000     0.700
-     0.000     0.000
-RNWEIR
-default2
-     1.000     7.900     4.200     3.000
-     1.040     1.350
-CRUMP
-testCrump
-     1.000     0.000     0.000     0.700
-     0.000     0.000
-CRUMP
-testCrump2  fds         dfsf        sdfsdf
-     0.800     6.220     5.670
-     2.320     4.650
-FLAT-V WEIR
-testFlatV
-       1.0       0.0       0.0                 0.0       0.0         5       1.2
-     0.000     0.000
-SPILL
-Spill1U     Spill1D
-      1.20     0.900
-         1
-     1.000     2.000      3.00      4.00
-RESERVOIR #revision#1
-a           b           c           d           e           f           g           h           i           j
-1           2           3           4
-         3
-     0.000 20000.000
-     2.800 30000.000
-     3.700 42000.000
-230021.623 297350.07         0
-INITIAL CONDITIONS
- label   ?      flow     stage froude no  velocity     umode    ustate         z
-Default      y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-default2     y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-testCrump    y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-testCrump2   y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-fds          y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-testFlatV    y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-dfsf         y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-sdfsdf       y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-Spill1U      y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-Spill1D      y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-a            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-b            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-c            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-d            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-e            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-f            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-g            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-h            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-i            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-j            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-1            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-2            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-3            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-4            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-GISINFO
-RNWEIR Default 0 0 0 0 0
-RNWEIR default2 0 0 0 0 0
-CRUMP testCrump 0 0 0 0 0
-CRUMP testCrump2 0 0 0 0 0
-FLAT-V WEIR testFlatV 0 0 0 0 0
-SPILL Spill1U 0 0 0 0 0
-RESERVOIR a 0 0 0 0 0
+#REVISION#1
+        24     0.750     0.900     0.100     0.001        12SI
+    10.000     0.010     0.010     0.700     0.100     0.700     0.000
+RAD FILE
+END GENERAL
+RNWEIR
+Default
+     1.000     0.000     0.000     0.000     0.700
+     0.000     0.000
+RNWEIR
+default2
+     1.000     7.900     4.200     3.000
+     1.040     1.350
+CRUMP
+testCrump
+     1.000     0.000     0.000     0.700
+     0.000     0.000
+CRUMP
+testCrump2  fds         dfsf        sdfsdf
+     0.800     6.220     5.670
+     2.320     4.650
+FLAT-V WEIR
+testFlatV
+       1.0       0.0       0.0                 0.0       0.0         5       1.2
+     0.000     0.000
+SPILL
+Spill1U     Spill1D
+      1.20     0.900
+         1
+     1.000     2.000      3.00      4.00
+RESERVOIR #revision#1
+a           b           c           d           e           f           g           h           i           j
+1           2           3           4
+         3
+     0.000 20000.000
+     2.800 30000.000
+     3.700 42000.000
+230021.623 297350.07         0
+INITIAL CONDITIONS
+ label   ?      flow     stage froude no  velocity     umode    ustate         z
+Default      y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+default2     y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+testCrump    y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+testCrump2   y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+fds          y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+testFlatV    y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+dfsf         y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+sdfsdf       y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+Spill1U      y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+Spill1D      y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+a            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+b            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+c            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+d            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+e            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+f            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+g            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+h            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+i            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+j            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+1            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+2            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+3            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+4            y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+GISINFO
+RNWEIR Default 0 0 0 0 0
+RNWEIR default2 0 0 0 0 0
+CRUMP testCrump 0 0 0 0 0
+CRUMP testCrump2 0 0 0 0 0
+FLAT-V WEIR testFlatV 0 0 0 0 0
+SPILL Spill1U 0 0 0 0 0
+RESERVOIR a 0 0 0 0 0

floodmodeller_api/test/test_data/rnweir_default.ext CHANGED Viewed

@@ -1,45 +1,45 @@
-[VISTEXT]
-VISTEXTCOUNT=0
-[Font]
-Font name=Tahoma
-Charset=1
-Height=-11
-Bold=0
-Italic=0
-Underline=0
-Strikeout=0
-[Text]
-Layout=1
-[Display]
-MiniNodes=0
-MiniStructureNodes=0
-NodeLabels=0
-Connections=1
-[General]
-UnitMove=0
-ExportConnections=0
-GeneralConnectionsColour=0
-LateralConnectionsColour=16711680
-SpillConnectionsColour=8421504
-[Grid]
-Show=0
-X=25
-Y=25
-[RWC]
-Top=400000
-Left=-108053.691275168
-Right=575339.379214677
-Bottom=0
-[PC]
-Top=0
-Left=0
-Right=0
-Bottom=0
+[VISTEXT]
+VISTEXTCOUNT=0
+[Font]
+Font name=Tahoma
+Charset=1
+Height=-11
+Bold=0
+Italic=0
+Underline=0
+Strikeout=0
+[Text]
+Layout=1
+[Display]
+MiniNodes=0
+MiniStructureNodes=0
+NodeLabels=0
+Connections=1
+[General]
+UnitMove=0
+ExportConnections=0
+GeneralConnectionsColour=0
+LateralConnectionsColour=16711680
+SpillConnectionsColour=8421504
+[Grid]
+Show=0
+X=25
+Y=25
+[RWC]
+Top=400000
+Left=-108053.691275168
+Right=575339.379214677
+Bottom=0
+[PC]
+Top=0
+Left=0
+Right=0
+Bottom=0

floodmodeller_api/test/test_data/rnweir_default.feb CHANGED Viewed

@@ -1,9 +1,9 @@
-#REVISION#1
-         0     0.750     0.900     0.100     0.001        12SI
-    10.000     0.010     0.010     0.700     0.100     0.700     0.000
-RAD FILE
-END GENERAL
-INITIAL CONDITIONS
- label   ?      flow     stage froude no  velocity     umode    ustate         z
+#REVISION#1
+         0     0.750     0.900     0.100     0.001        12SI
+    10.000     0.010     0.010     0.700     0.100     0.700     0.000
+RAD FILE
+END GENERAL
+INITIAL CONDITIONS
+ label   ?      flow     stage froude no  velocity     umode    ustate         z

floodmodeller_api/test/test_data/rnweir_default.fmpx CHANGED Viewed

@@ -1,59 +1,59 @@
-<?xml version="1.0"?>
-<project name="rnweir_default" type="FloodModeller">
-  <projectinfo>
-    <name>rnweir_default</name>
-    <description />
-    <date_created>05/09/2022 10:17:22</date_created>
-    <fmversion>4.0</fmversion>
-    <author>JEGINTL\CHRISTA4</author>
-    <last_modified>05/09/2022 15:51:35</last_modified>
-    <last_user>JEGINTL\CHRISTA4</last_user>
-    <location>Location</location>
-    <connection>
-      <address>127.0.0.1</address>
-      <port>8080</port>
-      <name>Sample connection</name>
-    </connection>
-    <network_settings>
-      <links shape_visible="True" label_visible="False" direction_visible="False" line_colour="0" line_width="1" line_style="Solid" direction_arrow_size="6">
-        <link_styles>
-          <link_style type="General" line_colour="0" line_width="1" line_style="Solid" />
-          <link_style type="Lateral" line_colour="16711680" line_width="1" line_style="Dot" />
-          <link_style type="Spill" line_colour="8421504" line_width="1" line_style="Dot" />
-        </link_styles>
-      </links>
-      <nodes shape_visible="True" label_visible="False" />
-      <collisions allow_shape_collision="True" allow_label_collision="True" />
-      <urban urban_nodes_visible="True" urban_links_visible="True" urban_icons_visible="True" />
-    </network_settings>
-    <geoprojection type="Proj4" name="OSGB 1936 / British National Grid" epsg="27700" description="">+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +towgs84=446.448,-125.157,542.06,0.15,0.247,0.842,-20.489 +units=m +no_defs </geoprojection>
-  </projectinfo>
-  <networks>
-    <model1D name="rnweir_default" file="C:\Users\CHRISTA4\OneDrive - Jacobs\Documents\FM API\floodmodeller-api\test\test_data\rnweir_default.dat" description="rnweir_default" isActive="true" />
-  </networks>
-  <urban1d_data />
-  <event_data />
-  <initial_conditions />
-  <spatial_data />
-  <associated_data />
-  <simulations />
-  <views>
-    <map_view>
-      <FileVersion>4.0</FileVersion>
-      <Map>
-        <Extent>
-          <Xmin>-108053.691275168</Xmin>
-          <Xmax>575339.379214677</Xmax>
-          <Ymin>0</Ymin>
-          <Ymax>400000</Ymax>
-          <Zmin>0</Zmin>
-          <Zmax>0</Zmax>
-        </Extent>
-        <Annotations />
-        <Bookmarks />
-      </Map>
-      <Groups />
-    </map_view>
-    <schematic_view />
-  </views>
+<?xml version="1.0"?>
+<project name="rnweir_default" type="FloodModeller">
+  <projectinfo>
+    <name>rnweir_default</name>
+    <description />
+    <date_created>05/09/2022 10:17:22</date_created>
+    <fmversion>4.0</fmversion>
+    <author>JEGINTL\CHRISTA4</author>
+    <last_modified>05/09/2022 15:51:35</last_modified>
+    <last_user>JEGINTL\CHRISTA4</last_user>
+    <location>Location</location>
+    <connection>
+      <address>127.0.0.1</address>
+      <port>8080</port>
+      <name>Sample connection</name>
+    </connection>
+    <network_settings>
+      <links shape_visible="True" label_visible="False" direction_visible="False" line_colour="0" line_width="1" line_style="Solid" direction_arrow_size="6">
+        <link_styles>
+          <link_style type="General" line_colour="0" line_width="1" line_style="Solid" />
+          <link_style type="Lateral" line_colour="16711680" line_width="1" line_style="Dot" />
+          <link_style type="Spill" line_colour="8421504" line_width="1" line_style="Dot" />
+        </link_styles>
+      </links>
+      <nodes shape_visible="True" label_visible="False" />
+      <collisions allow_shape_collision="True" allow_label_collision="True" />
+      <urban urban_nodes_visible="True" urban_links_visible="True" urban_icons_visible="True" />
+    </network_settings>
+    <geoprojection type="Proj4" name="OSGB 1936 / British National Grid" epsg="27700" description="">+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +towgs84=446.448,-125.157,542.06,0.15,0.247,0.842,-20.489 +units=m +no_defs </geoprojection>
+  </projectinfo>
+  <networks>
+    <model1D name="rnweir_default" file="C:\Users\CHRISTA4\OneDrive - Jacobs\Documents\FM API\floodmodeller-api\test\test_data\rnweir_default.dat" description="rnweir_default" isActive="true" />
+  </networks>
+  <urban1d_data />
+  <event_data />
+  <initial_conditions />
+  <spatial_data />
+  <associated_data />
+  <simulations />
+  <views>
+    <map_view>
+      <FileVersion>4.0</FileVersion>
+      <Map>
+        <Extent>
+          <Xmin>-108053.691275168</Xmin>
+          <Xmax>575339.379214677</Xmax>
+          <Ymin>0</Ymin>
+          <Ymax>400000</Ymax>
+          <Zmin>0</Zmin>
+          <Zmax>0</Zmax>
+        </Extent>
+        <Annotations />
+        <Bookmarks />
+      </Map>
+      <Groups />
+    </map_view>
+    <schematic_view />
+  </views>
 </project>

floodmodeller_api/test/test_data/rnweir_default.gxy CHANGED Viewed

@@ -1,53 +1,53 @@
-[RNWEIR__Default]
-X=135673.907
-Y=255675.03
-[RNWEIR__default2]
-X=175817.276
-Y=214097.969
-[VISTEXT]
-VISTEXTCOUNT=0
-[Font]
-Font name=Tahoma
-Charset=1
-Height=-11
-Bold=0
-Italic=0
-Underline=0
-Strikeout=0
-[Text]
-Layout=1
-[Display]
-MiniNodes=0
-MiniStructureNodes=0
-NodeLabels=0
-Connections=1
-[General]
-UnitMove=0
-ExportConnections=0
-GeneralConnectionsColour=0
-LateralConnectionsColour=16711680
-SpillConnectionsColour=8421504
-[Grid]
-Show=0
-X=25
-Y=25
-[RWC]
-Top=400000
-Left=-108053.691275168
-Right=575339.379214677
-Bottom=0
-[PC]
-Top=0
-Left=0
-Right=0
-Bottom=0
+[RNWEIR__Default]
+X=135673.907
+Y=255675.03
+[RNWEIR__default2]
+X=175817.276
+Y=214097.969
+[VISTEXT]
+VISTEXTCOUNT=0
+[Font]
+Font name=Tahoma
+Charset=1
+Height=-11
+Bold=0
+Italic=0
+Underline=0
+Strikeout=0
+[Text]
+Layout=1
+[Display]
+MiniNodes=0
+MiniStructureNodes=0
+NodeLabels=0
+Connections=1
+[General]
+UnitMove=0
+ExportConnections=0
+GeneralConnectionsColour=0
+LateralConnectionsColour=16711680
+SpillConnectionsColour=8421504
+[Grid]
+Show=0
+X=25
+Y=25
+[RWC]
+Top=400000
+Left=-108053.691275168
+Right=575339.379214677
+Bottom=0
+[PC]
+Top=0
+Left=0
+Right=0
+Bottom=0

floodmodeller_api/test/test_data/unit checks.dat CHANGED Viewed

@@ -1,16 +1,16 @@
-#REVISION#1
-         1     0.750     0.900     0.100     0.001        12SI
-    10.000     0.010     0.010     0.700     0.100     0.700     0.000
-RAD FILE
-END GENERAL
-QTBDY
-flowee
-         1     0.000     0.000     HOURS    EXTEND    LINEAR     0.000     0.000
-     0.000     0.000
-INITIAL CONDITIONS
- label   ?      flow     stage froude no  velocity     umode    ustate         z
-flowee       y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
-GISINFO
-QTBDY flowee 0 0 0 0 0
+#REVISION#1
+         1     0.750     0.900     0.100     0.001        12SI
+    10.000     0.010     0.010     0.700     0.100     0.700     0.000
+RAD FILE
+END GENERAL
+QTBDY
+flowee
+         1     0.000     0.000     HOURS    EXTEND    LINEAR     0.000     0.000
+     0.000     0.000
+INITIAL CONDITIONS
+ label   ?      flow     stage froude no  velocity     umode    ustate         z
+flowee       y     0.000     0.000     0.000     0.000     0.000     0.000     0.000
+GISINFO
+QTBDY flowee 0 0 0 0 0

floodmodeller_api/test/test_ied.py CHANGED Viewed

@@ -1,29 +1,29 @@
-import os
-import pytest
-from floodmodeller_api import IED
-@pytest.fixture
-def ied_fp(test_workspace):
-    return os.path.join(test_workspace, "network.ied")
-def test_open_ied_does_not_change_file(ied_fp):
-    """IED: Test str representation equal to ied file with no changes"""
-    with open(ied_fp, "r") as ied_file:
-        data_before = ied_file.read()
-    ied = IED(ied_fp)
-    assert ied._write() == data_before
-    ied = IED(ied_fp)
-    cs26_expected = [
-        "QTBDY ",
-        "CS26",
-        "         4     0.000     0.000   seconds  NOEXTEND    LINEAR     0.000     0.000  OVERRIDE",
-        "     1.000     0.000",
-        "     1.000 46800.000",
-        "     0.000 47160.000",
-        "     0.000 1.000e+09",
-    ]
-    assert ied.boundaries["CS26"]._write() == cs26_expected
+from pathlib import Path
+import pytest
+from floodmodeller_api import IED
+@pytest.fixture
+def ied_fp(test_workspace):
+    return Path(test_workspace, "network.ied")
+def test_open_ied_does_not_change_file(ied_fp):
+    """IED: Test str representation equal to ied file with no changes"""
+    with open(ied_fp) as ied_file:
+        data_before = ied_file.read()
+    ied = IED(ied_fp)
+    assert ied._write() == data_before
+    ied = IED(ied_fp)
+    cs26_expected = [
+        "QTBDY ",
+        "CS26",
+        "         4     0.000     0.000   seconds  NOEXTEND    LINEAR     0.000     0.000  OVERRIDE",
+        "     1.000     0.000",
+        "     1.000 46800.000",
+        "     0.000 47160.000",
+        "     0.000 1.000e+09",
+    ]
+    assert ied.boundaries["CS26"]._write() == cs26_expected

floodmodeller-api 0.4.2.post1__py3-none-any.whl → 0.4.4__py3-none-any.whl

floodmodeller-api 0.4.2.post1py3-none-any.whl → 0.4.4py3-none-any.whl