From d7fcf62e121bd469065966d418db0e33baf84225 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 13 Aug 2025 15:03:25 +0200 Subject: [PATCH] Adists: Scenario: Some minor fix. --- .../BoundaryConditionAdisTS.py | 4 ++-- .../BoundaryConditionsAdisTSList.py | 4 ++-- src/Model/D90AdisTS/D90AdisTS.py | 2 +- src/Model/D90AdisTS/D90AdisTSList.py | 2 +- src/Model/DIFAdisTS/DIFAdisTS.py | 2 +- src/Model/DIFAdisTS/DIFAdisTSList.py | 2 +- .../InitialConditionsAdisTS.py | 12 +++++------ .../InitialConditionsAdisTSList.py | 2 +- .../LateralContributionAdisTS.py | 20 +++++++++---------- .../LateralContributionsAdisTSList.py | 4 ++-- src/Model/OutputRKAdists/OutputRKAdists.py | 6 +++--- .../OutputRKAdists/OutputRKListAdists.py | 4 ++-- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index 10959e60..2a6546ea 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py @@ -95,7 +95,7 @@ class BoundaryConditionAdisTS(SQLSubModel): if int(release) < 7: cls._db_create(execute) - if major == "0" and int(minor) < 2: + elif major == "0" and int(minor) < 2: cls._db_update_to_0_2_0(execute, data) return True @@ -149,7 +149,7 @@ class BoundaryConditionAdisTS(SQLSubModel): new = [] table = execute( - "SELECT id, pollutant, type, node " + + "SELECT pamhyr_id, pollutant, type, node " + "FROM boundary_condition_adists" ) diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py index 54759aee..0bbf691a 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py +++ b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py @@ -46,11 +46,11 @@ class BoundaryConditionsAdisTSList(PamhyrModelList): def _db_save(self, execute, data=None): execute( - "DELETE FROM boundary_condition_adists" + + "DELETE FROM boundary_condition_adists " + f"WHERE scenario = {self._status.scenario_id}" ) execute( - "DELETE FROM boundary_condition_data_adists" + + "DELETE FROM boundary_condition_data_adists " + f"WHERE scenario = {self._status.scenario_id}" ) diff --git a/src/Model/D90AdisTS/D90AdisTS.py b/src/Model/D90AdisTS/D90AdisTS.py index c623f572..86b59802 100644 --- a/src/Model/D90AdisTS/D90AdisTS.py +++ b/src/Model/D90AdisTS/D90AdisTS.py @@ -72,7 +72,7 @@ class D90AdisTS(SQLSubModel): if int(release) < 6: cls._db_create(execute) - if major == "0" and int(minor) < 2: + elif major == "0" and int(minor) < 2: cls._db_update_to_0_2_0(execute, data) return True diff --git a/src/Model/D90AdisTS/D90AdisTSList.py b/src/Model/D90AdisTS/D90AdisTSList.py index 53cfb8d0..673b1e64 100644 --- a/src/Model/D90AdisTS/D90AdisTSList.py +++ b/src/Model/D90AdisTS/D90AdisTSList.py @@ -43,7 +43,7 @@ class D90AdisTSList(PamhyrModelList): def _db_save(self, execute, data=None): execute( - "DELETE FROM d90_adists" + + "DELETE FROM d90_adists " + f"WHERE scenario = {self._status.scenario_id}" ) diff --git a/src/Model/DIFAdisTS/DIFAdisTS.py b/src/Model/DIFAdisTS/DIFAdisTS.py index 43dc0eb0..b6ad0bbc 100644 --- a/src/Model/DIFAdisTS/DIFAdisTS.py +++ b/src/Model/DIFAdisTS/DIFAdisTS.py @@ -78,7 +78,7 @@ class DIFAdisTS(SQLSubModel): if int(release) < 6: cls._db_create(execute) - if major == "0" and int(minor) < 2: + elif major == "0" and int(minor) < 2: cls._db_update_to_0_2_0(execute, data) return True diff --git a/src/Model/DIFAdisTS/DIFAdisTSList.py b/src/Model/DIFAdisTS/DIFAdisTSList.py index edf30c09..cea40250 100644 --- a/src/Model/DIFAdisTS/DIFAdisTSList.py +++ b/src/Model/DIFAdisTS/DIFAdisTSList.py @@ -43,7 +43,7 @@ class DIFAdisTSList(PamhyrModelList): def _db_save(self, execute, data=None): execute( - "DELETE FROM dif_adists" + + "DELETE FROM dif_adists " + f"WHERE scenario = {self._status.scenario_id}" ) diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py index 9b8de57b..094d2807 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py @@ -82,7 +82,7 @@ class InitialConditionsAdisTS(SQLSubModel): if int(release) < 6: cls._db_create(execute) - if major == "0" and int(minor) < 2: + elif major == "0" and int(minor) < 2: cls._db_update_to_0_2_0(execute, data) return True @@ -99,8 +99,8 @@ class InitialConditionsAdisTS(SQLSubModel): execute( f"INSERT INTO {table}_tmp " + - "(pamhyr_id, pollutant, reach, begin_rk, end_rk, scenario) " + - "SELECT pamhyr_id, pollutant, edge, begin_rk, end_rk, scenario) " + + "(pamhyr_id, pollutant, name, concentration, eg, em, ed, scenario) " + + "SELECT pamhyr_id, pollutant, name, concentration, eg, em, ed, scenario) " + f"FROM {table}" ) @@ -114,8 +114,8 @@ class InitialConditionsAdisTS(SQLSubModel): new = [] table = execute( - "SELECT id, pollutant, name, concentration, eg, em, ed, " + - "enabled " + + "SELECT pamhyr_id, pollutant, name, concentration, eg, em, ed, " + + "enabled, scenario " + "FROM initial_conditions_adists" ) @@ -176,7 +176,7 @@ class InitialConditionsAdisTS(SQLSubModel): sql = ( "INSERT INTO " + "initial_conditions_adists(" + - "id, pollutant, name, concentration, " + + "pamhyr_id, pollutant, name, concentration, " + "eg, em, ed, enabled" + ") " + "VALUES (" + diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py index f1967f41..af7d65f8 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py @@ -44,7 +44,7 @@ class InitialConditionsAdisTSList(PamhyrModelList): def _db_save(self, execute, data=None): execute( - "DELETE FROM initial_conditions_adists" + + "DELETE FROM initial_conditions_adists " + f"WHERE scenario = {self._status.scenario_id}" ) diff --git a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py index 7d28fd95..cfd02aa5 100644 --- a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py +++ b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py @@ -97,7 +97,7 @@ class LateralContributionAdisTS(SQLSubModel): if int(release) < 7: cls._db_create(execute) - if major == "0" and int(minor) < 2: + elif major == "0" and int(minor) < 2: cls._db_update_to_0_2_0(execute, data) return True @@ -154,8 +154,8 @@ class LateralContributionAdisTS(SQLSubModel): loaded = data['loaded_pid'] table = execute( - "SELECT id, pollutant, edge, begin_rk, end_rk " + - "FROM lateral_contribution_adists" + + "SELECT pamhyr_id, pollutant, reach, begin_rk, end_rk " + + "FROM lateral_contribution_adists " + f"WHERE scenario = {scenario.id} " + f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " ) @@ -173,8 +173,8 @@ class LateralContributionAdisTS(SQLSubModel): lca.end_rk = row[4] values = execute( - "SELECT data0," + - " data1 FROM lateral_contribution_data_adists " + + "SELECT data0, data1 " + + "FROM lateral_contribution_data_adists " + f"WHERE scenario = {scenario.id} " + f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " f"AND lca = '{lca.id}'" @@ -200,13 +200,13 @@ class LateralContributionAdisTS(SQLSubModel): return True execute( - f"DELETE FROM lateral_contribution_adists" + - f" WHERE id = {self.id} " + + f"DELETE FROM lateral_contribution_adists " + + f"WHERE pamhyr_id = {self.id} " + f"AND scenario = {self._status.scenario_id}" ) execute( - f"DELETE FROM lateral_contribution_data_adists" + - f" WHERE lc = {self.id} " + + f"DELETE FROM lateral_contribution_data_adists " + + f"WHERE lca = {self.id} " + f"AND scenario = {self._status.scenario_id}" ) @@ -228,7 +228,7 @@ class LateralContributionAdisTS(SQLSubModel): sql = ( "INSERT INTO " + - "lateral_contribution_data_adists(data0, data1, lc) " + + "lateral_contribution_data_adists(data0, data1, lca) " + f"VALUES ('{data0}', {data1}, {self.id})" ) execute(sql) diff --git a/src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py b/src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py index ac51add3..c04dbfac 100644 --- a/src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py +++ b/src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py @@ -46,11 +46,11 @@ class LateralContributionsAdisTSList(PamhyrModelList): def _db_save(self, execute, data=None): execute( - "DELETE FROM lateral_contribution_adists" + + "DELETE FROM lateral_contribution_adists " + f"WHERE scenario = {self._status.scenario_id}" ) execute( - "DELETE FROM lateral_contribution_data_adists" + + "DELETE FROM lateral_contribution_data_adists " + f"WHERE scenario = {self._status.scenario_id}" ) diff --git a/src/Model/OutputRKAdists/OutputRKAdists.py b/src/Model/OutputRKAdists/OutputRKAdists.py index c0310017..71148f83 100644 --- a/src/Model/OutputRKAdists/OutputRKAdists.py +++ b/src/Model/OutputRKAdists/OutputRKAdists.py @@ -100,7 +100,7 @@ class OutputRKAdists(SQLSubModel): if int(release) < 7: cls._db_create(execute) - if major == "0" and int(minor) <= 2: + elif major == "0" and int(minor) <= 2: if int(release) <= 0: cls._db_update_to_0_2_0(execute, data) @@ -137,7 +137,7 @@ class OutputRKAdists(SQLSubModel): status = data["status"] table = execute( - "SELECT id, reach, rk, title " + + "SELECT pamhyr_id, reach, rk, title " + f"FROM OutputRKAdists" ) @@ -164,7 +164,7 @@ class OutputRKAdists(SQLSubModel): sql = ( "INSERT INTO " + - "OutputRKAdists(id, reach, rk, title) " + + "OutputRKAdists(pamhyr_id, reach, rk, title) " + "VALUES (" + f"{self.id}, {self._reach}, {self._rk}, " + f"'{self._db_format(self._title)}'" + diff --git a/src/Model/OutputRKAdists/OutputRKListAdists.py b/src/Model/OutputRKAdists/OutputRKListAdists.py index 3f348ca5..244dc63c 100644 --- a/src/Model/OutputRKAdists/OutputRKListAdists.py +++ b/src/Model/OutputRKAdists/OutputRKListAdists.py @@ -39,8 +39,8 @@ class OutputRKAdistsList(PamhyrModelList): # Delete previous data execute( - "DELETE FROM OutputRKAdists" + - f"AND scenario = {self._status.scenario_id}" + "DELETE FROM OutputRKAdists " + + f"WHERE scenario = {self._status.scenario_id}" ) for sl in self._lst: