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

adistslc => adistswc

adists_release
Theophile Terraz 2024-10-14 14:44:26 +02:00
parent 92c9b106e3
commit 0ec1a39328
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Solver/AdisTS.py
View File

@ -178,17 +178,17 @@ class AdisTS(CommandLineSolver):
################################# #################################
class AdisTSlc(AdisTS): class AdisTSwc(AdisTS):
_type = "adistslc" _type = "adistswc"
def __init__(self, name): def __init__(self, name):
super(AdisTSlc, self).__init__(name) super(AdisTSwc, self).__init__(name)
self._type = "adistslc" self._type = "adistswc"
@classmethod @classmethod
def default_parameters(cls): def default_parameters(cls):
lst = super(AdisTSlc, cls).default_parameters() lst = super(AdisTSwc, cls).default_parameters()
# Insert new parameters at specific position # Insert new parameters at specific position
names = list(map(lambda t: t[0], lst)) names = list(map(lambda t: t[0], lst))
@ -200,7 +200,7 @@ class AdisTSlc(AdisTS):
########## ##########
def cmd_args(self, study): def cmd_args(self, study):
lst = super(AdisTSlc, self).cmd_args(study) lst = super(AdisTSwc, self).cmd_args(study)
return lst return lst
@ -505,8 +505,8 @@ class AdisTSlc(AdisTS):
r = results.river.add(i) r = results.river.add(i)
reachs.append(r) reachs.append(r)
is1[i] = data[2 * i] - 1 # first section of reach i (FORTRAN numbering) is1[i] = data[2 * i] - 1 # first section of reach i
is2[i] = data[2 * i + 1] - 1 # last section of reach i (FORTRAN numbering) is2[i] = data[2 * i + 1] - 1 # last section of reach i
key = (is1[i], is2[i]) key = (is1[i], is2[i])
iprofiles[key] = r iprofiles[key] = r
@ -544,14 +544,15 @@ class AdisTSlc(AdisTS):
data = np.fromfile(f, dtype=np.int32, count=1) # line length (bytes) (end) data = np.fromfile(f, dtype=np.int32, count=1) # line length (bytes) (end)
# end header # end header
def ip_to_r(i): return iprofiles[ def ip_to_r(i):
next( return iprofiles[
filter( next(
lambda k: k[0] <= i <= k[1], filter(
iprofiles lambda k: k[0] <= i <= k[1],
iprofiles
)
) )
) ]
]
def ip_to_ri(r, i): return i - reach_offset[r] def ip_to_ri(r, i): return i - reach_offset[r]
@ -680,7 +681,7 @@ class AdisTSlc(AdisTS):
if name is None: if name is None:
name = study.name.replace(" ", "_") name = study.name.replace(" ", "_")
results = super(AdisTSlc, self).results(study, repertory, qlog, name=name) results = super(AdisTSwc, self).results(study, repertory, qlog, name=name)
return results return results
@ -694,7 +695,7 @@ class AdisTSlc(AdisTS):
@timer @timer
def export(self, study, repertory, mage_rep, qlog=None, name="0"): def export(self, study, repertory, mage_rep, qlog=None, name="0"):
print("cmd solver adistslc : ", self._cmd_solver) print("cmd solver adistswc : ", self._cmd_solver)
self._study = study self._study = study
name = study.name.replace(" ", "_") name = study.name.replace(" ", "_")

6
src/Solver/Solvers.py
View File

@ -22,7 +22,7 @@ from Solver.GenericSolver import GenericSolver
from Solver.Mage import ( from Solver.Mage import (
Mage7, Mage8, MageFake7, Mage7, Mage8, MageFake7,
) )
from Solver.AdisTS import AdisTSlc from Solver.AdisTS import AdisTSwc
from Solver.RubarBE import Rubar3, RubarBE from Solver.RubarBE import Rubar3, RubarBE
_translate = QCoreApplication.translate _translate = QCoreApplication.translate
@ -32,7 +32,7 @@ solver_long_name = {
# "mage7": "Mage v7", # "mage7": "Mage v7",
"mage8": "Mage v8", "mage8": "Mage v8",
# "mage_fake7": "Mage fake v7", # "mage_fake7": "Mage fake v7",
"adistslc": "Adis-TS_LC", "adistswc": "Adis-TS_WC",
# "rubarbe": "RubarBE", # "rubarbe": "RubarBE",
# "rubar3": "Rubar3", # "rubar3": "Rubar3",
} }
@ -42,7 +42,7 @@ solver_type_list = {
# "mage7": Mage7, # "mage7": Mage7,
"mage8": Mage8, "mage8": Mage8,
# "mage_fake7": MageFake7, # "mage_fake7": MageFake7,
"adistslc": AdisTSlc, "adistswc": AdisTSwc,
# "rubarbe": RubarBE, # "rubarbe": RubarBE,
# "rubar3": Rubar3, # "rubar3": Rubar3,
} }

4
src/View/MainWindow.py
View File

@ -1290,8 +1290,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
if self._study is None: if self._study is None:
return return
#solver = next(filter(lambda x: x._type == "adistslc", self.conf.solvers)) #solver = next(filter(lambda x: x._type == "adistswc", self.conf.solvers))
#solver = next(filter(lambda x: x.name == "AdisTS-LC", self.conf.solvers)) #solver = next(filter(lambda x: x.name == "AdisTS-WC", self.conf.solvers))
#print(solver._type) #print(solver._type)
#self.run_solver(solver) #self.run_solver(solver)