parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adists: Scenario: Some minor fix.

scenarios
Pierre-Antoine 2025-08-13 15:03:25 +02:00
parent 4ac86b9acb
commit d7fcf62e12
12 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py
View File

@ -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"
)

2
src/Model/D90AdisTS/D90AdisTS.py
View File

@ -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

2
src/Model/DIFAdisTS/DIFAdisTS.py
View File

@ -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

12
src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py
View File

@ -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 (" +

14
src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py
View File

@ -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,7 +154,7 @@ class LateralContributionAdisTS(SQLSubModel):
loaded = data['loaded_pid']
table = execute(
"SELECT id, pollutant, edge, begin_rk, end_rk " +
"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}'"
@ -201,12 +201,12 @@ class LateralContributionAdisTS(SQLSubModel):
execute(
f"DELETE FROM lateral_contribution_adists " +
f" WHERE id = {self.id} " +
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"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)

6
src/Model/OutputRKAdists/OutputRKAdists.py
View File

@ -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)}'" +

2
src/Model/OutputRKAdists/OutputRKListAdists.py
View File

@ -40,7 +40,7 @@ class OutputRKAdistsList(PamhyrModelList):
# Delete previous data
execute(
"DELETE FROM OutputRKAdists " +
f"AND scenario = {self._status.scenario_id}"
f"WHERE scenario = {self._status.scenario_id}"
)
for sl in self._lst: