xslope 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

xslope/plot_fem.py

@@ -22,8 +22,8 @@ from matplotlib.colors import LinearSegmentedColormap
 from matplotlib.patches import Polygon
 
 
-def plot_fem_data(fem_data, figsize=(14, 6), show_nodes=False, show_bc=True, material_table=False, 
-                  label_elements=False, label_nodes=False, alpha=0.4, bc_symbol_size=0.03):
+def plot_fem_data(fem_data, figsize=(14, 6), show_nodes=False, show_bc=True, 
+                  label_elements=False, label_nodes=False, alpha=0.4, bc_symbol_size=0.03, save_png=False, dpi=300):
     """
     Plots a FEM mesh colored by material zone with boundary conditions displayed.
     
@@ -32,7 +32,6 @@ def plot_fem_data(fem_data, figsize=(14, 6), show_nodes=False, show_bc=True, mat
         figsize: Figure size
         show_nodes: If True, plot node points
         show_bc: If True, plot boundary condition symbols
-        material_table: If True, show material table
         label_elements: If True, label each element with its number at its centroid
         label_nodes: If True, label each node with its number just above and to the right
         alpha: Transparency for element faces
@@ -245,12 +244,13 @@ def plot_fem_data(fem_data, figsize=(14, 6), show_nodes=False, show_bc=True, mat
     else:
         title = f"FEM Mesh with Material Zones ({num_triangles} triangles)"
     
-    # Place the table in the upper left
-    if material_table:
-        _plot_fem_material_table(ax, fem_data, xloc=0.3, yloc=1.1)  # upper left
-    
     ax.set_title(title)
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '').replace('(', '').replace(')', '') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 
@@ -361,73 +361,10 @@ def _plot_boundary_conditions(ax, nodes, bc_type, bc_values, legend_handles, bc_
                       markersize=8, label='Applied Force (bc_type=4)')
         )
 
-
-def _plot_fem_material_table(ax, fem_data, xloc=0.6, yloc=0.7):
-    """
-    Adds a FEM material properties table to the plot.
-
-    Parameters:
-        ax: matplotlib Axes object
-        fem_data: Dictionary containing FEM data with material properties
-        xloc: x-location of table (0-1)
-        yloc: y-location of table (0-1)
-
-    Returns:
-        None
-    """
-    # Extract material properties from fem_data
-    c_by_mat = fem_data.get("c_by_mat")
-    phi_by_mat = fem_data.get("phi_by_mat")
-    E_by_mat = fem_data.get("E_by_mat")
-    nu_by_mat = fem_data.get("nu_by_mat")
-    gamma_by_mat = fem_data.get("gamma_by_mat")
-    material_names = fem_data.get("material_names", [])
-    
-    if c_by_mat is None or len(c_by_mat) == 0:
-        return
-
-    # Column headers for FEM properties
-    col_labels = ["Mat", "Name", "γ", "c", "φ", "E", "ν"]
-
-    # Build table rows
-    table_data = []
-    for idx in range(len(c_by_mat)):
-        c = c_by_mat[idx]
-        phi = phi_by_mat[idx] if phi_by_mat is not None else 0.0
-        E = E_by_mat[idx] if E_by_mat is not None else 0.0
-        nu = nu_by_mat[idx] if nu_by_mat is not None else 0.0
-        gamma = gamma_by_mat[idx] if gamma_by_mat is not None else 0.0
-        
-        # Get material name, use default if not available
-        material_name = material_names[idx] if idx < len(material_names) else f"Material {idx+1}"
-        
-        # Format values with appropriate precision
-        row = [
-            idx + 1,  # Material number (1-based)
-            material_name,  # Material name
-            f"{gamma:.1f}",   # unit weight
-            f"{c:.1f}",  # cohesion
-            f"{phi:.1f}",  # friction angle
-            f"{E:.0f}",  # Young's modulus
-            f"{nu:.2f}"  # Poisson's ratio
-        ]
-        table_data.append(row)
-
-    # Add the table
-    table = ax.table(cellText=table_data,
-                     colLabels=col_labels,
-                     loc='upper right',
-                     colLoc='center',
-                     cellLoc='center',
-                     bbox=[xloc, yloc, 0.45, 0.25])  # Increased width to accommodate name column
-    table.auto_set_font_size(False)
-    table.set_fontsize(8)
-
-
 def plot_fem_results(fem_data, solution, plot_type='displacement', deform_scale=None, 
                     show_mesh=True, show_reinforcement=True, figsize=(12, 8), label_elements=False,
                     plot_nodes=False, plot_elements=False, plot_boundary=True, displacement_tolerance=0.5,
-                    scale_vectors=False):
+                    scale_vectors=False, save_png=False, dpi=300):
     """
     Plot FEM results with various visualization options.
     
@@ -540,6 +477,11 @@ def plot_fem_results(fem_data, solution, plot_type='displacement', deform_scale=
         ax.set_aspect('equal')
     
     plt.tight_layout()
+    
+    if save_png:
+        filename = f'plot_fem_results_{plot_type.lower().replace(",", "_").replace(" ", "_")}.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
     
     # Return appropriate values
@@ -1071,7 +1013,7 @@ def plot_reinforcement_forces(ax, fem_data, solution):
                 ax.add_collection(lc_failed)
 
 
-def plot_reinforcement_force_profiles(fem_data, solution, figsize=(12, 8)):
+def plot_reinforcement_force_profiles(fem_data, solution, figsize=(12, 8), save_png=False, dpi=300):
     """
     Plot force profiles along each reinforcement line.
     """
@@ -1170,10 +1112,15 @@ def plot_reinforcement_force_profiles(fem_data, solution, figsize=(12, 8)):
         axes[i].set_visible(False)
     
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_reinforcement_force_profiles.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     return fig, axes
 
 
-def plot_ssrm_convergence(ssrm_solution, figsize=(10, 6)):
+def plot_ssrm_convergence(ssrm_solution, figsize=(10, 6), save_png=False, dpi=300):
     """
     Plot SSRM convergence history.
     """
@@ -1214,6 +1161,11 @@ def plot_ssrm_convergence(ssrm_solution, figsize=(10, 6)):
     ax2.grid(True, alpha=0.3)
     
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_ssrm_convergence.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     return fig, (ax1, ax2)
 
 

xslope/plot_seep.py

@@ -4,7 +4,7 @@ from matplotlib.ticker import MaxNLocator
 import numpy as np
 
 
-def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False, material_table=False, label_elements=False, label_nodes=False, alpha=0.4):
+def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False, label_elements=False, label_nodes=False, alpha=0.4, save_png=False, dpi=300):
     """
     Plots a mesh colored by material zone.
     Supports both triangular and quadrilateral elements.
@@ -13,7 +13,6 @@ def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False,
         seep_data: Dictionary containing seepage data from import_seep2d
         show_nodes: If True, plot node points
         show_bc: If True, plot boundary condition nodes
-        material_table: If True, show material table
         label_elements: If True, label each element with its number at its centroid
         label_nodes: If True, label each node with its number just above and to the right
     """
@@ -181,10 +180,10 @@ def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False,
         bc1 = nodes[bc_type == 1]
         bc2 = nodes[bc_type == 2]
         if len(bc1) > 0:
-            h1, = ax.plot(bc1[:, 0], bc1[:, 1], 'ro', label="Fixed Head (bc_type=1)")
+            h1, = ax.plot(bc1[:, 0], bc1[:, 1], 'bs', label="Fixed Head (bc_type=1)")
             legend_handles.append(h1)
         if len(bc2) > 0:
-            h2, = ax.plot(bc2[:, 0], bc2[:, 1], 'bs', label="Exit Face (bc_type=2)")
+            h2, = ax.plot(bc2[:, 0], bc2[:, 1], 'ro', label="Exit Face (bc_type=2)")
             legend_handles.append(h2)
 
     # Single combined legend outside the plot
@@ -196,6 +195,12 @@ def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False,
         frameon=False
     )
     ax.set_aspect("equal")
+
+    # Add a bit of headroom so the mesh/BC markers don't touch the top border
+    y0, y1 = ax.get_ylim()
+    if y1 > y0:
+        pad = 0.05 * (y1 - y0)
+        ax.set_ylim(y0, y1 + pad)
     
     # Count element types for title
     num_triangles = np.sum(element_types == 3)
@@ -207,17 +212,18 @@ def plot_seep_data(seep_data, figsize=(14, 6), show_nodes=False, show_bc=False,
     else:
         title = f"SEEP2D Mesh with Material Zones ({num_triangles} triangles)"
     
-    # Place the table in the upper left
-    if material_table:
-        plot_seep_material_table(ax, seep_data, xloc=0.3, yloc=1.1)  # upper left
-    
     ax.set_title(title)
     # plt.subplots_adjust(bottom=0.2)  # Add vertical cushion
     plt.tight_layout()
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '').replace('(', '').replace(')', '') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 
-def plot_seep_solution(seep_data, solution, figsize=(14, 6), levels=20, base_mat=1, fill_contours=True, phreatic=True, alpha=0.4, pad_frac=0.05, mesh=True, variable="head", vectors=False, vector_scale=0.05, flowlines=True):
+def plot_seep_solution(seep_data, solution, figsize=(14, 6), levels=20, base_mat=1, fill_contours=True, phreatic=True, alpha=0.4, pad_frac=0.05, mesh=True, variable="head", vectors=False, vector_scale=0.05, flowlines=True, save_png=False, dpi=300):
     """
     Plot seepage analysis results including head contours, flowlines, and phreatic surface.
     
@@ -579,69 +585,15 @@ def plot_seep_solution(seep_data, solution, figsize=(14, 6), levels=20, base_mat
     # Remove tight_layout and subplots_adjust for best constrained layout
     # plt.tight_layout()
     # plt.subplots_adjust(top=0.78)
+    
+    if save_png:
+        filename = 'plot_' + title.lower().replace(' ', '_').replace(':', '').replace(',', '').replace('—', '').replace('(', '').replace(')', '') + '.png'
+        plt.savefig(filename, dpi=dpi, bbox_inches='tight')
+    
     plt.show()
 
 
-def plot_seep_material_table(ax, seep_data, xloc=0.6, yloc=0.7):
-    """
-    Adds a seepage material properties table to the plot.
-
-    Parameters:
-        ax: matplotlib Axes object
-        seep_data: Dictionary containing seepage data with material properties
-        xloc: x-location of table (0-1)
-        yloc: y-location of table (0-1)
-
-    Returns:
-        None
-    """
-    # Extract material properties from seep_data
-    k1_by_mat = seep_data.get("k1_by_mat")
-    k2_by_mat = seep_data.get("k2_by_mat")
-    angle_by_mat = seep_data.get("angle_by_mat")
-    kr0_by_mat = seep_data.get("kr0_by_mat")
-    h0_by_mat = seep_data.get("h0_by_mat")
-    material_names = seep_data.get("material_names", [])
-    
-    if k1_by_mat is None or len(k1_by_mat) == 0:
-        return
-
-    # Column headers for seepage properties
-    col_labels = ["Mat", "Name", "k₁", "k₂", "Angle", "kr₀", "h₀"]
-
-    # Build table rows
-    table_data = []
-    for idx in range(len(k1_by_mat)):
-        k1 = k1_by_mat[idx]
-        k2 = k2_by_mat[idx] if k2_by_mat is not None else 0.0
-        angle = angle_by_mat[idx] if angle_by_mat is not None else 0.0
-        kr0 = kr0_by_mat[idx] if kr0_by_mat is not None else 0.0
-        h0 = h0_by_mat[idx] if h0_by_mat is not None else 0.0
-        
-        # Get material name, use default if not available
-        material_name = material_names[idx] if idx < len(material_names) else f"Material {idx+1}"
-        
-        # Format values with appropriate precision
-        row = [
-            idx + 1,  # Material number (1-based)
-            material_name,  # Material name
-            f"{k1:.3f}",  # k1 in scientific notation
-            f"{k2:.3f}",  # k2 in scientific notation
-            f"{angle:.1f}",  # angle in degrees
-            f"{kr0:.4f}",  # kr0
-            f"{h0:.2f}"   # h0
-        ]
-        table_data.append(row)
-
-    # Add the table
-    table = ax.table(cellText=table_data,
-                     colLabels=col_labels,
-                     loc='upper right',
-                     colLoc='center',
-                     cellLoc='center',
-                     bbox=[xloc, yloc, 0.45, 0.25])  # Increased width to accommodate name column
-    table.auto_set_font_size(False)
-    table.set_fontsize(8)
+    # plot_seep_material_table has been moved to xslope/plot.py
 
 
 def get_ordered_mesh_boundary(nodes, elements, element_types=None):

xslope/seep.py

@@ -404,7 +404,7 @@ def solve_confined(nodes, elements, bc_type, dirichlet_bcs, k1_vals, k2_vals, an
 
 def solve_unsaturated(nodes, elements, bc_type, bc_values, kr0=0.001, h0=-1.0,
                       k1_vals=1.0, k2_vals=1.0, angles=0.0,
-                      max_iter=200, tol=1e-4, element_types=None):
+                      max_iter=200, tol=1e-6, element_types=None):
     """
     Iterative FEM solver for unconfined flow using linear kr frontal function.
     Supports triangular and quadrilateral elements with both linear and quadratic shape functions.
@@ -716,7 +716,7 @@ def solve_unsaturated(nodes, elements, bc_type, bc_values, kr0=0.001, h0=-1.0,
         print("  - Non-conservative flow field")
         print("  - Incorrect boundary identification")
         print("  - Numerical issues in the flow solution")
-
+        print(f"Try reducing the tolerance (tol) parameter. Current value: {tol:.6e}")
 
     return h, A, q_final, total_inflow
 
@@ -969,10 +969,14 @@ def create_flow_potential_bc(nodes, elements, q, debug=False, element_types=None
     starting_phi = phi[ordered_nodes[start_idx]]
     closure_error = phi_val - starting_phi
 
-    if debug or abs(closure_error) > 1e-3:
+    # Use a relative threshold based on total positive boundary flow
+    rel_tol = 1e-2  # 1%
+    scale = max(total_q, 1e-12)
+    
+    if debug or abs(closure_error) > rel_tol * scale:
         print(f"Flow potential closure check: error = {closure_error:.6e}")
 
-        if abs(closure_error) > 1e-3:
+        if abs(closure_error) > rel_tol * scale:
             print(f"Warning: Large flow potential closure error = {closure_error:.6e}")
             print("This may indicate:")
             print("  - Non-conservative flow field")
@@ -1983,7 +1987,7 @@ def quad4_stiffness_matrix(nodes_elem, Kmat):
     
     return ke
 
-def run_seepage_analysis(seep_data):
+def run_seepage_analysis(seep_data, tol=1e-6):
     """
     Standalone function to run seepage analysis.
     
@@ -2048,7 +2052,8 @@ def run_seepage_analysis(seep_data):
             k1_vals=k1,
             k2_vals=k2,
             angles=angle,
-            element_types=element_types
+            element_types=element_types,
+            tol=tol
         )
         # Solve for potential function φ for flow lines
         dirichlet_phi_bcs = create_flow_potential_bc(nodes, elements, q, element_types=element_types)

{xslope-0.1.10.dist-info → xslope-0.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xslope
-Version: 0.1.10
+Version: 0.1.12
 Summary: Slope stability analysis (limit equilibrium and FEM) in Python.
 Author: Norman L. Jones
 Project-URL: Homepage, https://github.com/njones61/xslope

xslope-0.1.12.dist-info/RECORD

@@ -0,0 +1,21 @@
+xslope/__init__.py,sha256=ZygAIkX6Nbjag1czWdQa-yP-GM1mBE_9ss21Xh__JFc,34
+xslope/_version.py,sha256=q5MF9vedBklo3vj52_gwvihlwfAGwilLmjxYlgKI-zM,51
+xslope/advanced.py,sha256=35k_ekQJ-mQJ1wHnoIHMc5TVfYn-2EPCJyHz827Cpbc,18281
+xslope/fem.py,sha256=K4_Pq06HFBpRkN3JwtXF2zw_AMnCkXvj0ggrlRFMQQw,115731
+xslope/fileio.py,sha256=nxpD5dnkWjSVnby9jsQgHrxikfAsL3KOUehiw8sMb-Q,31783
+xslope/global_config.py,sha256=Cj8mbPidIuj5Ty-5cZM-c8H12kNvyHsk5_ofNGez-3M,2253
+xslope/mesh copy.py,sha256=qtMH1yKFgHM4kNuIrxco7tKV86R3Dbf7Nok5j6MtlLY,131013
+xslope/mesh.py,sha256=dY_G7ctgOroUSv2oUuM-ZQOnKAEJ1dIq6FTU_JLWEqs,136816
+xslope/plot.py,sha256=SuwC6quvkdQ66sVzSam3USRoEUC99s-iS1_0j-V7k8A,81401
+xslope/plot_fem.py,sha256=z2FLPbIx6yNIKYcgC-LcZz2jfx0WLYFL3xJgNvQ1t-c,69488
+xslope/plot_seep.py,sha256=wEmK3FCYjkqtnNqy1nhFLe72GBVrdhcR0CkgxlLaAjc,32948
+xslope/search.py,sha256=dvgKn8JCobuvyD7fClF5lcbeHESCvV8gZ_U_lQnYRok,16867
+xslope/seep.py,sha256=Xc3C3HcAOXBdsVStJTPo2AxY4QjQKjMcfTuJGYCazMY,93300
+xslope/slice.py,sha256=QHawTk7XPLziHoN_ZS0jrEPYKlhPT62caUc_q-_EGjs,45236
+xslope/solve.py,sha256=u_sBjtsj1EeZtgSEmo80tEWoRrrMgvRjmi6P0ODO1lU,48645
+xslope-0.1.12.dist-info/LICENSE,sha256=NU5J88FUai_4Ixu5DqOQukA-gcXAyX8pXLhIg8OB3AM,10969
+xslope-0.1.12.dist-info/METADATA,sha256=BPz97uzKVuFiS9_RqS5r6iYd4O0W4IacO-CyZEsUaHY,2028
+xslope-0.1.12.dist-info/NOTICE,sha256=E-sbN0MWwvJC27Z-2_G4VUHIx4IsfvLDTmOstvY4-OQ,530
+xslope-0.1.12.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+xslope-0.1.12.dist-info/top_level.txt,sha256=5qHbWJ1R2pdTNIainFyrVtFk8R1tRcwIn0kzTuwuV1Q,7
+xslope-0.1.12.dist-info/RECORD,,

xslope-0.1.10.dist-info/RECORD

@@ -1,21 +0,0 @@
-xslope/__init__.py,sha256=ZygAIkX6Nbjag1czWdQa-yP-GM1mBE_9ss21Xh__JFc,34
-xslope/_version.py,sha256=DfeCqc-dgdypmy58WabEWmjpVnqKiY50hCCECclU5_I,51
-xslope/advanced.py,sha256=35k_ekQJ-mQJ1wHnoIHMc5TVfYn-2EPCJyHz827Cpbc,18281
-xslope/fem.py,sha256=K4_Pq06HFBpRkN3JwtXF2zw_AMnCkXvj0ggrlRFMQQw,115731
-xslope/fileio.py,sha256=DnFUYmJedjKXOuVPZUfTRxGfTjiIz8KyHkRDK7ddQg0,28840
-xslope/global_config.py,sha256=Cj8mbPidIuj5Ty-5cZM-c8H12kNvyHsk5_ofNGez-3M,2253
-xslope/mesh copy.py,sha256=qtMH1yKFgHM4kNuIrxco7tKV86R3Dbf7Nok5j6MtlLY,131013
-xslope/mesh.py,sha256=qtMH1yKFgHM4kNuIrxco7tKV86R3Dbf7Nok5j6MtlLY,131013
-xslope/plot.py,sha256=OW2eZyrT5h3Y95qjNFgGMnC_Am7TurUB2S7b_BgnO6E,54641
-xslope/plot_fem.py,sha256=al9zjqjxWKooLl4SAds77Zz-j9cjD4TJGygyU9QK5vo,71111
-xslope/plot_seep.py,sha256=Fs8S-0_7bnNJZlj7SnM0ij1mFDZWlNjXGnP6iMDiplY,34647
-xslope/search.py,sha256=dvgKn8JCobuvyD7fClF5lcbeHESCvV8gZ_U_lQnYRok,16867
-xslope/seep.py,sha256=tLvme-eL0R5SGGTH2Y6z4Rrfe36UuSWWLlL_1kglee8,93030
-xslope/slice.py,sha256=QHawTk7XPLziHoN_ZS0jrEPYKlhPT62caUc_q-_EGjs,45236
-xslope/solve.py,sha256=u_sBjtsj1EeZtgSEmo80tEWoRrrMgvRjmi6P0ODO1lU,48645
-xslope-0.1.10.dist-info/LICENSE,sha256=NU5J88FUai_4Ixu5DqOQukA-gcXAyX8pXLhIg8OB3AM,10969
-xslope-0.1.10.dist-info/METADATA,sha256=-iSQGoUnwIJgNg0sZizK2iZk6JRVarH5mDMpUxsFSgI,2028
-xslope-0.1.10.dist-info/NOTICE,sha256=E-sbN0MWwvJC27Z-2_G4VUHIx4IsfvLDTmOstvY4-OQ,530
-xslope-0.1.10.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-xslope-0.1.10.dist-info/top_level.txt,sha256=5qHbWJ1R2pdTNIainFyrVtFk8R1tRcwIn0kzTuwuV1Q,7
-xslope-0.1.10.dist-info/RECORD,,