diff --git a/simulation.py b/simulation.py index 3196587..7baff42 100644 --- a/simulation.py +++ b/simulation.py @@ -568,7 +568,7 @@ def run_simulation(name: str, simulation_type: str, modify_pattern_start_time: s print('modify_reservoir_head_pattern', modify_reservoir_head_pattern) print('modify_tank_initial_level', modify_tank_initial_level) print('modify_junction_base_demand', modify_junction_base_demand) - + print('{} -- Hydraulic simulation started.'.format( datetime.now(pytz.timezone('Asia/Shanghai')).strftime('%Y-%m-%d %H:%M:%S'))) @@ -883,7 +883,7 @@ def run_simulation(name: str, simulation_type: str, modify_pattern_start_time: s # DingZQ 下面这几句一定要这样,不然读取不了 time.sleep(5) # wait 5 seconds - + tmp_file = './temp/simulation.result.out' shutil.copy(f'./temp/{name_c}.db.opt', tmp_file) output = Output(tmp_file) @@ -891,6 +891,10 @@ def run_simulation(name: str, simulation_type: str, modify_pattern_start_time: s node_result = output.node_results() link_result = output.link_results() num_periods_result = output.times()['num_periods'] + + print("simulation_type", simulation_type) + print("before store result") + # print(num_periods_result) # print(node_result) # 存储 @@ -900,6 +904,8 @@ def run_simulation(name: str, simulation_type: str, modify_pattern_start_time: s influxdb_api.store_scheme_simulation_result_to_influxdb(node_result, link_result, modify_pattern_start_time, num_periods_result, scheme_Type, scheme_Name) + print("after store result") + if __name__ == "__main__": # 计算前,获取scada_info中的信息,按照设定的方法修改pg数据库