OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run inp should be same with run project

Browse Source
This commit is contained in:
Joey Wang
2023-03-22 13:48:59 +08:00
parent b9c8856528
commit 6f9d45d982
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
epanet/epanet.py
View File

@@ -264,10 +264,14 @@ def run_project(name: str, version: str = '3') -> str:
return json.dumps(data) return json.dumps(data)
def run_inp(name: str) -> str: def run_inp(name: str, version: str = '3') -> str:
if version != '3' and version != '2':
version = '2'
dir = os.path.abspath(os.getcwd()) dir = os.path.abspath(os.getcwd())
exe = os.path.join(os.path.join(dir, 'epanet'), 'runepanet.exe') program = 'runepanet.exe' if version == '2' else 'run-epanet3.exe'
exe = os.path.join(os.path.join(dir, 'epanet'), program)
inp = os.path.join(os.path.join(dir, 'inp'), name + '.inp') inp = os.path.join(os.path.join(dir, 'inp'), name + '.inp')
rpt = os.path.join(os.path.join(dir, 'temp'), name + '.rpt') rpt = os.path.join(os.path.join(dir, 'temp'), name + '.rpt')
opt = os.path.join(os.path.join(dir, 'temp'), name + '.opt') opt = os.path.join(os.path.join(dir, 'temp'), name + '.opt')
@@ -280,7 +284,10 @@ def run_inp(name: str) -> str:
data['simulation_result'] = 'failed' data['simulation_result'] = 'failed'
else: else:
data['simulation_result'] = 'successful' data['simulation_result'] = 'successful'
data |= _dump_output(opt) if version == '2':
data |= _dump_output(opt)
else:
pass # TODO: epanet3 output format?
data['report'] = dump_report(rpt) data['report'] = dump_report(rpt)

4
tjnetwork.py
View File

@@ -201,8 +201,8 @@ def run_project(name: str, version: str = '3') -> str:
return epanet.run_project(name, version) return epanet.run_project(name, version)
# put in inp folder, name without extension # put in inp folder, name without extension
def run_inp(name: str) -> str: def run_inp(name: str, version: str = '3') -> str:
return epanet.run_inp(name) return epanet.run_inp(name, version)
# path is absolute path # path is absolute path
def dump_output(path: str) -> str: def dump_output(path: str) -> str: