mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
SolverParameters: Add defautl and mage parameters.
This commit is contained in:
1 parent
75503628b3
commit
65cd92d793
3 files changed
+54
-4
No files matched your search
@@ -45,7 +45,13 @@ class AbstractSolver(object):
|
||||
|
||||
@classmethod
|
||||
def default_parameters(cls):
|
||||
return []
|
||||
lst = [
|
||||
("all_time_init", "00:00:00:00"),
|
||||
("all_time_final", "01:00:00:00"),
|
||||
("all_time_step", "300"),
|
||||
]
|
||||
|
||||
return lst
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
|
||||
+25
-2
@@ -17,7 +17,24 @@ class Mage(GenericSolver):
|
||||
lst = super(Mage, cls).default_parameters()
|
||||
|
||||
lst += [
|
||||
("mage_time_step", "300"),
|
||||
("mage_time_step_tra", "3600"),
|
||||
("mage_time_step_bin", "0"),
|
||||
("mage_param_impli", "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_precision_reduction_factor_Z", "1"),
|
||||
("mage_precision_reduction_factor_Q", "1"),
|
||||
("mage_iter_num_max_precision", "99"),
|
||||
("mage_error_bound_mesh_elevation", "-1"),
|
||||
("mage_maximun_froude_number", "2"),
|
||||
("mage_volume_report_monitoring_yn", "y"),
|
||||
("mage_divergence_relative_error", "0.001"),
|
||||
("mage_minimal_reach_volume_error", "1000"),
|
||||
]
|
||||
|
||||
return lst
|
||||
@@ -32,8 +49,8 @@ class Mage7(Mage):
|
||||
@classmethod
|
||||
def default_parameters(cls):
|
||||
lst = super(Mage7, cls).default_parameters()
|
||||
return lst
|
||||
|
||||
return lst
|
||||
|
||||
|
||||
class Mage8(Mage):
|
||||
@@ -45,4 +62,10 @@ class Mage8(Mage):
|
||||
@classmethod
|
||||
def default_parameters(cls):
|
||||
lst = super(Mage8, cls).default_parameters()
|
||||
|
||||
# Insert new parameters at specific position
|
||||
names = list(map(lambda t: t[0], lst))
|
||||
i = names.index("mage_precision_reduction_factor_Q")
|
||||
lst.insert(i+1, ("mage_precision_reduction_factor_r", "1"))
|
||||
|
||||
return lst
|
||||
Reference in new issue
Block a user