From 7cb3ac8a8025f77f3794368453f2fa1f294435ec Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Fri, 22 May 2026 09:40:56 +0200 Subject: [PATCH] Clean code: Remove some print function call. --- src/Meshing/Internal.py | 2 +- .../BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py | 6 ++++-- src/Model/Geometry/ProfileXYZ.py | 1 - src/Model/Geometry/Reach.py | 1 - src/Model/HydraulicStructures/Basic/HydraulicStructures.py | 1 - src/Model/InitialConditions/InitialConditions.py | 2 -- src/Model/Reservoir/Reservoir.py | 2 -- src/Model/Scenarios.py | 2 +- src/Model/Tools/PamhyrDB.py | 6 ++++-- src/Solver/RubarBE.py | 2 -- 10 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/Meshing/Internal.py b/src/Meshing/Internal.py index 2134b8c4..7a14bad5 100644 --- a/src/Meshing/Internal.py +++ b/src/Meshing/Internal.py @@ -214,7 +214,7 @@ class InternalMeshing(AMeshingTool): ratio = (alpha[j0] - beta[j0-1]) \ / (beta[j0] - beta[j0-1]) if ratio < 0.0: - print(f"ratio négatif {ratio}") + logger.warning(f"ratio négatif {ratio}") # on double le point a gauche p = sect2.point(start2+j0-1).copy() sect2.insert_point(start2+j0-1, p) diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index b33c1a03..b38c8ae2 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py @@ -304,8 +304,10 @@ class BoundaryConditionAdisTS(SQLSubModel): if pol_id not in pid_pol: # ⚠️ cas important : probablement déjà migré - print(f"[WARN] pol_id {pol_id} not in pid_pol " + - f"→ probably already migrated") + logger.warning( + f"pol_id {pol_id} not in pid_pol " + + "→ probably already migrated" + ) continue execute( diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py index 2ccb75fd..1b821051 100644 --- a/src/Model/Geometry/ProfileXYZ.py +++ b/src/Model/Geometry/ProfileXYZ.py @@ -396,7 +396,6 @@ class ProfileXYZ(Profile, SQLSubModel): for point in self._points: p = point.copy() - print(p) new_p._points.append(p) new_p.modified() diff --git a/src/Model/Geometry/Reach.py b/src/Model/Geometry/Reach.py index 45602018..9812df21 100644 --- a/src/Model/Geometry/Reach.py +++ b/src/Model/Geometry/Reach.py @@ -202,7 +202,6 @@ class Reach(SQLSubModel): else: gi = self.get_global_profil_index(index) profile.num = gi - print(f"gi = {gi}") self._profiles.insert(gi, profile) self.modified() diff --git a/src/Model/HydraulicStructures/Basic/HydraulicStructures.py b/src/Model/HydraulicStructures/Basic/HydraulicStructures.py index 6df03953..757d8bfb 100644 --- a/src/Model/HydraulicStructures/Basic/HydraulicStructures.py +++ b/src/Model/HydraulicStructures/Basic/HydraulicStructures.py @@ -183,7 +183,6 @@ class BasicHS(SQLSubModel): bhs._data = BHSValue._db_load( execute, data ) - print(f"{bhs_pid} : {deleted}") if deleted: bhs.set_as_deleted() diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py index bbec0492..fc299a77 100644 --- a/src/Model/InitialConditions/InitialConditions.py +++ b/src/Model/InitialConditions/InitialConditions.py @@ -588,8 +588,6 @@ class InitialConditions(SQLSubModel): for data in self._data: data_height[data["rk"].rk] = data["height"] - print(data_height) - incline = self._reach.reach.get_incline_median_mean() logger.debug(f"incline = {incline}") diff --git a/src/Model/Reservoir/Reservoir.py b/src/Model/Reservoir/Reservoir.py index c093691c..e120f9ec 100644 --- a/src/Model/Reservoir/Reservoir.py +++ b/src/Model/Reservoir/Reservoir.py @@ -263,8 +263,6 @@ class Reservoir(SQLSubModel): cls._db_update_to_0_2_0_set_node_pid(execute, table, nodes) Scenario.update_db_add_scenario(execute, table) - print(execute(f"SELECT * FROM {table}")) - cls._db_create(execute, ext="_tmp") execute( f"INSERT INTO {table}_tmp " + diff --git a/src/Model/Scenarios.py b/src/Model/Scenarios.py index 3dee2beb..e37a504e 100644 --- a/src/Model/Scenarios.py +++ b/src/Model/Scenarios.py @@ -84,7 +84,7 @@ class Scenarios(PamhyrModelDict): def is_leaf(self, scenario): return not reduce( lambda acc, s: ( - acc or s.parent is scenario + acc or (not s.is_deleted() and s.parent is scenario) ), self._dict.values(), False diff --git a/src/Model/Tools/PamhyrDB.py b/src/Model/Tools/PamhyrDB.py index 9ca7257c..caf56bb0 100644 --- a/src/Model/Tools/PamhyrDB.py +++ b/src/Model/Tools/PamhyrDB.py @@ -313,8 +313,10 @@ class SQLSubModel(PamhyrID): if node_id not in nodes: # ⚠️ cas important : probablement déjà migré - print(f"[WARN] node_id {node_id} not in nodes " + - f"→ probably already migrated") + logger.warning( + f"node_id {node_id} not in nodes " + + "→ probably already migrated" + ) continue execute( diff --git a/src/Solver/RubarBE.py b/src/Solver/RubarBE.py index f33b04dc..e92ca2cd 100644 --- a/src/Solver/RubarBE.py +++ b/src/Solver/RubarBE.py @@ -426,7 +426,6 @@ class Rubar3(CommandLineSolver): coeff = coeff_min else: for s in lst: - print(s.begin_rk, s.end_rk) 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 @@ -473,7 +472,6 @@ class Rubar3(CommandLineSolver): last = profiles[-1] if first not in data or last not in data: - print(data) logger.error( "Study initial condition is not fully defined" )