From ae49908a425a436d3cee100c0cfe116e0d3764fe Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Tue, 12 Aug 2025 16:09:24 +0200 Subject: [PATCH] Adists: Continue to prepare scenario. --- .../BoundaryConditionAdisTS.py | 1 + src/Model/D90AdisTS/D90AdisTS.py | 1 + src/Model/D90AdisTS/D90AdisTSSpec.py | 1 + src/Model/DIFAdisTS/DIFAdisTS.py | 1 + src/Model/DIFAdisTS/DIFAdisTSSpec.py | 1 + .../InitialConditionsAdisTS.py | 1 + .../LateralContributionAdisTS.py | 20 ++++++++++++++----- src/Model/OutputRKAdists/OutputRKAdists.py | 1 + 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index 764d2c7a..10959e60 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/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() diff --git a/src/Model/D90AdisTS/D90AdisTS.py b/src/Model/D90AdisTS/D90AdisTS.py index 822abb32..c623f572 100644 --- a/src/Model/D90AdisTS/D90AdisTS.py +++ b/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 diff --git a/src/Model/D90AdisTS/D90AdisTSSpec.py b/src/Model/D90AdisTS/D90AdisTSSpec.py index f13cb072..734f4ba3 100644 --- a/src/Model/D90AdisTS/D90AdisTSSpec.py +++ b/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() diff --git a/src/Model/DIFAdisTS/DIFAdisTS.py b/src/Model/DIFAdisTS/DIFAdisTS.py index db2443e4..43dc0eb0 100644 --- a/src/Model/DIFAdisTS/DIFAdisTS.py +++ b/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 diff --git a/src/Model/DIFAdisTS/DIFAdisTSSpec.py b/src/Model/DIFAdisTS/DIFAdisTSSpec.py index a1a389d5..ac6e237b 100644 --- a/src/Model/DIFAdisTS/DIFAdisTSSpec.py +++ b/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() diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py index 93da54a9..3cd911b0 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py +++ b/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 diff --git a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py index 5d1f3905..7d28fd95 100644 --- a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py +++ b/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" + - f" WHERE id = {self.id}") - execute(f"DELETE FROM lateral_contribution_data_adists" + - f" WHERE lc = {self.id}") + execute( + f"DELETE FROM lateral_contribution_adists" + + f" WHERE id = {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) diff --git a/src/Model/OutputRKAdists/OutputRKAdists.py b/src/Model/OutputRKAdists/OutputRKAdists.py index 9b237b7c..c0310017 100644 --- a/src/Model/OutputRKAdists/OutputRKAdists.py +++ b/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()