ras-commander 0.59.0__py3-none-any.whl → 0.61.0__py3-none-any.whl

ras_commander/Decorators.py

@@ -85,20 +85,24 @@ def standardize_input(file_type: str = 'plan_hdf'):
                 if Path(hdf_input).is_file():
                     hdf_path = Path(hdf_input)
                 # Check if it's a number (with or without 'p' prefix)
-                elif hdf_input.isdigit() or (len(hdf_input) == 3 and hdf_input[0] == 'p' and hdf_input[1:].isdigit()):
+                elif hdf_input.isdigit() or (len(hdf_input) > 1 and hdf_input[0] == 'p' and hdf_input[1:].isdigit()):
                     try:
                         ras_obj.check_initialized()
                     except Exception as e:
                         raise ValueError(f"RAS object is not initialized: {str(e)}")
                         
-                    number = hdf_input if hdf_input.isdigit() else hdf_input[1:]
+                    # Extract the numeric part and convert to integer for comparison
+                    number_str = hdf_input if hdf_input.isdigit() else hdf_input[1:]
+                    number_int = int(number_str)
                     
                     if file_type == 'plan_hdf':
-                        plan_info = ras_obj.plan_df[ras_obj.plan_df['plan_number'] == number]
+                        # Convert plan_number column to integers for comparison
+                        plan_info = ras_obj.plan_df[ras_obj.plan_df['plan_number'].astype(int) == number_int]
                         if not plan_info.empty:
                             hdf_path = Path(plan_info.iloc[0]['HDF_Results_Path'])
                     elif file_type == 'geom_hdf':
-                        geom_info = ras_obj.geom_df[ras_obj.geom_df['geom_number'] == number]
+                        # Convert geom_number column to integers for comparison
+                        geom_info = ras_obj.geom_df[ras_obj.geom_df['geom_number'].astype(int) == number_int]
                         if not geom_info.empty:
                             hdf_path = Path(geom_info.iloc[0]['HDF_Path'])
                     else:
@@ -110,14 +114,16 @@ def standardize_input(file_type: str = 'plan_hdf'):
                 except Exception as e:
                     raise ValueError(f"RAS object is not initialized: {str(e)}")
                     
-                number = f"{hdf_input:02d}"
+                number_int = hdf_input
                 
                 if file_type == 'plan_hdf':
-                    plan_info = ras_obj.plan_df[ras_obj.plan_df['plan_number'] == number]
+                    # Convert plan_number column to integers for comparison
+                    plan_info = ras_obj.plan_df[ras_obj.plan_df['plan_number'].astype(int) == number_int]
                     if not plan_info.empty:
                         hdf_path = Path(plan_info.iloc[0]['HDF_Results_Path'])
                 elif file_type == 'geom_hdf':
-                    geom_info = ras_obj.geom_df[ras_obj.geom_df['geom_number'] == number]
+                    # Convert geom_number column to integers for comparison
+                    geom_info = ras_obj.geom_df[ras_obj.geom_df['geom_number'].astype(int) == number_int]
                     if not geom_info.empty:
                         hdf_path = Path(geom_info.iloc[0]['HDF_Path'])
                 else:

{ras_commander-0.59.0.dist-info → ras_commander-0.61.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ras-commander
-Version: 0.59.0
+Version: 0.61.0
 Summary: A Python library for automating HEC-RAS 6.x operations
 Home-page: https://github.com/gpt-cmdr/ras-commander
 Author: William M. Katzenmeyer, P.E., C.F.M.
@@ -119,11 +119,43 @@ It is highly suggested to fork this repository before going this route, and usin
 from ras_commander import init_ras_project, RasCmdr, RasPlan
 ```
 
-### Initialize a project
+### Initialize a project (single project)
 ```
 init_ras_project(r"/path/to/project", "6.5")
 ```
 
+### Initialize a project (multiple projects)
+```
+your_ras_project = RasPrj()
+init_ras_project(r"/path/to/project", "6.5", ras_object=your_ras_project)
+```
+
+## Accessing Plan, Unsteady and Boundary Conditions Dataframes
+Using the default 'ras" object, othewise substitute your_ras_project for muli-project scripts
+```
+print("\nPlan Files DataFrame:")
+ras.plan_df
+
+print("\nFlow Files DataFrame:")
+ras.flow_df
+
+print("\nUnsteady Flow Files DataFrame:")
+ras.unsteady_df
+
+print("\nGeometry Files DataFrame:")
+ras.geom_df
+
+print("\nHDF Entries DataFrame:")
+ras.get_hdf_entries()
+
+print("\nBoundary Conditions DataFrame:")
+ras.boundaries_df
+
+```
+
+
+
+
 ### Execute a single plan
 ```
 RasCmdr.compute_plan("01", dest_folder=r"/path/to/results", overwrite_dest=True)
@@ -185,8 +217,10 @@ RAS Commander allows working with multiple HEC-RAS projects simultaneously:
 
 ```python
 # Initialize multiple projects
-project1 = init_ras_project(path1, "6.6")
-project2 = init_ras_project(path2, "6.6")
+project1 = RasPrj()
+init_ras_project(path1, "6.6", ras_object=project1)
+project2 = RasPrj()
+init_ras_project(path2, "6.6", ras_object=project2)
 
 # Perform operations on each project
 RasCmdr.compute_plan("01", ras_object=project1, dest_folder=folder1)
@@ -202,7 +236,7 @@ print(f"Project 2: {project2.project_name}")
 
 This is useful for comparing different river systems, running scenario analyses across multiple watersheds, or managing a suite of related models.
 
-#### Key Components
+#### Core HEC-RAS Automation Classes
 
 - `RasPrj`: Manages HEC-RAS projects, handling initialization and data loading
 - `RasCmdr`: Handles execution of HEC-RAS simulations
@@ -212,7 +246,7 @@ This is useful for comparing different river systems, running scenario analyses
 - `RasUtils`: Contains utility functions for file operations and data management
 - `RasExamples`: Manages and loads HEC-RAS example projects
 
-#### New Components:
+#### HDF Data Access Classes
 - `HdfBase`: Core functionality for HDF file operations
 - `HdfBndry`: Enhanced boundary condition handling
 - `HdfMesh`: Comprehensive mesh data management
@@ -224,8 +258,7 @@ This is useful for comparing different river systems, running scenario analyses
 - `HdfPipe`: Pipe network analysis tools
 - `HdfPump`: Pump station analysis capabilities
 - `HdfFluvialPluvial`: Fluvial-pluvial boundary analysis
-- `RasMapper`: RASMapper interface
-- `RasToGo`: Go-Consequences integration
+- `RasMapper`: RASMapper Functions
 - `HdfPlot` & `HdfResultsPlot`: Specialized plotting utilities
 
 ### Project Organization Diagram

{ras_commander-0.59.0.dist-info → ras_commander-0.61.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ras_commander/Decorators.py,sha256=v0xPvIs3LbPlRJXvSHNtMFhygWEBo7f-0j_fCp7lXnQ,6030
+ras_commander/Decorators.py,sha256=0UIYc-hzmBVS7tovSLMzDp2NIhwrZvOYNrQSvETxhEE,6538
 ras_commander/HdfBase.py,sha256=Jws6Y8JFkharuiM6Br5ivp6MS64X2fL6y87FOpe3FQw,14219
 ras_commander/HdfBndry.py,sha256=m81NdCu_ER-AAZpEkQPQka7pYv3sm7vEZevq3SIt2pw,12545
 ras_commander/HdfFluvialPluvial.py,sha256=dlqoFX5i7uSA2BvuRNrV-Fg-z2JaeUxY86_fbZAdGqI,25933
@@ -27,8 +27,8 @@ ras_commander/RasToGo.py,sha256=TKujfaV1xQhFaOddF4g2ogGy6ky-CLlfelSMPD2J3Nk,1223
 ras_commander/RasUnsteady.py,sha256=KfCXAag-_bPwwS3JbPZH-s4hbaoHACO0mlRnGrzbFgA,32092
 ras_commander/RasUtils.py,sha256=P2-aBL61kdRINsjnBpstZVD6VVc7hI_D3RUXqr6ldmc,34863
 ras_commander/__init__.py,sha256=mceEWRQJkDBi1o3zVg7DpG2qMrMnKHwwuK3GwyxoVr4,2132
-ras_commander-0.59.0.dist-info/LICENSE,sha256=_pbd6qHnlsz1iQ-ozDW_49r86BZT6CRwO2iBtw0iN6M,457
-ras_commander-0.59.0.dist-info/METADATA,sha256=Ai5tJpr_j9k8uO1SDIIz0WFLJu2QhAKesqh5ZB1mPWY,24307
-ras_commander-0.59.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-ras_commander-0.59.0.dist-info/top_level.txt,sha256=i76S7eKLFC8doKcXDl3aiOr9RwT06G8adI6YuKbQDaA,14
-ras_commander-0.59.0.dist-info/RECORD,,
+ras_commander-0.61.0.dist-info/LICENSE,sha256=_pbd6qHnlsz1iQ-ozDW_49r86BZT6CRwO2iBtw0iN6M,457
+ras_commander-0.61.0.dist-info/METADATA,sha256=FmTSLA-khuKDSyKxmVQYa6jX0aADR1tKmtX9k2iTOhI,25045
+ras_commander-0.61.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+ras_commander-0.61.0.dist-info/top_level.txt,sha256=i76S7eKLFC8doKcXDl3aiOr9RwT06G8adI6YuKbQDaA,14
+ras_commander-0.61.0.dist-info/RECORD,,