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

Merge branch 'scenarios' of https://gitlab.com/pamhyr/pamhyr2 into scenarios

dev_dylan
Dylan Jeannin 2026-05-27 09:35:46 +02:00
parent e573fa4197 7aa0cf4361
commit 26dc7d8761
11 changed files with 100 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,8 +70,11 @@ class Data(SQLSubModel):
def _db_update(cls, execute, version, data=None):
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:
cls._db_create(execute)
created = True
@ -250,6 +253,10 @@ 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:
cls._db_create(execute)
created = True

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

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

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

@ -72,7 +72,12 @@ class D90AdisTSSpec(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == 0 and minor < 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute)
created = True

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

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

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

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

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

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

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

@ -79,8 +79,12 @@ class ICAdisTSSpec(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == 0 and minor < 1:
if int(release) < 6:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True

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

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

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

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

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

@ -152,7 +152,11 @@ class PollutantCharacteristics(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True
@ -344,19 +348,21 @@ class Pollutants(SQLSubModel):
@data.setter
def data(self, data):
self._data = [PollutantCharacteristics(type=int(data[0]),
diametre=float(data[1]),
rho=float(data[2]),
porosity=float(data[3]),
cdc_riv=float(data[4]),
cdc_cas=float(data[5]),
apd=float(data[6]),
ac=float(data[7]),
bc=float(data[8]),
pollutant=self,
status=self._status
)
]
self._data = [
PollutantCharacteristics(
type=int(data[0]),
diametre=float(data[1]),
rho=float(data[2]),
porosity=float(data[3]),
cdc_riv=float(data[4]),
cdc_cas=float(data[5]),
apd=float(data[6]),
ac=float(data[7]),
bc=float(data[8]),
pollutant=self,
status=self._status
)
]
@classmethod
def _db_create(cls, execute, ext=""):
@ -380,7 +386,11 @@ class Pollutants(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True

34
src/View/RunSolver/Log/Window.py
View File

@ -20,7 +20,7 @@ import tempfile
import os
from queue import Queue
from tools import trace, timer
from tools import trace, timer, logger_exception
from View.Tools.PamhyrWindow import PamhyrDialog, PamhyrWindow
@ -81,25 +81,31 @@ class SolverLogFileWindow(PamhyrWindow):
self.open_on_editor)
def setup_text(self):
with open(self._file_name, "r") as f:
for line in f:
line = line.rstrip()
self.find(QTextEdit, "textEdit").append(line)
try:
with open(self._file_name, "r") as f:
for line in f:
line = line.rstrip()
self.find(QTextEdit, "textEdit").append(line)
except Exception as e:
logger_exception(e)
def revert(self):
self.find(QTextEdit, "textEdit").clear()
self.setup_text()
def open_on_editor(self):
p = QProcess(self)
try:
p = QProcess(self)
cmd = self._config.editor
cmd = cmd.replace("@file", self._file_name)
cmd = self._config.editor
cmd = cmd.replace("@file", self._file_name)
cmd = cmd.split()
exe = cmd[0]
args = cmd[1:]
cmd = cmd.split()
exe = cmd[0]
args = cmd[1:]
p.start(
exe, args,
)
p.start(
exe, args,
)
except Exception as e:
logger_exception(e)