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

xslope/seep.py

@@ -24,13 +24,13 @@ def build_seep_data(mesh, slope_data):
     Build a seep_data dictionary from a mesh and data dictionary.
     
     This function takes a mesh dictionary (from build_mesh_from_polygons) and a data dictionary
-    (from load_slope_data) and constructs a seep_data dictionary suitable for seepage analysis.
+    (from load_slope_data) and constructs a seep_data dictionary suitable for seep analysis.
     
     The function:
     1. Extracts mesh information (nodes, elements, element types, element materials)
     2. Builds material property arrays (k1, k2, alpha, kr0, h0) from the materials table
     3. Constructs boundary conditions by finding nodes that intersect with specified head
-       and seepage face lines from the data dictionary
+       and seep face lines from the data dictionary
     
     Parameters:
         mesh (dict): Mesh dictionary from build_mesh_from_polygons containing:
@@ -122,7 +122,7 @@ def build_seep_data(mesh, slope_data):
                 bc_type[i] = 1  # Fixed head
                 bc_values[i] = head_value
     
-    # Process seepage face (exit face) boundary conditions
+    # Process seep face (exit face) boundary conditions
     exit_face_coords = seepage_bc.get("exit_face", [])
     if len(exit_face_coords) >= 2:
         # Create LineString from exit face coordinates
@@ -286,7 +286,7 @@ def import_seep2d(filepath):
 
 def solve_confined(nodes, elements, bc_type, dirichlet_bcs, k1_vals, k2_vals, angles=None, element_types=None):
     """
-    FEM solver for confined seepage with anisotropic conductivity.
+    FEM solver for confined seep with anisotropic conductivity.
     Supports triangular and quadrilateral elements with both linear and quadratic shape functions.
     
     Parameters:
@@ -1989,10 +1989,10 @@ def quad4_stiffness_matrix(nodes_elem, Kmat):
 
 def run_seepage_analysis(seep_data, tol=1e-6):
     """
-    Standalone function to run seepage analysis.
+    Standalone function to run seep analysis.
     
     Args:
-        seep_data: Dictionary containing all the seepage data 
+        seep_data: Dictionary containing all the seep data
     
     Returns:
         Dictionary containing solution results with the following keys:
@@ -2023,7 +2023,7 @@ def run_seepage_analysis(seep_data, tol=1e-6):
     # Determine if unconfined flow
     is_unconfined = np.any(bc_type == 2)
     flow_type = "unconfined" if is_unconfined else "confined"
-    print(f"Solving {flow_type.upper()} seepage problem...")
+    print(f"Solving {flow_type.upper()} seep problem...")
     print("Number of fixed-head nodes:", np.sum(bc_type == 1))
     print("Number of exit face nodes:", np.sum(bc_type == 2))
 
@@ -2110,7 +2110,7 @@ def export_seep_solution(seep_data, solution, filename):
     
     Args:
         filename: Path to the output CSV file
-        seep_data: Dictionary containing seepage data 
+        seep_data: Dictionary containing seep data
         solution: Dictionary containing solution results from run_seepage_analysis
     """
     import pandas as pd
@@ -2140,7 +2140,7 @@ def print_seep_data_diagnostics(seep_data):
     Diagnostic function to print out the contents of seep_data after loading.
     
     Args:
-        seep_data: Dictionary containing seepage data 
+        seep_data: Dictionary containing seep data
     """
     print("\n" + "="*60)
     print("SEEP DATA DIAGNOSTICS")

xslope/slice.py

@@ -122,7 +122,7 @@ def get_profile_layer_y_coordinates(x_coords, profile_lines):
     
     Parameters:
         x_coords (array-like): X-coordinates to evaluate
-        profile_lines (list): List of profile layer lines
+        profile_lines (list): List of profile line dicts, each with 'coords' key containing coordinate tuples
         
     Returns:
         list: List of arrays, each containing y-coordinates for a profile layer
@@ -131,7 +131,7 @@ def get_profile_layer_y_coordinates(x_coords, profile_lines):
     layer_y_coords = []
     
     for line in profile_lines:
-        line_coords = np.array(line)
+        line_coords = np.array(line['coords'])
         line_x = line_coords[:, 0]
         line_y = line_coords[:, 1]
         
@@ -534,7 +534,7 @@ def generate_slices(slope_data, circle=None, non_circ=None, num_slices=40, debug
     
     # Vectorized approach for profile line points
     for line in profile_lines:
-        line_coords = np.array(line)
+        line_coords = np.array(line['coords'])
         x_coords = line_coords[:, 0]
         y_coords = line_coords[:, 1]
         
@@ -591,7 +591,7 @@ def generate_slices(slope_data, circle=None, non_circ=None, num_slices=40, debug
         # For circular failure surfaces, we can use a more efficient approach
         # by creating a dense circle representation and finding intersections
         for line in profile_lines:
-            line_geom = LineString(line)
+            line_geom = LineString(line['coords'])
             # Create a dense circle representation for intersection
             theta_range = np.linspace(np.pi, 2 * np.pi, 200)
             circle_coords = [(Xo + R * np.cos(t), Yo + R * np.sin(t)) for t in theta_range]
@@ -608,7 +608,7 @@ def generate_slices(slope_data, circle=None, non_circ=None, num_slices=40, debug
     else:
         # For non-circular failure surfaces, use the original approach
         for i in range(len(profile_lines)):
-            intersection = LineString(profile_lines[i]).intersection(clipped_surface)
+            intersection = LineString(profile_lines[i]['coords']).intersection(clipped_surface)
             if not intersection.is_empty:
                 if hasattr(intersection, 'x'):
                     fixed_xs.add(intersection.x)
@@ -775,12 +775,12 @@ def generate_slices(slope_data, circle=None, non_circ=None, num_slices=40, debug
         sum_gam_h_y = 0  # for calculating center of gravity of slice
         sum_gam_h = 0    # ditto
         
-        for mat_index, layer_y in enumerate(profile_y_coords):
+        for profile_idx, layer_y in enumerate(profile_y_coords):
             layer_top_y = layer_y[i]
             
             # Bottom: highest of all other profile lines at x, or failure surface
             layer_bot_y = y_cb  # Start with failure surface as default bottom
-            for j in range(mat_index + 1, len(profile_y_coords)):
+            for j in range(profile_idx + 1, len(profile_y_coords)):
                 next_y = profile_y_coords[j][i]
                 if not np.isnan(next_y) and next_y > layer_bot_y:
                     # Take the highest of the lower profile lines
@@ -792,14 +792,36 @@ def generate_slices(slope_data, circle=None, non_circ=None, num_slices=40, debug
                 overlap_top = min(y_ct, layer_top_y)
                 overlap_bot = max(y_cb, layer_bot_y)
                 h = max(0, overlap_top - overlap_bot)
+                
+                # Get material index from mat_id in profile line (already 0-based)
+                mat_id = profile_lines[profile_idx].get('mat_id')
+                if mat_id is not None and 0 <= mat_id < len(materials):
+                    mat_index = mat_id
+                else:
+                    # Fallback to profile index if no mat_id or out of range
+                    mat_index = profile_idx
+                
                 sum_gam_h_y += h * materials[mat_index]['gamma'] * (overlap_top + overlap_bot) / 2
                 sum_gam_h += h * materials[mat_index]['gamma']
 
             heights.append(h)
+            
+            # Get material index for soil weight calculation (already 0-based)
+            mat_id = profile_lines[profile_idx].get('mat_id')
+            if mat_id is not None and 0 <= mat_id < len(materials):
+                mat_index = mat_id
+            else:
+                mat_index = profile_idx
+            
             soil_weight += h * materials[mat_index]['gamma'] * dx
 
             if h > 0:
-                base_material_idx = mat_index
+                # Get material index for base material (already 0-based)
+                mat_id = profile_lines[profile_idx].get('mat_id')
+                if mat_id is not None and 0 <= mat_id < len(materials):
+                    base_material_idx = mat_id
+                else:
+                    base_material_idx = profile_idx
 
         # Center of gravity
         y_cg = (sum_gam_h_y) / sum_gam_h if sum_gam_h > 0 else None
@@ -926,7 +948,7 @@ def generate_slices(slope_data, circle=None, non_circ=None, num_slices=40, debug
             else:
                 u = 0
                 
-            # Check for second seepage solution (rapid drawdown)
+            # Check for second seep solution (rapid drawdown)
             if 'seep_u2' in data:
                 seep_mesh = data['seep_mesh']
                 seep_u2 = data['seep_u2']

xslope/solve.py

@@ -768,13 +768,17 @@ def spencer(slice_df, tol=1e-4, max_iter = 100, debug_level=0):
         """Compute Q and y_Q for given F and theta values."""
         # Equation (24): m_alpha
         ma = 1 / (np.cos(alpha - theta_rad) + np.sin(alpha - theta_rad) * tan_p / F)
-        
+
         # Equation (23): Q
         Q = (- Fv * sin_a - Fh * cos_a - (c / F) * dl + (Fv * cos_a - Fh * sin_a + u * dl) * tan_p / F) * ma
-        
-        # Equation (26): y_Q
-        y_q = y_b + Mo / (Q * np.cos(theta_rad))
-        
+
+        # Equation (26): y_Q with numerical safeguard
+        # Add small epsilon to prevent divide-by-zero when Q * cos(theta) is very small
+        Q_cos_theta = Q * np.cos(theta_rad)
+        eps = 1e-10
+        safe_denom = np.where(np.abs(Q_cos_theta) < eps, eps * np.sign(Q_cos_theta + eps), Q_cos_theta)
+        y_q = y_b + Mo / safe_denom
+
         return Q, y_q
     
     def compute_residuals(F, theta_rad):
@@ -814,10 +818,18 @@ def spencer(slice_df, tol=1e-4, max_iter = 100, debug_level=0):
         dC3_dtheta = sin_alpha_theta  # Equation (55)
         dC4_dtheta = -cos_alpha_theta * tan_p  # Equation (56)
         dQ_dtheta = (-1 / denom_Q**2) * (C1 + C2 / F) * (dC3_dtheta + dC4_dtheta / F)
-        
+
         # Partial derivatives of y_Q (Equations 59-60)
-        dyQ_dF = (-1 / (Q * cos_theta)**2) * Mo * dQ_dF * cos_theta
-        dyQ_dtheta = (-1 / (Q * cos_theta)**2) * Mo * (dQ_dtheta * cos_theta - Q * sin_theta)
+        # Add numerical safeguard to prevent divide-by-zero when Q * cos_theta is very small
+        Q_cos_theta = Q * cos_theta
+        eps = 1e-10  # Small epsilon to prevent exact zero division
+
+        # Use np.where to handle element-wise operations safely
+        # Where |Q * cos_theta| < eps, set derivatives to a large value to signal ill-conditioning
+        safe_denom = np.where(np.abs(Q_cos_theta) < eps, eps * np.sign(Q_cos_theta + eps), Q_cos_theta)
+
+        dyQ_dF = (-1 / safe_denom**2) * Mo * dQ_dF * cos_theta
+        dyQ_dtheta = (-1 / safe_denom**2) * Mo * (dQ_dtheta * cos_theta - Q * sin_theta)
         
         # First-order partial derivatives of R1 (Equations 35-36)
         dR1_dF = np.sum(dQ_dF)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xslope
-Version: 0.1.12
+Version: 0.1.13
 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.13.dist-info/RECORD

@@ -0,0 +1,21 @@
+xslope/__init__.py,sha256=ZygAIkX6Nbjag1czWdQa-yP-GM1mBE_9ss21Xh__JFc,34
+xslope/_version.py,sha256=XLyb183vl7CU3KttGJB7AeLEWBwd9veAWre8ysdY9ww,51
+xslope/advanced.py,sha256=-eL4-I36j6DfsheaGbOtclUHTFkkSn1k5k4YF9tOCvU,18278
+xslope/fem.py,sha256=x3BWHqxqJd-K78NzLquqr8eLXWVdFMzyA2cQXTNqLTk,115719
+xslope/fileio.py,sha256=BajiNljdwMMF2u2SqLpObZ-rimhgm3XyaFo14N6vZJI,38180
+xslope/global_config.py,sha256=Cj8mbPidIuj5Ty-5cZM-c8H12kNvyHsk5_ofNGez-3M,2253
+xslope/mesh copy.py,sha256=qtMH1yKFgHM4kNuIrxco7tKV86R3Dbf7Nok5j6MtlLY,131013
+xslope/mesh.py,sha256=Kn2Um1wz50EA4xd5xpxgxxegxWOlpL3Brks0_8JLWFQ,139382
+xslope/plot.py,sha256=VkItm3kASiNL3hha-W6PbjdJ7w2_yi2_4LcjH7GqokM,86265
+xslope/plot_fem.py,sha256=z2FLPbIx6yNIKYcgC-LcZz2jfx0WLYFL3xJgNvQ1t-c,69488
+xslope/plot_seep.py,sha256=0s8R76c_34sUwA-L-_71Kt5BZSaIFbs-xV56M69XRU4,32960
+xslope/search.py,sha256=dvgKn8JCobuvyD7fClF5lcbeHESCvV8gZ_U_lQnYRok,16867
+xslope/seep.py,sha256=AlZvp1kSPBfbNkpSZUNXqaefIRuT6BZPxhadmb5DFsk,93270
+xslope/slice.py,sha256=5zUl3qSF4PMt2d9y6jAX881aTcUWVMeVN87wt-BbIao,46380
+xslope/solve.py,sha256=_whlUuSsDqqe0wtgLowucc9dXmC8Q6J9zbViTQOmo-I,49337
+xslope-0.1.13.dist-info/LICENSE,sha256=NU5J88FUai_4Ixu5DqOQukA-gcXAyX8pXLhIg8OB3AM,10969
+xslope-0.1.13.dist-info/METADATA,sha256=gnmFMyTdek5oNE5MDHkb_WX6hiMKBJ9dP2DdG4OhHYI,2028
+xslope-0.1.13.dist-info/NOTICE,sha256=E-sbN0MWwvJC27Z-2_G4VUHIx4IsfvLDTmOstvY4-OQ,530
+xslope-0.1.13.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+xslope-0.1.13.dist-info/top_level.txt,sha256=5qHbWJ1R2pdTNIainFyrVtFk8R1tRcwIn0kzTuwuV1Q,7
+xslope-0.1.13.dist-info/RECORD,,

xslope-0.1.12.dist-info/RECORD

@@ -1,21 +0,0 @@
-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,,