trenchfoot 0.3.1__tar.gz → 0.4.1__tar.gz

trenchfoot-0.4.1/.gitignore

@@ -0,0 +1,9 @@
+
+# Secrets
+.env
+*.env
+.pypi_token.env
+.github_token.env
+
+# Generated mesh data for local inspection
+data/

{trenchfoot-0.3.1 → trenchfoot-0.4.1}/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [0.4.1] - 2026-01-28
+
+### Fixed
+- **Non-convex polygon extraction**: `_build_sdf_metadata()` now correctly extracts boundary polygons for non-convex shapes (L-shaped, U-shaped trenches) using boundary edge chaining instead of ConvexHull. ConvexHull was incorrectly filling in concave regions, causing sign computation errors at trench edges.
+- **sdf_metadata version bumped to 2.0**: Updated version to reflect the corrected polygon format.
+
+### Added
+- **`_extract_boundary_polygon()` helper**: New geometry helper that extracts ordered boundary vertices from triangulated meshes by finding boundary edges (edges appearing in only one face) and chaining them together.
+- **L-shaped polygon test**: Added `test_metadata_l_shaped_polygon_is_non_convex` to verify correct handling of non-convex trench shapes.
+
+## [0.4.0] - 2026-01-26
+
+### Added
+- **Makefile**: Added `make dump-meshes`, `make dump-meshes-volumetric`, and `make clean-meshes` targets for local mesh inspection
+- **Inner column lid for circular wells**: S07 and other closed-path trenches now have a proper ground surface capping the central column
+- **`fill_interior` option for GroundSpec**: Closed-path trenches can optionally fill the interior island with ground surface (used in S06)
+- **`inner_column_lid` render color**: Gray color matching ground surface
+
+### Fixed
+- **S03 box-pipe intersection**: Reduced box size to create clearance from nearby pipe
+- **S04 diagonal pipe clipping**: Adjusted pipe offset to prevent intersection with inner corner
+- **S05 pipe-box intersection**: Moved box position and offset to avoid pipe collision
+- **S06 ground overhang at open ends**: Closed the loop path to use proper annulus triangulation
+- **S07 pipe positions**: Repositioned all pipes with tangential orientation and negative offset to avoid crossing the central opening
+- **Circular path seam artifact**: `_offset_closed_polyline` now removes duplicate closing point that caused triangular protrusion on inner walls
+- **`.gitignore`**: Added `data/` directory for generated mesh inspection
+
+### Changed
+- **S07 pipe configuration**: All pipes now tangential (angle_deg=0) with offset_u=-0.4, lengths increased to 7.0-8.0 for wall penetration
+
 ## [0.3.1] - 2026-01-08
 
 ### Added

trenchfoot-0.4.1/Makefile

@@ -0,0 +1,35 @@
+# ABOUTME: Makefile for trenchfoot development tasks.
+# ABOUTME: Provides targets for testing, mesh generation, and other common operations.
+
+.PHONY: test dump-meshes dump-meshes-volumetric clean-meshes
+
+# Default data directory for generated meshes
+DATA_DIR := data/scenarios
+
+# Run tests
+test:
+	uv run pytest -rs
+
+# Generate scenario meshes (surface only, with previews) for inspection
+dump-meshes:
+	@mkdir -p $(DATA_DIR)
+	uv run python -m trenchfoot.generate_scenarios \
+		--out $(DATA_DIR) \
+		--preview \
+		--skip-volumetric
+	@echo "Meshes written to $(DATA_DIR)"
+
+# Generate scenario meshes including volumetric (requires gmsh)
+dump-meshes-volumetric:
+	@mkdir -p $(DATA_DIR)
+	uv run python -m trenchfoot.generate_scenarios \
+		--out $(DATA_DIR) \
+		--preview \
+		--volumetric \
+		--lc 0.4
+	@echo "Meshes (including volumetric) written to $(DATA_DIR)"
+
+# Remove generated mesh data
+clean-meshes:
+	rm -rf $(DATA_DIR)
+	@echo "Cleaned $(DATA_DIR)"

{trenchfoot-0.3.1 → trenchfoot-0.4.1}/PKG-INFO

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

{trenchfoot-0.3.1 → trenchfoot-0.4.1}/packages/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-0.3.1 → trenchfoot-0.4.1}/packages/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-0.3.1 → trenchfoot-0.4.1}/packages/trenchfoot/scenarios/S01_straight_vwalls/sdf_metadata.json

@@ -8,22 +8,41 @@
       "vertices_xy": [
         [
           0.0,
-          0.5
+          -0.5
         ],
         [
-          5.0,
+          0.0,
           0.5
         ],
         [
           5.0,
-          -0.5
+          0.5
         ],
         [
-          0.0,
+          5.0,
           -0.5
         ]
       ],
       "z_level": 0.0
+    },
+    "surface_groups": {
+      "trench_bottom": {
+        "normal_direction": "up",
+        "surface_type": "floor"
+      },
+      "trench_walls": {
+        "normal_direction": "inward",
+        "surface_type": "wall"
+      },
+      "ground_surface": {
+        "normal_direction": "up",
+        "surface_type": "ground"
+      }
+    },
+    "embedded_objects": {
+      "pipes": 0,
+      "boxes": 0,
+      "spheres": 0
     }
   }
 }

trenchfoot-0.4.1/packages/trenchfoot/scenarios/S02_straight_slope_pipe/sdf_metadata.json

@@ -0,0 +1,60 @@
+{
+  "sdf_metadata": {
+    "version": "2.0",
+    "normal_convention": "into_void",
+    "geometry_type": "open_trench",
+    "trench_opening": {
+      "type": "polygon",
+      "vertices_xy": [
+        [
+          0.0,
+          -0.6
+        ],
+        [
+          0.0,
+          0.6
+        ],
+        [
+          6.0,
+          0.6
+        ],
+        [
+          6.0,
+          -0.6
+        ]
+      ],
+      "z_level": 0.0
+    },
+    "surface_groups": {
+      "trench_bottom": {
+        "normal_direction": "up",
+        "surface_type": "floor"
+      },
+      "trench_walls": {
+        "normal_direction": "inward",
+        "surface_type": "wall"
+      },
+      "ground_surface": {
+        "normal_direction": "up",
+        "surface_type": "ground"
+      },
+      "pipe0_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      }
+    },
+    "embedded_objects": {
+      "pipes": 1,
+      "boxes": 0,
+      "spheres": 0
+    }
+  }
+}

trenchfoot-0.4.1/packages/trenchfoot/scenarios/S03_L_slope_two_pipes_box/sdf_metadata.json

@@ -0,0 +1,84 @@
+{
+  "sdf_metadata": {
+    "version": "2.0",
+    "normal_convention": "into_void",
+    "geometry_type": "open_trench",
+    "trench_opening": {
+      "type": "polygon",
+      "vertices_xy": [
+        [
+          0.0,
+          -0.6
+        ],
+        [
+          0.0,
+          0.6
+        ],
+        [
+          5.4,
+          0.6
+        ],
+        [
+          5.4,
+          4.0
+        ],
+        [
+          6.6,
+          4.0
+        ],
+        [
+          6.6,
+          -0.6
+        ]
+      ],
+      "z_level": 0.0
+    },
+    "surface_groups": {
+      "trench_bottom": {
+        "normal_direction": "up",
+        "surface_type": "floor"
+      },
+      "trench_walls": {
+        "normal_direction": "inward",
+        "surface_type": "wall"
+      },
+      "ground_surface": {
+        "normal_direction": "up",
+        "surface_type": "ground"
+      },
+      "pipe0_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "box0": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      }
+    },
+    "embedded_objects": {
+      "pipes": 2,
+      "boxes": 1,
+      "spheres": 0
+    }
+  }
+}

trenchfoot-0.4.1/packages/trenchfoot/scenarios/S04_U_slope_multi_noise/sdf_metadata.json

@@ -0,0 +1,104 @@
+{
+  "sdf_metadata": {
+    "version": "2.0",
+    "normal_convention": "into_void",
+    "geometry_type": "open_trench",
+    "trench_opening": {
+      "type": "polygon",
+      "vertices_xy": [
+        [
+          0.0,
+          -0.7
+        ],
+        [
+          0.0,
+          0.7
+        ],
+        [
+          5.3,
+          0.7
+        ],
+        [
+          5.3,
+          3.3
+        ],
+        [
+          0.0,
+          3.3
+        ],
+        [
+          0.0,
+          4.7
+        ],
+        [
+          6.7,
+          4.7
+        ],
+        [
+          6.7,
+          -0.7
+        ]
+      ],
+      "z_level": 0.0
+    },
+    "surface_groups": {
+      "trench_bottom": {
+        "normal_direction": "up",
+        "surface_type": "floor"
+      },
+      "trench_walls": {
+        "normal_direction": "inward",
+        "surface_type": "wall"
+      },
+      "ground_surface": {
+        "normal_direction": "up",
+        "surface_type": "ground"
+      },
+      "pipe0_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe2_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe2_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe2_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "sphere0": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      }
+    },
+    "embedded_objects": {
+      "pipes": 3,
+      "boxes": 0,
+      "spheres": 1
+    }
+  }
+}

trenchfoot-0.4.1/packages/trenchfoot/scenarios/S05_wide_slope_pair/sdf_metadata.json

@@ -0,0 +1,84 @@
+{
+  "sdf_metadata": {
+    "version": "2.0",
+    "normal_convention": "into_void",
+    "geometry_type": "open_trench",
+    "trench_opening": {
+      "type": "polygon",
+      "vertices_xy": [
+        [
+          0.0,
+          -1.2
+        ],
+        [
+          0.0,
+          1.2
+        ],
+        [
+          7.8,
+          1.2
+        ],
+        [
+          7.8,
+          3.0
+        ],
+        [
+          10.2,
+          3.0
+        ],
+        [
+          10.2,
+          -1.2
+        ]
+      ],
+      "z_level": 0.0
+    },
+    "surface_groups": {
+      "trench_bottom": {
+        "normal_direction": "up",
+        "surface_type": "floor"
+      },
+      "trench_walls": {
+        "normal_direction": "inward",
+        "surface_type": "wall"
+      },
+      "ground_surface": {
+        "normal_direction": "up",
+        "surface_type": "ground"
+      },
+      "pipe0_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "box0": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      }
+    },
+    "embedded_objects": {
+      "pipes": 2,
+      "boxes": 1,
+      "spheres": 0
+    }
+  }
+}

trenchfoot-0.4.1/packages/trenchfoot/scenarios/S06_bumpy_wide_loop/sdf_metadata.json

@@ -0,0 +1,88 @@
+{
+  "sdf_metadata": {
+    "version": "2.0",
+    "normal_convention": "into_void",
+    "geometry_type": "closed_well",
+    "trench_opening": {
+      "type": "polygon",
+      "vertices_xy": [
+        [
+          -0.8953594528137068,
+          -1.116169465122313
+        ],
+        [
+          4.0,
+          -2.3400093283257397
+        ],
+        [
+          9.3,
+          -1.0150093283257395
+        ],
+        [
+          9.3,
+          6.3
+        ],
+        [
+          1.4615223689149763,
+          6.3
+        ],
+        [
+          -2.58178866727825,
+          2.2566889638067735
+        ]
+      ],
+      "z_level": 0.2
+    },
+    "surface_groups": {
+      "trench_bottom": {
+        "normal_direction": "up",
+        "surface_type": "floor"
+      },
+      "trench_walls": {
+        "normal_direction": "inward",
+        "surface_type": "wall"
+      },
+      "ground_surface": {
+        "normal_direction": "up",
+        "surface_type": "ground"
+      },
+      "ground_island": {
+        "normal_direction": "up",
+        "surface_type": "ground"
+      },
+      "pipe0_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe0_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_side": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_cap_neg": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "pipe1_pipe_cap_pos": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      },
+      "sphere0": {
+        "normal_direction": "outward",
+        "surface_type": "embedded_object"
+      }
+    },
+    "embedded_objects": {
+      "pipes": 2,
+      "boxes": 0,
+      "spheres": 1
+    }
+  }
+}