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

SolverParameters: Minor change.

mesh
Pierre-Antoine Rouby 2023-06-14 14:48:13 +02:00
parent 65cd92d793
commit 6eca4647a9
4 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Solver/ASolver.py
View File

@ -46,9 +46,10 @@ class AbstractSolver(object):
@classmethod
def default_parameters(cls):
lst = [
("all_time_init", "00:00:00:00"),
("all_time_final", "01:00:00:00"),
("all_time_step", "300"),
("all_init_time", "00:00:00:00"),
("all_final_time", "01:00:00:00"),
("all_timestep", "300.0"),
("all_timestep_min", "1.0"),
]
return lst
@ -93,6 +94,10 @@ class AbstractSolver(object):
self._path_output = path
self._cmd_output = cmd
# Export
def export(self, study):
raise NotImplementedMethodeError(self, self.export)
# Run
def run_input_data_fomater(self):
if self._cmd_input == "":

17
src/Solver/Mage.py
View File

@ -17,19 +17,18 @@ class Mage(GenericSolver):
lst = super(Mage, cls).default_parameters()
lst += [
("mage_time_step_tra", "3600"),
("mage_time_step_bin", "0"),
("mage_param_impli", "0.70"),
("mage_timestep_tra", "3600"),
("mage_timestep_bin", "0"),
("mage_implication", "0.70"),
("mage_iter_type", "0"),
("mage_smooth_coef", "0"),
("mage_stream_number", "-1."),
("mage_water_minimum_height", "0.1"),
("mage_maximun_number_iter", "10"),
("mage_minimal_time_step", "1"),
("mage_time_step_reduction_factor", "2"),
("mage_cfl_max", "-1."),
("mage_min_height", "0.1"),
("mage_max_niter", "10"),
("mage_timestep_reduction_factor", "2"),
("mage_precision_reduction_factor_Z", "1"),
("mage_precision_reduction_factor_Q", "1"),
("mage_iter_num_max_precision", "99"),
("mage_niter_max_precision", "99"),
("mage_error_bound_mesh_elevation", "-1"),
("mage_maximun_froude_number", "2"),
("mage_volume_report_monitoring_yn", "y"),

9
src/View/SolverParameters/Window.py
View File

@ -34,6 +34,7 @@ _translate = QCoreApplication.translate
class SolverParametersWindow(ASubMainWindow, ListedSubWindow):
def __init__(self, title="Solver parameters", study=None, parent=None):
# Init tanslate dictionary
tr.init()
title = title + " - " + study.name
@ -67,15 +68,15 @@ class SolverParametersWindow(ASubMainWindow, ListedSubWindow):
self._tab_widget = self.find(QTabWidget, f"tabWidget")
for st in solver_type_list:
# Create table
# Create widgets
widget = QWidget()
widget.setObjectName(f"tab_{st}")
grid = QGridLayout()
table = QTableView()
widget.setObjectName(f"tab_{st}")
table.setObjectName(f"tableView_{st}")
# Create table model
self._table[st] = TableModel(
data = self._study.river,
undo = self._undo_stack[st],

28
src/View/SolverParameters/translate.py
View File

@ -12,8 +12,8 @@ names = None
def init():
global table_headers
table_headers = {
"name": _translate("LateralContribution", "Name"),
"value": _translate("LateralContribution", "Value")
"name": _translate("SolverParameters", "Name"),
"value": _translate("SolverParameters", "Value")
}
# Used to translate user parameter with value yes or no
@ -36,20 +36,20 @@ def init():
global names
names = {
"all_time_init": _translate("SolverParameters", "Initial time (jj:hh:mm:ss)"),
"all_time_final": _translate("SolverParameters", "Final time (jj:hh:mm:ss)"),
"all_time_step": _translate("SolverParameters", "Time step (second)"),
"mage_param_impli": _translate("SolverParameters", "Implicitation parameter"),
"mage_time_step_tra": _translate("SolverParameters", "Time step of writing on .TRA"),
"mage_time_step_bin": _translate("SolverParameters", "Time step of writing on .BIN"),
"all_init_time": _translate("SolverParameters", "Initial time (jj:hh:mm:ss)"),
"all_final_time": _translate("SolverParameters", "Final time (jj:hh:mm:ss)"),
"all_timestep": _translate("SolverParameters", "Timestep (second)"),
"all_timestep_min": _translate("SolverParameters", "Minimum timestep (second)"),
"mage_implication": _translate("SolverParameters", "Implicitation parameter"),
"mage_timestep_tra": _translate("SolverParameters", "Time step of writing on .TRA"),
"mage_timestep_bin": _translate("SolverParameters", "Time step of writing on .BIN"),
"mage_iter_type": _translate("SolverParameters", "Iteration type"),
"mage_smooth_coef": _translate("SolverParameters", "Smoothing coefficient"),
"mage_stream_number": _translate("SolverParameters", "Maximun accepted number of stream"),
"mage_water_minimum_height": _translate("SolverParameters", "Minimum water height (meter)"),
"mage_maximun_number_iter": _translate("SolverParameters", "Maximun number of iterations (< 100)"),
"mage_minimal_time_step": _translate("SolverParameters", "Minimum time step (second)"),
"mage_time_step_reduction_factor": _translate("SolverParameters", "Reduction factor of time step"),
"mage_iter_num_max_precision": _translate("SolverParameters", "Number of iteration at maximum precision"),
"mage_cfl_max": _translate("SolverParameters", "Maximun accepted number of CFL"),
"mage_min_height": _translate("SolverParameters", "Minimum water height (meter)"),
"mage_max_niter": _translate("SolverParameters", "Maximun number of iterations (< 100)"),
"mage_timestep_reduction_factor": _translate("SolverParameters", "Timestep reduction factor"),
"mage_niter_max_precision": _translate("SolverParameters", "Number of iteration at maximum precision"),
"mage_precision_reduction_factor_Z": _translate("SolverParameters", "Reduction precision factor of Z"),
"mage_precision_reduction_factor_Q": _translate("SolverParameters", "Reduction precision factor of Q"),
"mage_precision_reduction_factor_r": _translate("SolverParameters", "Reduction precision factor of residue"),