trenchfoot 0.1.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

trenchfoot/generate_scenarios.py

@@ -135,18 +135,35 @@ def gmsh_available() -> bool:
     return _gmsh_mesher is not None
 
 
+def _generate_circular_path(
+    center: tuple[float, float], radius: float, n_vertices: int = 32
+) -> List[List[float]]:
+    """Generate vertices for a closed circular polyline.
+
+    The path is explicitly closed by repeating the first point at the end.
+    This ensures proper handling as a closed loop in mesh generation.
+    """
+    import math
+    cx, cy = center
+    angles = [2 * math.pi * i / n_vertices for i in range(n_vertices)]
+    points = [[cx + radius * math.cos(a), cy + radius * math.sin(a)] for a in angles]
+    # Close the path by repeating the first point
+    points.append(points[0].copy())
+    return points
+
+
 def default_scenarios() -> List[ScenarioDefinition]:
-    """Built-in scenario presets."""
+    """Built-in scenario presets with shallower depths and offset polygon ground."""
     return [
         ScenarioDefinition(
             "S01_straight_vwalls",
             {
                 "path_xy": [[0, 0], [5, 0]],
                 "width": 1.0,
-                "depth": 1.0,
+                "depth": 0.6,
                 "wall_slope": 0.0,
                 "ground_margin": 0.5,
-                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 3.0},
+                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 1.0},
                 "pipes": [],
                 "boxes": [],
                 "spheres": [],
@@ -158,17 +175,17 @@ def default_scenarios() -> List[ScenarioDefinition]:
             {
                 "path_xy": [[0, 0], [6, 0]],
                 "width": 1.2,
-                "depth": 1.5,
+                "depth": 0.9,
                 "wall_slope": 0.2,
                 "ground_margin": 0.5,
-                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 3.0},
+                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 1.0},
                 "pipes": [
                     {
                         "radius": 0.15,
                         "length": 7.0,
                         "angle_deg": 0,
                         "s_center": 0.5,
-                        "z": -0.7,
+                        "z": -0.45,
                         "offset_u": 0.0,
                     }
                 ],
@@ -182,17 +199,17 @@ def default_scenarios() -> List[ScenarioDefinition]:
             {
                 "path_xy": [[0, 0], [6, 0], [6, 4]],
                 "width": 1.2,
-                "depth": 1.8,
+                "depth": 1.1,
                 "wall_slope": 0.15,
                 "ground_margin": 1.0,
-                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 4.0},
+                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 1.2},
                 "pipes": [
                     {
                         "radius": 0.15,
                         "length": 8.0,
                         "angle_deg": 0,
                         "s_center": 0.35,
-                        "z": -1.0,
+                        "z": -0.6,
                         "offset_u": 0.0,
                     },
                     {
@@ -200,7 +217,7 @@ def default_scenarios() -> List[ScenarioDefinition]:
                         "length": 5.0,
                         "angle_deg": 90,
                         "s_center": 0.75,
-                        "z": -0.9,
+                        "z": -0.55,
                         "offset_u": 0.2,
                     },
                 ],
@@ -230,17 +247,17 @@ def default_scenarios() -> List[ScenarioDefinition]:
             {
                 "path_xy": [[0, 0], [6, 0], [6, 4], [0, 4]],
                 "width": 1.4,
-                "depth": 2.0,
+                "depth": 1.2,
                 "wall_slope": 0.25,
                 "ground_margin": 1.2,
-                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 5.0},
+                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 1.5},
                 "pipes": [
                     {
                         "radius": 0.18,
                         "length": 9.0,
                         "angle_deg": 0,
                         "s_center": 0.25,
-                        "z": -1.0,
+                        "z": -0.6,
                         "offset_u": 0.0,
                     },
                     {
@@ -248,7 +265,7 @@ def default_scenarios() -> List[ScenarioDefinition]:
                         "length": 5.0,
                         "angle_deg": 45,
                         "s_center": 0.55,
-                        "z": -1.1,
+                        "z": -0.65,
                         "offset_u": -0.2,
                     },
                     {
@@ -256,12 +273,12 @@ def default_scenarios() -> List[ScenarioDefinition]:
                         "length": 3.5,
                         "angle_deg": -60,
                         "s_center": 0.75,
-                        "z": -1.3,
+                        "z": -0.8,
                         "offset_u": 0.25,
                     },
                 ],
                 "boxes": [],
-                "spheres": [{"radius": 0.3, "s": 0.85, "offset_u": -0.2}],
+                "spheres": [{"radius": 0.25, "s": 0.85, "offset_u": -0.2, "z": -0.7}],
                 "noise": {
                     "enable": True,
                     "amplitude": 0.02,
@@ -278,17 +295,17 @@ def default_scenarios() -> List[ScenarioDefinition]:
             {
                 "path_xy": [[0, 0], [9, 0], [9, 3]],
                 "width": 2.4,
-                "depth": 1.2,
+                "depth": 0.7,
                 "wall_slope": 0.08,
                 "ground_margin": 1.5,
-                "ground": {"z0": 0.0, "slope": [0.02, -0.015], "size_margin": 6.0},
+                "ground": {"z0": 0.0, "slope": [0.02, -0.015], "size_margin": 1.5},
                 "pipes": [
                     {
                         "radius": 0.2,
                         "length": 5.5,
                         "angle_deg": 10,
                         "s_center": 0.35,
-                        "z": -0.7,
+                        "z": -0.4,
                         "offset_u": 0.3,
                         "clearance_scale": 0.9,
                     },
@@ -297,7 +314,7 @@ def default_scenarios() -> List[ScenarioDefinition]:
                         "length": 4.2,
                         "angle_deg": -15,
                         "s_center": 0.7,
-                        "z": -0.8,
+                        "z": -0.45,
                         "offset_u": -0.4,
                         "clearance_scale": 1.1,
                     },
@@ -306,10 +323,10 @@ def default_scenarios() -> List[ScenarioDefinition]:
                     {
                         "along": 1.2,
                         "across": 0.9,
-                        "height": 0.5,
+                        "height": 0.35,
                         "s": 0.55,
                         "offset_u": -0.25,
-                        "z": -0.6,
+                        "z": -0.35,
                     }
                 ],
                 "spheres": [],
@@ -329,17 +346,17 @@ def default_scenarios() -> List[ScenarioDefinition]:
             {
                 "path_xy": [[0, 0], [4, -1], [8, 0], [8, 5], [2, 5], [-1, 2]],
                 "width": 2.6,
-                "depth": 1.4,
+                "depth": 0.85,
                 "wall_slope": 0.12,
                 "ground_margin": 2.0,
-                "ground": {"z0": 0.2, "slope": [0.015, 0.03], "size_margin": 7.0},
+                "ground": {"z0": 0.2, "slope": [0.015, 0.03], "size_margin": 1.8},
                 "pipes": [
                     {
                         "radius": 0.18,
                         "length": 6.0,
                         "angle_deg": 35,
                         "s_center": 0.3,
-                        "z": -0.9,
+                        "z": -0.55,
                         "offset_u": 0.35,
                         "clearance_scale": 1.0,
                     },
@@ -348,14 +365,14 @@ def default_scenarios() -> List[ScenarioDefinition]:
                         "length": 4.8,
                         "angle_deg": -40,
                         "s_center": 0.6,
-                        "z": -0.95,
+                        "z": -0.6,
                         "offset_u": -0.45,
                         "clearance_scale": 0.85,
                     },
                 ],
                 "boxes": [],
                 "spheres": [
-                    {"radius": 0.35, "s": 0.82, "offset_u": 0.3, "z": -0.65}
+                    {"radius": 0.3, "s": 0.82, "offset_u": 0.3, "z": -0.4}
                 ],
                 "noise": {
                     "enable": True,
@@ -368,6 +385,66 @@ def default_scenarios() -> List[ScenarioDefinition]:
                 },
             },
         ),
+        ScenarioDefinition(
+            "S07_circular_well",
+            {
+                "path_xy": _generate_circular_path((0.0, 0.0), radius=1.5, n_vertices=32),
+                "width": 2.0,
+                "depth": 2.5,
+                "wall_slope": 0.05,
+                "ground_margin": 1.0,
+                "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 2.0},
+                "pipes": [
+                    # Upper pipe - large diameter, horizontal
+                    {
+                        "radius": 0.20,
+                        "length": 4.0,
+                        "angle_deg": 0,
+                        "s_center": 0.25,
+                        "z": -0.5,
+                        "offset_u": 0.0,
+                    },
+                    # Middle pipe - medium, angled
+                    {
+                        "radius": 0.15,
+                        "length": 3.5,
+                        "angle_deg": 45,
+                        "s_center": 0.5,
+                        "z": -1.2,
+                        "offset_u": 0.1,
+                    },
+                    # Lower pipe - small, opposite angle
+                    {
+                        "radius": 0.10,
+                        "length": 3.0,
+                        "angle_deg": -60,
+                        "s_center": 0.75,
+                        "z": -1.8,
+                        "offset_u": -0.15,
+                    },
+                    # Deep pipe - crossing at bottom
+                    {
+                        "radius": 0.12,
+                        "length": 3.2,
+                        "angle_deg": 90,
+                        "s_center": 0.0,
+                        "z": -2.2,
+                        "offset_u": 0.0,
+                    },
+                ],
+                "boxes": [],
+                "spheres": [{"radius": 0.25, "s": 0.4, "offset_u": 0.0, "z": -1.5}],
+                "noise": {
+                    "enable": True,
+                    "amplitude": 0.02,
+                    "corr_length": 0.4,
+                    "octaves": 2,
+                    "gain": 0.5,
+                    "seed": 37,
+                    "apply_to": ["trench_walls", "trench_bottom"],
+                },
+            },
+        ),
     ]
 
 

trenchfoot/gmsh_sloped_trench_mesher.py

@@ -48,6 +48,42 @@ def _normalize(v):
 
 def _rotate_ccw(v): return np.array([-v[1], v[0]], float)
 
+def _is_path_closed(path, threshold=0.01):
+    """Detect if path is explicitly closed (first and last points nearly identical)."""
+    if len(path) < 3:
+        return False
+    P = np.array(path, float)
+    first_last_dist = np.linalg.norm(P[0] - P[-1])
+    return first_last_dist < threshold
+
+def _offset_closed_polyline(path, offset):
+    """Offset a closed polyline, returning a single closed ring."""
+    P = np.array(path, float)
+    n = len(P)
+    if n < 3:
+        raise ValueError("Closed polyline needs at least 3 points")
+    tangents = []
+    normals = []
+    for i in range(n):
+        t = _normalize(P[(i+1) % n] - P[i])
+        if np.linalg.norm(t) < 1e-12:
+            t = np.array([1.0, 0.0])
+        tangents.append(t)
+        normals.append(np.array([-t[1], t[0]], float))
+    offset_pts = []
+    for k in range(n):
+        t_prev, n_prev = tangents[(k-1) % n], normals[(k-1) % n]
+        t_next, n_next = tangents[k], normals[k]
+        L1_p = P[k] + offset * n_prev
+        L1_d = t_prev
+        L2_p = P[k] + offset * n_next
+        L2_d = t_next
+        pt = _line_intersection_2d(L1_p, L1_d, L2_p, L2_d)
+        if pt is None:
+            pt = 0.5 * (L1_p + L2_p)
+        offset_pts.append(pt)
+    return offset_pts
+
 def _line_intersection_2d(p, d, q, e):
     M = np.array([d, -e], float).T; det = np.linalg.det(M)
     if abs(det) < 1e-12: return None
@@ -173,35 +209,99 @@ def generate_trench_volume(
         half_top = width_top / 2.0
         half_bot = max(1e-3, half_top - slope * depth)
 
-        Ltop, Rtop = _offset_polyline(path_xy, half_top)
-        Lbot, Rbot = _offset_polyline(path_xy, half_bot)
-        ring_top = _ring_from_LR(Ltop, Rtop)
-        ring_bot = _ring_from_LR(Lbot, Rbot)
+        is_closed = _is_path_closed(path_xy)
 
-        ring_top_xyz = [(x, y, g(x, y)) for (x, y) in ring_top]
-        ring_bot_xyz = [(x, y, g(x, y) - depth) for (x, y) in ring_bot]
+        if is_closed:
+            # For closed paths, create annular (ring-shaped) trench with outer and inner walls
+            outer_top = np.array(_offset_closed_polyline(path_xy, half_top), float)
+            inner_top = np.array(_offset_closed_polyline(path_xy, -half_top), float)
+            outer_bot = np.array(_offset_closed_polyline(path_xy, half_bot), float)
+            inner_bot = np.array(_offset_closed_polyline(path_xy, -half_bot), float)
 
-        top_loop = _add_closed_wire_xyz(ring_top_xyz)
-        bot_loop = _add_closed_wire_xyz(ring_bot_xyz)
+            outer_top_xyz = [(x, y, g(x, y)) for (x, y) in outer_top]
+            inner_top_xyz = [(x, y, g(x, y)) for (x, y) in inner_top]
+            outer_bot_xyz = [(x, y, g(x, y) - depth) for (x, y) in outer_bot]
+            inner_bot_xyz = [(x, y, g(x, y) - depth) for (x, y) in inner_bot]
 
-        outDimTags = []
-        try:
-            gmsh.model.occ.addThruSections(
-                [top_loop, bot_loop], makeSolid=True, makeRuled=True, outDimTags=outDimTags
-            )
-        except TypeError:  # gmsh >= 4.14 removed outDimTags kwarg
-            outDimTags = gmsh.model.occ.addThruSections(
-                [top_loop, bot_loop], makeSolid=True, makeRuled=True
-            )
-            if outDimTags is None:
-                outDimTags = []
-        gmsh.model.occ.healShapes()
-        gmsh.model.occ.removeAllDuplicates()
-        gmsh.model.occ.synchronize()
+            # Create outer and inner wire loops at top and bottom
+            outer_top_loop = _add_closed_wire_xyz(outer_top_xyz)
+            inner_top_loop = _add_closed_wire_xyz(inner_top_xyz)
+            outer_bot_loop = _add_closed_wire_xyz(outer_bot_xyz)
+            inner_bot_loop = _add_closed_wire_xyz(inner_bot_xyz)
+
+            # Outer wall: loft from outer_top to outer_bot
+            outDimTags_outer = []
+            try:
+                gmsh.model.occ.addThruSections(
+                    [outer_top_loop, outer_bot_loop], makeSolid=False, makeRuled=True, outDimTags=outDimTags_outer
+                )
+            except TypeError:
+                outDimTags_outer = gmsh.model.occ.addThruSections(
+                    [outer_top_loop, outer_bot_loop], makeSolid=False, makeRuled=True
+                ) or []
+
+            # Inner wall: loft from inner_top to inner_bot
+            outDimTags_inner = []
+            try:
+                gmsh.model.occ.addThruSections(
+                    [inner_top_loop, inner_bot_loop], makeSolid=False, makeRuled=True, outDimTags=outDimTags_inner
+                )
+            except TypeError:
+                outDimTags_inner = gmsh.model.occ.addThruSections(
+                    [inner_top_loop, inner_bot_loop], makeSolid=False, makeRuled=True
+                ) or []
+
+            # Create top and bottom surfaces (annular)
+            top_surf = gmsh.model.occ.addPlaneSurface([outer_top_loop, inner_top_loop])
+            bot_surf = gmsh.model.occ.addPlaneSurface([outer_bot_loop, inner_bot_loop])
+
+            # Collect all surfaces to form a shell
+            all_surfs = [top_surf, bot_surf]
+            all_surfs.extend([tag for (dim, tag) in outDimTags_outer if dim == 2])
+            all_surfs.extend([tag for (dim, tag) in outDimTags_inner if dim == 2])
+
+            # Create surface loop and volume
+            gmsh.model.occ.synchronize()
+            surf_loop = gmsh.model.occ.addSurfaceLoop(all_surfs)
+            trench_vol = gmsh.model.occ.addVolume([surf_loop])
+
+            gmsh.model.occ.healShapes()
+            gmsh.model.occ.removeAllDuplicates()
+            gmsh.model.occ.synchronize()
+
+            # Use outer_top for ring_top in clearance calculations
+            ring_top = outer_top
+        else:
+            # Original logic for open paths
+            Ltop, Rtop = _offset_polyline(path_xy, half_top)
+            Lbot, Rbot = _offset_polyline(path_xy, half_bot)
+            ring_top = _ring_from_LR(Ltop, Rtop)
+            ring_bot = _ring_from_LR(Lbot, Rbot)
+
+            ring_top_xyz = [(x, y, g(x, y)) for (x, y) in ring_top]
+            ring_bot_xyz = [(x, y, g(x, y) - depth) for (x, y) in ring_bot]
+
+            top_loop = _add_closed_wire_xyz(ring_top_xyz)
+            bot_loop = _add_closed_wire_xyz(ring_bot_xyz)
+
+            outDimTags = []
+            try:
+                gmsh.model.occ.addThruSections(
+                    [top_loop, bot_loop], makeSolid=True, makeRuled=True, outDimTags=outDimTags
+                )
+            except TypeError:  # gmsh >= 4.14 removed outDimTags kwarg
+                outDimTags = gmsh.model.occ.addThruSections(
+                    [top_loop, bot_loop], makeSolid=True, makeRuled=True
+                )
+                if outDimTags is None:
+                    outDimTags = []
+            gmsh.model.occ.healShapes()
+            gmsh.model.occ.removeAllDuplicates()
+            gmsh.model.occ.synchronize()
 
-        vols = [tag for (dim, tag) in outDimTags if dim == 3]
-        assert len(vols) >= 1, "Loft did not create a volume"
-        trench_vol = vols[0]
+            vols = [tag for (dim, tag) in outDimTags if dim == 3]
+            assert len(vols) >= 1, "Loft did not create a volume"
+            trench_vol = vols[0]
 
         pipe_cfgs = cfg.get("pipes", [])
         cum_lengths, total_length = _polyline_lengths(path_xy)

trenchfoot/scenarios/S01_straight_vwalls/metrics.json

@@ -2,8 +2,8 @@
   "surface_area_by_group": {
     "trench_bottom": 5.0,
     "trench_cap_for_volume": 5.0,
-    "trench_walls": 12.0,
-    "ground_surface": 77.0
+    "trench_walls": 7.2,
+    "ground_surface": 10.0
   },
   "closed_surface_sets": {
     "trench_closed_groups": [
@@ -13,8 +13,8 @@
     ]
   },
   "volumes": {
-    "trench_from_surface": -1.6666666666666667,
-    "trench_flux_integral_div1": -1.6666666666666667
+    "trench_from_surface": -1.0,
+    "trench_flux_integral_div1": -1.0
   },
   "footprint_area_top": 5.0,
   "footprint_area_bottom": 5.0,

trenchfoot/scenarios/S01_straight_vwalls/scene.json

@@ -10,7 +10,7 @@
     ]
   ],
   "width": 1.0,
-  "depth": 1.0,
+  "depth": 0.6,
   "wall_slope": 0.0,
   "ground_margin": 0.5,
   "ground": {
@@ -19,7 +19,7 @@
       0.0,
       0.0
     ],
-    "size_margin": 3.0
+    "size_margin": 1.0
   },
   "pipes": [],
   "boxes": [],

trenchfoot/scenarios/S01_straight_vwalls/trench_scene.obj

@@ -1,46 +1,49 @@
 g trench_bottom
-v 0 -0.5 -1
-v 5 -0.5 -1
-v 5 0.5 -1
-v 0 0.5 -1
+v 0 -0.5 -0.6
+v 5 -0.5 -0.6
+v 5 0.5 -0.6
+v 0 0.5 -0.6
 f 2 1 4
 f 4 3 2
-g trench_cap_for_volume
-v 0 -0.5 0
-v 5 -0.5 0
-v 5 0.5 0
-v 0 0.5 0
-f 8 5 6
-f 6 7 8
 g trench_walls
 v 0 -0.5 0
 v 5 -0.5 0
-v 5 -0.5 -1
-v 0 -0.5 -1
+v 5 -0.5 -0.6
+v 0 -0.5 -0.6
 v 5 -0.5 0
 v 5 0.5 0
-v 5 0.5 -1
-v 5 -0.5 -1
+v 5 0.5 -0.6
+v 5 -0.5 -0.6
 v 5 0.5 0
 v 0 0.5 0
-v 0 0.5 -1
-v 5 0.5 -1
+v 0 0.5 -0.6
+v 5 0.5 -0.6
 v 0 0.5 0
 v 0 -0.5 0
-v 0 -0.5 -1
-v 0 0.5 -1
+v 0 -0.5 -0.6
+v 0 0.5 -0.6
+f 5 6 7
+f 5 7 8
 f 9 10 11
 f 9 11 12
 f 13 14 15
 f 13 15 16
 f 17 18 19
 f 17 19 20
-f 21 22 23
-f 21 23 24
 g ground_surface
-v -3 -3.5 0
-v 8 -3.5 0
-v 8 3.5 0
-v -3 3.5 0
-f 25 26 27
-f 25 27 28
+v 0 -1.5 0
+v 5 -1.5 0
+v 5 1.5 0
+v 0 1.5 0
+v 0 -0.5 0
+v 5 -0.5 0
+v 5 0.5 0
+v 0 0.5 0
+f 21 22 25
+f 22 26 25
+f 22 23 26
+f 23 27 26
+f 23 24 27
+f 24 28 27
+f 24 21 28
+f 21 25 28