src/Model/Geometry/ProfileXYZ.py

@@ -339,16 +339,6 @@ class ProfileXYZ(Profile, SQLSubModel):
 
         return ok
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for p in self._points:
-            p._data_traversal(predicate, modifier, data)
-
     @classmethod
     def from_data(cls, header, data):
         profile = None

src/Model/Geometry/Reach.py

@@ -99,13 +99,6 @@ class Reach(SQLSubModel):
 
         return ok
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        for p in self._profiles:
-            p._data_traversal(predicate, modifier, data)
-
     def profile(self, i):
         """Returns profile at index i
 

src/Model/LateralContribution/LateralContribution.py

@@ -439,6 +439,7 @@ class LateralContribution(SQLSubModel):
 
         return True
 
+
     def _data_traversal(self,
                         predicate=lambda obj, data: True,
                         modifier=lambda obj, data: None,

src/Model/River.py

@@ -190,13 +190,6 @@ class RiverNode(Node):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
     def is_deleted(self):
         return self._deleted
 
@@ -394,16 +387,6 @@ class RiverReach(Edge):
         objs = [self._reach, self._frictions]
         return self._save_submodel(execute, objs, data)
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        self._reach._data_traversal(predicate, modifier, data)
-        self._frictions._data_traversal(predicate, modifier, data)
-
     def is_deleted(self):
         return self._deleted
 

src/Model/SedimentLayer/SedimentLayer.py

@@ -40,7 +40,6 @@ class Layer(SQLSubModel):
             owner_scenario=owner_scenario
         )
 
-        self._sl = sl
         self._name = name
         self._type = type
 
@@ -59,7 +58,6 @@ class Layer(SQLSubModel):
     @name.setter
     def name(self, name):
         self._name = name
-        self.modified()
 
     @property
     def type(self):
@@ -68,7 +66,6 @@ class Layer(SQLSubModel):
     @type.setter
     def type(self, type):
         self._type = type
-        self.modified()
 
     @property
     def height(self):
@@ -77,7 +74,6 @@ class Layer(SQLSubModel):
     @height.setter
     def height(self, height):
         self._height = float(height)
-        self.modified()
 
     @property
     def d50(self):
@@ -86,7 +82,6 @@ class Layer(SQLSubModel):
     @d50.setter
     def d50(self, d50):
         self._d50 = float(d50)
-        self.modified()
 
     @property
     def sigma(self):
@@ -95,7 +90,6 @@ class Layer(SQLSubModel):
     @sigma.setter
     def sigma(self, sigma):
         self._sigma = float(sigma)
-        self.modified()
 
     @property
     def critical_constraint(self):
@@ -104,7 +98,6 @@ class Layer(SQLSubModel):
     @critical_constraint.setter
     def critical_constraint(self, critical_constraint):
         self._critical_constraint = float(critical_constraint)
-        self.modified()
 
     @classmethod
     def _db_create(cls, execute, ext=""):
@@ -206,7 +199,7 @@ class Layer(SQLSubModel):
             "SELECT pamhyr_id, deleted, name, type, height, " +
             "d50, sigma, critical_constraint, scenario " +
             "FROM sedimentary_layer_layer " +
-            f"WHERE sl = {sl.pamhyr_id} " +
+            f"WHERE sl = {sl} " +
             f"AND scenario = {scenario.id} " +
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " +
             "ORDER BY ind ASC"
@@ -270,10 +263,6 @@ class Layer(SQLSubModel):
 
         return True
 
-    def modified(self):
-        super(Layer, self).modified()
-
-        self._sl.modified()
 
 class SedimentLayer(SQLSubModel):
     _sub_classes = [Layer]
@@ -444,7 +433,7 @@ class SedimentLayer(SQLSubModel):
             if deleted:
                 sl.set_as_deleted()
 
-            data["sl"] = sl
+            data["sl"] = sl.id
             sl._layers = Layer._db_load(execute, data)
 
             loaded.add(pid)

src/Model/Study.py

@@ -514,12 +514,13 @@ class Study(SQLModel):
 
         new.name = self.status.scenario.name + " (copy)"
 
-        self.status.scenario = new
         self.river._data_traversal(
             predicate=lambda obj, data: obj._owner_scenario == source,
             modifier=lambda obj, data: obj.set_owner_scenario(),
             data={}
         )
 
+        self.status.scenario = new
+
         self.status.set_as_editable()
         return new