Merge remote-tracking branches 'origin/sub_laptop_2', 'origin/sub_laptop_3' and 'origin/sub_laptop_8' into sub_laptop_4

E03_StabSection/E03_StabSection_Router_WhatIf.py

@@ -18,7 +18,7 @@ import math
 import time
 from pathlib import Path
 from typing import Any, Literal
-from functools import lru_cache
+from functools import lru_cache, partial
 from uuid import UUID
 
 from fastapi import APIRouter, HTTPException
@@ -100,6 +100,7 @@ def _context(root: Path, station_key: str) -> dict[str, Any]:
     walls = walls_mod.walls_of(entry)
     if walls:
         kw["walls"] = walls
+    kw["groundwater_for"] = partial(ground_model.station_groundwater, ground)
     return {
         "ground": ground,
         "plan": plan,

E03_StabSection/E03_StabSection_Worker.py

@@ -13,10 +13,12 @@ import json
 import logging
 import sys
 from concurrent.futures import ProcessPoolExecutor, as_completed
+from functools import partial
 from pathlib import Path
 from typing import Any, Callable
 
 from common_util.common_util_derived_store import write_derived
+from E02_StabGround.E02_StabGround_Model import station_groundwater
 from E03_StabSection.E03_StabSection_Engine_Station import analyze_station
 
 KIND_STATION = "stab2d_station"
@@ -29,6 +31,8 @@ def _analyze(
     kw = {**kwargs, "layers": item["layers"], "ground": [tuple(p) for p in item["ground"]]}
     if item.get("walls"):
         kw["walls"] = item["walls"]
+    if conditions_ground is not None:
+        kw["groundwater_for"] = partial(station_groundwater, conditions_ground)
     return analyze_station(item["cross"], item["design"], **kw)