update sorting methods

Deltares · Sep 14, 2023 · dc0c288 · dc0c288
1 parent 03d2eb7
commit dc0c288
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/python/ribasim/ribasim/node_types/flow_boundary.py b/python/ribasim/ribasim/node_types/flow_boundary.py
@@ -25,3 +25,9 @@ class FlowBoundary(TableModel):
 
     static: Optional[DataFrame[FlowBoundaryStaticSchema]] = None
     time: Optional[DataFrame[FlowBoundaryTimeSchema]] = None
+
+    def sort(self):
+        if self.static is not None:
+            self.static.sort_values("node_id", ignore_index=True, inplace=True)
+        if self.time is not None:
+            self.time.sort_values(["time", "node_id"], ignore_index=True, inplace=True)
diff --git a/python/ribasim/ribasim/node_types/fractional_flow.py b/python/ribasim/ribasim/node_types/fractional_flow.py
@@ -17,6 +17,3 @@ class FractionalFlow(TableModel):
     """
 
     static: DataFrame[FractionalFlowStaticSchema]
-
-    def sort(self):
-        self.static.sort_values("node_id", ignore_index=True, inplace=True)
diff --git a/python/ribasim/ribasim/node_types/level_boundary.py b/python/ribasim/ribasim/node_types/level_boundary.py
@@ -23,3 +23,9 @@ class LevelBoundary(TableModel):
 
     static: Optional[DataFrame[LevelBoundaryStaticSchema]] = None
     time: Optional[DataFrame[LevelBoundaryTimeSchema]] = None
+
+    def sort(self):
+        if self.static is not None:
+            self.static.sort_values("node_id", ignore_index=True, inplace=True)
+        if self.time is not None:
+            self.time.sort_values(["time", "node_id"], ignore_index=True, inplace=True)
diff --git a/python/ribasim/ribasim/node_types/pid_control.py b/python/ribasim/ribasim/node_types/pid_control.py
@@ -26,3 +26,9 @@ class PidControl(TableModel):
 
     class Config:
         validate_assignment = True
+
+    def sort(self):
+        if self.static is not None:
+            self.static.sort_values("node_id", ignore_index=True, inplace=True)
+        if self.time is not None:
+            self.time.sort_values(["time", "node_id"], ignore_index=True, inplace=True)