Adists: Continue to prepare scenario.

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -27,6 +27,7 @@ from tools import (
 
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
 
 logger = logging.getLogger()
 

src/Model/D90AdisTS/D90AdisTS.py

@@ -23,6 +23,7 @@ from tools import trace, timer, old_pamhyr_date_to_timestamp
 
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
 
 from Model.D90AdisTS.D90AdisTSSpec import D90AdisTSSpec
 

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -22,6 +22,7 @@ from tools import trace, timer
 
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
 
 logger = logging.getLogger()
 

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -23,6 +23,7 @@ from tools import trace, timer, old_pamhyr_date_to_timestamp
 
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
 
 from Model.DIFAdisTS.DIFAdisTSSpec import DIFAdisTSSpec
 

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -22,6 +22,7 @@ from tools import trace, timer
 
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
 
 logger = logging.getLogger()
 

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -23,6 +23,7 @@ from tools import trace, timer, old_pamhyr_date_to_timestamp
 
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
 
 from Model.InitialConditionsAdisTS.InitialConditionsAdisTSSpec \
     import ICAdisTSSpec

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -27,6 +27,7 @@ from tools import (
 
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
 
 logger = logging.getLogger()
 
@@ -195,19 +196,28 @@ class LateralContributionAdisTS(SQLSubModel):
         return new
 
     def _db_save(self, execute, data=None):
+        if not self.must_be_saved():
+            return True
 
-        execute(f"DELETE FROM lateral_contribution_adists" +
+        execute(
-                f" WHERE id = {self.id}")
+            f"DELETE FROM lateral_contribution_adists" +
-        execute(f"DELETE FROM lateral_contribution_data_adists" +
+            f" WHERE id = {self.id} " +
-                f" WHERE lc = {self.id}")
+            f"AND scenario = {self._status.scenario_id}"
+        )
+        execute(
+            f"DELETE FROM lateral_contribution_data_adists" +
+            f" WHERE lc = {self.id} " +
+            f"AND scenario = {self._status.scenario_id}"
+        )
 
         sql = (
             "INSERT INTO " +
             "lateral_contribution_adists(id, " +
-            "pollutant, edge, begin_rk, end_rk) " +
+            "pollutant, reach, begin_rk, end_rk, scenario) " +
             "VALUES (" +
             f"{self.id}, {self._pollutant}, {self.edge}, " +
             f"{self._begin_rk}, {self._end_rk}" +
+            f"{self._status.scenario_id}" +
             ")"
         )
         execute(sql)

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -27,6 +27,7 @@ from tools import (
 
 from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
+from Model.Scenario import Scenario
 
 logger = logging.getLogger()