Remove FractionalFlow code (#189)

Fixes #117. @DanielTollenaar are you ok with removing `model_old.py` and `verdeelsleutels.py`? They don't seem to be used anywhere, and contain FractionalFlow code.
Deltares · Nov 27, 2024 · fcb7166 · fcb7166
1 parent bfa8c02
commit fcb7166
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 275 deletions.
diff --git a/src/hydamo/hydamo/geometry.py b/src/hydamo/hydamo/geometry.py
@@ -43,8 +43,6 @@ def find_nearest_branch(branches, geometries, method="overall", maxdist=5):
         Method for determine branch
     maxdist=5 : int or float
         Maximum distance for finding nearest geometry
-    minoffset : int or float
-        Minimum offset from the end of the corresponding branch in case of method=equal
     """
     # Check if method is in allowed methods
     allowed_methods = ["intersecting", "overall", "centroid", "ends"]

diff --git a/src/peilbeheerst_model/02_crossings_to_ribasim_notebook.py b/src/peilbeheerst_model/02_crossings_to_ribasim_notebook.py
@@ -77,7 +77,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -174,7 +173,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -271,7 +269,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -369,7 +366,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -464,7 +460,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -562,7 +557,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -678,7 +672,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -776,7 +769,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -877,7 +869,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()
@@ -974,7 +965,6 @@
 terminal_node = network.terminal()
 
 # linear_resistance = network.linear_resistance()
-# fractional_flow = network.fractional_flow()
 # outlet = network.outlet()
 # discrete_control = network.discrete_control()
 # pid_control = network.pid_control()

diff --git a/src/peilbeheerst_model/peilbeheerst_model/crossings_to_ribasim.py b/src/peilbeheerst_model/peilbeheerst_model/crossings_to_ribasim.py
@@ -1148,17 +1148,6 @@ def manning_resistance(self):
 
         return manning_resistance_node, manning_resistance_static
 
-    def fractional_flow(self):
-        """_summary_
-
-        Returns
-        -------
-        _type_
-            _description_
-        """
-        fractional_flow = ribasim.FractionalFlow(static=pd.DataFrame(data={"node_id": [], "fraction": []}))
-        return fractional_flow
-
     def terminal(self):
         """_summary_
 
@@ -1258,7 +1247,6 @@ def create(
         flow_boundary=None,
         linear_resistance=None,
         manning_resistance=None,
-        fractional_flow=None,
         terminal=None,
         outlet=None,
         discrete_control=None,
@@ -1286,8 +1274,6 @@ def create(
             _description_, by default None
         manning_resistance : _type_, optional
             _description_, by default None
-        fractional_flow : _type_, optional
-            _description_, by default None
         terminal : _type_, optional
             _description_, by default None
         outlet : _type_, optional
@@ -1319,7 +1305,6 @@ def create(
             level_boundary=level_boundary,
             #                               linear_resistance=linear_resistance,
             manning_resistance=manning_resistance,
-            #                               fractional_flow=fractional_flow,
             #                               outlet=outlet,
             #                               discrete_control=discrete_control,
             #                               pid_control=pid_control,

diff --git a/src/peilbeheerst_model/peilbeheerst_model/ribasim_feedback_processor.py b/src/peilbeheerst_model/peilbeheerst_model/ribasim_feedback_processor.py
@@ -11,7 +11,6 @@
 # Mapping between feedback form and model names
 mapping = {
     "Basin": "basin",
-    "FractionalFlow": "fractional_flow",
     "TabulatedRatingCurve": "tabulated_rating_curve",
     "Pump": "pump",
     "Outlet": "outlet",

diff --git a/src/ribasim_lumping/ribasim_lumping/ribasim_model_generator/generate_ribasim_model.py b/src/ribasim_lumping/ribasim_lumping/ribasim_model_generator/generate_ribasim_model.py
@@ -177,10 +177,6 @@ def generate_ribasim_linear_resistances(linearresistance_static: gpd.GeoDataFram
     return ribasim.LinearResistance(static=linearresistance_static)
 
 
-def generate_ribasim_fractional_flows():
-    return ribasim.FractionalFlow()
-
-
 def generate_ribasim_terminals():
     return ribasim.Terminal()
 
@@ -269,8 +265,6 @@ def generate_ribasim_model(
         linearresistance_static=tables["linearresistance_static"],
     )
 
-    fractions_flows = generate_ribasim_fractional_flows()
-
     terminals = generate_ribasim_terminals()
 
     discrete_controls = generate_ribasim_discrete_controls()
@@ -300,7 +294,6 @@ def generate_ribasim_model(
         outlet=ribasim_outlets,
         tabulated_rating_curve=ribasim_tabulated_rating_curve,
         manning_resistance=ribasim_manning_resistance,
-        fractional_flow=fractions_flows,
         linear_resistance=linear_resistances,
         terminal=terminals,
         discrete_control=discrete_controls,

diff --git a/src/ribasim_nl/ribasim_nl/model_old.py b/src/ribasim_nl/ribasim_nl/model_old.py