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

Scenario: Simplify scenario update and minor change.

scenarios
Pierre-Antoine 2025-08-22 14:14:22 +02:00
parent 76559f6af8
commit 0346080e16
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/River.py
View File

@ -547,12 +547,12 @@ class River(Graph):
data['loaded_pid'] = set() data['loaded_pid'] = set()
new._Pollutants = PollutantsList._db_load(execute, data)
new._Output_rk_adists = OutputRKAdistsList._db_load( new._Output_rk_adists = OutputRKAdistsList._db_load(
execute, data execute, data
) )
new._Pollutants = PollutantsList._db_load(execute, data)
new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load( new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load(
execute, data) execute, data)

17
src/Model/Scenario.py
View File

@ -93,21 +93,10 @@ class Scenario(SQLSubModel):
@classmethod @classmethod
def _db_update(cls, execute, version, data=None): def _db_update(cls, execute, version, data=None):
major, minor, release = version.strip().split(".") major, minor, release = version.strip().split(".")
if major == minor == "0":
if int(release) < 12:
cls._db_create(execute)
cls._db_add_default(execute)
if major == "0" and minor == "1": if major == "0" and int(minor) <= 2:
if int(release) < 2: cls._db_create(execute)
execute( cls._db_add_default(execute)
"ALTER TABLE scenario " +
"ADD COLUMN x REAL NOT NULL DEFAULT 1000"
)
execute(
f"ALTER TABLE scenario " +
"ADD COLUMN y REAL NOT NULL DEFAULT 1000"
)
return True return True