src/Model/BoundaryCondition/BoundaryCondition.py

@@ -400,16 +400,6 @@ class BoundaryCondition(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for el in self._data:
-            el._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(
             list(

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -415,16 +415,6 @@ class BoundaryConditionAdisTS(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(self._data)
 

src/Model/D90AdisTS/D90AdisTS.py

@@ -197,16 +197,6 @@ class D90AdisTS(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(self._data)
 

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -220,16 +220,6 @@ class DIFAdisTS(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(self._data)
 

src/Model/HydraulicStructures/Basic/HydraulicStructures.py

@@ -229,16 +229,6 @@ class BasicHS(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(self._data)
 

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -327,16 +327,6 @@ class HydraulicStructure(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(self.lst)
 

src/Model/InitialConditions/InitialConditions.py

@@ -374,16 +374,6 @@ class InitialConditions(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 d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(self.data)
 

src/Model/LateralContribution/LateralContribution.py

@@ -439,17 +439,6 @@ class LateralContribution(SQLSubModel):
 
         return True
 
-
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(
             list(

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -392,16 +392,6 @@ class LateralContributionAdisTS(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(
             list(

src/Model/Pollutants/Pollutants.py

@@ -441,16 +441,6 @@ class Pollutants(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 d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     @property
     def enabled(self):
         return self._enabled

src/Model/Reservoir/Reservoir.py

@@ -375,16 +375,6 @@ class Reservoir(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for d in self._data:
-            d._data_traversal(predicate, modifier, data)
-
     def __len__(self):
         return len(self._data)
 

src/Model/River.py

@@ -627,52 +627,6 @@ class River(Graph):
         except Exception as e:
             logger_exception(e)
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        """Traversal data and execute modifier fonction if predicate
-        true
-
-        Args:
-            predicate: Function predicate, take current obj and data as input
-            modifier: Function modifier, take current obj and data as input
-
-        Returns:
-            Nothing
-
-        """
-        if predicate(self, data):
-            modifier(self, data)
-
-        for obj in self._get_objs_list():
-            obj._data_traversal(predicate, modifier, data)
-
-    def _get_objs_list(self):
-        objs = (self._nodes + self._edges)
-        objs += [
-            self._boundary_condition,
-            self._initial_conditions,
-            self._lateral_contribution,
-            self._sediment_layers,
-            self._stricklers,
-            self._reservoir,
-            self._hydraulic_structures,
-            self._additional_files,
-            self._rep_lines,
-            self._Output_rk_adists,
-            self._Pollutants,
-            self._InitialConditionsAdisTS,
-            self._BoundaryConditionsAdisTS,
-            self._LateralContributionsAdisTS,
-            self._D90AdisTS, self._DIFAdisTS,
-        ]
-
-        for solver in self._parameters:
-            objs.append(self._parameters[solver])
-
-        return objs
-
     def init_default(self):
         self.init_default_network()
         self.init_default_sediment()

src/Model/SedimentLayer/SedimentLayer.py

@@ -471,16 +471,6 @@ class SedimentLayer(SQLSubModel):
 
         return True
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        if predicate(self, data):
-            modifier(self, data)
-
-        for layer in self._layers:
-            layer._data_traversal(predicate, modifier, data)
-
     def get(self, index):
         return self.layers[index]
 

src/Model/Study.py

@@ -502,25 +502,3 @@ class Study(SQLModel):
             self.status.set_as_read_only()
         else:
             self.status.set_as_editable()
-
-    def duplicate_current_scenario(self):
-        source = self.status.scenario_id
-        new = self.scenarios.new(
-            self.status.scenario.parent
-        )
-
-        new.set_pos(self.status.scenario.x + 100,
-                    self.status.scenario.y + 100)
-
-        new.name = self.status.scenario.name + " (copy)"
-
-        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

src/Model/Tools/PamhyrDB.py

@@ -202,7 +202,7 @@ class SQLSubModel(PamhyrID):
         self._owner_scenario = self._status.scenario_id
         self._status.modified()
 
-    def set_owner_scenario(self):
+    def set_owner_scenario_if(self, predicate):
         """Set study status the object owner_scenario to current
         scenario if predicate(scenario_id) is true
 
@@ -215,8 +215,9 @@ class SQLSubModel(PamhyrID):
         if self._status is None:
             return
 
-        self._owner_scenario = self._status.scenario_id
-        self._status.modified()
+        if predicate(self._owner_scenario):
+            self._owner_scenario = self._status.scenario_id
+            self._status.modified()
 
     def is_deleted(self):
         """This object is deleted?
@@ -413,22 +414,3 @@ class SQLSubModel(PamhyrID):
             save
         """
         raise NotImplementedMethodeError(self, self._db_save)
-
-
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        """Traversal data and execute modifier fonction if predicate
-        true
-
-        Args:
-            predicate: Function predicate, take current obj and data as input
-            modifier: Function modifier, take current obj and data as input
-
-        Returns:
-            Nothing
-
-        """
-        if predicate(self, data):
-            modifier(self, data)

src/Model/Tools/PamhyrDict.py

@@ -82,24 +82,20 @@ class PamhyrModelDict(SQLSubModel):
         self.set(key, new)
         return new
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        """Traversal data and execute modifier fonction if predicate
-        true
+    def rec_set_owner_scenario_if(self, predicate):
+        """Set study status the object owner_scenario to current
+        scenario if predicate(scenario_id) is true
 
         Args:
-            predicate: Function predicate, take current obj and data as input
-            modifier: Function modifier, take current obj and data as input
+            predicate: Function predicate on owner_scenario id
 
         Returns:
             Nothing
-
         """
-        for key in self._dict:
-            self._dict[key]\
-                ._data_traversal(predicate, modifier, data)
+        self.set_owner_scenario_if(predicate)
+
+        for k in self._lst:
+            self._dict[key].set_owner_scenario_if(predicate)
 
     def new(self, key):
         raise NotImplementedMethodeError(self, self.new)

src/Model/Tools/PamhyrList.py

@@ -85,23 +85,20 @@ class PamhyrModelList(SQLSubModel):
         if self._status is not None:
             self._status.modified()
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        """Traversal data and execute modifier fonction if predicate
-        true
+    def rec_set_owner_scenario_if(self, predicate):
+        """Set study status the object owner_scenario to current
+        scenario if predicate(scenario_id) is true
 
         Args:
-            predicate: Function predicate, take current obj and data as input
-            modifier: Function modifier, take current obj and data as input
+            predicate: Function predicate on owner_scenario id
 
         Returns:
             Nothing
-
         """
+        self.set_owner_scenario_if(predicate)
+
         for el in self._lst:
-            el._data_traversal(predicate, modifier, data)
+            el.set_owner_scenario_if(predicate)
 
     def new(self, index):
         """Create new elements and add it to list
@@ -213,24 +210,6 @@ class PamhyrModelListWithTab(SQLSubModel):
     def _db_save(self, execute, data=None):
         raise NotImplementedMethodeError(self, self._db_save)
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        """Traversal data and execute modifier fonction if predicate
-        true
-
-        Args:
-            predicate: Function predicate, take current obj and data as input
-            modifier: Function modifier, take current obj and data as input
-
-        Returns:
-            Nothing
-        """
-        for tab in self._tabs:
-            for el in self._tabs[tab]:
-                el._data_traversal(predicate, modifier, data)
-
     ################
     # MODEL METHOD #
     ################

src/Model/Tools/PamhyrListExt.py

@@ -90,22 +90,20 @@ class PamhyrModelList(SQLSubModel):
         if self._status is not None:
             self._status.modified()
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        """Traversal data and execute modifier fonction if predicate
-        true
+    def rec_set_owner_scenario_if(self, predicate):
+        """Set study status the object owner_scenario to current
+        scenario if predicate(scenario_id) is true
 
         Args:
-            predicate: Function predicate, take current obj and data as input
-            modifier: Function modifier, take current obj and data as input
+            predicate: Function predicate on owner_scenario id
 
         Returns:
             Nothing
         """
+        self.set_owner_scenario_if(predicate)
+
         for el in self._lst:
-            el._data_traversal(predicate, modifier, data)
+            el.set_owner_scenario_if(predicate)
 
     def new(self, index):
         """Create new elements and add it to list
@@ -226,24 +224,6 @@ class PamhyrModelListWithTab(SQLSubModel):
     def _db_save(self, execute, data=None):
         raise NotImplementedMethodeError(self, self._db_save)
 
-    def _data_traversal(self,
-                        predicate=lambda obj, data: True,
-                        modifier=lambda obj, data: None,
-                        data={}):
-        """Traversal data and execute modifier fonction if predicate
-        true
-
-        Args:
-            predicate: Function predicate, take current obj and data as input
-            modifier: Function modifier, take current obj and data as input
-
-        Returns:
-            Nothing
-        """
-        for tab in self._tabs_list:
-            for el in self._tabs[tab]:
-                el._data_traversal(predicate, modifier, data)
-
     ################
     # MODEL METHOD #
     ################

src/Solver/RubarBE.py

@@ -133,7 +133,7 @@ class Rubar3(CommandLineSolver):
 
     def log_file(self):
         name = self._study.name
-        return f"geomac-i.{name}"
+        return f"{name}"
 
     def export(self, study, repertory, qlog=None):
         self._study = study

src/View/Scenarios/ContextMenu.py

@@ -57,23 +57,14 @@ class DefaultMenu(AbstractMenu):
 class ScenarioMenu(AbstractMenu):
     def run(self):
         item = self._items[0]
-        current_scenario = item.graph._study.status.scenario.id
 
         select = self._menu.addAction(self._trad["menu_select_scenario"])
-        duplicate = None
-        delete = None
-
         if item.scenario.id != 0:
             delete = self._menu.addAction(self._trad["menu_del_scenario"])
-            if item.scenario.id == current_scenario:
-                duplicate = self._menu.addAction(
-                    self._trad["menu_dup_scenario"]
-                )
 
         action = self._exec()
         if action == select:
             self._parent.select_scenario(item)
-        elif action == delete:
-            self._parent.delete_scenario(item)
-        elif action == duplicate:
-            self._parent.duplicate_scenario(item)
+        elif item.scenario.id != 0:
+            if action == delete:
+                self._parent.delete_scenario(item)

src/View/Scenarios/GraphWidget.py

@@ -459,19 +459,6 @@ class GraphWidget(QGraphicsView):
         self.exec_with_waiting_window(fn, "delete_scenario")
         self.changeScenario.emit(self.sender())
 
-    def duplicate_scenario(self, item):
-        def fn():
-            self._close_other_window()
-            # self._study.save()
-            self._undo.push(
-                DuplicateScenariosCommand(
-                    self._study,
-                )
-            )
-
-        self.exec_with_waiting_window(fn, "duplicate_scenario")
-        self.changeScenario.emit(self.sender())
-
     def _close_other_window(self):
         self.parent\
             .parent\

src/View/Scenarios/UndoCommand.py

@@ -80,25 +80,6 @@ class DeleteScenariosCommand(QUndoCommand):
         self._scenario.set_as_deleted()
 
 
-class DuplicateScenariosCommand(QUndoCommand):
-    def __init__(self, study):
-        QUndoCommand.__init__(self)
-
-        self._study = study
-        self._new = None
-
-    def undo(self):
-        self._study.scenarios.delete(self._new.id)
-        self._study.reload_from_scenario(self._new.parent)
-
-    def redo(self):
-        if self._new is None:
-            self._new = self._study.duplicate_current_scenario()
-        else:
-            self._new.set_as_not_deleted()
-            self._study.reload_from_scenario(self._new)
-
-
 class SetCommand(QUndoCommand):
     def __init__(self, scenario, column, new_value):
         QUndoCommand.__init__(self)

src/View/Scenarios/translate.py

@@ -40,9 +40,6 @@ class ScenariosTranslate(MainTranslate):
         self._dict["menu_del_scenario"] = _translate(
             "Scenarios", "Delete this scenario"
         )
-        self._dict["menu_dup_scenario"] = _translate(
-            "Scenarios", "Duplicate this scenario"
-        )
 
         self._sub_dict["table_headers_scenarios"] = {
             # "id": self._dict['id'],