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

Merge branch 'scenarios' into dev_dylan

dev_dylan
Dylan Jeannin 2026-05-28 11:56:00 +02:00
parent 83e0ecbdc7 7e080767da
commit e3020d15ba
10 changed files with 20 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,11 +71,7 @@ class Data(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
if int(release) < 11:
cls._db_create(execute)
created = True
@ -253,11 +249,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
if int(release) < 11:
cls._db_create(execute)
created = True

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

@ -74,11 +74,7 @@ class D90AdisTS(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
if int(release) < 11:
cls._db_create(execute)
created = True

18
src/Model/D90AdisTS/D90AdisTSSpec.py
View File

@ -73,11 +73,7 @@ class D90AdisTSSpec(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
if int(release) < 11:
cls._db_create(execute)
created = True
@ -99,8 +95,10 @@ class D90AdisTSSpec(SQLSubModel):
execute(
f"INSERT INTO {table_new}_tmp " +
"(pamhyr_id, name, d90, enabled, scenario) " +
"SELECT pamhyr_id, name, d90, enabled, scenario " +
"(pamhyr_id, d90_default, name, reach, " +
" start_rk, end_rk, d90, enabled, scenario) " +
"SELECT pamhyr_id, d90_default, name, reach, " +
" start_rk, end_rk, d90, enabled, scenario " +
f"FROM {table}"
)
@ -113,7 +111,7 @@ class D90AdisTSSpec(SQLSubModel):
def _db_update_to_0_2_0_set_d90_pid(cls, execute, data):
pid_d90 = data["id2pid"]["d90_adists"]
els = execute(
f"SELECT pamhyr_id, d90 FROM d90_adists_spec"
f"SELECT pamhyr_id, d90_default FROM d90_adists_spec"
)
for row in els:
@ -125,8 +123,8 @@ class D90AdisTSSpec(SQLSubModel):
continue
execute(
f"UPDATE d90_adists_spec" +
f"SET d90 = {pid_d90[d90_id]} " +
f"UPDATE d90_adists_spec " +
f"SET d90_default = {pid_d90[d90_id]} " +
f"WHERE pamhyr_id = {pid}"
)

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

@ -80,11 +80,7 @@ class DIFAdisTS(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
if int(release) < 11:
cls._db_create(execute)
created = True

6
src/Model/DIFAdisTS/DIFAdisTSSpec.py
View File

@ -84,11 +84,7 @@ class DIFAdisTSSpec(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
if int(release) < 11:
cls._db_create(execute)
created = True

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

@ -82,11 +82,7 @@ class InitialConditionsAdisTS(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
if int(release) < 11:
cls._db_create(execute)
created = True

6
src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py
View File

@ -80,11 +80,7 @@ class ICAdisTSSpec(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
if int(release) < 11:
cls._db_create(execute)
created = True

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

@ -70,11 +70,7 @@ class Data(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
if int(release) < 11:
cls._db_create(execute)
created = True
@ -248,11 +244,7 @@ class LateralContributionAdisTS(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
if int(release) < 11:
cls._db_create(execute)
created = True

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

@ -98,11 +98,7 @@ class OutputRKAdists(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
if int(release) < 11:
cls._db_create(execute)
created = True

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

@ -141,11 +141,7 @@ class PollutantCharacteristics(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
if int(release) < 11:
cls._db_create(execute)
created = True
@ -375,11 +371,7 @@ class Pollutants(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
if int(release) < 11:
cls._db_create(execute)
created = True