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

Accept Merge Request #103: (api -> master)

Browse Source 
Merge Request: Fix path issue, since api dir is different from internal

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/103
This commit is contained in:
王琼钰
2022-11-24 19:44:54 +08:00
parent 110def2c05 5f5cf961ef
commit 2a470446b5
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_db.py
View File

@@ -21,4 +21,5 @@ def db2inp():
if __name__ == '__main__':
#inp2db()
#db2inp()
print(run_project('net3'))
pass

30
epanet/epanet.py
View File

@@ -19,7 +19,7 @@ class Output:
def __init__(self, path: str) -> None:
self._path = path
self._lib = ctypes.CDLL(os.path.join(os.getcwd(), 'epanet-output.dll'))
self._lib = ctypes.CDLL(os.path.join(os.getcwd(), 'epanet', 'epanet-output.dll'))
self._handle = ctypes.c_void_p()
self._check(self._lib.ENR_init(ctypes.byref(self._handle)))
@@ -27,6 +27,11 @@ class Output:
self._check(self._lib.ENR_open(self._handle, ctypes.c_char_p(self._path.encode())))
def __del__(self):
# throw exception in destructor ? :)
self._check(self._lib.ENR_close(ctypes.byref(self._handle)))
def _check(self, result):
if result != 0:
msg = ctypes.c_char_p()
@@ -108,7 +113,6 @@ class Output:
return { 'nodes' : nodes, 'links': links }
# { pump_index, link_index, utilization, avg.efficiency, avg.kW/flow, avg.kwatts, max.kwatts, cost/day }
def energy_usage(self) -> list[dict[str, Any]]:
size = self.net_size()['pump']
usages = []
@@ -126,6 +130,18 @@ class Output:
return usages
def reactions(self) -> dict[str, float]:
values = ctypes.POINTER(ctypes.c_float)()
length = ctypes.c_int()
self._check(self._lib.ENR_getNetReacts(self._handle, ctypes.byref(values), ctypes.byref(length)))
assert length.value == 4
category = ['bulk', 'wall', 'tank', 'source']
d = {}
for i in range(4):
d[category[i]] = values[i]
return d
def dump(self, cache: bool = True) -> str:
data = {}
data |= { 'version' : self.version() }
@@ -134,17 +150,13 @@ class Output:
data |= { 'times' : self.times() }
data |= { 'element_name' : self.element_name() }
data |= { 'energy_usage' : self.energy_usage() }
data |= { 'reactions' : self.reactions() }
if cache:
with open(self._path + '.json', 'w') as f:
json.dump(data, f)
return json.dumps(data)
def __del__(self):
# throw exception in destructor ? :)
self._check(self._lib.ENR_close(ctypes.byref(self._handle)))
def dump_output(path: str) -> str:
opt = Output(path)
return opt.dump()
@@ -154,7 +166,7 @@ def run_project(name: str) -> str:
if not project.have_project(name):
raise Exception(f'Not found project [{name}]')
dir = os.path.dirname(os.getcwd())
dir = os.path.abspath(os.getcwd())
db_inp = os.path.join(os.path.join(dir, 'db_inp'), name + '.db.inp')
parser.dump_inp(name, db_inp)
@@ -175,7 +187,7 @@ def run_project(name: str) -> str:
def run_inp(name: str) -> str:
dir = os.path.dirname(os.getcwd())
dir = os.path.abspath(os.getcwd())
exe = os.path.join(os.path.join(dir, 'epanet'), 'runepanet.exe')
inp = os.path.join(os.path.join(dir, 'inp'), name + '.inp')