Merge pull request #216 from Deltares/feature/DGeoFlow2024.02

Feature/d geo flow2024.02
Deltares · Jan 20, 2025 · 2fb75b4 · 2fb75b4
2 parents 2d77419 + ce36801
commit 2fb75b4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/docs/user/setup.rst b/docs/user/setup.rst
@@ -20,7 +20,7 @@ Setting the console paths per application
 In the *geolib.env* file, you can set the paths to the console applications, for example::
 
     DSTABILITY_CONSOLE_PATH="C:\\Program Files (x86)\\Deltares\\D-GEO Suite\\D-Stability 2023.01\\bin\\D-Stability Console.exe"
-    DGEOFLOW_CONSOLE_PATH="C:\\Program Files\\Deltares\\D-GEO Suite\\D-Geo Flow 2023.01\\bin\\DGeoFlow Console.exe"
+    DGEOFLOW_CONSOLE_PATH="C:\\Program Files\\Deltares\\D-GEO Suite\\D-Geo Flow 2024.02\\bin\\D-GeoFlow Console.exe"
     DSHEETPILING_CONSOLE_PATH="C:\\Program Files (x86)\\Deltares\\D-Sheet Piling 23.1.1\\DSheetPiling.exe"
     DFOUNDATIONS_CONSOLE_PATH="C:\\Program Files (x86)\\Deltares\\D-Foundations 23.1.1\\DFoundations.exe"
     DSETTLEMENT_CONSOLE_PATH="C:\\Program Files (x86)\\Deltares\\D-Settlement 23.1.1\\DSettlement.exe"
@@ -41,7 +41,7 @@ otherwise GEOLib will not start. The executables are expected in the following l
 - *CONSOLE_FOLDER*/"DSettlement/DSettlement.exe"
 - *CONSOLE_FOLDER*/"DSheetPiling/DSheetPiling.exe"
 - *CONSOLE_FOLDER*/"DStabilityConsole/D-Stability Console.exe"
-- *CONSOLE_FOLDER*/"DGeoFlowConsole/DGeoFlow Console.exe"
+- *CONSOLE_FOLDER*/"DGeoFlowConsole/D-GeoFlow Console.exe"
 
 It can also be set by a **CONSOLE_FOLDER** environment variable. The environment variable will
 overrule the .env file, which in its turn, overrides the defaults set in Python.

diff --git a/geolib.env b/geolib.env
@@ -2,7 +2,7 @@
 # can be customized by client
 CONSOLE_FOLDER="tests"  # path has to exist!
 # DSTABILITY_CONSOLE_PATH="C:\\Program Files (x86)\\Deltares\\D-GEO Suite\\D-Stability 2023.01\\bin\\D-Stability Console.exe"
-# DGEOFLOW_CONSOLE_PATH="C:\\Program Files\\Deltares\\D-GEO Suite\\D-Geo Flow 2023.01\\bin\\DGeoFlow Console.exe"
+# DGEOFLOW_CONSOLE_PATH="C:\\Program Files\\Deltares\\D-GEO Suite\\D-Geo Flow 2023.01\\bin\\D-GeoFlow Console.exe"
 # DSHEETPILING_CONSOLE_PATH="C:\\Program Files (x86)\\Deltares\\D-Sheet Piling 23.1.1\\DSheetPiling.exe"
 # DFOUNDATIONS_CONSOLE_PATH="C:\\Program Files (x86)\\Deltares\\D-Foundations 23.1.1\\DFoundations.exe"
 # DSETTLEMENT_CONSOLE_PATH="C:\\Program Files (x86)\\Deltares\\D-Settlement 23.1.1\\DSettlement.exe"

diff --git a/geolib/models/dgeoflow/dgeoflow_model.py b/geolib/models/dgeoflow/dgeoflow_model.py
@@ -59,7 +59,7 @@ def parser_provider_type(self) -> Type[DGeoFlowParserProvider]:
 
     @property
     def default_console_path(self) -> Path:
-        return Path("DGeoFlowConsole/DGeoFlow Console.exe")
+        return Path("DGeoFlowConsole/D-GeoFlow Console.exe")
 
     @property
     def custom_console_path(self) -> Path:

diff --git a/geolib/models/dgeoflow/internal.py b/geolib/models/dgeoflow/internal.py
@@ -583,9 +583,9 @@ class PersistableCalculation(DGeoFlowBaseModelStructure):
     Notes: Optional[str] = None
     CalculationType: Optional[CalculationTypeEnum] = CalculationTypeEnum.GROUNDWATER_FLOW
     CriticalHeadId: Optional[str] = None
-    CriticalHeadSearchSpace: Optional[
-        PersistableCriticalHeadSearchSpace
-    ] = PersistableCriticalHeadSearchSpace()
+    CriticalHeadSearchSpace: Optional[PersistableCriticalHeadSearchSpace] = (
+        PersistableCriticalHeadSearchSpace()
+    )
     PipeTrajectory: Optional[InternalPipeTrajectory] = None
     MeshPropertiesId: Optional[str] = None
     ResultsId: Optional[str] = None
@@ -606,6 +606,11 @@ class ElementResult(DGeoFlowBaseModelStructure):
     NodeResults: Optional[List[NodeResult]] = []
 
 
+class PersistablePhreaticLineSegment(DGeoFlowBaseModelStructure):
+    Start: Optional[PersistablePoint] = None
+    End: Optional[PersistablePoint] = None
+
+
 class PipeElementResult(DGeoFlowBaseModelStructure):
     Nodes: Optional[List[PersistablePoint]] = []
     IsActive: Optional[bool] = None
@@ -615,6 +620,7 @@ class PipeElementResult(DGeoFlowBaseModelStructure):
 class GroundwaterFlowResult(DGeoFlowSubStructure):
     Id: Optional[str] = None
     Elements: Optional[List[ElementResult]] = []
+    PhreaticLineSegments: Optional[List[PersistablePhreaticLineSegment]] = []
     ContentVersion: Optional[str] = "2"
 
     id_validator = field_validator("Id", mode="before")(transform_id_to_str)
@@ -628,6 +634,7 @@ class PipeLengthResult(DGeoFlowSubStructure):
     Id: Optional[str] = None
     PipeLength: Optional[float] = None
     Elements: Optional[List[ElementResult]] = []
+    PhreaticLineSegments: Optional[List[PersistablePhreaticLineSegment]] = []
     PipeElements: Optional[List[PipeElementResult]] = []
     ContentVersion: Optional[str] = "2"
 
@@ -643,6 +650,7 @@ class CriticalHeadResult(DGeoFlowSubStructure):
     PipeLength: Optional[float] = None
     CriticalHead: Optional[float] = None
     Elements: Optional[List[ElementResult]] = []
+    PhreaticLineSegments: Optional[List[PersistablePhreaticLineSegment]] = []
     PipeElements: Optional[List[PipeElementResult]] = []
     ContentVersion: Optional[str] = "2"