easysewer 0.0.3__py3-none-any.whl → 0.0.4__py3-none-any.whl

easysewer/ModelAPI.py

@@ -68,21 +68,27 @@ class Model(UrbanDrainageModel):
         unique_id = str(uuid.uuid4())
         # Define output directory
         output_dir = 'simulation_output'
-        # Check if directory exists, create it if not
-        if not os.path.exists(output_dir):
-            os.makedirs(output_dir)
+
         # Combine datetime and UUID for a unique filename
         model_name = f"{date_string}_{unique_id}"
         # Set default file paths if not provided
         if inp_file is None:
             inp_file = os.path.join(output_dir, f"{model_name}.inp")
+            # Check if directory exists, create it if not
+            if not os.path.exists(output_dir):
+                os.makedirs(output_dir)
+            # Export model to desired path
+            self.to_inp(inp_file)
         if rpt_file is None:
             rpt_file = os.path.join(output_dir, f"{model_name}.rpt")
+            # Check if directory exists, create it if not
+            if not os.path.exists(output_dir):
+                os.makedirs(output_dir)
         if out_file is None:
             out_file = os.path.join(output_dir, f"{model_name}.out")
-
-        # Export model to desired path
-        self.to_inp(inp_file)
+            # Check if directory exists, create it if not
+            if not os.path.exists(output_dir):
+                os.makedirs(output_dir)
 
         # Initialize swmm solver
         solver = SWMMSolverAPI()
@@ -142,14 +148,14 @@ class Model(UrbanDrainageModel):
             if progress_int > last_progress_int:
                 # Calculate the number of characters to fill
                 filled_length = int(bar_length * progress / 100)
-                bar = '█' * filled_length + '-' * (bar_length - filled_length)
+                bar = '=' * filled_length + '+' * (bar_length - filled_length)
 
                 # Print the entire progress bar each time (overwriting previous one)
                 print(f"\r[{bar}] {progress_int}%", end='', flush=True)
                 last_progress_int = progress_int
 
         # Complete the progress bar when finished
-        print(f"\r[{'█' * bar_length}] 100%")
+        print(f"\r[{'=' * bar_length}] 100%")
 
         # End the simulation
         err = solver.end()

easysewer/Options.py

@@ -42,7 +42,7 @@ class CalculationInformation:
     """
     def __init__(self):
         # general option
-        self.flow_unit = 'CFS'
+        self.flow_unit = 'CMS'
         self.infiltration_method = 'HORTON'
         self.flow_routing_method = 'KINWAVE'
         self.link_offsets_type = 'DEPTH'

{easysewer-0.0.3.dist-info → easysewer-0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easysewer
-Version: 0.0.3
+Version: 0.0.4
 Summary: An urban drainage modeling toolkit
 Author-email: Yiran Ji <yiranji@zju.edu.cn>
 License-Expression: AGPL-3.0-only

{easysewer-0.0.3.dist-info → easysewer-0.0.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
 easysewer/Area.py,sha256=Hw3xr-XiqAiTGVsG-fH71ovIBNnsRYBwmJrWG9l3YLA,32703
 easysewer/Curve.py,sha256=C5X_CJ9CtuYcUFqdClFkxWYZOYHhQFBxENYg9jC6Dqs,4241
 easysewer/Link.py,sha256=7hyQPme-ibnsgHO1VCjA0WgvPYflMgz3zCF8r5lhZ3g,23749
-easysewer/ModelAPI.py,sha256=qJe8YroVostJ_Xwnlu0P9EdBy8FEFJ6vjev_Jn9sECs,7557
+easysewer/ModelAPI.py,sha256=QtLCQdBGCsyTcWo7yJGiMJFFzFBIFpme_8RKsdVwCIU,7869
 easysewer/Node.py,sha256=Cbexul4OdPWRhLW9h2fGjeMhLLwtDl0vGwmbACg_Hjs,45547
-easysewer/Options.py,sha256=zsmyDpiQO0Swsrqkzw_vow4lNKbiLsLX_0YQ6XWsSBI,18425
+easysewer/Options.py,sha256=WN7opc5mbuBi2UReXL3fCteDdo3cl0dycuR5WsJOmDE,18425
 easysewer/OutputAPI.py,sha256=tD6-6VjBpG-DBlmvVhb9siZ_zgEe1lD1d0h2xPr72Qw,7519
 easysewer/Rain.py,sha256=Bb-SD-j7J0F6lWENsdU6Qc6Nr4ZcrCMOQcbJW3ZcbaQ,10865
 easysewer/SolverAPI.py,sha256=H1KZkS_03Mv2ruSNX6-Rg_fesTwL9O6R5TRCil2eC7o,5612
@@ -14,7 +14,7 @@ easysewer/libs/linux/libswmm5.so,sha256=UI5v1fCZ7LU9zkjLQMJqqJtzDefkFnL1iy3jmAlF
 easysewer/libs/linux/swmm-output.so,sha256=248JHb0PUGyeo3tLj9fL4L114ySTSLBrUUA_k3VHnCQ,30928
 easysewer/libs/win/swmm-output.dll,sha256=tN0K2ZRk7rlQZ-cLxlGLYZ6w269uvc5JuH1oVumADD0,71168
 easysewer/libs/win/swmm5.dll,sha256=7LjGQXUyj8bdVuFzzY8-pObQV0VcUDI5KsAz-hstWls,915968
-easysewer-0.0.3.dist-info/METADATA,sha256=G8-hiKnEacVIA20nHHrMwYbJvBI25EFoe70fpHg6kC4,586
-easysewer-0.0.3.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-easysewer-0.0.3.dist-info/top_level.txt,sha256=YJi065ohgpDZhPb0XuXfE6ExHMhHPlwveH40BgZ7kt4,10
-easysewer-0.0.3.dist-info/RECORD,,
+easysewer-0.0.4.dist-info/METADATA,sha256=muczJcFL5YrIAfpt-cWc9OPPQuFP3OmhYSoWFo19vLM,586
+easysewer-0.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+easysewer-0.0.4.dist-info/top_level.txt,sha256=YJi065ohgpDZhPb0XuXfE6ExHMhHPlwveH40BgZ7kt4,10
+easysewer-0.0.4.dist-info/RECORD,,

{easysewer-0.0.3.dist-info → easysewer-0.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any