Shape invoer

docs/rekenmethodiek/geohydrologische_modellen.rst

@@ -34,7 +34,7 @@ verschilt.
 De grondwaterstroming vormt de drijvende kracht achter het proces van terugschrijdende erosie.
 Door het analytische grondwatermodel 4A van :cite:`trw_2004` toe te passen,
 kan de respons :math:`r_{exit}` in het uittredepunt worden beschreven als functie van de locatie in het
-dwarspofiel :math:`x_{exit}` [m] en de geohydrologische parameters van model 4A.
+dwarsprofiel :math:`x_{exit}` [m] en de geohydrologische parameters van model 4A.
 Een uitgebreide toelichting op de onderliggende theorie van dit model is te vinden in :ref:`stationair-model`.
 
 De respons in het uittredepunt wordt bepaald met:

geoprob_pipe/calculations/systems/model4a/initial_input.py

@@ -293,4 +293,22 @@
         "mean": 0.3,
         "source": "excel",
     },
+    {
+      "name": "a_vak",
+      "description": "De mechanisme gevoelige fractie van het element.",
+      "remark": "",
+      "unit": "-",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 1.0,
+      "source": "excel" 
+    },
+    {
+      "name": "delta_length",
+      "description": "De equivalente onafhankelijke lengte voor STPH.",
+      "remark": "",
+      "unit": "m",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 300.0,
+      "source": "excel" 
+    },
 ]

geoprob_pipe/calculations/systems/moria/initial_input.py

@@ -276,7 +276,7 @@
         "remark": "",
         "unit": "kN/m³",
         "distribution_type": DistributionType.deterministic,
-        "mean": 16.5,
+        "mean": 26.0,
         "source": "excel",
     },
     {
@@ -288,4 +288,22 @@
         "mean": 0.3,
         "source": "excel",
     },
+    {
+      "name": "a_vak",
+      "description": "De mechanisme gevoelige fractie van het element.",
+      "remark": "",
+      "unit": "-",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 1.0,
+      "source": "excel" 
+    },
+    {
+      "name": "delta_length",
+      "description": "De equivalente onafhankelijke lengte voor STPH.",
+      "remark": "",
+      "unit": "m",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 300.0,
+      "source": "excel" 
+    },
 ]

geoprob_pipe/calculations/systems/single_calc.py

@@ -42,7 +42,7 @@ def reproduce_single_calculation(
     conn = sqlite3.connect(geopackage_filepath)
     cursor = conn.cursor()
     cursor.execute(
-        'SELECT "values" FROM geoprob_pipe_metadata WHERE metadata_type = ?',
+        'SELECT metadata_value FROM geoprob_pipe_metadata WHERE metadata_type = ?',
         ("geohydrologisch_model",))
     geohydrologisch_model: str = cursor.fetchone()[0]
 

geoprob_pipe/calculations/systems/validation.py

@@ -66,8 +66,8 @@
 GAMMA_KORREL = ColumnValidation(column_name="mean", requirements=[
     ValidationRequirement(
         requirement=requirements.is_in_range(left=23.0, right=29.0, inclusive="both"),
-        failure_msg=f"De parameter 'gamma_korrel' hoort 26.0 te zijn. "
-                    f"De applicatie vereist dat deze tussen 23.0 en 29.0 is. ",
+        failure_msg="De parameter 'gamma_korrel' hoort 26.0 te zijn. "
+                    "De applicatie vereist dat deze tussen 23.0 en 29.0 is. ",
         filters=filters.combine(filters.is_in(column="parameter", values=["gamma_korrel"]),
                                 FILTER_IS_NOT_CDF_CURVE))])
 

geoprob_pipe/calculations/systems/wbi/initial_input.py

@@ -251,4 +251,22 @@
         "mean": 0.3,
         "source": "excel",
     },
+    {
+      "name": "a_vak",
+      "description": "De mechanisme gevoelige fractie van het element.",
+      "remark": "",
+      "unit": "-",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 1.0,
+      "source": "excel" 
+    },
+    {
+      "name": "delta_length",
+      "description": "De equivalente onafhankelijke lengte voor STPH.",
+      "remark": "",
+      "unit": "m",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 300.0,
+      "source": "excel" 
+    },
 ]

geoprob_pipe/cmd_app/cmd.py

@@ -1,33 +1,49 @@
-import typer
-from rich.console import Console
 import os
 import sqlite3
-from geoprob_pipe.utils import clear_terminal
+from pathlib import Path
+from configparser import ConfigParser
 from datetime import datetime
+from importlib.metadata import distributions
+from typing import Dict, List, Optional
+
+import typer
+from rich.console import Console
 from rich.panel import Panel
+
 from geoprob_pipe.cmd_app.questionnaire import start_questionnaire
-from typing import Optional, List, Dict
 from geoprob_pipe.cmd_app.utils.misc import get_geoprob_pipe_version_number
+from geoprob_pipe.utils import clear_terminal
 from geoprob_pipe.utils.loggers import setup_base_logging
-from importlib.metadata import distributions
 
 app = typer.Typer(help="GeoProb-Pipe - CLI applicatie voor probabilistische piping berekeningen.", add_completion=False)
 
 
 class ApplicationSettings:
-
+    
     def __init__(self):
-        self.workspace_dir: Optional[str] = None
-        self.geopackage_filename: Optional[str] = None
+        self.workspace_dir: Path = Path()
+        self.geopackage_filename: Path = Path()
         self.datetime_stamp: str = datetime.now().strftime("%Y-%m-%d_%H%M%S")
         self.to_run = "all"
         # -> or vakken:1,2,3,4,5
         self.debug: bool = os.getenv("GEOPROB_DEBUG") == "1"
+        # Flags
+        self.batch_input: bool = False # Flag for batch input
 
     @property
     def geopackage_filepath(self) -> str:
         return os.path.join(self.workspace_dir, self.geopackage_filename)
+
+    @property
+    def batch_input_filepath(self) -> str:
+        return os.path.join(self.workspace_dir, "batch_input.ini")
 
+    @property
+    def input_config(self):
+        config = ConfigParser()
+        config.read(self.batch_input_filepath)
+        return config
+
     @property
     def hrd_dir(self):
         path_to_hrd_dir = os.path.join(self.workspace_dir, "hrd_files")
@@ -61,7 +77,7 @@ def geohydrologisch_model(self) -> str:
         conn = sqlite3.connect(self.geopackage_filepath)
         cursor = conn.cursor()
         cursor.execute("""
-            SELECT geoprob_pipe_metadata."values"
+            SELECT geoprob_pipe_metadata.metadata_value
             FROM geoprob_pipe_metadata
             WHERE metadata_type='geohydrologisch_model';
         """)
@@ -103,7 +119,7 @@ def startup_geoprob_pipe():
 
     debug_label: str = ""
     if app_settings.debug:
-        debug_label = f", DEBUG=TRUE"
+        debug_label = ", DEBUG=TRUE"
 
     clear_terminal()
     console = Console()