trenchfoot 0.3.1__py3-none-any.whl → 0.4.0__py3-none-any.whl

trenchfoot/generate_scenarios.py

@@ -223,9 +223,9 @@ def default_scenarios() -> List[ScenarioDefinition]:
                 ],
                 "boxes": [
                     {
-                        "along": 0.8,
-                        "across": 0.5,
-                        "height": 0.4,
+                        "along": 0.4,
+                        "across": 0.3,
+                        "height": 0.25,
                         "s": 0.55,
                         "offset_u": 0.0,
                     }
@@ -266,7 +266,7 @@ def default_scenarios() -> List[ScenarioDefinition]:
                         "angle_deg": 45,
                         "s_center": 0.55,
                         "z": -0.65,
-                        "offset_u": -0.2,
+                        "offset_u": -0.4,
                     },
                     {
                         "radius": 0.08,
@@ -304,7 +304,7 @@ def default_scenarios() -> List[ScenarioDefinition]:
                         "radius": 0.2,
                         "length": 5.5,
                         "angle_deg": 10,
-                        "s_center": 0.35,
+                        "s_center": 0.2,
                         "z": -0.4,
                         "offset_u": 0.3,
                         "clearance_scale": 0.9,
@@ -324,8 +324,8 @@ def default_scenarios() -> List[ScenarioDefinition]:
                         "along": 1.2,
                         "across": 0.9,
                         "height": 0.35,
-                        "s": 0.55,
-                        "offset_u": -0.25,
+                        "s": 0.45,
+                        "offset_u": -0.4,
                         "z": -0.35,
                     }
                 ],
@@ -344,12 +344,12 @@ def default_scenarios() -> List[ScenarioDefinition]:
         ScenarioDefinition(
             "S06_bumpy_wide_loop",
             {
-                "path_xy": [[0, 0], [4, -1], [8, 0], [8, 5], [2, 5], [-1, 2]],
+                "path_xy": [[0, 0], [4, -1], [8, 0], [8, 5], [2, 5], [-1, 2], [0, 0]],
                 "width": 2.6,
                 "depth": 0.85,
                 "wall_slope": 0.12,
                 "ground_margin": 2.0,
-                "ground": {"z0": 0.2, "slope": [0.015, 0.03], "size_margin": 1.8},
+                "ground": {"z0": 0.2, "slope": [0.015, 0.03], "size_margin": 1.8, "fill_interior": True},
                 "pipes": [
                     {
                         "radius": 0.18,
@@ -395,41 +395,41 @@ def default_scenarios() -> List[ScenarioDefinition]:
                 "ground_margin": 1.0,
                 "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 2.0},
                 "pipes": [
-                    # Upper pipe - large diameter, horizontal
+                    # Upper pipe - tangential
                     {
                         "radius": 0.20,
-                        "length": 4.0,
+                        "length": 8.0,
                         "angle_deg": 0,
-                        "s_center": 0.25,
+                        "s_center": 0.0,
                         "z": -0.5,
-                        "offset_u": 0.0,
+                        "offset_u": -0.4,
                     },
-                    # Middle pipe - medium, angled
+                    # Middle pipe - tangential
                     {
                         "radius": 0.15,
-                        "length": 3.5,
-                        "angle_deg": 45,
+                        "length": 7.5,
+                        "angle_deg": 0,
                         "s_center": 0.5,
                         "z": -1.2,
-                        "offset_u": 0.1,
+                        "offset_u": -0.4,
                     },
-                    # Lower pipe - small, opposite angle
+                    # Lower pipe - tangential
                     {
                         "radius": 0.10,
-                        "length": 3.0,
-                        "angle_deg": -60,
-                        "s_center": 0.75,
+                        "length": 7.0,
+                        "angle_deg": 0,
+                        "s_center": 0.25,
                         "z": -1.8,
-                        "offset_u": -0.15,
+                        "offset_u": -0.4,
                     },
-                    # Deep pipe - crossing at bottom
+                    # Deep pipe - tangential
                     {
                         "radius": 0.12,
-                        "length": 3.2,
-                        "angle_deg": 90,
-                        "s_center": 0.0,
+                        "length": 7.5,
+                        "angle_deg": 0,
+                        "s_center": 0.75,
                         "z": -2.2,
-                        "offset_u": 0.0,
+                        "offset_u": -0.4,
                     },
                 ],
                 "boxes": [],

trenchfoot/render_colors.py

@@ -6,6 +6,7 @@ _TRENCH_COLORS = {
     "trench_bottom": "#d2a679",
     "trench_cap_for_volume": "#e6cfa4",
     "ground_surface": "#b0b0b0",
+    "inner_column_lid": "#b0b0b0",  # same as ground
 }
 
 _PIPE_COLORS = ["#1f77b4", "#ff7f0e", "#2ca02c", "#d62728", "#9467bd", "#8c564b"]

trenchfoot/trench_scene_generator_v3.py

@@ -34,7 +34,7 @@ except Exception:
     Poly3DCollection = None
 
 # Groups kept for internal metrics but excluded from OBJ export and previews
-_INTERNAL_GROUPS = frozenset({"trench_cap_for_volume"})
+_INTERNAL_GROUPS = frozenset({"trench_cap_for_volume", "inner_column_lid"})
 
 # ---------------- Geometry helpers ----------------
 
@@ -123,6 +123,9 @@ def _offset_closed_polyline(path: List[Tuple[float,float]], offset: float) -> Li
     this returns a single continuous closed ring for paths where first ≈ last point.
     """
     P = np.array(path, float)
+    # Remove duplicate closing point if present (first ≈ last)
+    if len(P) > 1 and np.linalg.norm(P[0] - P[-1]) < 0.01:
+        P = P[:-1]
     n = len(P)
     if n < 3:
         raise ValueError("Closed polyline needs at least 3 points")
@@ -405,6 +408,7 @@ class GroundSpec:
     z0: float = 0.0
     slope: Tuple[float,float] = (0.0, 0.0)   # (dz/dx, dz/dy)
     size_margin: float = 3.0
+    fill_interior: bool = False  # For closed paths: fill the interior with ground surface
 
 @dataclass
 class SceneSpec:
@@ -735,6 +739,16 @@ def make_trench_from_path_sloped(path_xy: List[Tuple[float,float]], width_top: f
         V_walls = np.array(walls_V, float)
         F_walls = np.array(walls_F, int)
 
+        # Inner column lid: cap the top of the inner column at ground level
+        # Reverse inner_top to get CCW winding for upward-facing normals
+        inner_top_ccw = inner_top[::-1].copy()
+        z_inner_top_ccw = z_inner_top[::-1].copy()
+        lid_xy, lid_faces = _triangulate_polygon_fan(inner_top_ccw)
+        # Assign z-values: polygon vertices use z_inner_top_ccw, centroid uses average
+        z_lid = np.concatenate([z_inner_top_ccw, [np.mean(z_inner_top_ccw)]])
+        V_lid = np.column_stack([lid_xy, z_lid])
+        F_lid = _ensure_upward_normals(V_lid, lid_faces)
+
         # For closed path, poly_top is the outer ring (used for ground plane hole)
         poly_top = outer_top
         poly_bot = outer_bot
@@ -796,6 +810,10 @@ def make_trench_from_path_sloped(path_xy: List[Tuple[float,float]], width_top: f
         "trench_walls": (V_walls, F_walls)
     }
 
+    # Add inner column lid for closed paths
+    if is_closed:
+        groups["inner_column_lid"] = (V_lid, F_lid)
+
     return groups, poly_top, poly_bot, extra
 
 def _ensure_upward_normals(V: np.ndarray, F: np.ndarray) -> np.ndarray:
@@ -830,6 +848,28 @@ def _ensure_upward_normals(V: np.ndarray, F: np.ndarray) -> np.ndarray:
     return F_out
 
 
+def _triangulate_polygon_fan(polygon: np.ndarray) -> Tuple[np.ndarray, np.ndarray]:
+    """Triangulate a simple polygon using fan triangulation from centroid.
+
+    Works well for convex or nearly-convex polygons. Returns (vertices, faces)
+    where vertices includes the original polygon points plus the centroid.
+    """
+    n = len(polygon)
+    centroid = polygon.mean(axis=0)
+
+    # Vertices: polygon points first, then centroid at the end
+    verts = np.vstack([polygon, centroid.reshape(1, -1)])
+    centroid_idx = n
+
+    # Fan triangles from centroid to each edge
+    tris = []
+    for i in range(n):
+        j = (i + 1) % n
+        tris.append([centroid_idx, i, j])
+
+    return verts, np.array(tris, dtype=int)
+
+
 def _triangulate_annulus(outer: np.ndarray, inner: np.ndarray) -> Tuple[np.ndarray, np.ndarray]:
     """Triangulate the annular region between outer and inner polygons.
 
@@ -919,9 +959,8 @@ def make_ground_surface_plane(path_xy: List[Tuple[float,float]], width_top: floa
     is_closed = _is_path_closed(path_xy)
 
     if is_closed:
-        # For closed paths (like circular wells), the ground is an annulus
-        # from the outer ground boundary to the outer edge of the trench opening.
-        # The center (inside the trench) is left completely open.
+        # For closed paths, ground is an annulus from outer boundary to trench edge.
+        # Optionally, if fill_interior is set, also fill the interior island.
 
         # Trench outer boundary (edge of trench opening)
         trench_outer = np.array(_offset_closed_polyline(path_xy, half_top), float)
@@ -933,14 +972,23 @@ def make_ground_surface_plane(path_xy: List[Tuple[float,float]], width_top: floa
         trench_outer = _ensure_ccw(trench_outer)
         ground_outer = _ensure_ccw(ground_outer)
 
-        # Ground annulus: from ground_outer to trench_outer
-        combined_xy, tris = _triangulate_annulus(ground_outer, trench_outer)
-        Vg = np.array([[x, y, gfun(x, y)] for (x, y) in combined_xy], float)
+        # Outer ground annulus: from ground_outer to trench_outer
+        outer_xy, outer_tris = _triangulate_annulus(ground_outer, trench_outer)
+        Vg_outer = np.array([[x, y, gfun(x, y)] for (x, y) in outer_xy], float)
+        outer_tris = _ensure_upward_normals(Vg_outer, outer_tris)
 
-        # Ground normals should point UP (+z) into the air
-        tris = _ensure_upward_normals(Vg, tris)
+        result = {"ground_surface": (Vg_outer, outer_tris)}
 
-        return {"ground_surface": (Vg, tris)}
+        # Optionally fill the interior island (for loop trenches, not wells/pits)
+        if getattr(ground, 'fill_interior', False):
+            trench_inner = np.array(_offset_closed_polyline(path_xy, -half_top), float)
+            trench_inner = _ensure_ccw(trench_inner)
+            inner_xy, inner_tris = _triangulate_polygon_fan(trench_inner)
+            Vg_inner = np.array([[x, y, gfun(x, y)] for (x, y) in inner_xy], float)
+            inner_tris = _ensure_upward_normals(Vg_inner, inner_tris)
+            result["ground_island"] = (Vg_inner, inner_tris)
+
+        return result
     else:
         # Open paths: ground forms annulus with extensions past trench endpoints.
         # The outer ring (ground boundary) is extended, but the inner ring (trench

{trenchfoot-0.3.1.dist-info → trenchfoot-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trenchfoot
-Version: 0.3.1
+Version: 0.4.0
 Summary: Synthetic trench scenario generator bundle (surfaces + volumetrics).
 Author: Liam Moore
 License-File: LICENSE

{trenchfoot-0.3.1.dist-info → trenchfoot-0.4.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 trenchfoot/Dockerfile,sha256=TjwHTNOZF6eHxpDjw29uruEmvJ4FWQEv1XRDE3qMJvY,210
 trenchfoot/README.md,sha256=PGpBwprT0ZgR-ASx7bDLm9SvYR8yCbIzML7amq3oJ-k,5483
 trenchfoot/__init__.py,sha256=jI30sofuw13hesvaShlAaatpswxY8wRFVsTJq06TKo8,1672
-trenchfoot/generate_scenarios.py,sha256=1vIBEZ0qK1NFnzNQvNpmA0ZnDAcz82MH4Ux-bO8cYuI,25506
+trenchfoot/generate_scenarios.py,sha256=xZcPdRlDc23Ao6tTWca2g3Ks91s2zALRKGbAIFzxjlc,25495
 trenchfoot/gmsh_sloped_trench_mesher.py,sha256=D7EL6V0wkE6tvDARmm006yZE6KEzCl25OlZQviArBRo,25675
 trenchfoot/plot_mesh.py,sha256=26dOlVfaM1WsUfr_sXVqA7axtY9qjY3WCNM7cUBTS7Q,3810
-trenchfoot/render_colors.py,sha256=EfldvoshgaZ6iZFk-UDL67-tvwGYaiZFS2NQZBMwhDM,1596
+trenchfoot/render_colors.py,sha256=CWMre6DYa2EyrCgZsEY0bv313WqEhQdr3CdPF1xI-40,1649
 trenchfoot/scene_spec_example.json,sha256=UcV25ku422UO0ZZPDrJwrT1zwmjoOIpnBdLuEdh-AZA,1028
-trenchfoot/trench_scene_generator_v3.py,sha256=9d93JK1rl61iq4fPxjiENEiFdX0Zhw306UQISeWnnvg,49277
+trenchfoot/trench_scene_generator_v3.py,sha256=sZev3DvkB5HbH3fWcNWGYAWx9XBqkuZfeCzRhIMG8NU,51465
 trenchfoot/scenarios/SUMMARY.json,sha256=uylEzgzIqk5pGBfWVchVFnwwIDGBjNTDY_E23L_iakI,9372
 trenchfoot/scenarios/S01_straight_vwalls/ground_truth_isosurface.html,sha256=SLPROqEefBB8OgmZSW6DBmJxuSDxVQhWTn9eG3q6QRU,5880178
 trenchfoot/scenarios/S01_straight_vwalls/metrics.json,sha256=7VDscjZdxNPgNZaPHzRHYBJ1a5amNgJ7XYKCezVJJKQ,691
@@ -85,8 +85,8 @@ trenchfoot/scenarios/S07_circular_well/scene.json,sha256=bvror2YX6aNbsEc25-N7JO3
 trenchfoot/scenarios/S07_circular_well/sdf_metadata.json,sha256=2jYlePeCTX1OyROWCaRQ_IjDlyjc5_YGYSUZg6eN3lc,5602
 trenchfoot/scenarios/S07_circular_well/trench_scene.obj,sha256=leTTT0i5xE-fvFSzHLNf_JBsU0AN3YqadDx4HmNmFhU,1618101
 trenchfoot/scenarios/S07_circular_well/volumetric/trench_volume.msh,sha256=dqhtd3SFKj5RLT_BcWIIvVGCbAqvOx7RX25-K7NKX10,615212
-trenchfoot-0.3.1.dist-info/METADATA,sha256=gjJm1BuM_Ma0GS-MaDevLoCjJxynEyvmsuBo8UenNx0,5292
-trenchfoot-0.3.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-trenchfoot-0.3.1.dist-info/entry_points.txt,sha256=5TejAGmc4GnNYLn7MhhLtSCNz9240RvzcNaetF4IHfg,119
-trenchfoot-0.3.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-trenchfoot-0.3.1.dist-info/RECORD,,
+trenchfoot-0.4.0.dist-info/METADATA,sha256=s9T-HDufdDA7KVJXq6yZUlicXX9kabzqfLHdJAS1WWM,5292
+trenchfoot-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+trenchfoot-0.4.0.dist-info/entry_points.txt,sha256=5TejAGmc4GnNYLn7MhhLtSCNz9240RvzcNaetF4IHfg,119
+trenchfoot-0.4.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+trenchfoot-0.4.0.dist-info/RECORD,,