trenchfoot 0.1.0__tar.gz → 0.2.2__tar.gz

trenchfoot-0.2.2/.env

@@ -0,0 +1 @@
+PYPI_API_TOKEN=pypi-AgEIcHlwaS5vcmcCJGZjZTM1MzQwLTFiZGQtNGQ5MS1hNzIyLTc1MmU1YTJhYzE1NQACGFsxLFsicHl0ZXN0LWNocm9uaWNsZSJdXQACLFsyLFsiMzg4ZTYxZTMtMDk2NC00ZjNiLWE5ODItYzc4NTMxNDlhM2FjIl1dAAAGID45Pzb1Xm05EgS5M8C2_5BbgSEULSUwP3GpDCia6vTP

{trenchfoot-0.1.0 → trenchfoot-0.2.2}/.github/workflows/ci.yml

@@ -15,6 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install system dependencies
+        run: sudo apt-get update && sudo apt-get install -y libglu1-mesa
+
       - name: Set up uv
         uses: astral-sh/setup-uv@v3
         with:
@@ -38,9 +41,13 @@ jobs:
     env:
       UV_PROJECT_ENVIRONMENT: .venv
       PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install system dependencies
+        run: sudo apt-get update && sudo apt-get install -y libglu1-mesa
+
       - name: Set up uv
         uses: astral-sh/setup-uv@v3
         with:
@@ -49,6 +56,16 @@ jobs:
       - name: Create virtual environment
         run: uv venv --python 3.12
 
+      - name: Ensure PyPI token
+        shell: bash
+        run: |
+          TOKEN="${PYPI_API_TOKEN:-${PYPI_TOKEN:-}}"
+          if [ -z "$TOKEN" ]; then
+            echo "PYPI_API_TOKEN or PYPI_TOKEN secret not provided" >&2
+            exit 1
+          fi
+          echo "PYPI_API_TOKEN=$TOKEN" >> "$GITHUB_ENV"
+
       - name: Load .env if present
         if: hashFiles('.env') != ''
         shell: bash

trenchfoot-0.2.2/CHANGELOG.md

@@ -0,0 +1,40 @@
+# Changelog
+
+## [0.2.2] - 2025-12-20
+
+### Fixed
+- **Closed path handling for S07 circular well**: Explicitly close the circular path by repeating the first point. The previous heuristic was incorrectly detecting L-shaped and U-shaped paths as closed.
+- **Volumetric meshing for closed paths**: Added proper annular geometry support to the gmsh mesher for closed circular paths with outer and inner walls.
+
+## [0.2.1] - 2025-12-20
+
+### Fixed
+- **Annular triangulation bug**: Ground plane was incorrectly filling in the trench opening with triangles instead of leaving it as a hole. Replaced bridge+ear-clipping algorithm with proper annular triangulation that "zips" around both polygon boundaries.
+
+## [0.2.0] - 2025-12-19
+
+### Added
+- **S07 circular well scenario**: Deep cylindrical well with 4 criss-crossing pipes at different elevations and diameters
+- **Offset polygon ground plane**: Ground surface now follows trench outline instead of axis-aligned bounding box, reducing wasted space for L-shaped, U-shaped, and curved trenches
+- **Open-topped trenches**: Trench cap (`trench_cap_for_volume`) is kept internally for metrics calculations but excluded from OBJ export and preview renders
+- New tests for cap exclusion, offset ground, and circular well scenario
+
+### Changed
+- **Shallower trench depths**: All scenarios adjusted to be less extreme (S01: 0.6m, S02: 0.9m, S03: 1.1m, S04: 1.2m, S05: 0.7m, S06: 0.85m)
+- Reduced ground `size_margin` values to work better with offset polygon ground
+- Pipe z-positions adjusted proportionally to fit within shallower trenches
+
+### Fixed
+- Ground plane no longer wastes space on flat areas away from the trench path
+
+## [0.1.1] - 2025-10-30
+
+- CI hardening for PyPI token handling
+- Initial PyPI release
+
+## [0.1.0] - 2025-10-30
+
+- Initial release with surface and volumetric mesh generation
+- Scenarios S01-S06 with increasing complexity
+- Plotly HTML viewer support
+- Python SDK with `generate_surface_mesh()` and `generate_trench_volume()`

trenchfoot-0.2.2/CLAUDE.md

@@ -0,0 +1,68 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+Trenchfoot is a synthetic trench mesh generator that produces surface meshes (OBJ) and volumetric meshes (via Gmsh). It generates semi-realistic trench scenes with embedded pipes, boxes, and spheres, useful for creating synthetic datasets.
+
+## Commands
+
+```bash
+# Install with uv (development)
+uv pip install -e ".[dev,preview,mesher,viz]"
+
+# Run tests
+uv run pytest -rs
+
+# Run a single test
+uv run pytest tests/test_trenchfoot_generation.py::test_build_scene_produces_surface -v
+
+# Generate scenario previews (writes to TRENCHFOOT_SCENARIO_OUT_ROOT or packages/trenchfoot/scenarios/)
+uv run python -m trenchfoot.generate_scenarios --preview --skip-volumetric
+
+# Generate with volumetric meshes (requires gmsh)
+uv run python -m trenchfoot.generate_scenarios --volumetric --lc 0.4
+
+# Generate gallery markdown
+uv run python -m trenchfoot.generate_scenarios --preview --skip-volumetric --gallery docs/scenario_gallery.md
+
+# Interactive Plotly mesh viewer (requires viz extra)
+trenchfoot-plot path/to/trench_scene.obj --open
+```
+
+Set `TRENCHFOOT_SCENARIO_OUT_ROOT=/tmp/trench-previews` to keep generated assets out of the repository.
+
+## Architecture
+
+The package lives in `packages/trenchfoot/` with these core modules:
+
+- **`trench_scene_generator_v3.py`**: Surface mesh generator. Produces OBJ files with polyline trenches, sloped walls, ground planes, and embedded geometry (pipes/boxes/spheres). Handles noise application and preview rendering. Key types: `SceneSpec`, `SurfaceMeshResult`.
+
+- **`gmsh_sloped_trench_mesher.py`**: Volumetric mesher using Gmsh. Creates tetrahedral meshes with physical groups (`TrenchAir`, `Pipe0`, etc.). Has adaptive clearance logic that scales guard bands based on pipe radius and wall slope. Key types: `VolumeMeshResult`.
+
+- **`generate_scenarios.py`**: CLI and scenario runner. Defines preset scenarios (S01-S06) and orchestrates both surface and volumetric generation. Handles gallery markdown output and SUMMARY.json diagnostics.
+
+- **`__init__.py`**: Public API exports. Gracefully handles missing gmsh dependency.
+
+## Scene Specification
+
+Trenches are defined by JSON specs with:
+- `path_xy`: 2D polyline defining trench centerline
+- `width`, `depth`, `wall_slope`: Cross-section parameters
+- `ground`: Elevation, slope, and margin for ground plane
+- `pipes`, `boxes`, `spheres`: Embedded objects positioned along the trench
+- `noise`: Perlin-style surface perturbation settings
+
+Objects use `s` or `s_center` (0-1 arc-length parameter) to position along the trench path.
+
+## Optional Dependencies
+
+- `[preview]` - matplotlib for PNG previews
+- `[mesher]` - gmsh for volumetric mesh generation
+- `[viz]` - plotly for interactive HTML viewers
+- `[dev]` - pytest
+
+## Testing Notes
+
+Tests skip volumetric tests if gmsh runtime prerequisites (e.g., libGLU) are unavailable. The `_require_gmsh_runtime()` helper handles this gracefully.

trenchfoot-0.2.2/PKG-INFO

@@ -0,0 +1,111 @@
+Metadata-Version: 2.4
+Name: trenchfoot
+Version: 0.2.2
+Summary: Synthetic trench scenario generator bundle (surfaces + volumetrics).
+Author: Liam Moore
+License-File: LICENSE
+Requires-Python: >=3.12
+Requires-Dist: numpy>=1.26
+Provides-Extra: dev
+Requires-Dist: pytest>=8.3; extra == 'dev'
+Provides-Extra: mesher
+Requires-Dist: gmsh>=4.11; extra == 'mesher'
+Provides-Extra: preview
+Requires-Dist: matplotlib>=3.8; extra == 'preview'
+Provides-Extra: viz
+Requires-Dist: plotly>=5.24; extra == 'viz'
+Description-Content-Type: text/markdown
+
+# Trenchfoot
+
+Surface and volumetric trench mesh generator with shipped presets, Plotly previews, and a lightweight Python SDK.
+
+## Install
+
+```bash
+pip install trenchfoot
+```
+
+Want volumetrics or visualisations? Install extras as needed:
+- `pip install "trenchfoot[mesher]"` for gmsh-powered volume meshes.
+- `pip install "trenchfoot[preview]"` for matplotlib snapshot renders.
+- `pip install "trenchfoot[viz]"` for Plotly HTML viewers.
+
+## Scenario Gallery
+
+Color key: trench surfaces use warm soil tones; embedded geometry is colour-coded per group.
+
+| Scenario | Top | Side | Oblique |
+| --- | --- | --- | --- |
+| S01_straight_vwalls | ![S01 top](packages/trenchfoot/scenarios/S01_straight_vwalls/preview_top.png) | ![S01 side](packages/trenchfoot/scenarios/S01_straight_vwalls/preview_side.png) | ![S01 oblique](packages/trenchfoot/scenarios/S01_straight_vwalls/preview_oblique.png) |
+| S02_straight_slope_pipe | ![S02 top](packages/trenchfoot/scenarios/S02_straight_slope_pipe/preview_top.png) | ![S02 side](packages/trenchfoot/scenarios/S02_straight_slope_pipe/preview_side.png) | ![S02 oblique](packages/trenchfoot/scenarios/S02_straight_slope_pipe/preview_oblique.png) |
+| S03_L_slope_two_pipes_box | ![S03 top](packages/trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_top.png) | ![S03 side](packages/trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_side.png) | ![S03 oblique](packages/trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_oblique.png) |
+| S04_U_slope_multi_noise | ![S04 top](packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_top.png) | ![S04 side](packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_side.png) | ![S04 oblique](packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_oblique.png) |
+| S05_wide_slope_pair | ![S05 top](packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_top.png) | ![S05 side](packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_side.png) | ![S05 oblique](packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_oblique.png) |
+| S06_bumpy_wide_loop | ![S06 top](packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_top.png) | ![S06 side](packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_side.png) | ![S06 oblique](packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_oblique.png) |
+| S07_circular_well | ![S07 top](packages/trenchfoot/scenarios/S07_circular_well/preview_top.png) | ![S07 side](packages/trenchfoot/scenarios/S07_circular_well/preview_side.png) | ![S07 oblique](packages/trenchfoot/scenarios/S07_circular_well/preview_oblique.png) |
+
+### S07 circular well preset
+
+A deep cylindrical well with criss-crossing pipes at different elevations:
+
+```json
+{
+  "path_xy": "<<32-vertex circle approximation, radius=1.5>>",
+  "width": 2.0,
+  "depth": 2.5,
+  "wall_slope": 0.05,
+  "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 2.0},
+  "pipes": [
+    {"radius": 0.20, "length": 4.0, "angle_deg": 0, "s_center": 0.25, "z": -0.5},
+    {"radius": 0.15, "length": 3.5, "angle_deg": 45, "s_center": 0.5, "z": -1.2},
+    {"radius": 0.10, "length": 3.0, "angle_deg": -60, "s_center": 0.75, "z": -1.8},
+    {"radius": 0.12, "length": 3.2, "angle_deg": 90, "s_center": 0.0, "z": -2.2}
+  ],
+  "spheres": [{"radius": 0.25, "s": 0.4, "z": -1.5}],
+  "noise": {"enable": true, "amplitude": 0.02, "corr_length": 0.4, "octaves": 2, "gain": 0.5}
+}
+```
+
+## CLI quick start
+
+```bash
+trenchfoot-generate --help
+trenchfoot-generate --preview --skip-volumetric --gallery docs/scenario_gallery.md
+trenchfoot-plot packages/trenchfoot/scenarios/S05_wide_slope_pair/trench_scene.obj --open
+```
+
+Set `TRENCHFOOT_SCENARIO_OUT_ROOT=/tmp/trench-previews` (or another writable path) to keep generated assets out of your checkout.
+
+## Python API
+
+```python
+from trenchfoot import scene_spec_from_dict, generate_surface_mesh, generate_trench_volume, gmsh_available
+
+spec_dict = {
+    "path_xy": [[0.0, 0.0], [5.0, 0.0]],
+    "width": 1.0,
+    "depth": 1.2,
+    "pipes": [{"radius": 0.1, "length": 1.8, "angle_deg": 0.0, "s_center": 0.5}],
+    "boxes": [],
+    "spheres": [],
+    "noise": {"enable": False},
+}
+
+scene = scene_spec_from_dict(spec_dict)
+surface = generate_surface_mesh(scene, make_preview=True)
+surface.persist("./surface")
+
+if gmsh_available():
+    volume = generate_trench_volume(spec_dict, lc=0.4, persist_path="./volume/trench_volume.msh")
+```
+
+`SurfaceMeshResult` keeps per-group faces, metrics, and optional preview PNG bytes; call `.persist(...)` when you need files. `VolumeMeshResult` exposes node coordinates, elements, and physical groups while still letting you stay in memory.
+
+## Testing
+
+```bash
+pytest -rs
+```
+
+The suite exercises each preset (surface + volumetric), the gallery helpers, and the SDK smoke paths.

trenchfoot-0.2.2/README.md

@@ -0,0 +1,93 @@
+# Trenchfoot
+
+Surface and volumetric trench mesh generator with shipped presets, Plotly previews, and a lightweight Python SDK.
+
+## Install
+
+```bash
+pip install trenchfoot
+```
+
+Want volumetrics or visualisations? Install extras as needed:
+- `pip install "trenchfoot[mesher]"` for gmsh-powered volume meshes.
+- `pip install "trenchfoot[preview]"` for matplotlib snapshot renders.
+- `pip install "trenchfoot[viz]"` for Plotly HTML viewers.
+
+## Scenario Gallery
+
+Color key: trench surfaces use warm soil tones; embedded geometry is colour-coded per group.
+
+| Scenario | Top | Side | Oblique |
+| --- | --- | --- | --- |
+| S01_straight_vwalls | ![S01 top](packages/trenchfoot/scenarios/S01_straight_vwalls/preview_top.png) | ![S01 side](packages/trenchfoot/scenarios/S01_straight_vwalls/preview_side.png) | ![S01 oblique](packages/trenchfoot/scenarios/S01_straight_vwalls/preview_oblique.png) |
+| S02_straight_slope_pipe | ![S02 top](packages/trenchfoot/scenarios/S02_straight_slope_pipe/preview_top.png) | ![S02 side](packages/trenchfoot/scenarios/S02_straight_slope_pipe/preview_side.png) | ![S02 oblique](packages/trenchfoot/scenarios/S02_straight_slope_pipe/preview_oblique.png) |
+| S03_L_slope_two_pipes_box | ![S03 top](packages/trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_top.png) | ![S03 side](packages/trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_side.png) | ![S03 oblique](packages/trenchfoot/scenarios/S03_L_slope_two_pipes_box/preview_oblique.png) |
+| S04_U_slope_multi_noise | ![S04 top](packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_top.png) | ![S04 side](packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_side.png) | ![S04 oblique](packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_oblique.png) |
+| S05_wide_slope_pair | ![S05 top](packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_top.png) | ![S05 side](packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_side.png) | ![S05 oblique](packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_oblique.png) |
+| S06_bumpy_wide_loop | ![S06 top](packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_top.png) | ![S06 side](packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_side.png) | ![S06 oblique](packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_oblique.png) |
+| S07_circular_well | ![S07 top](packages/trenchfoot/scenarios/S07_circular_well/preview_top.png) | ![S07 side](packages/trenchfoot/scenarios/S07_circular_well/preview_side.png) | ![S07 oblique](packages/trenchfoot/scenarios/S07_circular_well/preview_oblique.png) |
+
+### S07 circular well preset
+
+A deep cylindrical well with criss-crossing pipes at different elevations:
+
+```json
+{
+  "path_xy": "<<32-vertex circle approximation, radius=1.5>>",
+  "width": 2.0,
+  "depth": 2.5,
+  "wall_slope": 0.05,
+  "ground": {"z0": 0.0, "slope": [0.0, 0.0], "size_margin": 2.0},
+  "pipes": [
+    {"radius": 0.20, "length": 4.0, "angle_deg": 0, "s_center": 0.25, "z": -0.5},
+    {"radius": 0.15, "length": 3.5, "angle_deg": 45, "s_center": 0.5, "z": -1.2},
+    {"radius": 0.10, "length": 3.0, "angle_deg": -60, "s_center": 0.75, "z": -1.8},
+    {"radius": 0.12, "length": 3.2, "angle_deg": 90, "s_center": 0.0, "z": -2.2}
+  ],
+  "spheres": [{"radius": 0.25, "s": 0.4, "z": -1.5}],
+  "noise": {"enable": true, "amplitude": 0.02, "corr_length": 0.4, "octaves": 2, "gain": 0.5}
+}
+```
+
+## CLI quick start
+
+```bash
+trenchfoot-generate --help
+trenchfoot-generate --preview --skip-volumetric --gallery docs/scenario_gallery.md
+trenchfoot-plot packages/trenchfoot/scenarios/S05_wide_slope_pair/trench_scene.obj --open
+```
+
+Set `TRENCHFOOT_SCENARIO_OUT_ROOT=/tmp/trench-previews` (or another writable path) to keep generated assets out of your checkout.
+
+## Python API
+
+```python
+from trenchfoot import scene_spec_from_dict, generate_surface_mesh, generate_trench_volume, gmsh_available
+
+spec_dict = {
+    "path_xy": [[0.0, 0.0], [5.0, 0.0]],
+    "width": 1.0,
+    "depth": 1.2,
+    "pipes": [{"radius": 0.1, "length": 1.8, "angle_deg": 0.0, "s_center": 0.5}],
+    "boxes": [],
+    "spheres": [],
+    "noise": {"enable": False},
+}
+
+scene = scene_spec_from_dict(spec_dict)
+surface = generate_surface_mesh(scene, make_preview=True)
+surface.persist("./surface")
+
+if gmsh_available():
+    volume = generate_trench_volume(spec_dict, lc=0.4, persist_path="./volume/trench_volume.msh")
+```
+
+`SurfaceMeshResult` keeps per-group faces, metrics, and optional preview PNG bytes; call `.persist(...)` when you need files. `VolumeMeshResult` exposes node coordinates, elements, and physical groups while still letting you stay in memory.
+
+## Testing
+
+```bash
+pytest -rs
+```
+
+The suite exercises each preset (surface + volumetric), the gallery helpers, and the SDK smoke paths.

{trenchfoot-0.1.0 → trenchfoot-0.2.2}/docs/scenario_gallery.md

@@ -6,3 +6,4 @@
 | S04_U_slope_multi_noise | ![S04_U_slope_multi_noise top](../packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_top.png) | ![S04_U_slope_multi_noise side](../packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_side.png) | ![S04_U_slope_multi_noise oblique](../packages/trenchfoot/scenarios/S04_U_slope_multi_noise/preview_oblique.png) |
 | S05_wide_slope_pair | ![S05_wide_slope_pair top](../packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_top.png) | ![S05_wide_slope_pair side](../packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_side.png) | ![S05_wide_slope_pair oblique](../packages/trenchfoot/scenarios/S05_wide_slope_pair/preview_oblique.png) |
 | S06_bumpy_wide_loop | ![S06_bumpy_wide_loop top](../packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_top.png) | ![S06_bumpy_wide_loop side](../packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_side.png) | ![S06_bumpy_wide_loop oblique](../packages/trenchfoot/scenarios/S06_bumpy_wide_loop/preview_oblique.png) |
+| S07_circular_well | ![S07_circular_well top](../packages/trenchfoot/scenarios/S07_circular_well/preview_top.png) | ![S07_circular_well side](../packages/trenchfoot/scenarios/S07_circular_well/preview_side.png) | ![S07_circular_well oblique](../packages/trenchfoot/scenarios/S07_circular_well/preview_oblique.png) |

{trenchfoot-0.1.0 → trenchfoot-0.2.2}/packages/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"],
+                },
+            },
+        ),
     ]