mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-29 19:10:42 +01:00
Compare commits
109
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f43d108871 | ||
|
|
33a2107876 | ||
|
|
7103fdcb46 | ||
|
|
ace85ccb40 | ||
|
|
ec81a998cb | ||
|
|
a18accb404 | ||
|
|
657f54ff91 | ||
|
|
bf2d3ae7a9 | ||
|
|
d2f03415c8 | ||
|
|
69371b5949 | ||
|
|
bbd8f7f832 | ||
|
|
17792ec995 | ||
|
|
7eb39e5896 | ||
|
|
28cc88b4b8 | ||
|
|
c9925cd03c | ||
|
|
40f9465929 | ||
|
|
359805b713 | ||
|
|
31565b9170 | ||
|
|
9c2a0541df | ||
|
|
38d7d587fa | ||
|
|
f19ab9455a | ||
|
|
cadffe40d6 | ||
|
|
5a195e2822 | ||
|
|
63592b91a9 | ||
|
|
88345c58a7 | ||
|
|
7124b2b61c | ||
|
|
f93e6a7d7c | ||
|
|
5d46401b85 | ||
|
|
97867080d9 | ||
|
|
93a4b44143 | ||
|
|
5e3e5628d2 | ||
|
|
4a6349cd9c | ||
|
|
e9c998fec8 | ||
|
|
290b8918fc | ||
|
|
0e6de5d0f0 | ||
|
|
98d30a326e | ||
|
|
5f64499984 | ||
|
|
6e32c740ae | ||
|
|
e0721715d0 | ||
|
|
10edc00973 | ||
|
|
f8829ce82c | ||
|
|
ac91b712a3 | ||
|
|
4bccbbac33 | ||
|
|
5c8b7290ba | ||
|
|
288713ce5b | ||
|
|
ff3b5a320c | ||
|
|
a2e0f6a517 | ||
|
|
7356e5dd30 | ||
|
|
933c6c1952 | ||
|
|
d8fd4488e2 | ||
|
|
fef2a2e979 | ||
|
|
f001dffb68 | ||
|
|
2818644b7f | ||
|
|
86d93fd702 | ||
|
|
593cc0c91b | ||
|
|
32a316589b | ||
|
|
d4bc9bdf75 | ||
|
|
3325ba935b | ||
|
|
345f24996f | ||
|
|
4040b2456c | ||
|
|
8e77d31a5a | ||
|
|
6e029beafc | ||
|
|
f5a7cd5984 | ||
|
|
d4d5e26a2b | ||
|
|
92990948ad | ||
|
|
bf6d40f398 | ||
|
|
03299db99a | ||
|
|
a0886d900e | ||
|
|
97fe038d9b | ||
|
|
58e3da8942 | ||
|
|
b7c3793a66 | ||
|
|
2498466a51 | ||
|
|
ef36eba039 | ||
|
|
c40e28ed0f | ||
|
|
b21846a513 | ||
|
|
3532f75c2b | ||
|
|
6c59919972 | ||
|
|
77d56b8bec | ||
|
|
7ef7bc13dc | ||
|
|
a1d85274b9 | ||
|
|
e7b9bc92a2 | ||
|
|
7d8e414fe2 | ||
|
|
476bcc9c55 | ||
|
|
ae006f52f4 | ||
|
|
3583a93ae0 | ||
|
|
212a00a43c | ||
|
|
e5dbba362a | ||
|
|
bdc09addfa | ||
|
|
51b3987a4a | ||
|
|
e7290fa81b | ||
|
|
b5432498c6 | ||
|
|
807592eab2 | ||
|
|
394c0779fc | ||
|
|
5b3f777100 | ||
|
|
8b36905842 | ||
|
|
b203e8e062 | ||
|
|
4d4df1bde2 | ||
|
|
876780a349 | ||
|
|
3b83377f3c | ||
|
|
e64c45b621 | ||
|
|
70dae9ab1b | ||
|
|
0bb3c5bc65 | ||
|
|
54f5c7c548 | ||
|
|
56217186ff | ||
|
|
82fb2bcc48 | ||
|
|
6dc42b637a | ||
|
|
e6d12713e3 | ||
|
|
9456cf32fc | ||
|
|
9b1fb4e7d2 |
No files matched your search
@@ -1069,6 +1069,12 @@ gitlab-ci.
|
||||
sudo python3 -m pip install pyinstaller
|
||||
#+end_src
|
||||
|
||||
In addition, you must install Glab[fn:glab] to allow the runner to
|
||||
proceed with the publication.
|
||||
|
||||
[fn:glab] The Gitlab cli releases page:
|
||||
https://gitlab.com/gitlab-org/cli/-/releases
|
||||
|
||||
*** Windows (Wine) {{{windows}}}
|
||||
|
||||
The ci-runner environment for Wine need at least wine version 8, let
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 127 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
@@ -4,7 +4,7 @@ PyQt5-sip==12.18.0
|
||||
PyQtWebEngine==5.15.6
|
||||
QScintilla>=2.14.1
|
||||
pyqtgraph>=0.12.1
|
||||
matplotlib==3.8.3
|
||||
matplotlib==3.10.8
|
||||
numpy>=1.24.2
|
||||
colorama>=0.4.3
|
||||
pyinstaller>=5.11.0
|
||||
@@ -14,3 +14,4 @@ platformdirs>=4.2.0
|
||||
pyshp>=2.3.1
|
||||
rasterio==1.3.11
|
||||
#fortranformat==2.0.3
|
||||
psutil>=7.2.2
|
||||
+1
-1
@@ -20,4 +20,4 @@
|
||||
"python-pyqtgraph" "python-qscintilla"
|
||||
"python-numpy@1" "python-shapely" "python-pyshp"
|
||||
"python-matplotlib" "python-colorama"
|
||||
"python-rasterio"))
|
||||
"python-rasterio" "python-psutil"))
|
||||
+2
-2
@@ -4,7 +4,7 @@ PyQt5-sip==12.18.0
|
||||
#PyQtWebEngine==5.15.6
|
||||
QScintilla>=2.14.1
|
||||
pyqtgraph>=0.12.1
|
||||
matplotlib==3.8.3
|
||||
matplotlib==3.10.8
|
||||
numpy>=1.24.2
|
||||
colorama>=0.4.3
|
||||
pyinstaller>=5.11.0
|
||||
@@ -14,4 +14,4 @@ platformdirs>=4.2.0
|
||||
pyshp>=2.3.1
|
||||
rasterio==1.3.11
|
||||
#fortranformat==2.0.3
|
||||
|
||||
psutil>=7.2.2
|
||||
@@ -0,0 +1,307 @@
|
||||
# Distribution.py -- Pamhyr
|
||||
# Copyright (C) 2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import struct
|
||||
import logging
|
||||
import itertools
|
||||
import numpy as np
|
||||
|
||||
from tools import logger_exception
|
||||
|
||||
from Model.Except import NotImplementedMethodeError
|
||||
from Model.Tools.PamhyrDB import SQLSubModel
|
||||
from Model.Scenario import Scenario
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class Distribution(SQLSubModel):
|
||||
_sub_classes = []
|
||||
|
||||
def __init__(self, id: int = -1,
|
||||
name: str = "", script: str = "",
|
||||
status=None):
|
||||
super(Distribution, self).__init__(
|
||||
id=id, status=status,
|
||||
owner_scenario=0
|
||||
)
|
||||
|
||||
self._name = name
|
||||
self._type = "generic"
|
||||
self._script = script
|
||||
self._labels = []
|
||||
self._default_values = []
|
||||
self._params_checkers = []
|
||||
self._params_tips = []
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self._name
|
||||
|
||||
@property
|
||||
def labels(self):
|
||||
return self._labels
|
||||
|
||||
@property
|
||||
def default_values(self):
|
||||
return self._default_values
|
||||
|
||||
@classmethod
|
||||
def _db_create(cls, execute, ext=""):
|
||||
execute(f"""
|
||||
CREATE TABLE ensemble_distribution{ext} (
|
||||
{cls.create_db_add_pamhyr_id()},
|
||||
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
name TEXT NOT NULL,
|
||||
script TEXT NOT NULL,
|
||||
PRIMARY KEY(pamhyr_id)
|
||||
)
|
||||
""")
|
||||
|
||||
if ext == "_tmp":
|
||||
return True
|
||||
|
||||
return cls._create_submodel(execute)
|
||||
|
||||
@classmethod
|
||||
def _db_update(cls, execute, version, data=None):
|
||||
major, minor, release = version.strip().split(".")
|
||||
if major == "0" and int(minor) < 2:
|
||||
cls._db_create(execute)
|
||||
elif major == "0" and int(minor) == 2:
|
||||
if int(release) < 8:
|
||||
cls._db_create(execute)
|
||||
|
||||
return cls._update_submodel(execute, version, data)
|
||||
|
||||
@classmethod
|
||||
def _db_load(cls, execute, data=None):
|
||||
new = []
|
||||
scenario = data["scenario"]
|
||||
loaded = data['loaded_pid']
|
||||
|
||||
table = execute(
|
||||
"SELECT pamhyr_id, deleted, name, script " +
|
||||
"FROM ensemble_distribution " +
|
||||
f"WHERE pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
|
||||
)
|
||||
|
||||
for row in table:
|
||||
it = iter(row)
|
||||
|
||||
id = next(it)
|
||||
deleted = (next(it) == 1)
|
||||
name = next(it)
|
||||
script = next(it)
|
||||
|
||||
new_distribution = cls(
|
||||
id, name=name, script=script,
|
||||
status=data["status"]
|
||||
)
|
||||
if deleted:
|
||||
new_distribution.set_as_deleted()
|
||||
|
||||
loaded.add(id)
|
||||
new.append(new_distribution)
|
||||
|
||||
return new
|
||||
|
||||
def _db_save(self, execute, data=None):
|
||||
# Only save custom distribution
|
||||
if self._type != "custom":
|
||||
return True
|
||||
|
||||
if not self.must_be_saved():
|
||||
return True
|
||||
|
||||
execute(
|
||||
"INSERT INTO " +
|
||||
"ensemble_distribution(pamhyr_id, deleted, " +
|
||||
" name, script) " +
|
||||
"VALUES (?, ?, ?, ?)",
|
||||
self.pamhyr_id, self.is_deleted(),
|
||||
self._name, self._script
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
def _data_traversal(self,
|
||||
predicate=lambda obj, data: True,
|
||||
modifier=lambda obj, data: None,
|
||||
data={}):
|
||||
if predicate(self, data):
|
||||
modifier(self, data)
|
||||
|
||||
def is_valid_parameters(self, parameters):
|
||||
valid = True
|
||||
tips = []
|
||||
|
||||
for i, checker in enumerate(self._params_checkers):
|
||||
ok = checker(parameters)
|
||||
if not ok:
|
||||
tips.append(self._params_tips[i])
|
||||
valid = False
|
||||
|
||||
return (valid, tips)
|
||||
|
||||
def check_params(self, params):
|
||||
return True
|
||||
|
||||
def random(self, r):
|
||||
raise NotImplementedMethodeError(cls, cls._load)
|
||||
|
||||
|
||||
###############################
|
||||
# DISTRIBUTION IMPLEMENTATION #
|
||||
###############################
|
||||
|
||||
class Uniform(Distribution):
|
||||
_sub_classes = []
|
||||
|
||||
def __init__(self, id: int = -1,
|
||||
name: str = "uniform", script: str = "",
|
||||
status=None):
|
||||
super(Uniform, self).__init__(
|
||||
id=id, status=status,
|
||||
name=name, script=script
|
||||
)
|
||||
|
||||
self._labels = ["low", "high"]
|
||||
self._default_values = [20.0, 40.0]
|
||||
self._params_checkers = [self.check_params, self.check_params]
|
||||
self._params_tips = ["uniform_low_tips", "uniform_high_tips"]
|
||||
|
||||
def check_params(self, params):
|
||||
return (params[0] < params[1])
|
||||
|
||||
def random(self, params, nb):
|
||||
lst = params.copy()
|
||||
lst.append(nb)
|
||||
|
||||
return np.random.uniform(*lst)
|
||||
|
||||
|
||||
class Normal(Distribution):
|
||||
_sub_classes = []
|
||||
|
||||
def __init__(self, id: int = -1,
|
||||
name: str = "normal", script: str = "",
|
||||
status=None):
|
||||
super(Normal, self).__init__(
|
||||
id=id, status=status,
|
||||
name=name, script=script
|
||||
)
|
||||
|
||||
self._labels = ["loc", "scale"]
|
||||
self._default_values = [30.0, 5.0]
|
||||
self._params_checkers = [self.check_params, self.check_scale]
|
||||
self._params_tips = ["normal_loc_tips", "normal_scale_tips"]
|
||||
|
||||
def check_scale(self, params):
|
||||
return 0 <= params[1]
|
||||
|
||||
def random(self, params, nb):
|
||||
lst = params.copy()
|
||||
lst.append(nb)
|
||||
|
||||
return np.random.normal(*lst)
|
||||
|
||||
|
||||
class Binomial(Distribution):
|
||||
_sub_classes = []
|
||||
|
||||
def __init__(self, id: int = -1,
|
||||
name: str = "binomial", script: str = "",
|
||||
status=None):
|
||||
super(Binomial, self).__init__(
|
||||
id=id, status=status,
|
||||
name=name, script=script
|
||||
)
|
||||
|
||||
self._labels = ["binomial_n", "binomial_p"]
|
||||
self._default_values = [100.0, 0.3]
|
||||
self._params_checkers = [self.check_n, self.check_p]
|
||||
self._params_tips = ["binomial_n_tips", "binomial_p_tips"]
|
||||
|
||||
def check_n(self, params):
|
||||
n = params[0]
|
||||
return (0 <= n) and (n == round(n))
|
||||
|
||||
def check_p(self, params):
|
||||
p = params[1]
|
||||
return 0 <= p <= 1
|
||||
|
||||
def random(self, params, nb):
|
||||
lst = params.copy()
|
||||
lst.append(nb)
|
||||
|
||||
return np.random.binomial(*lst)
|
||||
|
||||
|
||||
class Poisson(Distribution):
|
||||
_sub_classes = []
|
||||
|
||||
def __init__(self, id: int = -1,
|
||||
name: str = "poisson", script: str = "",
|
||||
status=None):
|
||||
super(Poisson, self).__init__(
|
||||
id=id, status=status,
|
||||
name=name, script=script
|
||||
)
|
||||
|
||||
self._labels = ["poisson_lam"]
|
||||
self._default_values = [5.0]
|
||||
self._params_checkers = [self.check_lam]
|
||||
self._params_tips = ["poisson_lam_tips"]
|
||||
|
||||
def check_lam(self, params):
|
||||
lam = params[0]
|
||||
return 0 <= lam
|
||||
|
||||
def random(self, params, nb):
|
||||
lst = params.copy()
|
||||
lst.append(nb)
|
||||
|
||||
return np.random.poisson(*lst)
|
||||
|
||||
|
||||
class Custom(Distribution):
|
||||
_sub_classes = []
|
||||
|
||||
def __init__(self, id: int = -1,
|
||||
name: str = "", script: str = "",
|
||||
status=None):
|
||||
super(Custom, self).__init__(
|
||||
id=id, status=status,
|
||||
name=name, script=script
|
||||
)
|
||||
|
||||
self._labels = ["custom"]
|
||||
self._type = "custom"
|
||||
self._default_values = [""]
|
||||
self._params_checkers = [self.check_params]
|
||||
self._params_tips = ["custom_params_tips"]
|
||||
|
||||
def random(self, params, nb):
|
||||
try:
|
||||
# Run script to (re)define the sample distribution
|
||||
f = eval(self._script)
|
||||
return f(params, nb)
|
||||
except Exception as e:
|
||||
logger_exception(e)
|
||||
return None # TODO: Raise helpful exception
|
||||
@@ -0,0 +1,62 @@
|
||||
# DistributionList.py -- Pamhyr
|
||||
# Copyright (C) 2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from tools import trace, timer
|
||||
|
||||
from Model.Tools.PamhyrListExt import PamhyrModelList
|
||||
from Model.Ensembles.Distribution import *
|
||||
|
||||
|
||||
class DistributionList(PamhyrModelList):
|
||||
_sub_classes = [Distribution]
|
||||
|
||||
@classmethod
|
||||
def _db_load(cls, execute, data=None):
|
||||
new = cls(status=data['status'])
|
||||
|
||||
# Default distributions
|
||||
d = {"status": data['status']}
|
||||
new._lst = [
|
||||
Uniform(**d),
|
||||
Normal(**d),
|
||||
Binomial(**d),
|
||||
Poisson(**d),
|
||||
]
|
||||
|
||||
# DB custom distributions
|
||||
new._lst += Distribution._db_load(
|
||||
execute, data
|
||||
)
|
||||
|
||||
return new
|
||||
|
||||
def _db_save(self, execute, data={}):
|
||||
execute(
|
||||
"DELETE FROM ensemble_distribution"
|
||||
)
|
||||
|
||||
for fun in self._lst:
|
||||
fun._db_save(execute, data)
|
||||
|
||||
return True
|
||||
|
||||
def new(self, index):
|
||||
r = Custom(status=self._status)
|
||||
self._lst.insert(index, r)
|
||||
self._status.modified()
|
||||
return r
|
||||
@@ -0,0 +1,279 @@
|
||||
# Ensemble.py -- Pamhyr
|
||||
# Copyright (C) 2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import struct
|
||||
import logging
|
||||
import itertools
|
||||
|
||||
import numpy as np
|
||||
|
||||
from Model.Tools.PamhyrDB import SQLSubModel
|
||||
from Model.Scenario import Scenario
|
||||
from Model.Ensembles.Distribution import Uniform
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class Ensemble(SQLSubModel):
|
||||
_sub_classes = []
|
||||
|
||||
def __init__(self, id: int = -1, name: str = "",
|
||||
distribution=None, params=[0., 100.],
|
||||
data_type=None, target_data=None,
|
||||
status=None, owner_scenario=-1):
|
||||
super(Ensemble, self).__init__(
|
||||
id=id, status=status,
|
||||
owner_scenario=owner_scenario
|
||||
)
|
||||
|
||||
self._name = name
|
||||
self._data_type = data_type
|
||||
self._distribution = distribution
|
||||
self._params = params
|
||||
self._target_data = target_data
|
||||
|
||||
@classmethod
|
||||
def _db_create(cls, execute, ext=""):
|
||||
execute(f"""
|
||||
CREATE TABLE ensemble{ext} (
|
||||
{cls.create_db_add_pamhyr_id()},
|
||||
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
name TEXT NOT NULL,
|
||||
type VARCHAR(8) NOT NULL,
|
||||
distribution INTEGER NOT NULL,
|
||||
distribution_name VARCHAR(32) NOT NULL,
|
||||
params BLOB NOT NULL,
|
||||
params_len INTEGER NOT NULL,
|
||||
data_pid INTEGER NOT NULL,
|
||||
{Scenario.create_db_add_scenario()},
|
||||
{Scenario.create_db_add_scenario_fk()},
|
||||
PRIMARY KEY(pamhyr_id, scenario)
|
||||
)
|
||||
""")
|
||||
|
||||
if ext == "_tmp":
|
||||
return True
|
||||
|
||||
return cls._create_submodel(execute)
|
||||
|
||||
@classmethod
|
||||
def _db_update(cls, execute, version, data=None):
|
||||
major, minor, release = version.strip().split(".")
|
||||
if major == "0" and int(minor) < 2:
|
||||
cls._db_create(execute)
|
||||
elif major == "0" and int(minor) == 2:
|
||||
if int(release) < 8:
|
||||
cls._db_create(execute)
|
||||
|
||||
return cls._update_submodel(execute, version, data)
|
||||
|
||||
@classmethod
|
||||
def _db_load(cls, execute, data=None):
|
||||
new = []
|
||||
scenario = data["scenario"]
|
||||
distributions = data["ens_distributions"]
|
||||
stricklers = data["stricklers"]
|
||||
loaded = data['loaded_pid']
|
||||
|
||||
table = execute(
|
||||
"SELECT pamhyr_id, deleted, name, type, " +
|
||||
"distribution, distribution_name, params, params_len, data_pid, " +
|
||||
"scenario " +
|
||||
"FROM ensemble " +
|
||||
f"WHERE scenario = {scenario.id} " +
|
||||
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
|
||||
)
|
||||
|
||||
for row in table:
|
||||
it = iter(row)
|
||||
|
||||
id = next(it)
|
||||
deleted = (next(it) == 1)
|
||||
name = next(it)
|
||||
data_type = next(it)
|
||||
fid = next(it)
|
||||
fname = next(it)
|
||||
params = next(it)
|
||||
params_len = next(it)
|
||||
data_pid = next(it)
|
||||
owner_scenario = next(it)
|
||||
|
||||
def fn(f): return f._name == fname
|
||||
if fid != -1:
|
||||
def fn(f): return f._pamhyr_id == fid
|
||||
|
||||
distribution = next(
|
||||
filter(fn, distributions.lst),
|
||||
None
|
||||
)
|
||||
|
||||
target_data = next(
|
||||
filter(
|
||||
lambda s: s._pamhyr_id == data_pid,
|
||||
stricklers.lst
|
||||
),
|
||||
None
|
||||
)
|
||||
|
||||
rdata = list(cls._decode_params(params, params_len))
|
||||
|
||||
new_ensemble = cls(
|
||||
id, name=name,
|
||||
distribution=distribution,
|
||||
params=rdata,
|
||||
data_type=data_type,
|
||||
target_data=target_data,
|
||||
status=data["status"],
|
||||
owner_scenario=owner_scenario
|
||||
)
|
||||
if deleted:
|
||||
new_ensemble.set_as_deleted()
|
||||
|
||||
loaded.add(id)
|
||||
new.append(new_ensemble)
|
||||
|
||||
return new
|
||||
|
||||
def _db_save(self, execute, data=None):
|
||||
if not self.must_be_saved():
|
||||
return True
|
||||
|
||||
execute(
|
||||
"DELETE FROM ensemble " +
|
||||
f"WHERE pamhyr_id = {self.pamhyr_id} " +
|
||||
f"AND scenario = {self._status.scenario_id}"
|
||||
)
|
||||
|
||||
bparams, length = self._encode_params()
|
||||
|
||||
if self._distribution is None:
|
||||
fid = -1
|
||||
fname = "NULL"
|
||||
else:
|
||||
fid = self._distribution._pamhyr_id
|
||||
fname = self._distribution._name
|
||||
|
||||
if self._distribution._type == "generic":
|
||||
fid = -1
|
||||
|
||||
data_pid = -1
|
||||
if self._target_data is not None:
|
||||
data_pid = self._target_data._pamhyr_id
|
||||
|
||||
execute(
|
||||
"INSERT INTO " +
|
||||
"ensemble(pamhyr_id, deleted, name, type, " +
|
||||
" distribution, distribution_name, params, params_len, " +
|
||||
" data_pid, scenario) " +
|
||||
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
self.pamhyr_id, self.is_deleted(),
|
||||
self._name, self._data_type,
|
||||
fid, fname, bparams, length,
|
||||
data_pid, self._status.scenario_id
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
def _encode_params(self):
|
||||
length = len(self._params)
|
||||
data_format = ">" + ''.join(itertools.repeat("d", length))
|
||||
|
||||
return struct.pack(data_format, *self._params), length
|
||||
|
||||
@classmethod
|
||||
def _decode_params(cls, bparams, length):
|
||||
data_format = ">" + ''.join(itertools.repeat("d", length))
|
||||
|
||||
return struct.unpack(data_format, bparams)
|
||||
|
||||
def random(self, nb):
|
||||
return np.nditer(
|
||||
self._distribution.random(
|
||||
self._params, nb
|
||||
)
|
||||
)
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self._name
|
||||
|
||||
@name.setter
|
||||
def name(self, name):
|
||||
self._name = name
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
def distribution(self):
|
||||
return self._distribution
|
||||
|
||||
@distribution.setter
|
||||
def distribution(self, distribution):
|
||||
self._distribution = distribution
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
def params(self):
|
||||
return self._params
|
||||
|
||||
@params.setter
|
||||
def params(self, params):
|
||||
self._params = params
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
def data_type(self):
|
||||
return self._data_type
|
||||
|
||||
@data_type.setter
|
||||
def data_type(self, data_type):
|
||||
self._data_type = data_type
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
def target_data(self):
|
||||
return self._target_data
|
||||
|
||||
@target_data.setter
|
||||
def target_data(self, target_data):
|
||||
self._target_data = target_data
|
||||
self._status.modified()
|
||||
|
||||
def get_data_dict(self, use_ids=False):
|
||||
target_data = self.target_data
|
||||
distribution = self.distribution
|
||||
|
||||
if use_ids:
|
||||
if self.target_data:
|
||||
target_data = self.target_data.pamhyr_id
|
||||
if self.distribution:
|
||||
distribution = self.distribution.name
|
||||
|
||||
return {
|
||||
"name": self.name,
|
||||
"data_type": self.data_type,
|
||||
"target_data": target_data,
|
||||
"distribution": distribution,
|
||||
"params": self.params,
|
||||
}
|
||||
|
||||
def set_data_dict(self, data):
|
||||
self.name = data["name"]
|
||||
self.data_type = data["data_type"]
|
||||
self.target_data = data["target_data"]
|
||||
self.distribution = data["distribution"]
|
||||
self.params = data["params"]
|
||||
@@ -0,0 +1,62 @@
|
||||
# EnsembleList.py -- Pamhyr
|
||||
# Copyright (C) 2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from tools import trace, timer
|
||||
|
||||
from Model.Tools.PamhyrListExt import PamhyrModelList
|
||||
from Model.Ensembles.Ensemble import Ensemble
|
||||
|
||||
|
||||
class EnsembleList(PamhyrModelList):
|
||||
_sub_classes = [Ensemble]
|
||||
|
||||
@classmethod
|
||||
def _db_load(cls, execute, data=None):
|
||||
new = cls(status=data['status'])
|
||||
|
||||
new._lst = Ensemble._db_load(
|
||||
execute, data
|
||||
)
|
||||
|
||||
return new
|
||||
|
||||
def _db_save(self, execute, data=None):
|
||||
execute(
|
||||
"DELETE FROM ensemble " +
|
||||
f"WHERE scenario = {self._status.scenario_id}"
|
||||
)
|
||||
|
||||
for ens in self._lst:
|
||||
ens._db_save(execute, data=data)
|
||||
|
||||
return True
|
||||
|
||||
def new(self, index):
|
||||
r = Ensemble(status=self._status)
|
||||
self._lst.insert(index, r)
|
||||
self._status.modified()
|
||||
return r
|
||||
|
||||
def new_with_data(self, index, data):
|
||||
r = Ensemble(status=self._status)
|
||||
|
||||
r.set_data_dict(data)
|
||||
|
||||
self._lst.insert(index, r)
|
||||
self._status.modified()
|
||||
return r
|
||||
@@ -39,9 +39,9 @@ logger = logging.getLogger()
|
||||
|
||||
@dataclass
|
||||
class Tabulation:
|
||||
z: np.array([])
|
||||
A: np.array([])
|
||||
L: np.array([])
|
||||
z: np.ndarray
|
||||
A: np.ndarray
|
||||
L: np.ndarray
|
||||
|
||||
|
||||
class ProfileXYZ(Profile, SQLSubModel):
|
||||
@@ -158,7 +158,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||
)
|
||||
|
||||
if major == "0" and int(minor) <= 2:
|
||||
if int(release) < 9:
|
||||
if int(release) < 10:
|
||||
execute(
|
||||
"ALTER TABLE geometry_profileXYZ " +
|
||||
"ADD COLUMN enabled BOOLEAN NOT NULL DEFAULT TRUE"
|
||||
@@ -862,6 +862,13 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||
|
||||
return n_zones
|
||||
|
||||
def froude(self, z, v):
|
||||
return v / np.sqrt(
|
||||
9.81 * (
|
||||
self.wet_area(z) / self.wet_width(z)
|
||||
)
|
||||
)
|
||||
|
||||
@timer
|
||||
def get_all_water_limits_ac(self, z):
|
||||
"""
|
||||
|
||||
@@ -272,9 +272,9 @@ class TableData(SQLSubModel):
|
||||
|
||||
if len(shape) == 2:
|
||||
shape_x, shape_y = shape
|
||||
elif len(shape == 1):
|
||||
elif len(shape) == 1:
|
||||
shape_x, = shape
|
||||
elif len(shape == 3):
|
||||
elif len(shape) == 3:
|
||||
shape_x, shape_y, shape_z = shape
|
||||
else:
|
||||
logger.error(
|
||||
@@ -326,14 +326,14 @@ class TableData(SQLSubModel):
|
||||
if isinstance(key, tuple):
|
||||
return self._data[key[0], key[1]]
|
||||
|
||||
self._date[key]
|
||||
self._data[key]
|
||||
|
||||
|
||||
class Results(SQLSubModel):
|
||||
_sub_classes = [River, TableData, AdditionalData]
|
||||
|
||||
def __init__(self, id=-1, study=None, solver=None,
|
||||
repertory="", name="0"):
|
||||
repertory="", name="0", is_ensemble=False):
|
||||
super(Results, self).__init__(
|
||||
id=id, status=study.status,
|
||||
owner_scenario=study.status.scenario.id
|
||||
@@ -341,11 +341,14 @@ class Results(SQLSubModel):
|
||||
|
||||
self._name = name
|
||||
self._study = study
|
||||
self._river = River(self._study, self)
|
||||
# Solver readers add their own reaches; ensembles need them upfront.
|
||||
self._river = River(self._study, self, init=is_ensemble)
|
||||
|
||||
self._solver = solver
|
||||
self._repertory = repertory
|
||||
|
||||
self._is_ensemble = is_ensemble
|
||||
|
||||
self._meta_data = {
|
||||
# Keep results creation date
|
||||
"creation_date": datetime.now(),
|
||||
@@ -359,6 +362,9 @@ class Results(SQLSubModel):
|
||||
if solver is not None:
|
||||
self.set("solver_type", solver._type)
|
||||
|
||||
def is_ensemble(self):
|
||||
return self._is_ensemble
|
||||
|
||||
@property
|
||||
def date(self):
|
||||
date = self._meta_data["creation_date"]
|
||||
@@ -426,9 +432,11 @@ class Results(SQLSubModel):
|
||||
solver_name TEXT NOT NULL,
|
||||
solver_type TEXT NOT NULL,
|
||||
study_revision INTEGER NOT NULL,
|
||||
creation_data DATE NOT NULL,
|
||||
creation_date DATE NOT NULL,
|
||||
nb_timestamps INTEGER NOT NULL,
|
||||
timestamps BLOB NOT NULL,
|
||||
seed INTEGER,
|
||||
number_of_run INTEGER,
|
||||
{Scenario.create_db_add_scenario()},
|
||||
{Scenario.create_db_add_scenario_fk()},
|
||||
PRIMARY KEY(pamhyr_id, scenario)
|
||||
@@ -454,6 +462,21 @@ class Results(SQLSubModel):
|
||||
cls._db_create(execute)
|
||||
create = True
|
||||
|
||||
if major == "0" and int(minor) <= 2:
|
||||
if int(release) < 9 and not create:
|
||||
execute(
|
||||
"ALTER TABLE results ADD COLUMN " +
|
||||
"seed INTEGER"
|
||||
)
|
||||
execute(
|
||||
"ALTER TABLE results ADD COLUMN " +
|
||||
"number_of_run INTEGER"
|
||||
)
|
||||
execute(
|
||||
"ALTER TABLE results RENAME COLUMN " +
|
||||
"creation_data TO creation_date"
|
||||
)
|
||||
|
||||
return cls._update_submodel(execute, version, data)
|
||||
|
||||
@classmethod
|
||||
@@ -466,7 +489,9 @@ class Results(SQLSubModel):
|
||||
|
||||
table = execute(
|
||||
"SELECT pamhyr_id, solver_name, solver_type, " +
|
||||
"study_revision, creation_data, nb_timestamps, timestamps, " +
|
||||
"study_revision, creation_date, " +
|
||||
"seed, number_of_run, " +
|
||||
"nb_timestamps, timestamps, " +
|
||||
"scenario " +
|
||||
"FROM results " +
|
||||
f"WHERE scenario = {scenario.id}"
|
||||
@@ -486,6 +511,8 @@ class Results(SQLSubModel):
|
||||
solver_type = next(it)
|
||||
revision = next(it)
|
||||
creation_date = next(it)
|
||||
seed = next(it)
|
||||
number_of_run = next(it)
|
||||
nb_timestamps = next(it)
|
||||
timestamps_bytes = next(it)
|
||||
owner_scenario = next(it)
|
||||
@@ -496,6 +523,9 @@ class Results(SQLSubModel):
|
||||
new_results.set("solver_type", solver_type)
|
||||
new_results.set("study_revision", revision)
|
||||
new_results.set("creation_date", creation_date)
|
||||
if seed is not None:
|
||||
new_results.set("seed", seed)
|
||||
new_results.set("number_of_run", number_of_run)
|
||||
|
||||
data["result_pid"] = pid
|
||||
data["result"] = new_results
|
||||
@@ -588,15 +618,25 @@ class Results(SQLSubModel):
|
||||
ts = sorted(self.get("timestamps"))
|
||||
sf = ">" + ''.join(itertools.repeat("d", len(ts)))
|
||||
|
||||
if "seed" in self._meta_data:
|
||||
seed = int(self.get("seed"))
|
||||
number_of_run = int(self.get("number_of_run"))
|
||||
else:
|
||||
seed = None
|
||||
number_of_run = None
|
||||
|
||||
execute(
|
||||
"INSERT INTO " +
|
||||
"results (pamhyr_id, solver_name, solver_type, " +
|
||||
"study_revision, creation_data, " +
|
||||
"study_revision, creation_date, " +
|
||||
"seed, number_of_run, " +
|
||||
"nb_timestamps, timestamps, " +
|
||||
"scenario) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
"scenario) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
self._pamhyr_id, solver_name, solver_type,
|
||||
self._status.version, self.get("creation_date"),
|
||||
len(ts), struct.pack(sf, *ts), self._owner_scenario
|
||||
seed, number_of_run,
|
||||
len(ts), struct.pack(sf, *ts),
|
||||
self._owner_scenario
|
||||
)
|
||||
|
||||
data["result"] = self._pamhyr_id
|
||||
|
||||
@@ -403,7 +403,7 @@ class Reach(SQLSubModel):
|
||||
class River(SQLSubModel):
|
||||
_sub_classes = [Reach]
|
||||
|
||||
def __init__(self, study, parent):
|
||||
def __init__(self, study, parent, init=True):
|
||||
super(River, self).__init__(
|
||||
id=-1, status=study.status,
|
||||
owner_scenario=study.status.scenario.id
|
||||
@@ -414,6 +414,9 @@ class River(SQLSubModel):
|
||||
|
||||
# Dict with timestamps as key
|
||||
self._reachs = []
|
||||
if init:
|
||||
for i, _ in enumerate(self._study.river.enable_edges()):
|
||||
self.add(i)
|
||||
|
||||
def __len__(self):
|
||||
return len(self._reachs)
|
||||
@@ -453,7 +456,7 @@ class River(SQLSubModel):
|
||||
|
||||
reach.update_water_limits(
|
||||
timestamp,
|
||||
data[ind[0]:ind[1]]
|
||||
data[ind[0]:ind[1] + 1]
|
||||
)
|
||||
|
||||
@classmethod
|
||||
@@ -469,7 +472,7 @@ class River(SQLSubModel):
|
||||
study = data["study"]
|
||||
parent = data["parent"]
|
||||
|
||||
new_river = cls(study, parent)
|
||||
new_river = cls(study, parent, init=False)
|
||||
|
||||
for reach in study.river.reachs():
|
||||
data["reach"] = reach.reach
|
||||
|
||||
+10
-1
@@ -69,6 +69,7 @@ from Model.WeatherParameters.WeatherParametersList \
|
||||
import WeatherParametersList
|
||||
|
||||
from Model.GeoTIFF.GeoTIFFList import GeoTIFFList
|
||||
from Model.Ensembles.EnsembleList import EnsembleList
|
||||
from Model.Results.Results import Results
|
||||
|
||||
logger = logging.getLogger()
|
||||
@@ -487,6 +488,7 @@ class River(Graph):
|
||||
BoundaryConditionsTemperatureList,
|
||||
WeatherParametersList,
|
||||
GeoTIFFList,
|
||||
EnsembleList,
|
||||
Results
|
||||
]
|
||||
|
||||
@@ -532,6 +534,9 @@ class River(Graph):
|
||||
|
||||
self._geotiff = GeoTIFFList(status=self._status)
|
||||
|
||||
# Scenario ensemble
|
||||
self._ensembles = EnsembleList(status=self._status)
|
||||
|
||||
self._results = {}
|
||||
|
||||
@classmethod
|
||||
@@ -650,6 +655,8 @@ class River(Graph):
|
||||
|
||||
new._geotiff = GeoTIFFList._db_load(execute, data)
|
||||
|
||||
new._ensembles = EnsembleList._db_load(execute, data)
|
||||
|
||||
return new
|
||||
|
||||
def _db_load_results(self, execute, data=None):
|
||||
@@ -688,6 +695,8 @@ class River(Graph):
|
||||
|
||||
objs.append(self._geotiff)
|
||||
|
||||
objs.append(self._ensembles)
|
||||
|
||||
for solv_type in self.results:
|
||||
objs.append(self.results[solv_type])
|
||||
|
||||
@@ -766,7 +775,7 @@ class River(Graph):
|
||||
self._InitialConditionsTemperature,
|
||||
self._BoundaryConditionsTemperature,
|
||||
self._WeatherParameters,
|
||||
self._geotiff,
|
||||
self._geotiff, self._ensembles,
|
||||
]
|
||||
|
||||
for solver in self._parameters:
|
||||
|
||||
+29
-12
@@ -58,6 +58,7 @@ class Scenario(SQLSubModel):
|
||||
"initial_conditions_temperature",
|
||||
"initial_conditions_temperature_spec",
|
||||
"weather_parameters", "weather_parameters_data",
|
||||
"ensemble",
|
||||
]
|
||||
|
||||
related_tables = tables_with_deleted_column + [
|
||||
@@ -72,6 +73,7 @@ class Scenario(SQLSubModel):
|
||||
name: str = "",
|
||||
description: str = "",
|
||||
x: int = 1000.0, y: int = 1000.0,
|
||||
is_ensemble: bool = False,
|
||||
revision: int = 0,
|
||||
parent=None):
|
||||
super(Scenario, self).__init__()
|
||||
@@ -81,6 +83,7 @@ class Scenario(SQLSubModel):
|
||||
self._x, self._y = x, y
|
||||
self._name = name
|
||||
self._description = description
|
||||
self._is_ensemble = is_ensemble
|
||||
self._revision = revision
|
||||
self._parent = parent
|
||||
|
||||
@@ -103,6 +106,7 @@ class Scenario(SQLSubModel):
|
||||
y REAL NOT NULL DEFAULT 1000,
|
||||
name TEXT NOT NULL,
|
||||
description TEXT NOT NULL,
|
||||
is_ensemble BOOL DEFAULT FALSE,
|
||||
revision INTEGER NOT NULL,
|
||||
parent_id INTEGER REFERENCES scenario(id)
|
||||
)
|
||||
@@ -138,6 +142,13 @@ class Scenario(SQLSubModel):
|
||||
cls._db_create(execute)
|
||||
cls._db_add_default(execute)
|
||||
|
||||
if major == "0" and int(minor) == 2:
|
||||
if int(release) < 8:
|
||||
execute(
|
||||
f"ALTER TABLE scenario " +
|
||||
"ADD COLUMN is_ensemble BOOL DEFAULT FALSE"
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
@classmethod
|
||||
@@ -158,7 +169,8 @@ class Scenario(SQLSubModel):
|
||||
scenarios = {}
|
||||
|
||||
table = execute(
|
||||
"SELECT id, x, y, name, description, revision, parent_id " +
|
||||
"SELECT id, x, y, name, description, " +
|
||||
" is_ensemble, revision, parent_id " +
|
||||
"FROM scenario " +
|
||||
"ORDER BY id ASC"
|
||||
)
|
||||
@@ -170,6 +182,7 @@ class Scenario(SQLSubModel):
|
||||
x, y = next(it), next(it)
|
||||
name = next(it)
|
||||
desc = next(it)
|
||||
is_ens = next(it)
|
||||
revi = next(it)
|
||||
parent = next(it)
|
||||
|
||||
@@ -179,7 +192,9 @@ class Scenario(SQLSubModel):
|
||||
new = cls(
|
||||
id=id, x=x, y=y,
|
||||
name=name, description=desc,
|
||||
revision=revi, parent=parent
|
||||
is_ensemble=is_ens,
|
||||
revision=revi,
|
||||
parent=parent
|
||||
)
|
||||
scenarios[id] = new
|
||||
|
||||
@@ -189,21 +204,18 @@ class Scenario(SQLSubModel):
|
||||
if self.is_deleted():
|
||||
return self.drop_all(execute)
|
||||
|
||||
parent = 'NULL'
|
||||
parent = None
|
||||
if self.parent is not None:
|
||||
parent = self.parent._id
|
||||
|
||||
execute(
|
||||
"INSERT OR REPLACE INTO " +
|
||||
"scenario(id, x, y, name, description, revision, parent_id) " +
|
||||
"VALUES (" +
|
||||
f"{self._id}, " +
|
||||
f"{self.x}, {self.y}, " +
|
||||
f"'{self._db_format(self.name)}', " +
|
||||
f"'{self._db_format(self.description)}', " +
|
||||
f"{self._revision}, " +
|
||||
f"{parent}" +
|
||||
")"
|
||||
"scenario(id, x, y, name, description, " +
|
||||
" is_ensemble, revision, parent_id) " +
|
||||
"VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
self._id, self.x, self.y,
|
||||
self.name, self.description, self._is_ensemble,
|
||||
self._revision, parent
|
||||
)
|
||||
|
||||
return True
|
||||
@@ -328,6 +340,9 @@ class Scenario(SQLSubModel):
|
||||
def parent(self):
|
||||
return self._parent
|
||||
|
||||
def is_ensemble(self):
|
||||
return self._is_ensemble
|
||||
|
||||
def set_pos(self, x, y):
|
||||
self._x = x
|
||||
self._y = y
|
||||
@@ -345,6 +360,8 @@ class Scenario(SQLSubModel):
|
||||
return self.name
|
||||
if key == "description":
|
||||
return self.description
|
||||
if key == "is_ensemble":
|
||||
return self.is_ensemble()
|
||||
if key == "parent":
|
||||
return self.parent
|
||||
|
||||
|
||||
@@ -57,8 +57,11 @@ class Scenarios(PamhyrModelDict):
|
||||
|
||||
return None
|
||||
|
||||
def new(self, parent):
|
||||
new = Scenario(parent=parent)
|
||||
def new(self, parent, is_ensemble=False):
|
||||
new = Scenario(
|
||||
parent=parent,
|
||||
is_ensemble=is_ensemble
|
||||
)
|
||||
self.set(new._id, new)
|
||||
return new
|
||||
|
||||
|
||||
@@ -315,6 +315,14 @@ class SolverParametersList(PamhyrModelList):
|
||||
|
||||
n._lst = list(map(lambda t: t[1], sorted(lst)))
|
||||
|
||||
# Parameters added to the solver after the study was saved
|
||||
names = {p.name for p in n._lst}
|
||||
n._lst += [
|
||||
Parameter(name=name, value=value, status=status)
|
||||
for name, value in st.default_parameters()
|
||||
if name not in names
|
||||
]
|
||||
|
||||
new[solver] = n
|
||||
|
||||
return new
|
||||
|
||||
+55
-3
@@ -34,6 +34,7 @@ from Model.Except import NotImplementedMethodeError
|
||||
from Model.River import River
|
||||
from Model.TimeShift import shift_river_times, shift_database_times
|
||||
from Model.Geometry.Reach import Reach
|
||||
from Model.Ensembles.DistributionList import DistributionList
|
||||
from Model.HydraulicStructures.HydraulicStructures import (
|
||||
HydraulicStructure
|
||||
)
|
||||
@@ -51,6 +52,7 @@ class Study(SQLModel):
|
||||
|
||||
_sub_classes = [
|
||||
Scenario,
|
||||
DistributionList,
|
||||
River,
|
||||
]
|
||||
|
||||
@@ -86,6 +88,9 @@ class Study(SQLModel):
|
||||
self.scenarios = Scenarios(status=self.status)
|
||||
self.scenarios[0] = s0
|
||||
self.status.scenario = s0
|
||||
|
||||
self._ens_distributions = DistributionList(status=self.status)
|
||||
|
||||
self._river = River(status=self.status)
|
||||
else:
|
||||
self._init_db_file(filename, is_new=False)
|
||||
@@ -406,12 +411,19 @@ class Study(SQLModel):
|
||||
lambda a, s: a or (s.parent is scenario),
|
||||
new.scenarios.lst,
|
||||
False
|
||||
):
|
||||
) or scenario.is_ensemble():
|
||||
new.status.set_as_read_only()
|
||||
|
||||
data["scenario"] = scenario
|
||||
data["loaded_pid"] = set()
|
||||
|
||||
# Get ensemble distribution
|
||||
new._ens_distributions = DistributionList._db_load(
|
||||
sql_exec, data=data
|
||||
)
|
||||
|
||||
data["ens_distributions"] = new._ens_distributions
|
||||
|
||||
# Load river data
|
||||
new._river = River._db_load(
|
||||
sql_exec, data=data
|
||||
@@ -483,8 +495,27 @@ class Study(SQLModel):
|
||||
raise
|
||||
self._pending_time_offset = 0.0
|
||||
|
||||
if self.status.scenario.is_ensemble():
|
||||
lst = [
|
||||
self.scenarios, self._ens_distributions,
|
||||
self._river._ensembles,
|
||||
]
|
||||
for solv in self._river._results:
|
||||
lst.append(self._river._results[solv])
|
||||
|
||||
self._save_submodel(
|
||||
[self.scenarios, self._river],
|
||||
lst, data=progress
|
||||
)
|
||||
progress()
|
||||
self.commit()
|
||||
|
||||
return
|
||||
|
||||
self._save_submodel(
|
||||
[
|
||||
self.scenarios, self._ens_distributions,
|
||||
self._river
|
||||
],
|
||||
data=progress
|
||||
)
|
||||
|
||||
@@ -602,7 +633,8 @@ class Study(SQLModel):
|
||||
data = {
|
||||
"status": self.status,
|
||||
"loaded_pid": set(),
|
||||
"scenario": scenario
|
||||
"scenario": scenario,
|
||||
"ens_distributions": self._ens_distributions,
|
||||
}
|
||||
|
||||
self.status.start_loading()
|
||||
@@ -679,6 +711,7 @@ class Study(SQLModel):
|
||||
self.status.scenario.y + 100)
|
||||
|
||||
new.name = self.status.scenario.name + " (copy)"
|
||||
new.is_ensemble = self.status.scenario.is_ensemble
|
||||
|
||||
self.status.scenario = new
|
||||
self.river._data_traversal(
|
||||
@@ -690,6 +723,25 @@ class Study(SQLModel):
|
||||
self.status.set_as_editable()
|
||||
return new
|
||||
|
||||
def create_ensemble_scenario(self, pos=None, switch=True):
|
||||
new = self.scenarios.new(
|
||||
self.status.scenario,
|
||||
is_ensemble=True
|
||||
)
|
||||
|
||||
new.name = self.status.scenario.name + " (ensemble)"
|
||||
if pos is not None:
|
||||
new.set_pos(pos.x(), pos.y())
|
||||
else:
|
||||
new.set_pos(self.status.scenario.x + 100,
|
||||
self.status.scenario.y)
|
||||
|
||||
if switch:
|
||||
self.status.scenario = new
|
||||
|
||||
self.status.set_as_read_only()
|
||||
return new
|
||||
|
||||
@property
|
||||
def results(self):
|
||||
return self._river.results
|
||||
|
||||
@@ -185,6 +185,13 @@ class SQLSubModel(PamhyrID):
|
||||
else:
|
||||
self._owner_scenario = owner_scenario
|
||||
|
||||
def __str__(self):
|
||||
t = type(self)
|
||||
return (
|
||||
f"'{t.__module__}.{t.__name__}" +
|
||||
f"@{self._pamhyr_id}.{self._owner_scenario}'"
|
||||
)
|
||||
|
||||
def must_be_saved(self):
|
||||
"""Return True if this object MUST be save in the save file.
|
||||
|
||||
|
||||
@@ -341,7 +341,7 @@ class WeatherParameters(SQLSubModel):
|
||||
created = False
|
||||
|
||||
if major == "0" and (int(minor) < 2 or
|
||||
(int(minor) == 2 and int(release) <= 7)):
|
||||
(int(minor) == 2 and int(release) < 10)):
|
||||
if not cls.is_table_exists(execute, "air_temperature"):
|
||||
cls._db_create(execute)
|
||||
created = True
|
||||
|
||||
@@ -1063,6 +1063,75 @@ class Mage8(Mage):
|
||||
logger_exception(e)
|
||||
return False
|
||||
|
||||
def export_ensemble_variation(self, study, repertory,
|
||||
qlog=None, name="0",
|
||||
samples=None):
|
||||
self._study = study
|
||||
name = study.name.replace(" ", "_")
|
||||
|
||||
var_samples = self._export_ensemble_RUG(
|
||||
study, repertory,
|
||||
qlog, name=name,
|
||||
samples=samples,
|
||||
)
|
||||
|
||||
return var_samples
|
||||
|
||||
def _export_ensemble_RUG(self, study, repertory,
|
||||
qlog, name="0",
|
||||
samples={}):
|
||||
files = []
|
||||
var_samples = []
|
||||
|
||||
for ens in samples:
|
||||
if ens.target_data is None:
|
||||
continue
|
||||
|
||||
x = next(samples[ens])
|
||||
var_samples.append(x)
|
||||
|
||||
qlog.put(f"*** Variation " +
|
||||
f"'{ens.target_data}' - {ens.data_type} x {x}")
|
||||
|
||||
if ens.data_type == "strickler_minor":
|
||||
ens.target_data.minor = x
|
||||
elif ens.data_type == "strickler_medium":
|
||||
ens.target_data.medium = x
|
||||
|
||||
if qlog is not None:
|
||||
qlog.put("Export variation of RUG file")
|
||||
|
||||
# Write header
|
||||
with mage_file_open(os.path.join(repertory, f"{name}.RUG"), "w+") as f:
|
||||
files.append(f"{name}.RUG")
|
||||
|
||||
edges = study.river.enable_edges()
|
||||
|
||||
id = 1
|
||||
for edge in edges:
|
||||
frictions = edge.frictions
|
||||
|
||||
for friction in frictions.frictions:
|
||||
if friction.begin_strickler is None:
|
||||
continue
|
||||
|
||||
if friction.is_deleted():
|
||||
continue
|
||||
|
||||
num = f"{id:>3}"
|
||||
brk = f"{friction.begin_rk:>10.3f}"
|
||||
erk = f"{friction.end_rk:>10.3f}"
|
||||
|
||||
strickler = friction.begin_strickler
|
||||
coef_1 = f"{strickler.minor:>10.3f}"
|
||||
coef_2 = f"{strickler.medium:>10.3f}"
|
||||
|
||||
f.write(f"K{num} {brk}{erk}{coef_1}{coef_2}\n")
|
||||
|
||||
id += 1
|
||||
|
||||
return var_samples
|
||||
|
||||
###########
|
||||
# RESULTS #
|
||||
###########
|
||||
@@ -1493,6 +1562,171 @@ class Mage8(Mage):
|
||||
|
||||
return results
|
||||
|
||||
@timer
|
||||
def read_ensemble_bin(self, study, fname, tables, run_number, qlog=None):
|
||||
logger.info(f"read_ensemble_bin: Start reading '{fname}' ...")
|
||||
start = time.time()
|
||||
|
||||
with mage_file_open(fname, "r") as f:
|
||||
def newline(): return np.fromfile(f, dtype=np.int32, count=1)
|
||||
def endline(): return np.fromfile(f, dtype=np.int32, count=1)
|
||||
|
||||
def read_int(size): return np.fromfile(
|
||||
f, dtype=np.int32, count=size)
|
||||
|
||||
def read_float(size): return np.fromfile(
|
||||
f, dtype=np.float32, count=size)
|
||||
|
||||
def read_float64(size): return np.fromfile(
|
||||
f, dtype=np.float64, count=size)
|
||||
|
||||
# Meta data (1st line)
|
||||
newline()
|
||||
data = read_int(3)
|
||||
|
||||
nb_reach = data[0]
|
||||
nb_profile = data[1]
|
||||
mage_version = data[2]
|
||||
|
||||
if mage_version <= 80:
|
||||
msg = (
|
||||
"Read BIN files: " +
|
||||
f"Possible incompatible mage version '{mage_version}', " +
|
||||
"please check your solver configuration..."
|
||||
)
|
||||
logger.warning(msg)
|
||||
|
||||
if qlog is not None:
|
||||
qlog.put("[WARNING] " + msg)
|
||||
|
||||
endline()
|
||||
|
||||
# Reach information (2nd line)
|
||||
newline()
|
||||
_ = read_int(2*nb_reach)
|
||||
endline()
|
||||
|
||||
# X (3rd line)
|
||||
newline()
|
||||
_ = read_float(nb_profile)
|
||||
endline()
|
||||
|
||||
# Z and Y (4th line)
|
||||
newline()
|
||||
_ = read_float(3*nb_profile)
|
||||
endline()
|
||||
|
||||
# Data
|
||||
newline()
|
||||
|
||||
ts = set()
|
||||
|
||||
tmp_table = {}
|
||||
end = False
|
||||
while not end:
|
||||
n = read_int(1)[0]
|
||||
timestamp = read_float64(1)[0]
|
||||
key = bytearray(
|
||||
np.fromfile(
|
||||
f, dtype=np.byte, count=1
|
||||
)
|
||||
).decode()
|
||||
data = read_float(n)
|
||||
|
||||
if key not in tmp_table:
|
||||
tmp_table[key] = []
|
||||
|
||||
tmp_table[key].append(data)
|
||||
|
||||
ts.add(timestamp)
|
||||
|
||||
endline()
|
||||
end = newline().size <= 0
|
||||
|
||||
table = {}
|
||||
for k in tmp_table:
|
||||
table[k] = np.array(tmp_table[k])
|
||||
|
||||
self.read_ensemble_bin_agregate_data(
|
||||
table, tables, run_number
|
||||
)
|
||||
|
||||
tables["timestamps"] = ts
|
||||
|
||||
logger.info(f"reading time: '{time.time() - start}'")
|
||||
|
||||
def read_ensemble_bin_agregate_data(self, tables, res, run_number):
|
||||
z = tables["Z"]
|
||||
q = tables["Q"]
|
||||
|
||||
if "z_mean" not in res:
|
||||
res["z_mean"] = z
|
||||
res["q_mean"] = q
|
||||
|
||||
res["z_tmp_M2"] = np.zeros(z.shape)
|
||||
res["q_tmp_M2"] = np.zeros(q.shape)
|
||||
|
||||
res["z_std_derivation"] = np.zeros(z.shape)
|
||||
res["q_std_derivation"] = np.zeros(q.shape)
|
||||
|
||||
res["z_min"] = z
|
||||
res["z_max"] = z
|
||||
|
||||
res["q_min"] = q
|
||||
res["q_max"] = q
|
||||
else:
|
||||
# Get mean results for Z and Q
|
||||
n = run_number
|
||||
for x, txt in [(z, "z"), (q, "q")]:
|
||||
t_mean = f"{txt}_mean"
|
||||
t_M2 = f"{txt}_tmp_M2"
|
||||
t_std_deriv = f"{txt}_std_derivation"
|
||||
|
||||
delta = x - res[t_mean]
|
||||
|
||||
res[t_mean] += delta / n
|
||||
|
||||
delta_2 = x - res[t_mean]
|
||||
|
||||
res[t_M2] += delta * delta_2
|
||||
res[t_std_deriv] = np.sqrt(res[t_M2] / n)
|
||||
|
||||
# Z and Q min max values
|
||||
res["z_min"] = np.minimum(z, res["z_min"])
|
||||
res["z_max"] = np.maximum(z, res["z_max"])
|
||||
res["q_min"] = np.minimum(q, res["q_min"])
|
||||
res["q_max"] = np.maximum(q, res["q_max"])
|
||||
|
||||
@timer
|
||||
def results_ensemble(self, study, repertory,
|
||||
tables, run_number,
|
||||
qlog=None, name=None):
|
||||
self._study = study
|
||||
if name is None:
|
||||
name = study.name.replace(" ", "_")
|
||||
|
||||
fname = os.path.join(repertory, f"{name}.BIN".replace(" ", "_"))
|
||||
if not os.path.isfile(fname):
|
||||
logger.info(f"Result file {name}.BIN does not exist")
|
||||
return None
|
||||
try:
|
||||
self.read_ensemble_bin(study, fname, tables, run_number, qlog)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to read results")
|
||||
logger_exception(e)
|
||||
return None
|
||||
|
||||
return True
|
||||
|
||||
def get_ensemble_empty_results(self, study, repertory, name=None):
|
||||
return Results(
|
||||
study=study,
|
||||
solver=self,
|
||||
repertory=repertory,
|
||||
name=name,
|
||||
is_ensemble=True,
|
||||
)
|
||||
|
||||
|
||||
class MageFake7(Mage8):
|
||||
_type = "mage_fake7"
|
||||
|
||||
+485
-260
@@ -33,6 +33,11 @@ from Model.Results.River.River import River, Reach, Profile
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class RubarExportError(Exception):
|
||||
"""Study data that cannot be exported; the message is shown to the
|
||||
user and no file is written"""
|
||||
|
||||
|
||||
class Rubar3(CommandLineSolver):
|
||||
_type = "rubar3"
|
||||
|
||||
@@ -92,6 +97,7 @@ class Rubar3(CommandLineSolver):
|
||||
("rubarbe_sediment_mult_3", ""),
|
||||
("rubarbe_sediment_mult_4", ""),
|
||||
("rubarbe_sediment_mult_5", ""),
|
||||
("rubarbe_sediment_tcadim", "0.047"),
|
||||
("rubarbe_sediment_visc", "1.3E-06"),
|
||||
("rubarbe_sediment_opts", "3"),
|
||||
("rubarbe_sediment_odchar", "0"),
|
||||
@@ -167,21 +173,363 @@ class Rubar3(CommandLineSolver):
|
||||
qlog.put(trad["warning"].format(message=message))
|
||||
return False
|
||||
|
||||
# Check the hydraulic data before writing any file
|
||||
try:
|
||||
hydraulics = self._hydraulic_data(study, values)
|
||||
geometry = self._geometry_data(hydraulics["edge"], trased)
|
||||
except RubarExportError as error:
|
||||
self._cancel(qlog, str(error))
|
||||
return False
|
||||
|
||||
for message in hydraulics["warnings"]:
|
||||
logger.warning(message)
|
||||
if qlog is not None:
|
||||
qlog.put(RunSolverTranslate()["warning"].format(
|
||||
message=message))
|
||||
|
||||
self._export_donnee(study, repertory, qlog, name=name)
|
||||
if trased:
|
||||
if not self._export_ts(study, repertory, qlog, name=name):
|
||||
return False
|
||||
self._export_geomac_i(study, repertory, qlog, name=name)
|
||||
self._export_geomac_i(geometry, repertory, qlog, name=name)
|
||||
self._export_mail(study, repertory, qlog, name=name)
|
||||
self._export_devers(study, repertory, qlog, name=name)
|
||||
self._export_condin(study, repertory, qlog, name=name)
|
||||
self._export_stricklers(study, repertory, qlog, name=name)
|
||||
self._export_hydro(study, repertory, qlog, name=name)
|
||||
self._export_condav(study, repertory, qlog, name=name)
|
||||
self._export_condin(hydraulics, repertory, qlog, name=name)
|
||||
self._export_stricklers(hydraulics, repertory, qlog, name=name)
|
||||
self._export_boundaries(hydraulics, repertory, qlog, name=name)
|
||||
# self._export_abshyd(study, repertory, qlog, name=name)
|
||||
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def _cancel(qlog, message):
|
||||
logger.warning(message)
|
||||
if qlog is not None:
|
||||
qlog.put(RunSolverTranslate()["warning"].format(message=message))
|
||||
|
||||
##############
|
||||
# Hydraulics #
|
||||
##############
|
||||
|
||||
# Notice §3.1: liquid boundary conditions read for each CONDAM, CONDAV
|
||||
_upstream_types = {"0": (), "1": ("TD",), "2": ()}
|
||||
_downstream_types = {"0": (), "1": ("ZD",), "2": (), "3": ("TZ",),
|
||||
"5": (), "7": ()}
|
||||
_boundary_kinds = {"TD": "hydrograph Q(t)", "TZ": "water level Z(t)",
|
||||
"ZD": "rating curve Q(Z)",
|
||||
"PC": "punctual contribution"}
|
||||
|
||||
def _hydraulic_data(self, study, values):
|
||||
"""Check the single reach data needed by DONNEE, MAIL, CONDIN,
|
||||
FROT, HYDRO and CONDAV, and return them. Raise
|
||||
RubarExportError with a user message"""
|
||||
trad = RunSolverTranslate()
|
||||
river = study.river
|
||||
|
||||
edges = river.enable_edges()
|
||||
if len(edges) != 1:
|
||||
raise RubarExportError(trad["multireach_unsupported"].format(
|
||||
count=len(edges)))
|
||||
edge = edges[0]
|
||||
profiles = edge.reach.profiles
|
||||
if len(profiles) < 2:
|
||||
raise RubarExportError(trad["not_enough_profiles"].format(
|
||||
reach=edge.name))
|
||||
rks = [p.rk for p in profiles]
|
||||
if any(b <= a for a, b in zip(rks, rks[1:])):
|
||||
raise RubarExportError(trad["rk_not_increasing"].format(
|
||||
reach=edge.name))
|
||||
|
||||
warnings = []
|
||||
boundaries = self._check_boundaries(river, edge, values)
|
||||
|
||||
return {
|
||||
"edge": edge,
|
||||
"profiles": profiles,
|
||||
"tinit": self._seconds(values.get("rubarbe_tinit", "0")),
|
||||
"frictions": self._interpolated_frictions(edge),
|
||||
"initial": self._initial_conditions(river, edge),
|
||||
"boundaries": boundaries,
|
||||
"warnings": warnings,
|
||||
}
|
||||
|
||||
############
|
||||
# Geometry #
|
||||
############
|
||||
|
||||
# Point names giving the limits of the main channel (G, D) and of the
|
||||
# active bed (g, d) in GEOMAC-I (rubar_init.f90). Other names are not
|
||||
# written
|
||||
_point_markers = {"rg": "G", "rd": "D", "g": "g", "d": "d"}
|
||||
# RubarBE never erodes a compartment whose critical stress is above
|
||||
# 999 Pa (rubarbe.f90, EROSEC)
|
||||
_hard_stress = 999.999
|
||||
# CSMAX (variables.f90)
|
||||
_max_compartments = 10
|
||||
|
||||
@staticmethod
|
||||
def _profile_label(profile):
|
||||
name = profile.name if profile.name != "" else "#"
|
||||
return f"{name} (rk {profile.rk:g})"
|
||||
|
||||
def _geometry_data(self, edge, trased):
|
||||
"""Check the GEOMAC-I data of the reach and return its sections
|
||||
[(rk, [(marker, y, [(z_top, d, s, tau_c), ...]), ...]), ...].
|
||||
Raise RubarExportError with a user message"""
|
||||
sections = []
|
||||
for profile in edge.reach.profiles:
|
||||
points = profile.points
|
||||
markers = self._markers(edge, profile, points, trased)
|
||||
station = profile.get_station()
|
||||
|
||||
rows = []
|
||||
for i, (point, marker, y) in enumerate(
|
||||
zip(points, markers, station)):
|
||||
if trased:
|
||||
compartments = self._compartments(
|
||||
edge, profile, i + 1, point)
|
||||
else:
|
||||
# Only the bed level is used by the hydraulics
|
||||
compartments = [(point.z, 1.0, 1.0, self._hard_stress)]
|
||||
rows.append((marker, y, compartments))
|
||||
|
||||
sections.append((self._section_rk(profile), rows))
|
||||
return sections
|
||||
|
||||
def _markers(self, edge, profile, points, trased):
|
||||
trad = RunSolverTranslate()
|
||||
markers = [self._point_markers.get(p.name.strip(), " ")
|
||||
for p in points]
|
||||
names = {v: k for k, v in self._point_markers.items()}
|
||||
for marker in "GDgd":
|
||||
if markers.count(marker) > 1:
|
||||
raise RubarExportError(trad["duplicate_point_name"].format(
|
||||
name=names[marker], profile=self._profile_label(profile),
|
||||
reach=edge.name))
|
||||
|
||||
# Defaults of RubarBE: first and last points for G and D, G and D
|
||||
# for g and d. Erosion only applies strictly between g and d
|
||||
def index(marker, default):
|
||||
return markers.index(marker) if marker in markers else default
|
||||
|
||||
left = index("G", 0)
|
||||
right = index("D", len(points) - 1)
|
||||
limits = [("main_channel", "rg", "rd", left, right)]
|
||||
if trased:
|
||||
limits.append(("active_bed", "g", "d",
|
||||
index("g", left), index("d", right)))
|
||||
for bed, lname, rname, i, j in limits:
|
||||
if j - i < 2:
|
||||
raise RubarExportError(trad["bed_limits_invalid"].format(
|
||||
bed=trad[bed], left=lname, right=rname,
|
||||
profile=self._profile_label(profile), reach=edge.name))
|
||||
return markers
|
||||
|
||||
def _compartments(self, edge, profile, number, point):
|
||||
"""Sediment layers of a point as RubarBE compartments, from the
|
||||
top: (top elevation, D, S, critical stress). A non erodible
|
||||
compartment is added under an erodible last layer, so that the
|
||||
layer thicknesses are kept"""
|
||||
trad = RunSolverTranslate()
|
||||
sl = point.sl
|
||||
if sl is None or sl.is_deleted() or len(sl) == 0:
|
||||
raise RubarExportError(trad["missing_sediment_layers"].format(
|
||||
point=number, profile=self._profile_label(profile),
|
||||
reach=edge.name))
|
||||
|
||||
layers = sl.layers
|
||||
for layer in layers:
|
||||
if not (layer.height >= 0 and layer.d50 > 0 and
|
||||
layer.sigma >= 1 and layer.critical_constraint >= 0):
|
||||
raise RubarExportError(trad["invalid_sediment_layer"].format(
|
||||
layer=layer.name, sl=sl.name,
|
||||
profile=self._profile_label(profile), reach=edge.name))
|
||||
|
||||
top = point.z
|
||||
compartments = []
|
||||
for layer in layers:
|
||||
if layer.height == 0:
|
||||
continue
|
||||
compartments.append((top, layer.d50, layer.sigma,
|
||||
layer.critical_constraint))
|
||||
top -= layer.height
|
||||
|
||||
if not compartments or compartments[-1][3] <= 999:
|
||||
last = layers[-1]
|
||||
compartments.append((top, last.d50, last.sigma,
|
||||
self._hard_stress))
|
||||
|
||||
if len(compartments) > self._max_compartments:
|
||||
raise RubarExportError(trad["too_many_compartments"].format(
|
||||
sl=sl.name, count=len(compartments),
|
||||
maximum=self._max_compartments,
|
||||
profile=self._profile_label(profile), reach=edge.name))
|
||||
return compartments
|
||||
|
||||
@staticmethod
|
||||
def _seconds(value):
|
||||
if ":" in value:
|
||||
return float(old_pamhyr_date_to_timestamp(value))
|
||||
return float(value)
|
||||
|
||||
def _check_boundaries(self, river, edge, values):
|
||||
"""Liquid boundary conditions used for CONDAM, REGIME and CONDAV.
|
||||
Return {'hydro': bc, 'condav': bc} (or None)"""
|
||||
trad = RunSolverTranslate()
|
||||
condam = values.get("rubarbe_condam", "")
|
||||
condav = values.get("rubarbe_condav", "")
|
||||
regime = values.get("rubarbe_regime", "0")
|
||||
|
||||
if condam not in self._upstream_types:
|
||||
raise RubarExportError(trad["boundary_code_unsupported"].format(
|
||||
key="rubarbe_condam", value=condam))
|
||||
if condav not in self._downstream_types:
|
||||
raise RubarExportError(trad["boundary_code_unsupported"].format(
|
||||
key="rubarbe_condav", value=condav))
|
||||
|
||||
# rubar_init.f90 reads HAMONT only when REGIME=1 and the
|
||||
# computation never uses its values (HIMP, TA, NT3); CONDAM=2 reads
|
||||
# no upstream level at all. The upstream level would be silently
|
||||
# ignored: refuse both settings.
|
||||
for key, value, unsupported in (("REGIME", regime, "1"),
|
||||
("CONDAM", condam, "2")):
|
||||
if value == unsupported:
|
||||
raise RubarExportError(
|
||||
trad["upstream_level_unsupported"].format(
|
||||
setting=f"{key}={value}"))
|
||||
|
||||
liquid = [
|
||||
bc for bc in river.boundary_condition.get_tab("liquid")
|
||||
if not bc.is_deleted() and bc.bctype in self._boundary_kinds
|
||||
]
|
||||
|
||||
def at(node):
|
||||
return [bc for bc in liquid if bc.node == node]
|
||||
|
||||
upstream = self._select_boundaries(
|
||||
at(edge.node1), self._upstream_types[condam], edge.node1,
|
||||
{"TD": f"CONDAM={condam}"}, f"CONDAM={condam}"
|
||||
)
|
||||
downstream = self._select_boundaries(
|
||||
at(edge.node2), self._downstream_types[condav], edge.node2,
|
||||
{"ZD": f"CONDAV={condav}", "TZ": f"CONDAV={condav}"},
|
||||
f"CONDAV={condav}"
|
||||
)
|
||||
|
||||
return {
|
||||
"hydro": upstream.get("TD"),
|
||||
"condav": downstream.get("ZD", downstream.get("TZ")),
|
||||
}
|
||||
|
||||
def _select_boundaries(self, bcs, expected, node, required_by, setting):
|
||||
trad = RunSolverTranslate()
|
||||
selected = {}
|
||||
|
||||
for bc in bcs:
|
||||
kind = self._boundary_kinds[bc.bctype]
|
||||
if bc.bctype not in expected:
|
||||
raise RubarExportError(trad["boundary_unexpected"].format(
|
||||
name=bc.name, kind=kind, node=node.name,
|
||||
setting=setting))
|
||||
if bc.bctype in selected:
|
||||
raise RubarExportError(trad["boundary_ambiguous"].format(
|
||||
kind=kind, node=node.name))
|
||||
if len(bc) == 0:
|
||||
raise RubarExportError(trad["boundary_empty"].format(
|
||||
name=bc.name, node=node.name))
|
||||
times = [d[0] for d in bc.data]
|
||||
if bc.bctype != "ZD" and any(
|
||||
b < a for a, b in zip(times, times[1:])):
|
||||
raise RubarExportError(trad["boundary_not_sorted"].format(
|
||||
name=bc.name, node=node.name))
|
||||
selected[bc.bctype] = bc
|
||||
|
||||
for bctype in expected:
|
||||
if bctype not in selected:
|
||||
raise RubarExportError(trad["boundary_missing"].format(
|
||||
setting=required_by[bctype],
|
||||
kind=self._boundary_kinds[bctype], node=node.name))
|
||||
|
||||
return selected
|
||||
|
||||
@staticmethod
|
||||
def _interpolated_frictions(edge):
|
||||
"""Minor and medium Strickler at each centre of cell. The model
|
||||
holds one Strickler per zone (Friction.end_strickler returns the
|
||||
begin one): constant inside a zone, linearly interpolated between
|
||||
two zones (notice §3.4), constant beyond the first and last ones"""
|
||||
points = []
|
||||
for friction in edge.frictions.frictions:
|
||||
if friction.is_deleted() or not friction.is_full_defined():
|
||||
continue
|
||||
begin = friction.begin_strickler
|
||||
end = friction.end_strickler or begin
|
||||
pts = [(friction.begin_rk, begin.minor, begin.medium),
|
||||
(friction.end_rk, end.minor, end.medium)]
|
||||
points += sorted(pts, key=lambda p: p[0])
|
||||
|
||||
if len(points) == 0:
|
||||
raise RubarExportError(
|
||||
RunSolverTranslate()["missing_friction"].format(
|
||||
reach=edge.name))
|
||||
|
||||
points.sort(key=lambda p: p[0])
|
||||
|
||||
def at(rk):
|
||||
if rk <= points[0][0]:
|
||||
return points[0][1:]
|
||||
if rk >= points[-1][0]:
|
||||
return points[-1][1:]
|
||||
for (r0, *k0), (r1, *k1) in zip(points, points[1:]):
|
||||
if r0 <= rk <= r1:
|
||||
if r1 == r0:
|
||||
return tuple(k1)
|
||||
a = (rk - r0) / (r1 - r0)
|
||||
return tuple(v0 + a * (v1 - v0)
|
||||
for v0, v1 in zip(k0, k1))
|
||||
|
||||
return [at(rk) for rk in edge.reach.inter_profiles_rk()]
|
||||
|
||||
@staticmethod
|
||||
def _initial_conditions(river, edge):
|
||||
"""(depth, discharge) at each profile, linearly interpolated in rk
|
||||
between the profiles holding an initial condition (notice §3.5)"""
|
||||
profiles = edge.reach.profiles
|
||||
ics = river.initial_conditions.get(edge)
|
||||
known = {}
|
||||
for data in ics.data:
|
||||
profile = data["rk"]
|
||||
if profile is None or profile not in profiles:
|
||||
continue
|
||||
depth = max(data["elevation"] - profile.z_min(), 0.0)
|
||||
known[profile] = (depth, data["discharge"])
|
||||
|
||||
if len(known) == 0:
|
||||
raise RubarExportError(
|
||||
RunSolverTranslate()["missing_initial_conditions"].format(
|
||||
reach=edge.name))
|
||||
|
||||
points = sorted((p.rk, *v) for p, v in known.items())
|
||||
|
||||
def at(rk):
|
||||
if rk <= points[0][0]:
|
||||
return points[0][1:]
|
||||
if rk >= points[-1][0]:
|
||||
return points[-1][1:]
|
||||
for (r0, h0, q0), (r1, h1, q1) in zip(points, points[1:]):
|
||||
if r0 <= rk <= r1:
|
||||
a = (rk - r0) / (r1 - r0)
|
||||
return (h0 + a * (h1 - h0), q0 + a * (q1 - q0))
|
||||
|
||||
result = [known[p] if p in known else at(p.rk) for p in profiles]
|
||||
if any(q <= -500.0 for _, q in result):
|
||||
# CONDIN stores 1000 + Q, read as a discharge above 500
|
||||
raise RubarExportError(
|
||||
RunSolverTranslate()["discharge_out_of_range"].format(
|
||||
reach=edge.name))
|
||||
|
||||
return result
|
||||
|
||||
# Notice Rubar3/RubarBE, annex 1: records are positional, not keyed.
|
||||
# Each record starts with an A50 label, including records of integers.
|
||||
_donnee_fields = (
|
||||
@@ -200,7 +548,7 @@ class Rubar3(CommandLineSolver):
|
||||
_ts_fields = (
|
||||
("ros", "real"), ("por", "real"), ("dcharg", "real"),
|
||||
("halfa", "real"), ("mult_1", "multipliers"),
|
||||
("visc", "real"), ("opts", "law"), ("odchar", "integer"),
|
||||
("visc", "visc"), ("opts", "law"), ("odchar", "integer"),
|
||||
("unisol", "integer"), ("typdef", "integer"),
|
||||
("depot", "depot"), ("choixc", "integer"),
|
||||
("option", "options"), ("capsol", "integer"),
|
||||
@@ -208,6 +556,28 @@ class Rubar3(CommandLineSolver):
|
||||
("defond", "integer"), ("varcons", "integer"),
|
||||
)
|
||||
|
||||
# rubar_init.f90 (inits): laws whose critical stress may come from the
|
||||
# Shields diagram, and laws without critical stress
|
||||
_shields_laws = {1, 10, 11, 12, 14, 25, 26}
|
||||
_no_threshold_laws = {2, 3, 8, 13, 18, 19, 22, 23, 24}
|
||||
_brownlie_law = 16
|
||||
|
||||
@classmethod
|
||||
def tcadim_required(cls, opts, option):
|
||||
"""True if RubarBE reads the dimensionless critical stress TCADIM
|
||||
for transport law OPTS and options OPTION (notice §3.10)"""
|
||||
try:
|
||||
law = int(opts)
|
||||
except ValueError:
|
||||
return False
|
||||
|
||||
shields = len(option) == 3 and option[1] != "1"
|
||||
if shields and law in cls._shields_laws:
|
||||
return False
|
||||
if law in cls._no_threshold_laws or law == cls._brownlie_law:
|
||||
return False
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def _reaches_without_solid_boundary(study):
|
||||
river = study.river
|
||||
@@ -293,10 +663,16 @@ class Rubar3(CommandLineSolver):
|
||||
def _export_donnee(self, study, repertory, qlog=None, name="0"):
|
||||
values = self._parameter_values(study)
|
||||
fields = list(self._donnee_fields)
|
||||
# The diagnostic transport-capacity extension is optional as a block.
|
||||
if values.get("rubarbe_optfpc", ""):
|
||||
fields += [("optfpc", "integer"), ("ros", "real"),
|
||||
("dm", "real"), ("segma", "real")]
|
||||
# Optional OPTFPC. ROS, DM and SEGMA follow it only for a friction
|
||||
# computed from sediments without transport (notice §3.1)
|
||||
optfpc = values.get("rubarbe_optfpc", "")
|
||||
if optfpc:
|
||||
fields += [("optfpc", "integer")]
|
||||
trased = self._flag(values.get("rubarbe_trased", "n"),
|
||||
"rubarbe_trased")
|
||||
if optfpc != "0" and trased == "N":
|
||||
fields += [("ros", "real"), ("dm", "real"),
|
||||
("segma", "real")]
|
||||
elif any(values.get("rubarbe_" + key, "")
|
||||
for key in ("ros", "dm", "segma")):
|
||||
raise ValueError("rubarbe_optfpc: required before ROS/DM/SEGMA")
|
||||
@@ -344,6 +720,26 @@ class Rubar3(CommandLineSolver):
|
||||
value = self._required(values, key)
|
||||
if kind == "real":
|
||||
result = self._real(value, key)
|
||||
elif kind == "visc":
|
||||
# Notice annex 1: TCADIM then VISC, read as (A50, A20) then
|
||||
# two F10.0. A single value would be read as TCADIM, with
|
||||
# VISC = 0 (rubar_init.f90, inits).
|
||||
if Decimal(self._real(value, key)) <= 0:
|
||||
raise ValueError(f"{key}: expected a positive viscosity")
|
||||
tcadim_key = prefix + "tcadim"
|
||||
tcadim = values.get(tcadim_key, "")
|
||||
if tcadim:
|
||||
result = self._real(tcadim, tcadim_key)
|
||||
elif self.tcadim_required(values.get(prefix + "opts", ""),
|
||||
values.get(prefix + "option", "")):
|
||||
message = trad["missing_tcadim"].format(key=tcadim_key)
|
||||
logger.warning(message)
|
||||
if qlog is not None:
|
||||
qlog.put(trad["warning"].format(message=message))
|
||||
return False
|
||||
else:
|
||||
result = " " * 10
|
||||
result += self._real(value, key)
|
||||
elif kind == "multipliers":
|
||||
result = self._real(value, key)
|
||||
extras = [values.get(prefix + f"mult_{i}", "")
|
||||
@@ -382,81 +778,52 @@ class Rubar3(CommandLineSolver):
|
||||
self._write_parameters(repertory, f"ts.{name}", lines)
|
||||
return True
|
||||
|
||||
def _export_geomac_i(self, study, repertory, qlog, name="0"):
|
||||
def _export_geomac_i(self, geometry, repertory, qlog, name="0"):
|
||||
"""GEOMAC-I: number of sections, then for each section its
|
||||
header and one line per point (A1, 1X, F11.5, then up to 10
|
||||
compartments in F13.5, 2F15.10, F15.5; rubar_init.f90)"""
|
||||
if qlog is not None:
|
||||
qlog.put("Export GEOMAC-i file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"geomac-i.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
for edge in study.river.enable_edges():
|
||||
reach = edge.reach
|
||||
n_profiles = len(reach)
|
||||
time = 0.0
|
||||
|
||||
f.write(f"{n_profiles:>5} {time:>11.3f}\n")
|
||||
|
||||
ind = 1
|
||||
for profile in reach.profiles:
|
||||
rk = profile.rk
|
||||
n_points = len(profile)
|
||||
|
||||
f.write(f"{ind:>4} {rk:>11.3f} {n_points:>4}\n")
|
||||
|
||||
station = profile.get_station()
|
||||
for i, point in enumerate(profile.points):
|
||||
label = point.name.lower()
|
||||
if label != "":
|
||||
if label[0] == "r":
|
||||
label = label[1].upper()
|
||||
else:
|
||||
label = " "
|
||||
else:
|
||||
label = " "
|
||||
|
||||
y = station[i]
|
||||
z = point.z
|
||||
dcs = 1.0
|
||||
scs = 1.0
|
||||
tmcs = 0.0
|
||||
|
||||
f.write(
|
||||
f"{label} {y:>11.5f}" +
|
||||
f"{z:>13.5f}{dcs:>15.10f}" +
|
||||
f"{scs:>15.10f}{tmcs:>15.5f}" +
|
||||
lines = [f"{len(geometry):>4} {0.0:>12.3f}\n"]
|
||||
for i, (rk, rows) in enumerate(geometry, 1):
|
||||
lines.append(f"{i:>4} {rk:>11.3f} {len(rows):>4}\n")
|
||||
for marker, y, compartments in rows:
|
||||
lines.append(
|
||||
f"{marker} {y:>11.5f}" +
|
||||
"".join(f"{z:>13.5f}{d:>15.10f}{s:>15.10f}{t:>15.5f}"
|
||||
for z, d, s, t in compartments) +
|
||||
"\n"
|
||||
)
|
||||
|
||||
ind += 1
|
||||
self._write_parameters(repertory, f"geomac-i.{name}", lines)
|
||||
|
||||
@staticmethod
|
||||
def _section_rk(profile):
|
||||
"""Abscissa of a section as written in GEOMAC-I (F11.3). MAIL
|
||||
intermailles must match it within 1e-6 (rubar_init.f90, geomac)"""
|
||||
return float(f"{profile.rk:.3f}")
|
||||
|
||||
def _export_mail(self, study, repertory, qlog, name="0"):
|
||||
"""MAIL: LM, the LM centres of cells, then the LM - 1 intermailles
|
||||
(notice, annex 1). Free format"""
|
||||
if qlog is not None:
|
||||
qlog.put("Export MAIL file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"mail.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
lines = []
|
||||
for edge in study.river.enable_edges():
|
||||
reach = edge.reach
|
||||
lm = len(reach) + 1
|
||||
f.write(f"{lm:>13}\n")
|
||||
sections = [self._section_rk(p) for p in edge.reach.profiles]
|
||||
centres = ([sections[0]] +
|
||||
[(a + b) / 2 for a, b in zip(sections, sections[1:])] +
|
||||
[sections[-1]])
|
||||
|
||||
for mails in [reach.inter_profiles_rk(),
|
||||
reach.get_rk()]:
|
||||
ind = 0
|
||||
for mail in mails:
|
||||
f.write(f"{mail:15.3f}")
|
||||
lines.append(f"{len(centres):>13}\n")
|
||||
for values in (centres, sections):
|
||||
for i in range(0, len(values), 3):
|
||||
lines.append("".join(f"{v:15.6f}"
|
||||
for v in values[i:i + 3]) + "\n")
|
||||
|
||||
ind += 1
|
||||
if ind % 3 == 0:
|
||||
f.write("\n")
|
||||
|
||||
if ind % 3 != 0:
|
||||
f.write("\n")
|
||||
self._write_parameters(repertory, f"mail.{name}", lines)
|
||||
|
||||
def _export_abshyd(self, study, repertory, qlog, name="0"):
|
||||
if qlog is not None:
|
||||
@@ -502,208 +869,66 @@ class Rubar3(CommandLineSolver):
|
||||
|
||||
reach_ind += 1
|
||||
|
||||
def _export_stricklers(self, study, repertory, qlog, name="0"):
|
||||
self._export_frot(study, repertory, qlog, name=name, version="")
|
||||
self._export_frot(study, repertory, qlog, name=name, version="2")
|
||||
|
||||
def _export_frot(self, study, repertory, qlog, name="0", version=""):
|
||||
def _export_stricklers(self, hydraulics, repertory, qlog, name="0"):
|
||||
"""FROT (minor bed) and FROT2 (medium bed): LM, then one Strickler
|
||||
per cell (notice, annex 1)"""
|
||||
frictions = hydraulics["frictions"]
|
||||
for version, column in (("", 0), ("2", 1)):
|
||||
if qlog is not None:
|
||||
qlog.put(f"Export FROT{version} file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"frot{version}.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
for edge in study.river.enable_edges():
|
||||
reach = edge.reach
|
||||
lm = len(reach) + 1
|
||||
f.write(f"{lm:>6}\n")
|
||||
lines = [f"{len(frictions):>6}\n"]
|
||||
lines += [f"{i:>6} {values[column]:>12.5f}\n"
|
||||
for i, values in enumerate(frictions, 1)]
|
||||
self._write_parameters(repertory, f"frot{version}.{name}", lines)
|
||||
|
||||
lst = list(filter(
|
||||
lambda f: f.is_full_defined(),
|
||||
edge.frictions.frictions
|
||||
))
|
||||
|
||||
rk_min = 9999999.9
|
||||
rk_max = -9999999.9
|
||||
coeff_min = -1.0
|
||||
coeff_max = -1.0
|
||||
for s in lst: # TODO optimise ?
|
||||
if s.begin_rk > rk_max:
|
||||
rk_max = s.begin_rk
|
||||
coeff_max = s.begin_strickler
|
||||
if s.begin_rk < rk_min:
|
||||
rk_min = s.begin_rk
|
||||
coeff_min = s.begin_strickler
|
||||
if s.end_rk > rk_max:
|
||||
rk_max = s.end_rk
|
||||
coeff_max = s.end_strickler
|
||||
if s.end_rk < rk_min:
|
||||
rk_min = s.end_rk
|
||||
coeff_min = s.end_strickler
|
||||
|
||||
def get_stricklers_from_rk(rk, lst):
|
||||
|
||||
coeff = None
|
||||
if rk > rk_max:
|
||||
coeff = coeff_max
|
||||
elif rk < rk_min:
|
||||
coeff = coeff_min
|
||||
else:
|
||||
for s in lst:
|
||||
if (rk >= s.begin_rk and rk <= s.end_rk or
|
||||
rk <= s.begin_rk and rk >= s.end_rk):
|
||||
coeff = s.begin_strickler # TODO: inerpolate
|
||||
break
|
||||
|
||||
# TODO interpolation if rk is not in frictons
|
||||
|
||||
if coeff is None:
|
||||
logger.error(
|
||||
"Study frictions are not fully defined"
|
||||
)
|
||||
return None
|
||||
|
||||
return coeff.medium if version == "2" else coeff.minor
|
||||
|
||||
ind = 1
|
||||
for mail in edge.reach.inter_profiles_rk():
|
||||
coef = get_stricklers_from_rk(mail, lst)
|
||||
if coef is not None:
|
||||
f.write(f"{ind:>6} {coef:>12.5f}")
|
||||
|
||||
ind += 1
|
||||
f.write("\n")
|
||||
|
||||
def _export_condin(self, study, repertory, qlog, name="0"):
|
||||
def _export_condin(self, hydraulics, repertory, qlog, name="0"):
|
||||
"""CONDIN: TINIT LM, then for each cell I, depth and 1000 + Q
|
||||
(notice §3.5 and annex 1). Cell values are the mean of the two
|
||||
adjacent sections; the first and last cells take the values of
|
||||
the first and last sections"""
|
||||
if qlog is not None:
|
||||
qlog.put("Export CONDIN file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"condin.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
for edge in study.river.enable_edges():
|
||||
reach = edge.reach
|
||||
sections = hydraulics["initial"]
|
||||
cells = ([sections[0]] +
|
||||
[((h0 + h1) / 2, (q0 + q1) / 2)
|
||||
for (h0, q0), (h1, q1) in zip(sections, sections[1:])] +
|
||||
[sections[-1]])
|
||||
|
||||
f.write(f"{0.0}\n")
|
||||
lines = [f"{hydraulics['tinit']!r} {len(cells)}\n"]
|
||||
lines += [f"{i:>5} {h:.6f} {1000.0 + q:.6f}\n"
|
||||
for i, (h, q) in enumerate(cells, 1)]
|
||||
self._write_parameters(repertory, f"condin.{name}", lines)
|
||||
|
||||
ics = study.river.initial_conditions.get(edge)
|
||||
data = self._export_condin_init_data(ics)
|
||||
def _export_boundaries(self, hydraulics, repertory, qlog, name="0"):
|
||||
"""HYDRO (Q, t) and CONDAV ((Q, Z) for a rating curve, (t, Z) for
|
||||
a Z(t) condition), notice annex 1. A file is written only when the
|
||||
matching condition is used. HAMONT is not written: REGIME=1 and
|
||||
CONDAM=2 are refused (see _check_boundaries)"""
|
||||
bcs = hydraulics["boundaries"]
|
||||
|
||||
profiles = reach.profiles
|
||||
first = profiles[0]
|
||||
last = profiles[-1]
|
||||
def records(bc, columns):
|
||||
return [columns(d0, d1) for d0, d1 in bc.data]
|
||||
|
||||
if first not in data or last not in data:
|
||||
logger.error(
|
||||
"Study initial condition is not fully defined"
|
||||
)
|
||||
return
|
||||
|
||||
f_h_s = self._export_condin_profile_height_speed(first, data)
|
||||
l_h_s = self._export_condin_profile_height_speed(last, data)
|
||||
|
||||
# First mail
|
||||
f.write(f"{1:>5} {f_h_s[0]} {f_h_s[1]}\n")
|
||||
|
||||
ind = 2
|
||||
it = iter(profiles)
|
||||
prev = next(it)
|
||||
|
||||
prev_h, prev_s = f_h_s
|
||||
for profile in it:
|
||||
if profile not in data:
|
||||
ind += 1
|
||||
continue
|
||||
|
||||
cur_h, cur_s = self._export_condin_profile_height_speed(
|
||||
profile, data
|
||||
)
|
||||
|
||||
# Mean of height and speed
|
||||
h = (prev_h + cur_h) / 2
|
||||
s = (prev_s + cur_s) / 2
|
||||
|
||||
f.write(f"{ind:>5} {h} {s}\n")
|
||||
|
||||
prev_h, prev_s = cur_h, cur_s
|
||||
ind += 1
|
||||
|
||||
# Last mail
|
||||
f.write(f"{ind:>5} {f_h_s[0]} {f_h_s[1]}\n")
|
||||
|
||||
def _export_condin_init_data(self, ics):
|
||||
data = {}
|
||||
|
||||
for d in ics.data:
|
||||
data[d['rk']] = (
|
||||
d['elevation'],
|
||||
d['discharge'],
|
||||
)
|
||||
|
||||
return data
|
||||
|
||||
def _export_condin_profile_height_speed(self, profile, data):
|
||||
z = data[profile][0]
|
||||
q = data[profile][1]
|
||||
|
||||
height = z - profile.z_min()
|
||||
speed = profile.speed(q, z)
|
||||
|
||||
return height, speed
|
||||
|
||||
def _export_hydro(self, study, repertory, qlog, name="0"):
|
||||
if qlog is not None:
|
||||
qlog.put("Export HYDRO file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"hydro.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
bcs = []
|
||||
for edge in study.river.enable_edges():
|
||||
for bound in study.river.boundary_condition.get_tab("liquid"):
|
||||
# BC is an hydrogramme
|
||||
if bound.bctype == "TD" or bound.bctype == "PC":
|
||||
# BC is on input node of this reach
|
||||
if bound.node == edge.node1:
|
||||
bcs.append(bound)
|
||||
|
||||
for bc in bcs:
|
||||
f.write(f"{len(bc)}\n")
|
||||
for d0, d1 in bc.data:
|
||||
f.write(f"{d1} {d0}\n")
|
||||
|
||||
def _export_condav(self, study, repertory, qlog, name="0"):
|
||||
if qlog is not None:
|
||||
qlog.put("Export CONDAV file")
|
||||
|
||||
with open(
|
||||
os.path.join(
|
||||
repertory, f"condav.{name}"
|
||||
), "w+"
|
||||
) as f:
|
||||
bcs = []
|
||||
for edge in study.river.enable_edges():
|
||||
for bound in study.river.boundary_condition.get_tab("liquid"):
|
||||
# BC is an hydrogramme
|
||||
if bound.bctype == "ZD" or bound.bctype == "TZ":
|
||||
# BC is on input node of this reach
|
||||
if bound.node == edge.node2:
|
||||
bcs.append(bound)
|
||||
|
||||
for bc in bcs:
|
||||
f.write(f"{len(bc)}\n")
|
||||
files = []
|
||||
if bcs["hydro"] is not None:
|
||||
files.append(("hydro", bcs["hydro"],
|
||||
lambda t, q: f"{float(q)!r} {float(t)!r}\n",
|
||||
lambda n: f"{n}\n"))
|
||||
if bcs["condav"] is not None:
|
||||
bc = bcs["condav"]
|
||||
if bc.bctype == "ZD":
|
||||
for d0, d1 in bc.data:
|
||||
f.write(f"{d1} {d0}\n")
|
||||
def columns(z, q): return f"{float(q)!r} {float(z)!r}\n"
|
||||
else:
|
||||
for d0, d1 in bc.data:
|
||||
f.write(f"{d0} {d1}\n")
|
||||
def columns(t, z): return f"{float(t)!r} {float(z)!r}\n"
|
||||
files.append(("condav", bc, columns, lambda n: f"{n}\n"))
|
||||
|
||||
for filename, bc, columns, header in files:
|
||||
if qlog is not None:
|
||||
qlog.put(f"Export {filename.upper()} file")
|
||||
lines = [header(len(bc))] + records(bc, columns)
|
||||
self._write_parameters(repertory, f"{filename}.{name}", lines)
|
||||
|
||||
def read_profil(self, study, fname, results, qlog=None, name="0"):
|
||||
logger.info(f"read: profil.{name}")
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
import psutil
|
||||
import logging
|
||||
import traceback
|
||||
|
||||
@@ -120,7 +122,10 @@ class TimerWindow(PamhyrWindow):
|
||||
parent=parent
|
||||
)
|
||||
|
||||
self._process = psutil.Process(os.getpid())
|
||||
|
||||
self.setup_table()
|
||||
self.setup_label()
|
||||
self.setup_alarm()
|
||||
self.setup_connections()
|
||||
|
||||
@@ -136,6 +141,15 @@ class TimerWindow(PamhyrWindow):
|
||||
data=None,
|
||||
)
|
||||
|
||||
def setup_label(self):
|
||||
label = self.find(QLabel, "label")
|
||||
label.setText(
|
||||
f" Memory usage:\t" +
|
||||
"<b>" +
|
||||
f"{self._process.memory_info().rss / (1000 * 1000):.3f}" +
|
||||
"</b> MB"
|
||||
)
|
||||
|
||||
def setup_alarm(self):
|
||||
self._alarm = QTimer()
|
||||
self._alarm.start(2000)
|
||||
@@ -148,6 +162,7 @@ class TimerWindow(PamhyrWindow):
|
||||
|
||||
def update(self):
|
||||
self._table.update_lst()
|
||||
self.setup_label()
|
||||
|
||||
# def reset(self):
|
||||
# self._table.reset_timers()
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
# Translate.py -- Pamhyr
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from PyQt5.QtCore import QCoreApplication
|
||||
|
||||
from View.Ensembles.Translate import EnsemblesTranslate
|
||||
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
|
||||
class EnsembleEditTranslate(EnsemblesTranslate):
|
||||
def __init__(self):
|
||||
super(EnsembleEditTranslate, self).__init__()
|
||||
|
||||
self._dict["binomial_n"] = _translate("Ensemble", "n")
|
||||
self._dict["binomial_p"] = _translate("Ensemble", "p")
|
||||
|
||||
self._dict["poisson_lam"] = _translate("Ensemble", "Lam")
|
||||
|
||||
self._dict["checker_failed_title"] = _translate(
|
||||
"Ensemble",
|
||||
"Invalid parameter"
|
||||
)
|
||||
self._dict["checker_failed_text"] = _translate(
|
||||
"Ensemble",
|
||||
"This parameter is not valid for selected distribution: "
|
||||
)
|
||||
|
||||
uniform = _translate(
|
||||
"Ensemble", "(High - Low) must be non-negative."
|
||||
)
|
||||
self._dict["uniform_low_tips"] = uniform
|
||||
self._dict["uniform_high_tips"] = uniform
|
||||
|
||||
self._dict["normal_scale_tips"] = _translate(
|
||||
"Ensemble", "Scale must be non-negative."
|
||||
)
|
||||
|
||||
self._dict["binomial_n_tips"] = _translate(
|
||||
"Ensemble", "N must be non-negative and must be an integers."
|
||||
)
|
||||
|
||||
self._dict["binomial_p_tips"] = _translate(
|
||||
"Ensemble", "P must be >= 0 and <=1."
|
||||
)
|
||||
|
||||
self._dict["poisson_lam_tips"] = _translate(
|
||||
"Ensemble", "Lam must be >= 0."
|
||||
)
|
||||
@@ -0,0 +1,320 @@
|
||||
# Window.py -- Pamhyr
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import logging
|
||||
|
||||
from tools import trace, timer, logger_exception
|
||||
|
||||
from View.Tools.PamhyrWindow import PamhyrWindow, PamhyrDialog
|
||||
from View.Tools.PamhyrWidget import PamhyrWidget
|
||||
from View.Tools.PamhyrTree import (
|
||||
PamhyrModelItem, PamhyrModelListItem,
|
||||
)
|
||||
|
||||
from PyQt5.QtGui import (
|
||||
QKeySequence,
|
||||
)
|
||||
|
||||
from PyQt5 import QtWidgets
|
||||
from PyQt5.QtCore import (
|
||||
Qt, QVariant, QAbstractTableModel,
|
||||
QCoreApplication, QModelIndex, pyqtSlot,
|
||||
QRect, QSettings,
|
||||
)
|
||||
|
||||
from PyQt5.QtWidgets import (
|
||||
QDialogButtonBox, QPushButton, QLineEdit,
|
||||
QFileDialog, QTableView, QAbstractItemView,
|
||||
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||
QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
|
||||
QGroupBox, QTreeWidget,
|
||||
)
|
||||
|
||||
from View.Ensembles.Edit.Translate import EnsembleEditTranslate
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class StricklersCoefModelItem(PamhyrModelItem):
|
||||
def get_value(self):
|
||||
return (self._data, self.parent()._data)
|
||||
|
||||
|
||||
class StricklersModelItem(PamhyrModelItem):
|
||||
def __init__(self, data=None, trad=None, parent=None):
|
||||
super(StricklersModelItem, self).__init__(
|
||||
data=data, trad=trad, parent=parent,
|
||||
)
|
||||
|
||||
def _setup_children(self):
|
||||
for coef in ["strickler_minor", "strickler_medium"]:
|
||||
self.addChild(
|
||||
StricklersCoefModelItem(data=coef, parent=self)
|
||||
)
|
||||
|
||||
def get_value(self):
|
||||
return self._data
|
||||
|
||||
|
||||
class EnsembleEditDialog(PamhyrDialog):
|
||||
_pamhyr_ui = "EnsembleEditDialog"
|
||||
_pamhyr_name = "Parameters"
|
||||
|
||||
def __init__(self, study=None, ensemble=None,
|
||||
parent=None):
|
||||
trad = EnsembleEditTranslate()
|
||||
|
||||
super(EnsembleEditDialog, self).__init__(
|
||||
title=trad[self._pamhyr_name],
|
||||
trad=trad,
|
||||
options=[],
|
||||
parent=parent
|
||||
)
|
||||
|
||||
self._study = study
|
||||
self._ensemble = ensemble
|
||||
self._target_data = None
|
||||
|
||||
self._tree = self.find(QTreeWidget, "treeWidget_target_data")
|
||||
self._tg_group_box = self.find(QGroupBox, "groupBox_target_data")
|
||||
|
||||
self._init_tree()
|
||||
self._init_default_values()
|
||||
self._init_connection()
|
||||
|
||||
def _init_tree(self):
|
||||
self._tree.setColumnCount(1)
|
||||
self._tree.setHeaderLabels(["Name"])
|
||||
|
||||
stricklers = PamhyrModelListItem(
|
||||
name="Stricklers",
|
||||
lst=self._study.river.stricklers,
|
||||
child_item_ctor=StricklersModelItem,
|
||||
parent=self._tree
|
||||
)
|
||||
|
||||
self._target_data = (
|
||||
self._ensemble.data_type,
|
||||
self._ensemble.target_data
|
||||
)
|
||||
|
||||
self._tg_group_box.setTitle(
|
||||
self._format_target_data(self._target_data)
|
||||
)
|
||||
|
||||
item = stricklers.find_item_by_value(self._target_data)
|
||||
if item:
|
||||
self._tree.setCurrentItem(item)
|
||||
|
||||
def _init_default_values(self):
|
||||
self.set_line_edit_text("lineEdit_name", self._ensemble.name)
|
||||
|
||||
self.combobox_add_items(
|
||||
"comboBox_distribution",
|
||||
[self._trad["not_defined"]] +
|
||||
list(
|
||||
map(
|
||||
lambda d: d.name,
|
||||
self._study._ens_distributions.lst
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
self._params_widget = None
|
||||
if self._ensemble.distribution is not None:
|
||||
self.set_combobox_text("comboBox_distribution",
|
||||
self._ensemble.distribution.name)
|
||||
|
||||
self._set_widget(self._ensemble.distribution)
|
||||
|
||||
def _init_connection(self):
|
||||
self.find(QComboBox, "comboBox_distribution")\
|
||||
.currentTextChanged.connect(self.update_distribution)
|
||||
|
||||
self._tree.itemClicked.connect(self._tree_item_select)
|
||||
|
||||
def _tree_item_select(self, item):
|
||||
if type(item) is StricklersCoefModelItem:
|
||||
self._target_data = item.get_value()
|
||||
|
||||
self._tg_group_box.setTitle(
|
||||
self._format_target_data(self._target_data)
|
||||
)
|
||||
|
||||
def _format_target_data(self, data):
|
||||
return f" Selection: {str(data[1])}, {data[0]}"
|
||||
|
||||
def update_distribution(self, txt):
|
||||
# txt = self.get_combobox_text("comboBox_distribution")
|
||||
distribution = next(
|
||||
filter(
|
||||
lambda d: d.name == txt,
|
||||
self._study._ens_distributions.lst
|
||||
),
|
||||
None
|
||||
)
|
||||
|
||||
self._set_widget(distribution)
|
||||
|
||||
def _set_widget(self, distribution):
|
||||
box = self.find(QGroupBox, "groupBox_params")
|
||||
vbox = self.find(QVBoxLayout, "verticalLayout_params")
|
||||
|
||||
if self._params_widget is not None:
|
||||
vbox.removeWidget(self._params_widget)
|
||||
self._params_widget.setParent(None)
|
||||
|
||||
if distribution is None:
|
||||
return
|
||||
|
||||
size = len(distribution._labels)
|
||||
if size == 1:
|
||||
self._params_widget = Ensemble1ParamsWidget(
|
||||
ensemble=self._ensemble,
|
||||
distribution=distribution,
|
||||
trad=self._trad, parent=box,
|
||||
)
|
||||
vbox.addWidget(self._params_widget)
|
||||
elif size == 2:
|
||||
self._params_widget = Ensemble2ParamsWidget(
|
||||
ensemble=self._ensemble,
|
||||
distribution=distribution,
|
||||
trad=self._trad, parent=box,
|
||||
)
|
||||
vbox.addWidget(self._params_widget)
|
||||
else:
|
||||
self._params_widget = None
|
||||
|
||||
@property
|
||||
def values(self):
|
||||
return self._values
|
||||
|
||||
def accept(self):
|
||||
txt = self.get_combobox_text("comboBox_distribution")
|
||||
distribution = next(
|
||||
filter(
|
||||
lambda d: d.name == txt,
|
||||
self._study._ens_distributions.lst
|
||||
),
|
||||
None
|
||||
)
|
||||
parameters = self._params_widget.values
|
||||
|
||||
if distribution is not None:
|
||||
ok, tips = distribution.is_valid_parameters(parameters)
|
||||
if not ok:
|
||||
self.message_box(
|
||||
text=self._trad["checker_failed_text"],
|
||||
informative_text="\n".join(
|
||||
map(lambda t: " - " + self._trad[t], tips)
|
||||
),
|
||||
window_title=self._trad["checker_failed_title"],
|
||||
)
|
||||
return
|
||||
|
||||
self._values = {
|
||||
"name": self.get_line_edit_text("lineEdit_name"),
|
||||
"data_type": self._target_data[0],
|
||||
"target_data": self._target_data[1],
|
||||
"distribution": distribution,
|
||||
"params": parameters,
|
||||
}
|
||||
|
||||
super().accept()
|
||||
|
||||
def reject(self):
|
||||
self.close()
|
||||
|
||||
|
||||
class Ensemble1ParamsWidget(PamhyrWidget):
|
||||
_pamhyr_ui = "Ensemble1ParamsWidget"
|
||||
_pamhyr_name = "Parameters"
|
||||
|
||||
def __init__(self, ensemble=None,
|
||||
distribution=None,
|
||||
trad=None, parent=None):
|
||||
super(Ensemble1ParamsWidget, self).__init__(
|
||||
parent=parent
|
||||
)
|
||||
self._trad = trad
|
||||
|
||||
self._ensemble = ensemble
|
||||
self._distribution = distribution
|
||||
self._labels = distribution.labels
|
||||
|
||||
self._init_default_labels()
|
||||
self._init_default_values()
|
||||
|
||||
def _init_default_labels(self):
|
||||
self.set_label_text("label_0", self._trad[self._labels[0]])
|
||||
|
||||
def _init_default_values(self):
|
||||
self._values = self._ensemble.params
|
||||
if len(self._values) != 1:
|
||||
self._values = self._distribution.default_values.copy()
|
||||
|
||||
self.set_double_spin_box("doubleSpinBox_0", self._values[0])
|
||||
|
||||
@property
|
||||
def values(self):
|
||||
self._values = [
|
||||
self.get_double_spin_box("doubleSpinBox_0"),
|
||||
]
|
||||
|
||||
return self._values
|
||||
|
||||
|
||||
class Ensemble2ParamsWidget(PamhyrWidget):
|
||||
_pamhyr_ui = "Ensemble2ParamsWidget"
|
||||
_pamhyr_name = "Parameters"
|
||||
|
||||
def __init__(self, ensemble=None,
|
||||
distribution=None,
|
||||
trad=None, parent=None):
|
||||
super(Ensemble2ParamsWidget, self).__init__(
|
||||
parent=parent
|
||||
)
|
||||
self._trad = trad
|
||||
|
||||
self._ensemble = ensemble
|
||||
self._distribution = distribution
|
||||
self._labels = distribution.labels
|
||||
|
||||
self._init_default_labels()
|
||||
self._init_default_values()
|
||||
|
||||
def _init_default_labels(self):
|
||||
self.set_label_text("label_0", self._trad[self._labels[0]])
|
||||
self.set_label_text("label_1", self._trad[self._labels[1]])
|
||||
|
||||
def _init_default_values(self):
|
||||
self._values = self._ensemble.params
|
||||
if len(self._values) != 2:
|
||||
self._values = self._distribution.default_values.copy()
|
||||
|
||||
self.set_double_spin_box("doubleSpinBox_0", self._values[0])
|
||||
self.set_double_spin_box("doubleSpinBox_1", self._values[1])
|
||||
|
||||
@property
|
||||
def values(self):
|
||||
self._values = [
|
||||
self.get_double_spin_box("doubleSpinBox_0"),
|
||||
self.get_double_spin_box("doubleSpinBox_1")
|
||||
]
|
||||
|
||||
return self._values
|
||||
@@ -0,0 +1,268 @@
|
||||
# Table.py -- Pamhyr
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import logging
|
||||
import traceback
|
||||
|
||||
from tools import trace, timer
|
||||
|
||||
from PyQt5.QtCore import (
|
||||
Qt, QVariant, QAbstractTableModel,
|
||||
QCoreApplication, QModelIndex, pyqtSlot,
|
||||
QRect,
|
||||
)
|
||||
|
||||
from PyQt5.QtWidgets import (
|
||||
QDialogButtonBox, QPushButton, QLineEdit,
|
||||
QFileDialog, QTableView, QAbstractItemView,
|
||||
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||
QComboBox,
|
||||
)
|
||||
|
||||
from View.Ensembles.UndoCommand import (
|
||||
SetNameCommand, SetTypeCommand, SetDataCommand,
|
||||
SetDistributionCommand,
|
||||
AddCommand, DelCommand,
|
||||
)
|
||||
|
||||
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||
|
||||
from View.Ensembles.Translate import *
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
|
||||
class ComboBoxDelegate(QItemDelegate):
|
||||
def __init__(self, data=None, study=None,
|
||||
mode="stricklers", trad=None, parent=None):
|
||||
super(ComboBoxDelegate, self).__init__(parent)
|
||||
|
||||
self._data = data
|
||||
self._study = study
|
||||
self._trad = trad
|
||||
self._mode = mode
|
||||
|
||||
def createEditor(self, parent, option, index):
|
||||
self.editor = QComboBox(parent)
|
||||
|
||||
if self._mode == "data_type":
|
||||
self.editor.addItems(
|
||||
[
|
||||
self._trad["not_defined"],
|
||||
self._trad["strickler_minor"],
|
||||
self._trad["strickler_medium"],
|
||||
]
|
||||
)
|
||||
elif self._mode == "stricklers":
|
||||
used = list(
|
||||
map(
|
||||
lambda e: (e.data_type, e._target_data),
|
||||
self._data.lst
|
||||
)
|
||||
)
|
||||
current = self._data.get(index.row())
|
||||
|
||||
self.editor.addItems(
|
||||
[self._trad["not_defined"]] +
|
||||
list(
|
||||
map(
|
||||
lambda s: str(s),
|
||||
filter(
|
||||
# Exclude target data already used for
|
||||
# this data type
|
||||
lambda s: (
|
||||
current.target_data == s or
|
||||
(current.data_type, s) not in used
|
||||
),
|
||||
self._study.river.stricklers.stricklers
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
elif self._mode == "distribution":
|
||||
self.editor.addItems(
|
||||
[self._trad["not_defined"]] +
|
||||
list(
|
||||
map(
|
||||
lambda f: f.name,
|
||||
self._study._ens_distributions.lst
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
self.editor.setCurrentText(index.data(Qt.DisplayRole))
|
||||
return self.editor
|
||||
|
||||
def setEditorData(self, editor, index):
|
||||
value = index.data(Qt.DisplayRole)
|
||||
self.editor.currentTextChanged.connect(self.currentItemChanged)
|
||||
|
||||
def setModelData(self, editor, model, index):
|
||||
text = str(editor.currentText())
|
||||
|
||||
if self._mode == "data_type":
|
||||
value = next(
|
||||
filter(
|
||||
lambda x: self._trad[x] == text,
|
||||
["strickler_minor", "strickler_medium"],
|
||||
),
|
||||
""
|
||||
)
|
||||
elif self._mode == "stricklers":
|
||||
value = next(
|
||||
filter(
|
||||
lambda s: str(s) == text,
|
||||
self._study.river.stricklers.stricklers
|
||||
),
|
||||
None
|
||||
)
|
||||
elif self._mode == "distribution":
|
||||
value = next(
|
||||
filter(
|
||||
lambda f: f.name == text,
|
||||
self._study._ens_distributions.lst
|
||||
),
|
||||
None
|
||||
)
|
||||
else:
|
||||
value = text
|
||||
|
||||
model.setData(index, value)
|
||||
|
||||
editor.close()
|
||||
editor.deleteLater()
|
||||
|
||||
def updateEditorGeometry(self, editor, option, index):
|
||||
r = QRect(option.rect)
|
||||
if self.editor.windowFlags() & Qt.Popup:
|
||||
if editor.parent() is not None:
|
||||
r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
|
||||
editor.setGeometry(r)
|
||||
|
||||
@pyqtSlot()
|
||||
def currentItemChanged(self):
|
||||
self.commitData.emit(self.sender())
|
||||
|
||||
|
||||
class EnsembleTableModel(PamhyrTableModel):
|
||||
def _setup_lst(self):
|
||||
self._lst = self._data
|
||||
self._study = self._opt_data
|
||||
|
||||
def data(self, index, role):
|
||||
if role != Qt.ItemDataRole.DisplayRole:
|
||||
return QVariant()
|
||||
|
||||
row = index.row()
|
||||
column = index.column()
|
||||
|
||||
if self._headers[column] == "name":
|
||||
return self._lst.get(row).name
|
||||
elif self._headers[column] == "type":
|
||||
return self._trad[self._lst.get(row).data_type]
|
||||
elif self._headers[column] == "target_data":
|
||||
value = self._lst.get(row).target_data
|
||||
if value is None:
|
||||
return self._trad["not_defined"]
|
||||
return str(value)
|
||||
elif self._headers[column] == "distribution":
|
||||
value = self._lst.get(row).distribution
|
||||
if value is None:
|
||||
return self._trad["not_defined"]
|
||||
return value.name
|
||||
elif self._headers[column] == "parameters":
|
||||
value = self._lst.get(row).params
|
||||
return str(value)
|
||||
|
||||
return QVariant()
|
||||
|
||||
def setData(self, index, value, role=Qt.EditRole):
|
||||
if not index.isValid() or role != Qt.EditRole:
|
||||
return False
|
||||
|
||||
if self.is_same_data(index, value):
|
||||
return False
|
||||
|
||||
row = index.row()
|
||||
column = index.column()
|
||||
|
||||
try:
|
||||
if self._headers[column] == "name":
|
||||
self._undo.push(
|
||||
SetNameCommand(
|
||||
self._lst, row, value
|
||||
)
|
||||
)
|
||||
elif self._headers[column] == "type":
|
||||
self._undo.push(
|
||||
SetTypeCommand(
|
||||
self._lst, row, value
|
||||
)
|
||||
)
|
||||
elif self._headers[column] == "target_data":
|
||||
self._undo.push(
|
||||
SetDataCommand(
|
||||
self._lst, row, value
|
||||
)
|
||||
)
|
||||
elif self._headers[column] == "distribution":
|
||||
self._undo.push(
|
||||
SetDistributionCommand(
|
||||
self._lst, row, value
|
||||
)
|
||||
)
|
||||
except Exception as e:
|
||||
logger.info(e)
|
||||
logger.debug(traceback.format_exc())
|
||||
|
||||
self.dataChanged.emit(index, index)
|
||||
return True
|
||||
|
||||
def add(self, row, parent=QModelIndex()):
|
||||
self.beginInsertRows(parent, row, row - 1)
|
||||
|
||||
self._undo.push(
|
||||
AddCommand(
|
||||
self._lst, row,
|
||||
)
|
||||
)
|
||||
|
||||
self.endInsertRows()
|
||||
self.layoutChanged.emit()
|
||||
|
||||
def delete(self, rows, parent=QModelIndex()):
|
||||
self.beginRemoveRows(parent, rows[0], rows[-1])
|
||||
|
||||
self._undo.push(
|
||||
DelCommand(
|
||||
self._lst, rows
|
||||
)
|
||||
)
|
||||
|
||||
self.endRemoveRows()
|
||||
self.layoutChanged.emit()
|
||||
|
||||
def undo(self):
|
||||
self._undo.undo()
|
||||
self.layoutChanged.emit()
|
||||
|
||||
def redo(self):
|
||||
self._undo.redo()
|
||||
self.layoutChanged.emit()
|
||||
@@ -0,0 +1,50 @@
|
||||
# Translate.py -- Pamhyr
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from PyQt5.QtCore import QCoreApplication
|
||||
|
||||
from View.Translate import MainTranslate
|
||||
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
|
||||
class EnsemblesTranslate(MainTranslate):
|
||||
def __init__(self):
|
||||
super(EnsemblesTranslate, self).__init__()
|
||||
|
||||
self._dict["Ensembles"] = _translate(
|
||||
"Ensembles", "Ensembles"
|
||||
)
|
||||
|
||||
self._dict["ensemble"] = _translate(
|
||||
"Ensembles", "Ensembles scenario"
|
||||
)
|
||||
self._dict["strickler_minor"] = _translate(
|
||||
"Ensembles", "Stricklers minor"
|
||||
)
|
||||
self._dict["strickler_medium"] = _translate(
|
||||
"Ensembles", "Stricklers medium"
|
||||
)
|
||||
|
||||
self._sub_dict["table_headers"] = {
|
||||
"name": self._dict["name"],
|
||||
"type": _translate("Ensembles", "Type"),
|
||||
"target_data": _translate("Ensembles", "Target data"),
|
||||
"distribution": _translate("Ensembles", "Distribution"),
|
||||
"parameters": _translate("Ensembles", "Parameters"),
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
# UndoCommand.py -- Pamhyr
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from copy import deepcopy
|
||||
from tools import trace, timer
|
||||
|
||||
from PyQt5.QtWidgets import (
|
||||
QMessageBox, QUndoCommand, QUndoStack,
|
||||
)
|
||||
|
||||
from Model.Friction.Friction import Friction
|
||||
from Model.Friction.FrictionList import FrictionList
|
||||
|
||||
|
||||
class SetNameCommand(QUndoCommand):
|
||||
def __init__(self, ensembles, index, new_value):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ensembles = ensembles
|
||||
self._index = index
|
||||
self._old = self._ensembles.get(self._index).name
|
||||
self._new = str(new_value)
|
||||
|
||||
def undo(self):
|
||||
self._ensembles.get(self._index).name = self._old
|
||||
|
||||
def redo(self):
|
||||
self._ensembles.get(self._index).name = self._new
|
||||
|
||||
|
||||
class SetTypeCommand(QUndoCommand):
|
||||
def __init__(self, ensembles, index, new_value):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ensembles = ensembles
|
||||
self._index = index
|
||||
self._old = self._ensembles.get(self._index)\
|
||||
.data_type
|
||||
self._new = new_value
|
||||
|
||||
def undo(self):
|
||||
self._ensembles.get(self._index).data_type = self._old
|
||||
|
||||
def redo(self):
|
||||
self._ensembles.get(self._index).data_type = self._new
|
||||
|
||||
|
||||
class SetDataCommand(QUndoCommand):
|
||||
def __init__(self, ensembles, index, data):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ensembles = ensembles
|
||||
self._index = index
|
||||
self._old = self._ensembles.get(self._index)\
|
||||
.target_data
|
||||
self._new = data
|
||||
|
||||
def undo(self):
|
||||
self._ensembles.get(self._index).target_data = self._old
|
||||
|
||||
def redo(self):
|
||||
self._ensembles.get(self._index).target_data = self._new
|
||||
|
||||
|
||||
class SetDistributionCommand(QUndoCommand):
|
||||
def __init__(self, ensembles, index, distribution):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ensembles = ensembles
|
||||
self._index = index
|
||||
self._old = self._ensembles.get(self._index).distribution
|
||||
self._old_params = self._ensembles.get(self._index).params
|
||||
self._new = distribution
|
||||
|
||||
def undo(self):
|
||||
self._ensembles.get(self._index).distribution = self._old
|
||||
self._ensembles.get(self._index).params = self._old_params
|
||||
|
||||
def redo(self):
|
||||
self._ensembles.get(self._index).distribution = self._new
|
||||
if self._new is not None:
|
||||
self._ensembles.get(self._index).params = self._new.default_values
|
||||
|
||||
|
||||
class AddCommand(QUndoCommand):
|
||||
def __init__(self, ensembles, index):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ensembles = ensembles
|
||||
self._index = index
|
||||
self._new = None
|
||||
|
||||
def undo(self):
|
||||
self._ensembles.delete_i([self._index])
|
||||
|
||||
def redo(self):
|
||||
if self._new is None:
|
||||
self._new = self._ensembles.new(self._index)
|
||||
else:
|
||||
self._ensembles.insert(self._index, self._new)
|
||||
|
||||
|
||||
class ImportCommand(QUndoCommand):
|
||||
def __init__(self, ensembles, data, index):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ensembles = ensembles
|
||||
self._index = index
|
||||
self._data = data
|
||||
self._news = None
|
||||
|
||||
def undo(self):
|
||||
for new in self._news:
|
||||
new.set_as_deleted()
|
||||
|
||||
def redo(self):
|
||||
if self._news is None:
|
||||
self._news = list(
|
||||
map(
|
||||
lambda d: self._ensembles.new_with_data(
|
||||
self._index, d
|
||||
),
|
||||
self._data,
|
||||
)
|
||||
)
|
||||
else:
|
||||
for new in self._news:
|
||||
new.set_as_not_deleted()
|
||||
|
||||
|
||||
class DelCommand(QUndoCommand):
|
||||
def __init__(self, ensembles, rows):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ensembles = ensembles
|
||||
self._rows = rows
|
||||
|
||||
self._friction = []
|
||||
for row in rows:
|
||||
self._friction.append((row, self._ensembles.get(row)))
|
||||
self._friction.sort()
|
||||
|
||||
def undo(self):
|
||||
for row, el in self._friction:
|
||||
self._ensembles.insert(row, el)
|
||||
|
||||
def redo(self):
|
||||
self._ensembles.delete_i(self._rows)
|
||||
|
||||
|
||||
class SetAllCommand(QUndoCommand):
|
||||
def __init__(self, ensemble, data):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._ensemble = ensemble
|
||||
self._old = self._ensemble.get_data_dict()
|
||||
self._new = data
|
||||
|
||||
def undo(self):
|
||||
self._ensemble.set_data_dict(self._old)
|
||||
|
||||
def redo(self):
|
||||
self._ensemble.set_data_dict(self._new)
|
||||
@@ -0,0 +1,280 @@
|
||||
# Window.py -- Pamhyr
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import logging
|
||||
import json
|
||||
|
||||
from tools import trace, timer, logger_exception
|
||||
|
||||
from View.Tools.PamhyrWindow import PamhyrWindow, PamhyrDialog
|
||||
|
||||
from PyQt5.QtGui import (
|
||||
QKeySequence,
|
||||
)
|
||||
|
||||
from PyQt5 import QtWidgets
|
||||
from PyQt5.QtCore import (
|
||||
Qt, QVariant, QAbstractTableModel,
|
||||
QCoreApplication, QModelIndex, pyqtSlot,
|
||||
QRect, QSettings,
|
||||
)
|
||||
|
||||
from PyQt5.QtWidgets import (
|
||||
QDialogButtonBox, QPushButton, QLineEdit,
|
||||
QFileDialog, QTableView, QAbstractItemView,
|
||||
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||
QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
|
||||
)
|
||||
|
||||
from Modules import Modules
|
||||
|
||||
from View.Ensembles.Edit.Window import EnsembleEditDialog
|
||||
from View.Ensembles.Table import (
|
||||
EnsembleTableModel, ComboBoxDelegate
|
||||
)
|
||||
from View.Ensembles.Translate import EnsemblesTranslate
|
||||
from View.Ensembles.UndoCommand import SetAllCommand, ImportCommand
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class EnsemblesWindow(PamhyrWindow):
|
||||
_pamhyr_ui = "Ensembles"
|
||||
_pamhyr_name = "Ensembles"
|
||||
|
||||
def __init__(self, ensembles=None,
|
||||
study=None, config=None,
|
||||
parent=None):
|
||||
trad = EnsemblesTranslate()
|
||||
|
||||
self._ensembles = ensembles
|
||||
|
||||
name = (
|
||||
trad[self._pamhyr_name] + " - " +
|
||||
study.name
|
||||
)
|
||||
|
||||
super(EnsemblesWindow, self).__init__(
|
||||
title=name,
|
||||
study=study,
|
||||
config=config,
|
||||
trad=trad,
|
||||
parent=parent
|
||||
)
|
||||
|
||||
self.setup_table()
|
||||
self.setup_connections()
|
||||
|
||||
def setup_table_delegate(self):
|
||||
self._delegate_stricklers = ComboBoxDelegate(
|
||||
data=self._ensembles,
|
||||
study=self._study,
|
||||
mode="stricklers",
|
||||
trad=self._trad,
|
||||
parent=self
|
||||
)
|
||||
|
||||
self._delegate_data_type = ComboBoxDelegate(
|
||||
data=self._ensembles,
|
||||
study=self._study,
|
||||
mode="data_type",
|
||||
trad=self._trad,
|
||||
parent=self
|
||||
)
|
||||
|
||||
self._delegate_distribution = ComboBoxDelegate(
|
||||
data=self._ensembles,
|
||||
study=self._study,
|
||||
mode="distribution",
|
||||
trad=self._trad,
|
||||
parent=self
|
||||
)
|
||||
|
||||
return {
|
||||
"type": self._delegate_data_type,
|
||||
"target_data": self._delegate_stricklers,
|
||||
"distribution": self._delegate_distribution,
|
||||
}
|
||||
|
||||
def setup_table(self):
|
||||
self._table = {}
|
||||
|
||||
delegates = self.setup_table_delegate()
|
||||
|
||||
editable_headers = [
|
||||
"name",
|
||||
]
|
||||
|
||||
table = self.find(QTableView, f"tableView")
|
||||
self._table = EnsembleTableModel(
|
||||
table_view=table,
|
||||
table_headers=self._trad.get_dict("table_headers"),
|
||||
editable_headers=editable_headers,
|
||||
delegates=delegates,
|
||||
data=self._ensembles,
|
||||
trad=self._trad,
|
||||
undo=self._undo_stack,
|
||||
opt_data=self._study
|
||||
)
|
||||
|
||||
table.setModel(self._table)
|
||||
table.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||
table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
|
||||
table.setAlternatingRowColors(True)
|
||||
|
||||
def setup_connections(self):
|
||||
self.find(QAction, "action_add").triggered.connect(self.add)
|
||||
self.find(QAction, "action_del").triggered.connect(self.delete)
|
||||
self.find(QAction, "action_edit").triggered.connect(self.edit)
|
||||
self.find(QAction, "action_export").triggered.connect(
|
||||
self.export_to_json
|
||||
)
|
||||
self.find(QAction, "action_import").triggered.connect(
|
||||
self.import_from_json
|
||||
)
|
||||
|
||||
table = self.find(QTableView, f"tableView")
|
||||
table.selectionModel()\
|
||||
.selectionChanged\
|
||||
.connect(self.update)
|
||||
|
||||
self._table.dataChanged\
|
||||
.connect(self.update)
|
||||
|
||||
def index_selected_rows(self):
|
||||
table = self.find(QTableView, f"tableView")
|
||||
return list(
|
||||
# Delete duplicate
|
||||
set(
|
||||
map(
|
||||
lambda i: i.row(),
|
||||
table.selectedIndexes()
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
def add(self):
|
||||
rows = self.index_selected_rows()
|
||||
if len(self._ensembles) == 0 or len(rows) == 0:
|
||||
self._table.add(0)
|
||||
else:
|
||||
self._table.add(rows[0])
|
||||
|
||||
def delete(self):
|
||||
rows = self.index_selected_rows()
|
||||
if len(rows) == 0:
|
||||
return
|
||||
|
||||
self._table.delete(rows)
|
||||
|
||||
def _undo(self):
|
||||
self._table.undo()
|
||||
|
||||
def _redo(self):
|
||||
self._table.redo()
|
||||
|
||||
def edit(self):
|
||||
rows = self.index_selected_rows()
|
||||
|
||||
for row in rows:
|
||||
try:
|
||||
ens = self._ensembles.get(row)
|
||||
dlg = EnsembleEditDialog(
|
||||
study=self._study,
|
||||
ensemble=ens,
|
||||
parent=self
|
||||
)
|
||||
|
||||
if dlg.exec():
|
||||
self._undo_stack.push(
|
||||
SetAllCommand(
|
||||
ens, dlg.values
|
||||
)
|
||||
)
|
||||
except Exception as e:
|
||||
logger_exception(e)
|
||||
return
|
||||
|
||||
def export_to_json(self):
|
||||
ens = []
|
||||
for e in self._ensembles.lst:
|
||||
ens.append(e.get_data_dict(use_ids=True))
|
||||
|
||||
data = {"ensembles": ens}
|
||||
|
||||
def aux(filename):
|
||||
with open(filename[0], 'w') as f:
|
||||
f.write(json.dumps(data))
|
||||
|
||||
self.file_dialog(
|
||||
select_file=None,
|
||||
callback=aux,
|
||||
default_suffix='.json',
|
||||
file_filter=[self._trad["file_json"]]
|
||||
)
|
||||
|
||||
def import_from_json(self):
|
||||
def aux(filename):
|
||||
with open(filename[0], 'r') as f:
|
||||
return json.load(f)
|
||||
|
||||
data = self.file_dialog(
|
||||
select_file=None,
|
||||
callback=aux,
|
||||
default_suffix='.json',
|
||||
file_filter=[self._trad["file_json"]]
|
||||
)
|
||||
|
||||
dtarget = dict(
|
||||
map(
|
||||
lambda s: (s.pamhyr_id, s),
|
||||
self._study.river.stricklers.stricklers
|
||||
)
|
||||
)
|
||||
|
||||
ddistr = dict(
|
||||
map(
|
||||
lambda d: (d.name, d),
|
||||
self._study._ens_distributions.lst
|
||||
)
|
||||
)
|
||||
|
||||
def update(d, values):
|
||||
d.update(values)
|
||||
return d
|
||||
|
||||
updated = list(
|
||||
map(
|
||||
lambda d: update(
|
||||
d, {"target_data": dtarget[d["target_data"]]}
|
||||
),
|
||||
map(
|
||||
lambda d: update(
|
||||
d, {"distribution": ddistr[d["distribution"]]}
|
||||
),
|
||||
data["ensembles"]
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
self._undo_stack.push(
|
||||
ImportCommand(
|
||||
self._ensembles, updated, 0
|
||||
)
|
||||
)
|
||||
self._table.update()
|
||||
+80
-1
@@ -67,6 +67,7 @@ from View.Configure.Window import ConfigureWindow
|
||||
from View.Study.Window import NewStudyWindow
|
||||
from View.About.Window import AboutWindow
|
||||
from View.Scenarios.Window import ScenariosWindow
|
||||
from View.Ensembles.Window import EnsemblesWindow
|
||||
from View.Network.Window import NetworkWindow
|
||||
from View.Geometry.Window import GeometryWindow
|
||||
from View.BoundaryCondition.Window import BoundaryConditionWindow
|
||||
@@ -83,11 +84,14 @@ from View.GeoTIFF.Window import GeoTIFFListWindow
|
||||
from View.REPLines.Window import REPLineListWindow
|
||||
from View.SolverParameters.Window import SolverParametersWindow
|
||||
from View.RunSolver.Window import (
|
||||
EnsembleRunNumberDialog,
|
||||
SelectSolverWindow,
|
||||
SolverLogWindow,
|
||||
SolverLogEnsWindow,
|
||||
)
|
||||
|
||||
from View.Results.Window import ResultsWindow
|
||||
|
||||
from View.Results.Window import ResultsWindow, ResultsEnsembleWindow
|
||||
from View.Results.CompareDialog import (
|
||||
CompareScenariosWindow
|
||||
)
|
||||
@@ -1339,6 +1343,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
"""
|
||||
if self._study is None:
|
||||
return
|
||||
|
||||
if self._study.filename is None or self._study.filename == "":
|
||||
self.message_box(
|
||||
window_title=self._trad["Warning"],
|
||||
@@ -1372,6 +1377,29 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
self.scenarios = ScenariosWindow(study=self._study, parent=self)
|
||||
self.scenarios.show()
|
||||
|
||||
def open_ensemble_scenario(self):
|
||||
"""Open ensemble scenario window
|
||||
|
||||
Returns:
|
||||
Nothing
|
||||
"""
|
||||
if self._study is None:
|
||||
return
|
||||
|
||||
if self.sub_window_exists(
|
||||
EnsemblesWindow,
|
||||
data=[self._study, self.conf]
|
||||
):
|
||||
return
|
||||
|
||||
ensemble = EnsemblesWindow(
|
||||
ensembles=self._study.river._ensembles,
|
||||
study=self._study,
|
||||
config=self.conf,
|
||||
parent=self
|
||||
)
|
||||
ensemble.show()
|
||||
|
||||
def open_geometry(self):
|
||||
"""Open geometry window
|
||||
|
||||
@@ -1728,6 +1756,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
sol.show()
|
||||
|
||||
def solver_log(self, solver):
|
||||
if self._study.status.scenario.is_ensemble():
|
||||
return self._solver_log_ensemble(solver)
|
||||
|
||||
sol = SolverLogWindow(
|
||||
study=self._study,
|
||||
config=self.conf,
|
||||
@@ -1736,6 +1767,28 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
)
|
||||
sol.show()
|
||||
|
||||
def _solver_log_ensemble(self, solver):
|
||||
run_number = 1
|
||||
|
||||
dlg = EnsembleRunNumberDialog(
|
||||
trad=self._trad,
|
||||
parent=self
|
||||
)
|
||||
if dlg.exec():
|
||||
function = dlg.function
|
||||
number_of_run = dlg.number
|
||||
seed = dlg.seed
|
||||
|
||||
sol = SolverLogEnsWindow(
|
||||
number_of_run=number_of_run,
|
||||
seed=seed, function=function,
|
||||
study=self._study,
|
||||
config=self.conf,
|
||||
solver=solver,
|
||||
parent=self
|
||||
)
|
||||
sol.show()
|
||||
|
||||
def msg_box_results_continue(self):
|
||||
dlg = QMessageBox(self)
|
||||
|
||||
@@ -1812,6 +1865,12 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
if not self.msg_box_results_continue():
|
||||
return
|
||||
|
||||
if self._study.status.scenario.is_ensemble():
|
||||
self.open_solver_ens_results_window(solver, results)
|
||||
else:
|
||||
self.open_solver_results_window(solver, results)
|
||||
|
||||
def open_solver_results_window(self, solver, results):
|
||||
# Windows already opened
|
||||
if self.sub_window_exists(
|
||||
ResultsWindow,
|
||||
@@ -1831,6 +1890,26 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
)
|
||||
res.show()
|
||||
|
||||
def open_solver_ens_results_window(self, solver, results):
|
||||
# Windows already opened
|
||||
if self.sub_window_exists(
|
||||
ResultsEnsembleWindow,
|
||||
data=[
|
||||
self._study,
|
||||
None, # No config,
|
||||
results._solver,
|
||||
results._repertory,
|
||||
results._name]
|
||||
):
|
||||
return
|
||||
|
||||
res = ResultsEnsembleWindow(
|
||||
study=self._study,
|
||||
results=[results],
|
||||
parent=self
|
||||
)
|
||||
res.show()
|
||||
|
||||
def msg_open_results_no_results(self):
|
||||
self.message_box(
|
||||
window_title=self._trad["Warning"],
|
||||
|
||||
@@ -26,10 +26,13 @@ from View.Results.translate import ResultsTranslate
|
||||
|
||||
|
||||
class CustomExportDialog(PamhyrDialog):
|
||||
_pamhyr_ui = "CustomExportAdisDialog"
|
||||
_pamhyr_name = "Custom Plot Selection"
|
||||
_pamhyr_ui = "CustomExportDialog"
|
||||
_pamhyr_name = "Custom Export"
|
||||
|
||||
def __init__(self, parent=None):
|
||||
def __init__(self,
|
||||
tag_x="values_x",
|
||||
tag_y="values_y",
|
||||
parent=None):
|
||||
trad = ResultsTranslate()
|
||||
super(CustomExportDialog, self).__init__(
|
||||
title=trad[self._pamhyr_name],
|
||||
@@ -38,8 +41,8 @@ class CustomExportDialog(PamhyrDialog):
|
||||
parent=parent
|
||||
)
|
||||
|
||||
self._available_values_x = self._trad.get_dict("values_x")
|
||||
self._available_values_y = self._trad.get_dict("values_y")
|
||||
self._available_values_x = self._trad.get_dict(tag_x)
|
||||
self._available_values_y = self._trad.get_dict(tag_y)
|
||||
|
||||
self.setup_radio_buttons_x()
|
||||
self.setup_radio_buttons_res()
|
||||
@@ -66,8 +69,8 @@ class CustomExportDialog(PamhyrDialog):
|
||||
|
||||
def setup_radio_buttons_res(self):
|
||||
self._radio2 = []
|
||||
layout = self.find(QVBoxLayout, "verticalLayout_pol")
|
||||
label = self.find(QLabel, "label_3")
|
||||
layout = self.find(QVBoxLayout, "verticalLayout_solv")
|
||||
label = self.find(QLabel, "label_solv")
|
||||
label.setText(self._trad["solver"])
|
||||
|
||||
for solver in self.parent._solvers:
|
||||
@@ -89,7 +92,7 @@ class CustomExportDialog(PamhyrDialog):
|
||||
layout.addStretch()
|
||||
|
||||
def setup_label(self):
|
||||
self._label = self.find(QLabel, "label_4")
|
||||
self._label = self.find(QLabel, "label_data")
|
||||
self._label.setFrameStyle(QFrame.StyledPanel)
|
||||
self._label.setStyleSheet('background-color: white')
|
||||
self.set_label()
|
||||
@@ -163,6 +166,15 @@ class CustomExportDialog(PamhyrDialog):
|
||||
res = i
|
||||
break
|
||||
|
||||
self.value = x, y, self._envelop.isChecked(), res
|
||||
self.value = (x, y, self._envelop.isChecked(), res)
|
||||
|
||||
super().accept()
|
||||
|
||||
|
||||
class CustomExportEnsembleDialog(CustomExportDialog):
|
||||
def __init__(self, parent=None):
|
||||
super(CustomExportEnsembleDialog, self).__init__(
|
||||
tag_x="values_x_ens",
|
||||
tag_y="values_y_ens",
|
||||
parent=parent
|
||||
)
|
||||
@@ -0,0 +1,261 @@
|
||||
# PlotHEnsemble.py -- Pamhyr
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import logging
|
||||
|
||||
from functools import reduce
|
||||
from datetime import datetime
|
||||
|
||||
from tools import timer, trace, logger_exception
|
||||
from View.Tools.PamhyrPlot import PamhyrPlot
|
||||
|
||||
from PyQt5.QtCore import (
|
||||
QCoreApplication
|
||||
)
|
||||
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class PlotHEnsemble(PamhyrPlot):
|
||||
def __init__(self, canvas=None, trad=None, toolbar=None,
|
||||
results=None, reach_id=0, profile_id=[0], res_id=[0],
|
||||
parent=None):
|
||||
super(PlotHEnsemble, self).__init__(
|
||||
canvas=canvas,
|
||||
trad=trad,
|
||||
data=results,
|
||||
toolbar=toolbar,
|
||||
parent=parent
|
||||
)
|
||||
|
||||
self._mode = "time"
|
||||
|
||||
self._parent = parent
|
||||
self._current_reach_id = reach_id
|
||||
self._current_profile_id = profile_id
|
||||
self._current_res_id = res_id
|
||||
self._timestamps = parent._timestamps
|
||||
self._current_timestamp = max(self._timestamps)
|
||||
|
||||
self.label_x = self._trad["unit_time_s"]
|
||||
self.label_y = self._trad["unit_discharge"]
|
||||
|
||||
self.label_discharge = _translate("Results", "Cross-section discharge")
|
||||
self.label_discharge_max = _translate("Results", "Max discharge")
|
||||
self.label_timestamp = _translate("Results", "Current timestamp")
|
||||
|
||||
self._isometric_axis = False
|
||||
|
||||
# self._auto_relim_update = False
|
||||
# self._autoscale_update = False
|
||||
|
||||
self._line_max = []
|
||||
self._line = []
|
||||
self._add_data_lines = []
|
||||
|
||||
@property
|
||||
def results(self):
|
||||
return self.data
|
||||
|
||||
@results.setter
|
||||
def results(self, results):
|
||||
self.data = results
|
||||
self._current_timestamp = max(self._timestamps)
|
||||
|
||||
@timer
|
||||
def draw(self, highlight=None):
|
||||
self.canvas.axes.cla()
|
||||
self.canvas.axes.grid(color='grey', linestyle='--', linewidth=0.5)
|
||||
|
||||
if self.results is None:
|
||||
return
|
||||
|
||||
if len(self._current_res_id) < 1:
|
||||
return
|
||||
|
||||
for res_id in self._current_res_id:
|
||||
if self.results[res_id] is None:
|
||||
continue
|
||||
|
||||
results = self.results[res_id]
|
||||
reach = results.river.reach(self._current_reach_id)
|
||||
|
||||
if reach.geometry.number_profiles == 0:
|
||||
self._init = False
|
||||
return
|
||||
|
||||
self.draw_data(res_id)
|
||||
self.draw_data_std_derivation(res_id)
|
||||
|
||||
self.canvas.axes.set_xlabel(
|
||||
self._trad["unit_time_s"],
|
||||
color='black', fontsize=10
|
||||
)
|
||||
|
||||
self.canvas.axes.set_ylabel(
|
||||
self._trad["unit_discharge"],
|
||||
color='black', fontsize=10
|
||||
)
|
||||
|
||||
self.set_ticks_time_formater()
|
||||
|
||||
self.draw_additional_data(0)
|
||||
|
||||
self.enable_legend()
|
||||
|
||||
self.canvas.draw_idle()
|
||||
self.update_idle()
|
||||
|
||||
self.draw_current()
|
||||
self._init = True
|
||||
|
||||
@timer
|
||||
def draw_data(self, res_id):
|
||||
results = self.results[res_id]
|
||||
reach = results.river.reach(self._current_reach_id)
|
||||
|
||||
colors = [
|
||||
("q_min", self.color_plot_ensemble_min),
|
||||
("q_mean", self.color_plot_ensemble_mean),
|
||||
("q_max", self.color_plot_ensemble_max),
|
||||
]
|
||||
|
||||
for t, c in colors:
|
||||
q = results.get("table")[t]
|
||||
profile = reach.profile(self._current_profile_id[0])
|
||||
|
||||
x = self._timestamps
|
||||
y = q[:, profile.global_index]
|
||||
# y = profile.get_key("Q")
|
||||
|
||||
if res_id == 2:
|
||||
label = f"Δ {self.label_discharge} {t} {profile.name}"
|
||||
else:
|
||||
label = f"{self.label_discharge} {t} {profile.name}"
|
||||
|
||||
line, = self.canvas.axes.plot(
|
||||
x, y,
|
||||
label=label,
|
||||
color=c,
|
||||
# linestyle=self.linestyle[i % len(self.linestyle)],
|
||||
**self.plot_default_kargs
|
||||
)
|
||||
|
||||
self._line.append(line)
|
||||
|
||||
@timer
|
||||
def draw_data_std_derivation(self, res_id):
|
||||
results = self.results[res_id]
|
||||
reach = results.river.reach(self._current_reach_id)
|
||||
|
||||
q = results.get("table")["q_mean"]
|
||||
std_deriv = results.get("table")["q_std_derivation"]
|
||||
profile = reach.profile(self._current_profile_id[0])
|
||||
|
||||
x = self._timestamps
|
||||
y = q[:, profile.global_index]
|
||||
std = std_deriv[:, profile.global_index]
|
||||
|
||||
y_b = y - std
|
||||
y_t = y + std
|
||||
|
||||
plot = self.canvas.axes.fill_between(
|
||||
x, y_b, y_t,
|
||||
label=f"Standard derivation {profile.name}",
|
||||
color=self.color_plot_ensemble_std_deriv,
|
||||
alpha=0.3,
|
||||
)
|
||||
|
||||
def draw_additional_data(self, res_id):
|
||||
results = self.results[res_id]
|
||||
|
||||
self._add_data_lines = []
|
||||
|
||||
for data in results.get("additional_data"):
|
||||
data = data._data
|
||||
x, y = data['x'], data['y']
|
||||
legend = data['legend']
|
||||
unit = data['unit']
|
||||
|
||||
if data['type_x'] == 'time' and data['type_y'] == 'discharge':
|
||||
line, = self.canvas.axes.plot(
|
||||
x, y, marker="+",
|
||||
label=legend + ' ' + unit
|
||||
)
|
||||
|
||||
self._add_data_lines.append(line)
|
||||
|
||||
self.enable_legend()
|
||||
self.canvas.draw_idle()
|
||||
|
||||
def draw_current(self):
|
||||
self._current, = self.canvas.axes.plot(
|
||||
[self._current_timestamp, self._current_timestamp],
|
||||
self.canvas.axes.get_ylim(),
|
||||
# label=self.label_timestamp,
|
||||
color="grey",
|
||||
linestyle="dashed",
|
||||
lw=1.,
|
||||
)
|
||||
|
||||
def set_reach(self, reach_id):
|
||||
self._current_reach_id = reach_id
|
||||
self._current_profile_id = [0]
|
||||
self.draw()
|
||||
|
||||
def set_profile(self, profile_id):
|
||||
self._current_profile_id = profile_id
|
||||
# self.update()
|
||||
self.draw()
|
||||
|
||||
def set_result(self, res_id):
|
||||
self._current_res_id = res_id
|
||||
self.draw()
|
||||
|
||||
def set_timestamp(self, timestamp):
|
||||
self._current_timestamp = timestamp
|
||||
self.update_current()
|
||||
self.update_idle()
|
||||
|
||||
def update(self):
|
||||
if not self._init:
|
||||
self.draw()
|
||||
|
||||
self.update_current()
|
||||
self.update_idle()
|
||||
|
||||
def update_additional_data(self):
|
||||
self.draw_additional_data(0)
|
||||
self.update_idle()
|
||||
|
||||
def update_all(self):
|
||||
self._current_reach_id = self._parent._get_current_reach()
|
||||
self._current_profile_id = self._parent._get_current_profiles_list()
|
||||
self._current_res_id = self._parent._get_current_results()
|
||||
self._current_timestamp = self._parent._get_current_timestamp()
|
||||
self._init = False
|
||||
self.update()
|
||||
|
||||
def update_current(self):
|
||||
y = self._current.get_ydata()
|
||||
self._current.set_data(
|
||||
[self._current_timestamp, self._current_timestamp],
|
||||
y
|
||||
)
|
||||
+10
-36
@@ -124,12 +124,8 @@ class PlotRKC(PamhyrPlot):
|
||||
table = results.get("table")["zfd"]
|
||||
ts = results.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
zfd = list(
|
||||
map(
|
||||
lambda p: table[ts, p.global_index],
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
gi_0, gi_1 = reach.global_index
|
||||
zfd = table[ts, gi_0:gi_1 + 1]
|
||||
|
||||
self.line_bottom, = self.canvas.axes.plot(
|
||||
rk, zfd,
|
||||
@@ -189,14 +185,8 @@ class PlotRKC(PamhyrPlot):
|
||||
table = result.get("table")["Z"]
|
||||
ts = result.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
water_z = list(
|
||||
map(
|
||||
lambda p: table[
|
||||
ts, p.global_index
|
||||
],
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
gi_0, gi_1 = reach.global_index
|
||||
water_z = table[ts, gi_0:gi_1 + 1]
|
||||
|
||||
self.water = self.canvas.axes.plot(
|
||||
rk, water_z,
|
||||
@@ -219,16 +209,8 @@ class PlotRKC(PamhyrPlot):
|
||||
table = result.get("table")["Z"]
|
||||
ts = result.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
water_z = list(
|
||||
map(
|
||||
lambda p: np.max(
|
||||
table[
|
||||
:, p.global_index
|
||||
]
|
||||
),
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
gi_0, gi_1 = reach.global_index
|
||||
water_z = table[ts, gi_0:gi_1 + 1]
|
||||
|
||||
self.canvas.axes.plot(
|
||||
rk, water_z, lw=1.,
|
||||
@@ -361,14 +343,8 @@ class PlotRKC(PamhyrPlot):
|
||||
table = result.get("table")["Z"]
|
||||
ts = result.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
water_z = list(
|
||||
map(
|
||||
lambda p: table[
|
||||
ts, p.global_index
|
||||
],
|
||||
reach.profiles
|
||||
)
|
||||
)
|
||||
gi_0, gi_1 = reach.global_index
|
||||
water_z = table[ts, gi_0:gi_1 + 1]
|
||||
|
||||
self.water[0].set_data(
|
||||
rk, water_z
|
||||
@@ -411,10 +387,8 @@ class PlotRKC(PamhyrPlot):
|
||||
table = results.get("table")["zfd"]
|
||||
ts = results.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
zfd = list(map(
|
||||
lambda p: table[ts, p.global_index],
|
||||
reach.profiles
|
||||
))
|
||||
gi_0, gi_1 = reach.global_index
|
||||
zfd = table[ts, gi_0:gi_1 + 1]
|
||||
|
||||
self.line_bottom.remove()
|
||||
|
||||
|
||||
@@ -0,0 +1,355 @@
|
||||
# PlotRKCEnsemble.py -- Pamhyr
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import logging
|
||||
import numpy as np
|
||||
|
||||
from functools import reduce
|
||||
|
||||
from tools import timer
|
||||
from View.Tools.PamhyrPlot import PamhyrPlot
|
||||
|
||||
from PyQt5.QtCore import (
|
||||
QCoreApplication
|
||||
)
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class PlotRKCEnsemble(PamhyrPlot):
|
||||
def __init__(self, canvas=None, trad=None, toolbar=None,
|
||||
results=None, reach_id=0, profile_id=0,
|
||||
parent=None):
|
||||
super(PlotRKCEnsemble, self).__init__(
|
||||
canvas=canvas,
|
||||
trad=trad,
|
||||
data=results,
|
||||
toolbar=toolbar,
|
||||
parent=parent
|
||||
)
|
||||
|
||||
self._parent = parent
|
||||
self._current_reach_id = reach_id
|
||||
self._current_profile_id = profile_id
|
||||
self._timestamps = parent._timestamps
|
||||
self._current_timestamp = max(self._timestamps)
|
||||
|
||||
self.label_x = self._trad["unit_rk"]
|
||||
self.label_y = self._trad["unit_elevation"]
|
||||
|
||||
self.label_bottom = self._trad["label_bottom"]
|
||||
self.label_water = self._trad["label_water"]
|
||||
self.label_water_mean = self._trad["label_water_mean"]
|
||||
self.label_water_min = self._trad["label_water_min"]
|
||||
self.label_water_max = self._trad["label_water_max"]
|
||||
|
||||
self.water = []
|
||||
|
||||
self._isometric_axis = False
|
||||
|
||||
self._auto_relim_update = True
|
||||
self._autoscale_update = False
|
||||
|
||||
@property
|
||||
def results(self):
|
||||
return self.data
|
||||
|
||||
@results.setter
|
||||
def results(self, results):
|
||||
self.data = results
|
||||
self._current_timestamp = max(self._timestamps)
|
||||
|
||||
@timer
|
||||
def draw(self, highlight=None):
|
||||
self.init_axes()
|
||||
|
||||
if self.results is None:
|
||||
return
|
||||
|
||||
if self.results[0] is None:
|
||||
return
|
||||
|
||||
results = self.results[0]
|
||||
reach = results.river.reach(self._current_reach_id)
|
||||
|
||||
self.draw_bottom(reach)
|
||||
self.draw_std_derivation(reach)
|
||||
self.draw_water_elevation(reach)
|
||||
self.draw_current(reach)
|
||||
self.draw_profiles_hs(reach)
|
||||
|
||||
self.enable_legend()
|
||||
|
||||
self.idle()
|
||||
self._init = True
|
||||
|
||||
def draw_bottom(self, reach):
|
||||
self.draw_bottom_geometry(reach)
|
||||
|
||||
def draw_profiles_hs(self, reach):
|
||||
results = self.results[0]
|
||||
lhs = filter(
|
||||
lambda hs: hs._input_reach.reach is reach.geometry,
|
||||
filter(
|
||||
lambda hs: hs._input_reach is not None,
|
||||
results.study.river.hydraulic_structures.lst
|
||||
)
|
||||
)
|
||||
|
||||
for hs in lhs:
|
||||
x = hs.input_section.rk
|
||||
z_min = reach.geometry.get_z_min()
|
||||
z_max = reach.geometry.get_z_max()
|
||||
|
||||
self.canvas.axes.plot(
|
||||
[x, x],
|
||||
[min(z_min), max(z_max)],
|
||||
linestyle="--",
|
||||
lw=1.,
|
||||
color=self.color_plot_previous,
|
||||
)
|
||||
|
||||
self.canvas.axes.annotate(
|
||||
" > " + hs.name,
|
||||
(x, max(z_max)),
|
||||
horizontalalignment='left',
|
||||
verticalalignment='top',
|
||||
annotation_clip=True,
|
||||
fontsize=9, color=self.color_plot_previous,
|
||||
)
|
||||
|
||||
def draw_bottom_geometry(self, reach):
|
||||
rk = reach.geometry.get_rk()
|
||||
z_min = reach.geometry.get_z_min()
|
||||
z_max = reach.geometry.get_z_max()
|
||||
|
||||
self.line_rk_zmin = self.canvas.axes.plot(
|
||||
rk, z_min,
|
||||
color=self.color_plot_river_bottom,
|
||||
lw=1.
|
||||
)
|
||||
|
||||
self._river_bottom = z_min
|
||||
|
||||
def draw_water_elevation(self, reach):
|
||||
if len(reach.geometry.profiles) != 0:
|
||||
result = self.results[0]
|
||||
rk = reach.geometry.get_rk()
|
||||
|
||||
self.water = []
|
||||
|
||||
colors = [
|
||||
("z_min", self.color_plot_ensemble_min),
|
||||
("z_mean", self.color_plot_ensemble_mean),
|
||||
("z_max", self.color_plot_ensemble_max),
|
||||
]
|
||||
|
||||
for t, color in colors:
|
||||
table = result.get("table")[t]
|
||||
ts = result.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
gi_0, gi_1 = reach.global_index
|
||||
water_z = table[ts, gi_0:gi_1 + 1]
|
||||
|
||||
plot, = self.canvas.axes.plot(
|
||||
rk, water_z,
|
||||
lw=1., color=color,
|
||||
label=f"Elevation: {t} (m)",
|
||||
)
|
||||
|
||||
self.water.append(plot)
|
||||
|
||||
def draw_std_derivation(self, reach):
|
||||
if len(reach.geometry.profiles) != 0:
|
||||
result = self.results[0]
|
||||
rk = reach.geometry.get_rk()
|
||||
z_min = reach.geometry.get_z_min()
|
||||
|
||||
color = self.color_plot_ensemble_std_deriv
|
||||
|
||||
table = result.get("table")["z_mean"]
|
||||
std_deriv = result.get("table")["z_std_derivation"]
|
||||
|
||||
ts = result.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
gi_0, gi_1 = reach.global_index
|
||||
|
||||
water_z = table[ts, gi_0:gi_1 + 1]
|
||||
std = std_deriv[ts, gi_0:gi_1 + 1]
|
||||
|
||||
water_z_b = water_z - std
|
||||
water_z_t = water_z + std
|
||||
|
||||
plot = self.canvas.axes.fill_between(
|
||||
rk, water_z_b, water_z_t,
|
||||
lw=1., color=color, alpha=0.3,
|
||||
label=f"Standard derivation",
|
||||
)
|
||||
|
||||
self.water_std_deriv = plot
|
||||
|
||||
def draw_additional_data(self):
|
||||
results = self.results[0]
|
||||
|
||||
self._add_data_lines = []
|
||||
|
||||
for data in results.get("additional_data"):
|
||||
data = data._data
|
||||
|
||||
tx, ty = data['type_x'], data['type_y']
|
||||
x, y = data['x'], data['y']
|
||||
legend = data['legend']
|
||||
unit = data['unit']
|
||||
|
||||
if tx == 'water_elevation' and ty == 'time':
|
||||
line, = self.canvas.axes.plot(
|
||||
x, y, marker="+",
|
||||
label=legend + ' ' + unit
|
||||
)
|
||||
|
||||
self._add_data_lines.append(line)
|
||||
|
||||
self.canvas.draw_idle()
|
||||
|
||||
def draw_current(self, reach):
|
||||
rk = reach.geometry.get_rk()
|
||||
z_min = reach.geometry.get_z_min()
|
||||
z_max = reach.geometry.get_z_max()
|
||||
|
||||
self.profile, = self.canvas.axes.plot(
|
||||
[
|
||||
rk[self._current_profile_id],
|
||||
rk[self._current_profile_id]
|
||||
],
|
||||
[
|
||||
z_max[self._current_profile_id],
|
||||
z_min[self._current_profile_id]
|
||||
],
|
||||
color=self.color_plot,
|
||||
lw=1.
|
||||
)
|
||||
|
||||
def is_overflow_point(self, profile, point):
|
||||
left_limit = profile.geometry.point(0)
|
||||
right_limit = profile.geometry.point(
|
||||
profile.geometry.number_points - 1
|
||||
)
|
||||
|
||||
return (
|
||||
point == left_limit
|
||||
or point == right_limit
|
||||
)
|
||||
|
||||
def set_reach(self, reach_id):
|
||||
self._current_reach_id = reach_id
|
||||
self._current_profile_id = 0
|
||||
self.draw()
|
||||
|
||||
def set_profile(self, profile_id):
|
||||
self._current_profile_id = profile_id
|
||||
self.update_current()
|
||||
|
||||
def set_timestamp(self, timestamp):
|
||||
self._current_timestamp = timestamp
|
||||
self.update()
|
||||
|
||||
def update(self):
|
||||
if not self._init:
|
||||
self.draw()
|
||||
|
||||
results = self.results[0]
|
||||
reach = results.river.reach(self._current_reach_id)
|
||||
|
||||
self.update_water_elevation()
|
||||
self.update_std_derivation()
|
||||
|
||||
self.update_idle()
|
||||
|
||||
def update_all(self):
|
||||
self._current_reach_id = self._parent._get_current_reach()
|
||||
self._current_profile_id = self._parent._get_current_profile()
|
||||
self._current_timestamp = self._parent._get_current_timestamp()
|
||||
self._init = False
|
||||
self.update()
|
||||
|
||||
def update_water_elevation(self):
|
||||
result = self.results[0]
|
||||
reach = result.river.reach(self._current_reach_id)
|
||||
rk = reach.geometry.get_rk()
|
||||
z_min = reach.geometry.get_z_min()
|
||||
table = result.get("table")["z_mean"]
|
||||
ts = result.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
gi_0, gi_1 = reach.global_index
|
||||
water_z = table[ts, gi_0:gi_1 + 1]
|
||||
|
||||
colors = [
|
||||
(0, "z_min", self.color_plot_ensemble_min),
|
||||
(1, "z_mean", self.color_plot_ensemble_mean),
|
||||
(2, "z_max", self.color_plot_ensemble_max),
|
||||
]
|
||||
|
||||
for i, t, color in colors:
|
||||
table = result.get("table")[t]
|
||||
ts = result.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
gi_0, gi_1 = reach.global_index
|
||||
water_z = table[ts, gi_0:gi_1 + 1]
|
||||
|
||||
self.water[i].set_data(rk, water_z)
|
||||
|
||||
def update_std_derivation(self):
|
||||
result = self.results[0]
|
||||
reach = result.river.reach(self._current_reach_id)
|
||||
|
||||
rk = reach.geometry.get_rk()
|
||||
|
||||
table = result.get("table")["z_mean"]
|
||||
std_deriv = result.get("table")["z_std_derivation"]
|
||||
|
||||
ts = result.get_timestamp_id(self._current_timestamp)
|
||||
|
||||
gi_0, gi_1 = reach.global_index
|
||||
|
||||
water_z = table[ts, gi_0:gi_1 + 1]
|
||||
std = std_deriv[ts, gi_0:gi_1 + 1]
|
||||
|
||||
water_z_b = water_z - std
|
||||
water_z_t = water_z + std
|
||||
|
||||
self.water_std_deriv.set_data(rk, water_z_b, water_z_t)
|
||||
|
||||
def update_additional_data(self):
|
||||
self.draw_additional_data()
|
||||
self.update_idle()
|
||||
|
||||
def update_current(self):
|
||||
results = self.results[0]
|
||||
reach = results.river.reach(self._current_reach_id)
|
||||
rk = reach.geometry.get_rk()
|
||||
z_min = reach.geometry.get_z_min()
|
||||
z_max = reach.geometry.get_z_max()
|
||||
cid = self._current_profile_id
|
||||
|
||||
self.profile.set_data(
|
||||
[rk[cid], rk[cid]],
|
||||
[z_max[cid], z_min[cid]]
|
||||
)
|
||||
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
self.update_idle()
|
||||
@@ -61,6 +61,8 @@ class TableModel(PamhyrTableModel):
|
||||
# _river.reach(0).profiles))
|
||||
elif self._opt_data == "solver":
|
||||
self._lst = self._parent._solvers
|
||||
elif self._opt_data == "runs":
|
||||
self._lst = self._data[0].get("table")["samples"]
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
self._timestamp = max(kwargs["parent"]._timestamps)
|
||||
@@ -93,6 +95,10 @@ class TableModel(PamhyrTableModel):
|
||||
if v is None:
|
||||
v = self._data[0].solver_name
|
||||
return str(v)
|
||||
elif self._opt_data == "runs":
|
||||
if self._headers[column] == "runs":
|
||||
p = self._lst[row, :]
|
||||
return f"{row}: {p}"
|
||||
elif self._opt_data == "raw_data":
|
||||
table = self._data[0].get("table")
|
||||
ts = self._data[0].get_timestamp_id(self._timestamp)
|
||||
|
||||
+648
-347
File diff suppressed because it is too large.
Load diff
@@ -44,6 +44,7 @@ class ResultsTranslate(MainTranslate):
|
||||
|
||||
self._dict['envelop'] = _translate("Results", "Envelop")
|
||||
self._dict['solver'] = _translate("Results", "Solver")
|
||||
self._dict['runs'] = _translate("Results", "Runs")
|
||||
|
||||
self._dict['x'] = _translate("Results", "X (m)")
|
||||
self._dict["temperature_map"] = _translate(
|
||||
@@ -55,10 +56,20 @@ class ResultsTranslate(MainTranslate):
|
||||
|
||||
self._dict['label_bottom'] = _translate("Results", "Bottom")
|
||||
self._dict['label_water'] = _translate("Results", "Water elevation")
|
||||
|
||||
self._dict['label_water_min'] = _translate(
|
||||
"Results",
|
||||
"Min water elevation"
|
||||
)
|
||||
self._dict['label_water_mean'] = _translate(
|
||||
"Results",
|
||||
"Mean water elevation"
|
||||
)
|
||||
self._dict['label_water_max'] = _translate(
|
||||
"Results",
|
||||
"Max water elevation"
|
||||
)
|
||||
|
||||
self._dict["ImageCoordinates"] = _translate(
|
||||
"Results", "Image coordinates"
|
||||
)
|
||||
@@ -87,6 +98,10 @@ class ResultsTranslate(MainTranslate):
|
||||
"solver": self._dict['solver'],
|
||||
}
|
||||
|
||||
self._sub_dict["table_headers_runs"] = {
|
||||
"runs": self._dict['runs'],
|
||||
}
|
||||
|
||||
self._sub_dict["table_headers_pollutants"] = {
|
||||
"name": _translate("Results", "Pollutant name"),
|
||||
}
|
||||
@@ -121,6 +136,25 @@ class ResultsTranslate(MainTranslate):
|
||||
"wet_area": self._dict["unit_wet_area"],
|
||||
}
|
||||
|
||||
self._sub_dict["values_x_ens"] = {
|
||||
"rk": self._dict["unit_rk"],
|
||||
"time": self._dict["unit_time_s"],
|
||||
}
|
||||
|
||||
self._sub_dict["values_y_ens"] = {
|
||||
"z_mean": self._dict["unit_mean_water_elevation"],
|
||||
"q_mean": self._dict["unit_mean_discharge"],
|
||||
"z_standard_derivation": self._dict["unit_std_deriv_elevation"],
|
||||
"q_standard_derivation": self._dict["unit_std_deriv_discharge"],
|
||||
}
|
||||
|
||||
self._sub_dict["values_y_envelop_ens"] = {
|
||||
"z_min": self._dict["unit_min_water_elevation"],
|
||||
"z_max": self._dict["unit_max_water_elevation"],
|
||||
"q_min": self._dict["unit_min_discharge"],
|
||||
"q_max": self._dict["unit_max_discharge"],
|
||||
}
|
||||
|
||||
if self.pollutants is not None:
|
||||
self._sub_dict["table_headers_raw_data"] = {
|
||||
"name": _translate("Results", "Profile"),
|
||||
|
||||
@@ -43,6 +43,12 @@ class RunSolverTranslate(PamhyrTranslate):
|
||||
"Export cancelled: REGIME=1 is incompatible with CONDAM=0. "
|
||||
"A reflecting upstream boundary cannot impose the water depth."
|
||||
)
|
||||
self._dict["missing_tcadim"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: {key}: the selected transport law and options "
|
||||
"use a dimensionless critical stress given by the user. "
|
||||
"Fill it in the parameters (tab Solid Transport)."
|
||||
)
|
||||
self._dict["missing_solid_boundary"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: sediment transport (TRASED) is enabled but "
|
||||
@@ -50,6 +56,105 @@ class RunSolverTranslate(PamhyrTranslate):
|
||||
"of reach(es): {reaches}. Add a solid boundary condition, or "
|
||||
"disable sediment transport in the solver parameters."
|
||||
)
|
||||
self._dict["multireach_unsupported"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: the Rubar export supports a single reach, "
|
||||
"{count} enabled reaches found."
|
||||
)
|
||||
self._dict["not_enough_profiles"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: reach {reach} needs at least two profiles."
|
||||
)
|
||||
self._dict["rk_not_increasing"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: the profiles of reach {reach} must have "
|
||||
"strictly increasing rk. Sort the profiles of the geometry."
|
||||
)
|
||||
self._dict["boundary_code_unsupported"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: {key}={value} is not supported by the Rubar "
|
||||
"export (single reach)."
|
||||
)
|
||||
self._dict["boundary_missing"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: {setting} requires a {kind} boundary "
|
||||
"condition at node {node}."
|
||||
)
|
||||
self._dict["boundary_unexpected"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: boundary condition {name} ({kind}) at node "
|
||||
"{node} is not used with {setting}. Remove it or change the "
|
||||
"boundary settings in the solver parameters."
|
||||
)
|
||||
self._dict["boundary_ambiguous"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: several {kind} boundary conditions at node "
|
||||
"{node}."
|
||||
)
|
||||
self._dict["boundary_empty"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: boundary condition {name} at node {node} "
|
||||
"has no value."
|
||||
)
|
||||
self._dict["boundary_not_sorted"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: the times of boundary condition {name} at "
|
||||
"node {node} must be increasing."
|
||||
)
|
||||
self._dict["upstream_level_unsupported"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: {setting} imposes an upstream water level, "
|
||||
"which the current RubarBE version reads but does not use in "
|
||||
"the computation. Choose another upstream boundary setting."
|
||||
)
|
||||
self._dict["missing_friction"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: no friction defined on reach {reach}."
|
||||
)
|
||||
self._dict["missing_initial_conditions"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: no initial condition defined on reach "
|
||||
"{reach}."
|
||||
)
|
||||
self._dict["discharge_out_of_range"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: initial discharges of reach {reach} must be "
|
||||
"greater than -500 m3/s."
|
||||
)
|
||||
self._dict["duplicate_point_name"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: several points are named '{name}' in "
|
||||
"profile {profile} of reach {reach}."
|
||||
)
|
||||
self._dict["main_channel"] = _translate("Solver", "main channel")
|
||||
self._dict["active_bed"] = _translate("Solver", "active bed")
|
||||
self._dict["bed_limits_invalid"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: in profile {profile} of reach {reach}, the "
|
||||
"{bed} limits (points '{left}' and '{right}', or the profile "
|
||||
"ends) must be ordered from left to right with at least one "
|
||||
"point between them."
|
||||
)
|
||||
self._dict["missing_sediment_layers"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: point {point} of profile {profile} of reach "
|
||||
"{reach} has no sediment layer, which the sediment transport "
|
||||
"requires."
|
||||
)
|
||||
self._dict["invalid_sediment_layer"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: layer '{layer}' of sediment layers '{sl}' "
|
||||
"(profile {profile} of reach {reach}) must have a thickness "
|
||||
">= 0, D50 > 0 m, sigma >= 1 (1 for a uniform sediment) and a "
|
||||
"critical constraint >= 0 Pa."
|
||||
)
|
||||
self._dict["too_many_compartments"] = _translate(
|
||||
"Solver",
|
||||
"Export cancelled: sediment layers '{sl}' (profile {profile} of "
|
||||
"reach {reach}) give {count} compartments, RubarBE accepts at "
|
||||
"most {maximum}. A non erodible compartment is added under an "
|
||||
"erodible last layer."
|
||||
)
|
||||
self._dict["export_failed"] = _translate(
|
||||
"Solver", "Export failed; task cancelled"
|
||||
)
|
||||
@@ -20,6 +20,8 @@ import os
|
||||
import logging
|
||||
import tempfile
|
||||
|
||||
import numpy as np
|
||||
|
||||
from queue import Queue
|
||||
from tools import trace, timer, logger_exception
|
||||
|
||||
@@ -40,7 +42,7 @@ from PyQt5.QtWidgets import (
|
||||
QFileDialog, QTableView, QAbstractItemView,
|
||||
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||
QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
|
||||
QTextEdit,
|
||||
QTextEdit, QProgressBar, QCheckBox,
|
||||
)
|
||||
|
||||
from View.RunSolver.Log.Window import SolverLogFileWindow
|
||||
@@ -57,6 +59,63 @@ _translate = QCoreApplication.translate
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class EnsembleRunNumberDialog(PamhyrDialog):
|
||||
_pamhyr_ui = "EnsembleRunNumberDialog"
|
||||
_pamhyr_name = "EnsembleRunNumber"
|
||||
|
||||
def __init__(self, trad=None, parent=None):
|
||||
super(EnsembleRunNumberDialog, self).__init__(
|
||||
title=trad[self._pamhyr_name],
|
||||
trad=trad,
|
||||
options=[],
|
||||
parent=parent
|
||||
)
|
||||
|
||||
self._function = "Random"
|
||||
self._number = 100
|
||||
self._seed = -1
|
||||
|
||||
self._init_default_values()
|
||||
self._init_connection()
|
||||
|
||||
def _init_default_values(self):
|
||||
self.combobox_add_items("comboBox", ["Random"])
|
||||
self.set_combobox_text("comboBox", "Random")
|
||||
|
||||
self.set_spin_box("spinBox", 100)
|
||||
|
||||
def _init_connection(self):
|
||||
self._checkbox = self.find(QCheckBox, f"checkBox")
|
||||
self._checkbox.clicked.connect(self._set_random_seed_spin_box_state)
|
||||
|
||||
def _set_random_seed_spin_box_state(self):
|
||||
self.set_spin_box_enable("spinBox_seed", self._checkbox.isChecked())
|
||||
|
||||
@property
|
||||
def number(self):
|
||||
return self._number
|
||||
|
||||
@property
|
||||
def seed(self):
|
||||
return self._seed
|
||||
|
||||
@property
|
||||
def function(self):
|
||||
return self._function
|
||||
|
||||
def accept(self):
|
||||
self._function = self.get_combobox_text("comboBox")
|
||||
self._number = self.get_spin_box("spinBox")
|
||||
|
||||
if self._checkbox.isChecked():
|
||||
self._seed = self.get_spin_box("spinBox_seed")
|
||||
|
||||
super().accept()
|
||||
|
||||
def reject(self):
|
||||
self.close()
|
||||
|
||||
|
||||
class SelectSolverWindow(PamhyrDialog):
|
||||
_pamhyr_ui = "SelectSolver"
|
||||
_pamhyr_name = "Select solver"
|
||||
@@ -427,3 +486,233 @@ class SolverLogWindow(PamhyrWindow):
|
||||
parent=self,
|
||||
)
|
||||
log.show()
|
||||
|
||||
|
||||
class SolverLogEnsWindow(SolverLogWindow):
|
||||
_pamhyr_ui = "SolverLogEnsemble"
|
||||
_pamhyr_name = "Solver Log Ensemble"
|
||||
|
||||
def __init__(self, number_of_run=100,
|
||||
seed=-1, function="Random",
|
||||
study=None, config=None,
|
||||
solver=None, parent=None):
|
||||
self._number_of_run = number_of_run
|
||||
self._last_run = 0
|
||||
|
||||
if seed != -1:
|
||||
np.random.seed(seed)
|
||||
|
||||
self._seed = np.random.get_state()[1][0]
|
||||
logger.info(
|
||||
"solver: Set ensemble with " +
|
||||
f"{number_of_run} {function} and " +
|
||||
f"{self._seed} as random seed"
|
||||
)
|
||||
|
||||
self._samples = {}
|
||||
for ens in study.river._ensembles.lst:
|
||||
if ens.distribution is None:
|
||||
continue
|
||||
|
||||
self._samples[ens] = ens.random(self._number_of_run)
|
||||
|
||||
self._results = None
|
||||
self._run_samples = []
|
||||
self._results_tables = {}
|
||||
|
||||
super(SolverLogEnsWindow, self).__init__(
|
||||
solver=solver,
|
||||
study=study,
|
||||
config=config,
|
||||
parent=parent,
|
||||
)
|
||||
|
||||
def setup_connections(self):
|
||||
self.setup_progress_bar()
|
||||
|
||||
super(SolverLogEnsWindow, self).setup_connections()
|
||||
|
||||
def setup_progress_bar(self):
|
||||
self._progress_bar = self.find(QProgressBar, "progressBar")
|
||||
self._progress_bar.setRange(0, self._number_of_run)
|
||||
self._progress_bar.setValue(0)
|
||||
|
||||
def _log_int(self, int_code, color=None):
|
||||
logger.info(f"solver: Returns {int_code}")
|
||||
color = "blue" if int_code == 0 else "red"
|
||||
|
||||
self.find(QTextEdit, "textEdit")\
|
||||
.append(
|
||||
f"<font color=\"{color}\">" +
|
||||
f" *** Finished with code {int_code}" +
|
||||
"</font>"
|
||||
)
|
||||
|
||||
self.statusbar.showMessage(
|
||||
("Done" if int_code == 0 else "Failed")
|
||||
+ f" #{self._last_run}",
|
||||
3000
|
||||
)
|
||||
|
||||
self._solver.results_ensemble(
|
||||
self._study, self._workdir,
|
||||
self._results_tables,
|
||||
self._last_run,
|
||||
qlog=self._output,
|
||||
)
|
||||
|
||||
if self._last_run < self._number_of_run:
|
||||
self.next()
|
||||
else:
|
||||
self._results = self.fill_results_from_tables()
|
||||
self._parent.set_results(self._solver, self._results)
|
||||
|
||||
self._progress_bar.setValue(self._last_run)
|
||||
|
||||
def fill_results_from_tables(self):
|
||||
tables = self._results_tables
|
||||
results = self._solver.get_ensemble_empty_results(
|
||||
self._study, self._workdir
|
||||
)
|
||||
|
||||
table = {}
|
||||
|
||||
for key in ["z", "q"]:
|
||||
for func in ["min", "mean", "max", "std_derivation"]:
|
||||
name = f"{key}_{func}"
|
||||
table[name] = results.new_table_data(name, tables[name])
|
||||
|
||||
table["samples"] = results.new_table_data(
|
||||
"samples", np.array(self._run_samples)
|
||||
)
|
||||
results.set("number_of_run", self._number_of_run)
|
||||
results.set("seed", self._seed) # Keep random seed
|
||||
|
||||
results.set("table", table)
|
||||
|
||||
# Compute global index for reaches and profiles
|
||||
gi = 0
|
||||
for reach in results.river.reachs:
|
||||
gi_start = gi
|
||||
|
||||
for profile in reach.profiles:
|
||||
gi += 1
|
||||
|
||||
reach.set_global_index(range(gi_start, gi))
|
||||
|
||||
# Compute timestamps index table
|
||||
ts = tables["timestamps"]
|
||||
ts_index = {}
|
||||
for i, t in enumerate(sorted(ts)):
|
||||
ts_index[t] = i
|
||||
|
||||
results.set("timestamps", ts)
|
||||
results.set_timestamp_index(ts_index)
|
||||
|
||||
return results
|
||||
|
||||
def next(self):
|
||||
self._process = self.new_process(self._parent)
|
||||
|
||||
self._log(f" *** Run #{self._last_run}", color="blue")
|
||||
|
||||
if self._solver._type in ["mage8"]:
|
||||
samples = self._solver.export_ensemble_variation(
|
||||
self._study, self._workdir, qlog=self._output,
|
||||
samples=self._samples,
|
||||
)
|
||||
else:
|
||||
samples = self.ensemble_variation()
|
||||
self._solver.export(
|
||||
self._study, self._workdir, qlog=self._output
|
||||
)
|
||||
|
||||
# Keep samples generators results
|
||||
self._run_samples.append(samples)
|
||||
|
||||
self._solver.run(
|
||||
self._study,
|
||||
process=self._process,
|
||||
output_queue=self._output
|
||||
)
|
||||
|
||||
self.set_running_button_status()
|
||||
|
||||
self._last_run += 1
|
||||
self._progress_bar.setValue(self._last_run - 1)
|
||||
|
||||
def ensemble_variation(self):
|
||||
samples = []
|
||||
|
||||
for ens in self._samples:
|
||||
if ens.target_data is None:
|
||||
continue
|
||||
|
||||
x = next(self._samples[ens])
|
||||
samples.append(x)
|
||||
|
||||
self._log(f"*** Variation #{self._last_run} " +
|
||||
f"'{ens.target_data}' - {ens.data_type} x {x}",
|
||||
color="blue")
|
||||
|
||||
if ens.data_type == "strickler_minor":
|
||||
ens.target_data.minor = x
|
||||
elif ens.data_type == "strickler_medium":
|
||||
ens.target_data.medium = x
|
||||
|
||||
return samples
|
||||
|
||||
def run(self):
|
||||
self._log(f" *** Run solver {self._solver.name}", color="blue")
|
||||
self.next()
|
||||
|
||||
def start(self):
|
||||
if self._solver.is_stoped():
|
||||
self._log(f" *** Export study {self._solver.name}", color="blue")
|
||||
|
||||
ok = self._solver.export(
|
||||
self._study, self._workdir, qlog=self._output
|
||||
)
|
||||
|
||||
if not ok:
|
||||
self._log(f" *** Failed to export", color="red")
|
||||
self.update()
|
||||
return
|
||||
else:
|
||||
self.update()
|
||||
self._process = self.new_process(self._parent)
|
||||
|
||||
self._log(" *** Start", color="blue")
|
||||
self._results = None
|
||||
|
||||
self.next()
|
||||
|
||||
def set_running_button_status(self):
|
||||
self.find(QAction, "action_start").setEnabled(False)
|
||||
if _signal:
|
||||
self.find(QAction, "action_pause").setEnabled(True)
|
||||
else:
|
||||
self.find(QAction, "action_pause").setEnabled(False)
|
||||
self.find(QAction, "action_stop").setEnabled(True)
|
||||
self.find(QAction, "action_log_file").setEnabled(False)
|
||||
self.find(QAction, "action_results").setEnabled(False)
|
||||
|
||||
def stop(self):
|
||||
self._log(" *** Stop", color="blue")
|
||||
self._solver.kill()
|
||||
|
||||
self.find(QAction, "action_start").setEnabled(True)
|
||||
self.find(QAction, "action_pause").setEnabled(False)
|
||||
self.find(QAction, "action_stop").setEnabled(False)
|
||||
self.find(QAction, "action_results").setEnabled(True)
|
||||
if self._solver.log_file() != "":
|
||||
self.find(QAction, "action_log_file").setEnabled(True)
|
||||
|
||||
def results(self):
|
||||
if self._results is None:
|
||||
return
|
||||
|
||||
self._parent.set_results(self._solver, self._results)
|
||||
self._parent.open_solver_results(self._solver, self._results)
|
||||
|
||||
self._solver.has_results_loaded()
|
||||
@@ -47,11 +47,19 @@ class AbstractMenu(object):
|
||||
|
||||
class DefaultMenu(AbstractMenu):
|
||||
def run(self):
|
||||
current_scenario = self._graph.status.scenario
|
||||
|
||||
if current_scenario.is_ensemble():
|
||||
return
|
||||
|
||||
add_node = self._menu.addAction(self._trad["menu_add_scenario"])
|
||||
ensemble = self._menu.addAction(self._trad["menu_ens_scenario"])
|
||||
|
||||
action = self._exec()
|
||||
if action == add_node:
|
||||
self._parent.new_scenario(self._pos)
|
||||
if action == ensemble:
|
||||
self._parent.create_new_ensemble_scenario(self._pos)
|
||||
|
||||
|
||||
class ScenarioMenu(AbstractMenu):
|
||||
@@ -61,9 +69,13 @@ class ScenarioMenu(AbstractMenu):
|
||||
|
||||
current_scenario = item.graph._study.status.scenario.id
|
||||
|
||||
select = self._menu.addAction(self._trad["menu_select_scenario"])
|
||||
select = None
|
||||
duplicate = None
|
||||
delete = None
|
||||
edit_ens = None
|
||||
|
||||
if len(scenarios) > 1:
|
||||
select = self._menu.addAction(self._trad["menu_select_scenario"])
|
||||
|
||||
if item.scenario.id != 0:
|
||||
if scenarios.is_leaf(item.scenario):
|
||||
@@ -74,6 +86,11 @@ class ScenarioMenu(AbstractMenu):
|
||||
self._trad["menu_dup_scenario"]
|
||||
)
|
||||
|
||||
if item.scenario.is_ensemble():
|
||||
edit_ens = self._menu.addAction(
|
||||
self._trad["menu_edit_ens_scenario"]
|
||||
)
|
||||
|
||||
action = self._exec()
|
||||
if action is None:
|
||||
return
|
||||
@@ -83,3 +100,5 @@ class ScenarioMenu(AbstractMenu):
|
||||
self._parent.delete_scenario(item)
|
||||
elif action == duplicate:
|
||||
self._parent.duplicate_scenario(item)
|
||||
elif action == edit_ens:
|
||||
self._parent.edit_ensemble_scenario(item)
|
||||
@@ -100,6 +100,10 @@ class ScenarioItem(QGraphicsTextItem):
|
||||
)
|
||||
)
|
||||
painter.setBrush(QBrush(color))
|
||||
|
||||
if self.scenario.is_ensemble():
|
||||
painter.drawRect(self.boundingRect())
|
||||
else:
|
||||
painter.drawEllipse(self.boundingRect())
|
||||
|
||||
super(ScenarioItem, self).paint(painter, option, widget)
|
||||
@@ -526,6 +530,51 @@ class GraphWidget(QGraphicsView):
|
||||
self.exec_with_waiting_window(fn, "duplicate_scenario")
|
||||
self.changeScenario.emit(self.sender())
|
||||
|
||||
def create_ensemble_scenario(self, item):
|
||||
must_save = self.dialog_save()
|
||||
if must_save == "Cancel":
|
||||
return
|
||||
|
||||
def fn():
|
||||
self._close_other_window()
|
||||
|
||||
if must_save == "Save":
|
||||
self._study.save()
|
||||
|
||||
self._undo.push(
|
||||
CreateEnsembleScenarioCommand(
|
||||
self._study,
|
||||
)
|
||||
)
|
||||
|
||||
self.exec_with_waiting_window(fn, "create_ensemble_scenario")
|
||||
self.changeScenario.emit(self.sender())
|
||||
|
||||
def create_new_ensemble_scenario(self, pos):
|
||||
must_save = self.dialog_save()
|
||||
if must_save == "Cancel":
|
||||
return
|
||||
|
||||
def fn():
|
||||
self._close_other_window()
|
||||
|
||||
if must_save == "Save":
|
||||
self._study.save()
|
||||
|
||||
self._undo.push(
|
||||
CreateEnsembleScenarioCommand(
|
||||
self._study, pos=pos,
|
||||
)
|
||||
)
|
||||
|
||||
self.exec_with_waiting_window(fn, "create_ensemble_scenario")
|
||||
self.changeScenario.emit(self.sender())
|
||||
|
||||
def edit_ensemble_scenario(self, item):
|
||||
self.parent\
|
||||
.parent\
|
||||
.open_ensemble_scenario()
|
||||
|
||||
def _close_other_window(self):
|
||||
self.parent\
|
||||
.parent\
|
||||
|
||||
@@ -98,6 +98,26 @@ class DuplicateScenariosCommand(QUndoCommand):
|
||||
self._study.reload_from_scenario(self._new)
|
||||
|
||||
|
||||
class CreateEnsembleScenarioCommand(QUndoCommand):
|
||||
def __init__(self, study, pos=None):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
self._study = study
|
||||
self._new = None
|
||||
self._pos = pos
|
||||
|
||||
def undo(self):
|
||||
self._study.scenarios.delete(self._new.id)
|
||||
self._study.reload_from_scenario(self._new.parent)
|
||||
|
||||
def redo(self):
|
||||
if self._new is None:
|
||||
self._new = self._study.create_ensemble_scenario(self._pos)
|
||||
else:
|
||||
self._new.set_as_not_deleted()
|
||||
self._study.reload_from_scenario(self._new)
|
||||
|
||||
|
||||
class SetCommand(QUndoCommand):
|
||||
def __init__(self, scenario, column, new_value):
|
||||
QUndoCommand.__init__(self)
|
||||
|
||||
@@ -43,6 +43,12 @@ class ScenariosTranslate(MainTranslate):
|
||||
self._dict["menu_dup_scenario"] = _translate(
|
||||
"Scenarios", "Duplicate this scenario"
|
||||
)
|
||||
self._dict["menu_ens_scenario"] = _translate(
|
||||
"Scenarios", "Create ensemble scenario from current scenario"
|
||||
)
|
||||
self._dict["menu_edit_ens_scenario"] = _translate(
|
||||
"Scenarios", "Edit this ensemble scenario"
|
||||
)
|
||||
|
||||
self._sub_dict["table_headers_scenarios"] = {
|
||||
# "id": self._dict['id'],
|
||||
|
||||
@@ -42,6 +42,16 @@ OPTION_CHOICES = (
|
||||
)
|
||||
|
||||
|
||||
# Choices read by RubarBE 2021 but never used by its computation: the
|
||||
# upstream level of HAMONT (rubar_init.f90). The export refuses them.
|
||||
UNSUPPORTED_CHOICES = {
|
||||
('rubarbe_condam', '2'): 'La version actuelle de RubarBE ne prend pas '
|
||||
'en compte la cote amont imposée.',
|
||||
('rubarbe_regime', '1'): 'La version actuelle de RubarBE ne prend pas '
|
||||
'en compte le tirant d’eau amont imposé.',
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class Field:
|
||||
key: str
|
||||
@@ -89,7 +99,9 @@ def fields():
|
||||
'Nécessite les fichiers de reprise du calcul précédent.', YES_NO)
|
||||
|
||||
choice('condam', 1, 'Condition à la limite amont',
|
||||
'Le choix doit correspondre aux données de la limite amont.',
|
||||
'Le choix doit correspondre aux données de la limite amont. '
|
||||
'La cote imposée n’est pas prise en compte par la version '
|
||||
'actuelle de RubarBE.',
|
||||
{'0': 'Réflexion', '1': 'Débit imposé Q(t)',
|
||||
'2': 'Cote imposée Z(t)', '4': 'Confluence'})
|
||||
choice('condav', 1, 'Condition à la limite aval',
|
||||
@@ -99,8 +111,8 @@ def fields():
|
||||
'3': 'Cote imposée Z(t)', '4': 'Confluence / défluence',
|
||||
'5': 'Régime uniforme', '7': 'Régime critique'})
|
||||
choice('regime', 1, 'Imposer aussi le tirant d’eau amont',
|
||||
'Complète le débit imposé ; incompatible avec une limite '
|
||||
'amont de type "Réflexion".',
|
||||
'Complète le débit imposé ; non pris en compte par la version '
|
||||
'actuelle de RubarBE.',
|
||||
ON_OFF)
|
||||
choice('iodev', 1, 'Déversement latéral',
|
||||
'Nécessite les données de déversements latéraux.',
|
||||
@@ -156,10 +168,15 @@ def fields():
|
||||
add('sediment_option', 2, 'Calcul de la contrainte critique',
|
||||
'Trois choix indépendants, enregistrés ensemble dans OPTION.',
|
||||
kind='options')
|
||||
add('sediment_visc', 2, 'Viscosité ou seuil critique',
|
||||
'Selon la configuration : seuil critique adimensionnel fourni, ou '
|
||||
'viscosité cinématique de l’eau. À 15 °C : environ 1,30 × 10⁻⁶ m²/s. '
|
||||
'Un changement de mode ne convertit pas la valeur.', positive=True)
|
||||
add('sediment_tcadim', 2, 'Seuil critique adimensionnel (—)',
|
||||
'Contrainte critique adimensionnelle (TCADIM) fournie par '
|
||||
'l’utilisateur, par exemple 0,047 pour Meyer-Peter et Müller ou 0,15 '
|
||||
'pour Recking et al. (2008). Utilisée lorsque le seuil n’est pas '
|
||||
'calculé par le diagramme de Shields et que la loi en a besoin.',
|
||||
positive=True, optional=True)
|
||||
add('sediment_visc', 2, 'Viscosité cinématique de l’eau (m²/s)',
|
||||
'Viscosité cinématique de l’eau, variable avec la température. '
|
||||
'À 15 °C : environ 1,30 × 10⁻⁶ m²/s.', positive=True)
|
||||
choice('sediment_choixc', 2, 'Calcul de la contrainte hydrodynamique de '
|
||||
'cisaillement',
|
||||
'MPC : méthode des perpendiculaires confondues (notice §8.5).',
|
||||
@@ -327,6 +344,10 @@ def active(field, values):
|
||||
return False
|
||||
if key == 'tiopdt':
|
||||
return values.get('rubarbe_iopdt', '').lower() == 'm'
|
||||
if key == 'sediment_tcadim':
|
||||
return Rubar3.tcadim_required(
|
||||
values.get('rubarbe_sediment_opts', ''),
|
||||
values.get('rubarbe_sediment_option', ''))
|
||||
if key in ('ros', 'dm', 'segma'):
|
||||
return (not transport and
|
||||
values.get('rubarbe_optfpc', '0') not in ('', '0'))
|
||||
|
||||
@@ -10,7 +10,8 @@ from PyQt5.QtWidgets import (
|
||||
)
|
||||
|
||||
from View.SolverParameters.RubarFields import (
|
||||
FIELDS, GROUPS, OPTION_CHOICES, Field, active, canonical, validate,
|
||||
FIELDS, GROUPS, OPTION_CHOICES, UNSUPPORTED_CHOICES, Field, active,
|
||||
canonical, validate,
|
||||
)
|
||||
from View.SolverParameters.UndoCommand import SetCommand
|
||||
|
||||
@@ -293,19 +294,18 @@ class RubarForm(QWidget):
|
||||
index = editor.findData(forbidden)
|
||||
if index >= 0:
|
||||
editor.model().item(index).setEnabled(not blocked)
|
||||
# Unsupported choices stay visible, so a stored value is still
|
||||
# displayed, but cannot be selected anymore
|
||||
for (key, value), reason in UNSUPPORTED_CHOICES.items():
|
||||
editor = self.editors.get(key)
|
||||
index = editor.findData(value) if editor is not None else -1
|
||||
if index >= 0:
|
||||
item = editor.model().item(index)
|
||||
item.setEnabled(False)
|
||||
item.setToolTip(tr(reason))
|
||||
self._refreshing = False
|
||||
|
||||
def _update_context(self, values):
|
||||
option = values.get('rubarbe_sediment_option', '')
|
||||
label = self.labels.get('rubarbe_sediment_visc')
|
||||
if label is not None:
|
||||
if len(option) == 3 and all(c in '12' for c in option):
|
||||
title = ('Seuil critique adimensionnel (—)' if option[1] == '1'
|
||||
else 'Viscosité cinématique de l’eau (m²/s)')
|
||||
label.setText(tr(title))
|
||||
else:
|
||||
label.setText(tr(
|
||||
'Viscosité / seuil : préciser les trois choix'))
|
||||
warnings = []
|
||||
if not self.editable:
|
||||
warnings.append(tr('Étude en lecture seule.'))
|
||||
@@ -322,6 +322,11 @@ class RubarForm(QWidget):
|
||||
values.get('rubarbe_regime') == '1'):
|
||||
warnings.append(tr('Une limite amont réfléchissante ne permet pas '
|
||||
'd’imposer aussi le tirant d’eau.'))
|
||||
for (key, value), reason in UNSUPPORTED_CHOICES.items():
|
||||
if values.get(key) == value:
|
||||
warnings.append(tr(reason) + tr(
|
||||
' Le calcul sera refusé : choisissez un autre réglage '
|
||||
'de la limite amont.'))
|
||||
try:
|
||||
from tools import old_pamhyr_date_to_timestamp
|
||||
|
||||
@@ -334,15 +339,21 @@ class RubarForm(QWidget):
|
||||
warnings.append(tr('La fin du calcul doit suivre son début.'))
|
||||
except (KeyError, ValueError):
|
||||
pass
|
||||
if transport and len(option) == 3 and option[1] == '2':
|
||||
if transport:
|
||||
try:
|
||||
if float(values.get('rubarbe_sediment_visc', '0')) > 0.001:
|
||||
warnings.append(tr(
|
||||
'Viscosité élevée pour de l’eau : vérifiez la valeur, '
|
||||
'qui n’a pas été convertie lors du changement '
|
||||
'de mode.'))
|
||||
'Viscosité élevée pour de l’eau : vérifiez la valeur. '
|
||||
'Le seuil critique adimensionnel se saisit dans son '
|
||||
'propre champ.'))
|
||||
except ValueError:
|
||||
pass
|
||||
if (FIELDS['rubarbe_sediment_tcadim'].key in self.editors and
|
||||
active(FIELDS['rubarbe_sediment_tcadim'], values) and
|
||||
not values.get('rubarbe_sediment_tcadim', '').strip()):
|
||||
warnings.append(tr(
|
||||
'La loi et les options choisies utilisent un seuil '
|
||||
'critique adimensionnel : renseignez-le.'))
|
||||
self.notice.setText('\n'.join(warnings))
|
||||
self.notice.setVisible(bool(warnings))
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ class WindowToolKit(object):
|
||||
|
||||
dialog = QFileDialog(self, options=options)
|
||||
|
||||
if select_file == "Existing_file":
|
||||
if select_file == "ExistingFile":
|
||||
mode = QFileDialog.FileMode.ExistingFile
|
||||
elif select_file == "Directory":
|
||||
mode = QFileDialog.FileMode.Directory
|
||||
@@ -390,6 +390,18 @@ class ASubWindowFeatures(object):
|
||||
"""
|
||||
return self.find(QSpinBox, name).value()
|
||||
|
||||
def set_spin_box_enable(self, name: str, value: bool):
|
||||
"""Set status of spinbox component
|
||||
|
||||
Args:
|
||||
name: The spinbox component name
|
||||
value: The boolean value
|
||||
|
||||
Returns:
|
||||
Nothing
|
||||
"""
|
||||
self.find(QSpinBox, name).setEnabled(value)
|
||||
|
||||
def set_double_spin_box(self, name: str, value: int):
|
||||
"""Set value of spinbox component
|
||||
|
||||
|
||||
@@ -42,6 +42,12 @@ class PamhyrPlot(APlot):
|
||||
color_plot_river_bottom = "grey"
|
||||
color_plot_river_water = "blue"
|
||||
color_plot_river_water_zone = "skyblue"
|
||||
|
||||
color_plot_ensemble_min = "green"
|
||||
color_plot_ensemble_mean = "black"
|
||||
color_plot_ensemble_max = "red"
|
||||
color_plot_ensemble_std_deriv = "black"
|
||||
|
||||
colors = list(mplcolors.TABLEAU_COLORS)
|
||||
linestyle = ['solid', 'dashed', 'dashdot', 'dotted']
|
||||
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
# PamhyrTree.py -- Pamhyr abstract table model
|
||||
# Copyright (C) 2023-2026 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import logging
|
||||
import traceback
|
||||
|
||||
from tools import trace, timer
|
||||
|
||||
from Model.Except import NotImplementedMethodeError
|
||||
|
||||
from PyQt5.QtCore import (
|
||||
Qt, QVariant, QAbstractItemModel,
|
||||
QCoreApplication, QModelIndex, pyqtSlot,
|
||||
)
|
||||
|
||||
from PyQt5.QtWidgets import (
|
||||
QTreeWidget, QTreeWidgetItem,
|
||||
)
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
|
||||
class PamhyrModelItem(QTreeWidgetItem):
|
||||
def __init__(self, data=None, trad=None, parent=None):
|
||||
self._data = data
|
||||
self._name = self._get_name()
|
||||
|
||||
super(PamhyrModelItem, self).__init__(
|
||||
parent, [self._name],
|
||||
)
|
||||
|
||||
self._setup_children()
|
||||
|
||||
def _get_name(self):
|
||||
return str(self._data)
|
||||
|
||||
def _setup_children(self):
|
||||
return
|
||||
|
||||
def get_value(self):
|
||||
return self._data
|
||||
|
||||
def find_item_by_value(self, data):
|
||||
if self.get_value() == data:
|
||||
return self
|
||||
|
||||
for i in range(self.childCount()):
|
||||
item = self.child(i)
|
||||
if item.get_value() == data:
|
||||
return item
|
||||
|
||||
found = item.find_item_by_value(data)
|
||||
if found:
|
||||
return found
|
||||
|
||||
return None
|
||||
|
||||
|
||||
class PamhyrModelListItem(QTreeWidgetItem):
|
||||
def __init__(self, name=None, lst=None,
|
||||
child_item_ctor=PamhyrModelItem,
|
||||
trad=None, parent=None):
|
||||
super(PamhyrModelListItem, self).__init__(
|
||||
parent, [name],
|
||||
)
|
||||
|
||||
self._name = name
|
||||
self._lst = lst
|
||||
self._trad = trad
|
||||
self._child_item_ctor = child_item_ctor
|
||||
|
||||
self._setup_children()
|
||||
|
||||
def _setup_children(self):
|
||||
for el in self._lst.lst:
|
||||
self.addChild(
|
||||
self._child_item_ctor(
|
||||
data=el, trad=self._trad, parent=self
|
||||
)
|
||||
)
|
||||
|
||||
def get_value(self):
|
||||
return None
|
||||
|
||||
def find_item_by_value(self, data):
|
||||
if self.get_value() == data:
|
||||
return self
|
||||
|
||||
for i in range(self.childCount()):
|
||||
item = self.child(i)
|
||||
if item.get_value() == data:
|
||||
return item
|
||||
|
||||
found = item.find_item_by_value(data)
|
||||
if found:
|
||||
return found
|
||||
|
||||
return None
|
||||
+25
-2
@@ -40,6 +40,12 @@ class CommonWordTranslate(PamhyrTranslate):
|
||||
self._dict["time"] = _translate("CommonWord", "Time")
|
||||
self._dict["date"] = _translate("CommonWord", "Date")
|
||||
|
||||
self._dict["low"] = _translate("CommonWord", "Low")
|
||||
self._dict["high"] = _translate("CommonWord", "High")
|
||||
|
||||
self._dict["loc"] = _translate("CommonWord", "Loc")
|
||||
self._dict["scale"] = _translate("CommonWord", "Scale")
|
||||
|
||||
self._dict["reach"] = _translate("CommonWord", "Reach")
|
||||
self._dict["reaches"] = _translate("CommonWord", "Reaches")
|
||||
self._dict["Select reach"] = _translate("CommonWord", "Select reach")
|
||||
@@ -65,6 +71,9 @@ class CommonWordTranslate(PamhyrTranslate):
|
||||
self._dict["file_csv"] = _translate(
|
||||
"CommonWord", "CSV file (*.csv)"
|
||||
)
|
||||
self._dict["file_json"] = _translate(
|
||||
"CommonWord", "JSON file (*.json)"
|
||||
)
|
||||
|
||||
|
||||
class UnitTranslate(CommonWordTranslate):
|
||||
@@ -103,6 +112,12 @@ class UnitTranslate(CommonWordTranslate):
|
||||
self._dict["unit_water_elevation"] = _translate(
|
||||
"Unit", "Water Elevation (m)"
|
||||
)
|
||||
self._dict["unit_mean_water_elevation"] = _translate(
|
||||
"Unit", "Mean water elevation (m)"
|
||||
)
|
||||
self._dict["unit_std_deriv_elevation"] = _translate(
|
||||
"Unit", "Elevation standard derivation (m)"
|
||||
)
|
||||
self._dict["unit_water_elevation_envelop"] = _translate(
|
||||
"Unit", "Water Elevation Envelop (m)"
|
||||
)
|
||||
@@ -122,8 +137,16 @@ class UnitTranslate(CommonWordTranslate):
|
||||
self._dict["unit_min_velocity"] = _translate(
|
||||
"Unit", "Min Velocity (m/s)"
|
||||
)
|
||||
self._dict["unit_discharge"] = _translate(
|
||||
"Unit", "Discharge") + f" (m³/s)"
|
||||
self._dict["unit_discharge"] = (
|
||||
_translate("Unit", "Discharge") + f" (m³/s)"
|
||||
)
|
||||
self._dict["unit_mean_discharge"] = (
|
||||
_translate("Unit", "Mean discharge") + f" (m³/s)"
|
||||
)
|
||||
self._dict["unit_std_deriv_discharge"] = (
|
||||
_translate("Unit", "Discharge standard derivation")
|
||||
+ f" (m³/s)"
|
||||
)
|
||||
self._dict["unit_discharge_envelop"] = _translate(
|
||||
"Unit", "Discharge Envelop") + " (m³/s)"
|
||||
self._dict["unit_max_discharge"] = _translate(
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog</class>
|
||||
<widget class="QDialog" name="Dialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>418</width>
|
||||
<height>220</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="3" column="0">
|
||||
<widget class="QSplitter" name="splitter">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<widget class="QWidget" name="verticalLayoutWidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_x">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_x">
|
||||
<property name="text">
|
||||
<string>X axis:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="verticalLayoutWidget_2">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_y">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_y">
|
||||
<property name="text">
|
||||
<string>Y axis:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="verticalLayoutWidget_3">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_solv">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_solv">
|
||||
<property name="text">
|
||||
<string>Solver:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label_data">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -18,6 +18,13 @@
|
||||
<item row="0" column="0">
|
||||
<widget class="QTableView" name="tableView"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QMenuBar" name="menubar">
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog</class>
|
||||
<widget class="QDialog" name="Dialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>416</width>
|
||||
<height>81</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_0">
|
||||
<property name="text">
|
||||
<string>@param0</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_0">
|
||||
<property name="minimum">
|
||||
<double>-100000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>100000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -0,0 +1,106 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog</class>
|
||||
<widget class="QDialog" name="Dialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>416</width>
|
||||
<height>81</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_0">
|
||||
<property name="text">
|
||||
<string>@param0</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_0">
|
||||
<property name="minimum">
|
||||
<double>-100000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>100000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_1">
|
||||
<property name="text">
|
||||
<string>@param1</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_1">
|
||||
<property name="minimum">
|
||||
<double>-100000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>100000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -0,0 +1,157 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog</class>
|
||||
<widget class="QDialog" name="Dialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>875</width>
|
||||
<height>415</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Name</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_name"/>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Distribution</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="3">
|
||||
<widget class="QComboBox" name="comboBox_distribution"/>
|
||||
</item>
|
||||
<item row="0" column="4">
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>313</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="1" column="0" rowspan="2" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_target_data">
|
||||
<property name="title">
|
||||
<string>Target data</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QTreeWidget" name="treeWidget_target_data">
|
||||
<column>
|
||||
<property name="text">
|
||||
<string notr="true">1</string>
|
||||
</property>
|
||||
</column>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2" colspan="3">
|
||||
<widget class="QGroupBox" name="groupBox_params">
|
||||
<property name="title">
|
||||
<string>Parameters</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="0" column="0">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_params"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2" colspan="3">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="3" column="2" colspan="3">
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -0,0 +1,123 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog</class>
|
||||
<widget class="QDialog" name="Dialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>152</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Draw function</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="comboBox"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Number of run</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSpinBox" name="spinBox">
|
||||
<property name="minimum">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>1000000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>100</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="checkBox">
|
||||
<property name="text">
|
||||
<string>Custom seed</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSpinBox" name="spinBox_seed">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2147483647</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -0,0 +1,112 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainWindow</class>
|
||||
<widget class="QMainWindow" name="MainWindow">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>800</width>
|
||||
<height>600</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>MainWindow</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QTableView" name="tableView"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QToolBar" name="toolBar">
|
||||
<property name="windowTitle">
|
||||
<string>toolBar</string>
|
||||
</property>
|
||||
<attribute name="toolBarArea">
|
||||
<enum>TopToolBarArea</enum>
|
||||
</attribute>
|
||||
<attribute name="toolBarBreak">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
<addaction name="action_add"/>
|
||||
<addaction name="action_del"/>
|
||||
<addaction name="action_edit"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="action_export"/>
|
||||
<addaction name="action_import"/>
|
||||
</widget>
|
||||
<action name="action_add">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Add ensemble</string>
|
||||
</property>
|
||||
<property name="menuRole">
|
||||
<enum>QAction::NoRole</enum>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_del">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Delete</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Delete selected ensembles</string>
|
||||
</property>
|
||||
<property name="menuRole">
|
||||
<enum>QAction::NoRole</enum>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_edit">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Edit</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Edit ensembles range</string>
|
||||
</property>
|
||||
<property name="menuRole">
|
||||
<enum>QAction::NoRole</enum>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_export">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/export.png</normaloff>ressources/export.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Export</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Export all ensemble configuration into json file</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_import">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Import</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Import ensemble configuration from json file</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@@ -0,0 +1,232 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainWindow</class>
|
||||
<widget class="QMainWindow" name="MainWindow">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1280</width>
|
||||
<height>720</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>MainWindow</string>
|
||||
</property>
|
||||
<property name="locale">
|
||||
<locale language="English" country="Europe"/>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>874</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0">
|
||||
<widget class="QSplitter" name="splitter_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<widget class="QSplitter" name="splitter_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<widget class="QTableView" name="tableView_reach"/>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QTableView" name="tableView_profile"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="horizontalLayoutWidget">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<widget class="QTableView" name="tableView_runs"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="1" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QPushButton" name="firstButton">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/media-skip-backward.png</normaloff>ressources/media-skip-backward.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="backButton">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/media-seek-backward.png</normaloff>ressources/media-seek-backward.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="playButton">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::DefaultContextMenu</enum>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/media-playback-start.png</normaloff>
|
||||
<normalon>ressources/media-playback-pause.png</normalon>ressources/media-playback-start.png</iconset>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="nextButton">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/media-seek-forward.png</normaloff>ressources/media-seek-forward.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="lastButton">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/media-skip-forward.png</normaloff>ressources/media-skip-forward.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSlider" name="horizontalSlider_time">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="tabsClosable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab">
|
||||
<attribute name="title">
|
||||
<string>Water elevation</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_elevation"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_2">
|
||||
<attribute name="title">
|
||||
<string>Discharge time series</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="0">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_hydrograph"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QMenuBar" name="menubar">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1280</width>
|
||||
<height>24</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusbar"/>
|
||||
<widget class="QToolBar" name="toolBar">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>toolBar</string>
|
||||
</property>
|
||||
<attribute name="toolBarArea">
|
||||
<enum>TopToolBarArea</enum>
|
||||
</attribute>
|
||||
<attribute name="toolBarBreak">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
<addaction name="action_export"/>
|
||||
<addaction name="action_import_data"/>
|
||||
</widget>
|
||||
<action name="action_export">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/export.png</normaloff>ressources/export.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Export</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Export data as CSV</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>Ctrl+E</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_import_data">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/import.png</normaloff>ressources/import.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Import data</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Import data from SCV file</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@@ -0,0 +1,123 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainWindow</class>
|
||||
<widget class="QMainWindow" name="MainWindow">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1152</width>
|
||||
<height>648</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>MainWindow</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QTextEdit" name="textEdit">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Monospace</family>
|
||||
<pointsize>10</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="locale">
|
||||
<locale language="English" country="Europe"/>
|
||||
</property>
|
||||
<property name="documentTitle">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="undoRedoEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QProgressBar" name="progressBar">
|
||||
<property name="value">
|
||||
<number>24</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QMenuBar" name="menubar">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1152</width>
|
||||
<height>24</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusbar"/>
|
||||
<widget class="QToolBar" name="toolBar">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>toolBar</string>
|
||||
</property>
|
||||
<attribute name="toolBarArea">
|
||||
<enum>TopToolBarArea</enum>
|
||||
</attribute>
|
||||
<attribute name="toolBarBreak">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
<addaction name="action_start"/>
|
||||
<addaction name="action_pause"/>
|
||||
<addaction name="action_stop"/>
|
||||
<addaction name="action_log_file"/>
|
||||
<addaction name="action_results"/>
|
||||
</widget>
|
||||
<action name="action_stop">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/close.png</normaloff>ressources/close.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Stop</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_start">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/run.png</normaloff>ressources/run.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Start</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_pause">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/player_pause.png</normaloff>ressources/player_pause.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Pause</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_log_file">
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>ressources/zoom.png</normaloff>ressources/zoom.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>LogFile</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_results">
|
||||
<property name="text">
|
||||
<string>results</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@@ -0,0 +1,42 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Form</class>
|
||||
<widget class="QWidget" name="Form">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>482</width>
|
||||
<height>48</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_0">
|
||||
<property name="text">
|
||||
<string>Parameter 1</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_0">
|
||||
<property name="minimum">
|
||||
<double>-10000000000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>10000000000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Form</class>
|
||||
<widget class="QWidget" name="Form">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>416</width>
|
||||
<height>80</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_0">
|
||||
<property name="text">
|
||||
<string>Parameter 1</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_0">
|
||||
<property name="minimum">
|
||||
<double>-10000000000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>10000000000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_1">
|
||||
<property name="text">
|
||||
<string>Parameter 2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBox_1">
|
||||
<property name="minimum">
|
||||
<double>-10000000000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>10000000000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
+1
-2
@@ -195,7 +195,7 @@ class Config(SQL):
|
||||
)
|
||||
|
||||
if major == "0" and minor <= "2":
|
||||
if int(release) < 8:
|
||||
if int(release) < 10:
|
||||
posix = os.name == 'posix'
|
||||
ext = "" if posix else ".exe"
|
||||
path = os.path.join("@install_dir",
|
||||
@@ -215,7 +215,6 @@ class Config(SQL):
|
||||
)
|
||||
""")
|
||||
|
||||
if int(release) < 9:
|
||||
self.execute(
|
||||
"INSERT OR IGNORE INTO data "
|
||||
"VALUES ('display_manning', 'False')"
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user