mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-29 19:10:42 +01:00
Merge branch 'scenarios' into dev_dylan
This commit is contained in:
Dylan Jeannin committed
commit
e3020d15ba
10 files changed
+20
-70
No files matched your search
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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}"
|
||||
)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user