From 1dca9b98dfa207572f8354a3cd3979812fb5aab9 Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Tue, 28 Oct 2025 15:56:53 +0100 Subject: [PATCH] debug rubarBE --- src/Solver/RubarBE.py | 65 ++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/src/Solver/RubarBE.py b/src/Solver/RubarBE.py index d9597c6b..26049dfa 100644 --- a/src/Solver/RubarBE.py +++ b/src/Solver/RubarBE.py @@ -52,8 +52,8 @@ class Rubar3(CommandLineSolver): ("rubarbe_condav", "3"), ("rubarbe_regime", "0"), ("rubarbe_iodev", "n"), - # ("rubarbe_iodebord", ""), - # ("rubarbe_iostockage", ""), + ("rubarbe_iodebord", ""), + ("rubarbe_iostockage", ""), ("rubarbe_iopdt", "y"), ("rubarbe_iovis", "n"), ("rubarbe_rep", "n"), @@ -73,36 +73,37 @@ class Rubar3(CommandLineSolver): ("rubarbe_tf_4", "y"), ("rubarbe_tf_5", "y"), ("rubarbe_tf_6", "n"), - ("rubarbe_trased", "y"), - # ("rubarbe_optfpc", "0"), - # ("rubarbe_ros", "2650.0"), - # ("rubarbe_dm", "0.1"), - # ("rubarbe_segma", "1.0"), + ("rubarbe_trased", "n"), + ("rubarbe_optfpc", "0"), + # trased parameters + ("rubarbe_ros", "2650.0"), + ("rubarbe_dm", "0.1"), + ("rubarbe_segma", "1.0"), # Sediment parameters - # ("rubarbe_sediment_ros", "2650.0"), - # ("rubarbe_sediment_por", "0.4"), - # ("rubarbe_sediment_dcharg", "0.0"), - # ("rubarbe_sediment_halfa", "1.0"), - # ("rubarbe_sediment_mult_1", "1.0"), - # ("rubarbe_sediment_mult_2", ""), - # ("rubarbe_sediment_mult_3", ""), - # ("rubarbe_sediment_mult_4", ""), - # ("rubarbe_sediment_mult_5", ""), - # ("rubarbe_sediment_visc", "0.047"), - # ("rubarbe_sediment_opts", "6"), - # ("rubarbe_sediment_odchar", "0"), - # ("rubarbe_sediment_unisol", "1"), - # ("rubarbe_sediment_typdef", "3"), - # ("rubarbe_sediment_depot", "2"), - # ("rubarbe_sediment_choixc", "2"), - # ("rubarbe_sediment_option", "2"), - # ("rubarbe_sediment_capsol", "1"), - # ("rubarbe_sediment_bmiu", "0.85"), - # ("rubarbe_sediment_demix", "0"), - # ("rubarbe_sediment_defond", "1"), - # ("rubarbe_sediment_varcons", "1"), - # ("rubarbe_sediment_dchard", "0.0"), - # ("rubarbe_sediment_dchars", "0.0"), + ("rubarbe_sediment_ros", "2650.0"), + ("rubarbe_sediment_por", "0.4"), + ("rubarbe_sediment_dcharg", "0.0"), + ("rubarbe_sediment_halfa", "1.0"), + ("rubarbe_sediment_mult_1", "1.0"), + ("rubarbe_sediment_mult_2", ""), + ("rubarbe_sediment_mult_3", ""), + ("rubarbe_sediment_mult_4", ""), + ("rubarbe_sediment_mult_5", ""), + ("rubarbe_sediment_visc", "0.047"), + ("rubarbe_sediment_opts", "6"), + ("rubarbe_sediment_odchar", "0"), + ("rubarbe_sediment_unisol", "1"), + ("rubarbe_sediment_typdef", "3"), + ("rubarbe_sediment_depot", "2"), + ("rubarbe_sediment_choixc", "2"), + ("rubarbe_sediment_option", "2"), + ("rubarbe_sediment_capsol", "1"), + ("rubarbe_sediment_bmiu", "0.85"), + ("rubarbe_sediment_demix", "0"), + ("rubarbe_sediment_defond", "1"), + ("rubarbe_sediment_varcons", "1"), + ("rubarbe_sediment_dchard", "0.0"), + ("rubarbe_sediment_dchars", "0.0"), ] return lst @@ -169,7 +170,7 @@ class Rubar3(CommandLineSolver): it = iter(params) line = 0 - while line < 25: + while line < 27: param = next(it) name = param.name value = param.value