From 63b31b46b90bc1f7a4d586d2c60b90913b9519ae Mon Sep 17 00:00:00 2001 From: Jiang Date: Fri, 6 Feb 2026 17:46:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E9=81=93=E6=B8=85?= =?UTF-8?q?=E6=B4=97=E7=AE=97=E6=B3=95=E6=B5=81=E9=87=8F=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=8F=96=E5=80=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/algorithms/simulations.py | 3 ++- app/services/simulation.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/algorithms/simulations.py b/app/algorithms/simulations.py index 7273be3..4c5e79d 100644 --- a/app/algorithms/simulations.py +++ b/app/algorithms/simulations.py @@ -345,7 +345,8 @@ def flushing_analysis( # status['setting'] = 0.1036 * pow(valve_k, -3.105) # cs.append(status) # set_status(new_name,cs) - units = get_option(new_name) + options = get_option(new_name) + units = options["UNITS"] # step 2. set the emitter coefficient of drainage node or add flush flow to the drainage node emitter_demand = get_demand(new_name, drainage_node_ID) cs = ChangeSet() diff --git a/app/services/simulation.py b/app/services/simulation.py index ec651e3..4b7e976 100644 --- a/app/services/simulation.py +++ b/app/services/simulation.py @@ -1190,12 +1190,12 @@ def run_simulation( if modify_valve_opening[valve_name] == 0: valve_status["status"] = "CLOSED" valve_status["setting"] = 0 - if modify_valve_opening[valve_name] < 1: + elif modify_valve_opening[valve_name] < 1: valve_status["status"] = "OPEN" valve_status["setting"] = 0.1036 * pow( modify_valve_opening[valve_name], -3.105 ) - if modify_valve_opening[valve_name] == 1: + elif modify_valve_opening[valve_name] == 1: valve_status["status"] = "OPEN" valve_status["setting"] = 0 cs = ChangeSet()