easysewer 0.0.3__tar.gz → 0.0.4__tar.gz

{easysewer-0.0.3 → easysewer-0.0.4}/PKG-INFO

@@ -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 → easysewer-0.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "easysewer"
-version = "0.0.3"
+version = "0.0.4"
 authors = [
     {name = "Yiran Ji", email = "yiranji@zju.edu.cn"}
 ]

{easysewer-0.0.3 → easysewer-0.0.4}/src/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-0.0.3 → easysewer-0.0.4}/src/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 → easysewer-0.0.4}/src/easysewer.egg-info/PKG-INFO

@@ -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