diff --git a/api/__init__.py b/api/__init__.py index b671e8f..831eb98 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -41,4 +41,9 @@ from .s6_pumps import get_pump_node1, get_pump_node2 from .s6_pumps import set_pump_node1, set_pump_node2 # TODO: more properties... +from .s7_valves import VALVES_TYPE_PRV, VALVES_TYPE_PSV, VALVES_TYPE_PBV, VALVES_TYPE_FCV, VALVES_TYPE_TCV, VALVES_TYPE_GPV +from .s7_valves import add_valve, delete_valve +from .s7_valves import get_valve_node1, get_valve_node2, get_valve_diameter, get_valve_type, get_valve_setting, get_valve_minor_loss +from .s7_valves import set_valve_node1, set_valve_node2, set_valve_diameter, set_valve_type, set_valve_setting, set_valve_minor_loss + from .s24_coordinates import get_node_coord, set_node_coord \ No newline at end of file diff --git a/tjnetwork.py b/tjnetwork.py index 2b3b825..f5b215d 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -26,6 +26,13 @@ PIPE_STATUS_OPEN = api.PIPE_STATUS_OPEN PIPE_STATUS_CLOSED = api.PIPE_STATUS_CLOSED PIPE_STATUS_CV = api.PIPE_STATUS_CV +VALVES_TYPE_PRV = api.VALVES_TYPE_PRV +VALVES_TYPE_PSV = api.VALVES_TYPE_PSV +VALVES_TYPE_PBV = api.VALVES_TYPE_PBV +VALVES_TYPE_FCV = api.VALVES_TYPE_FCV +VALVES_TYPE_TCV = api.VALVES_TYPE_TCV +VALVES_TYPE_GPV = api.VALVES_TYPE_GPV + ############################################################ # project @@ -348,6 +355,53 @@ def set_pump_node2(name: str, pump_id: str, node2: str) -> ChangeSet: return api.set_pump_node2(name, pump_id, node2) +############################################################ +# valve 4.[VALVES] +############################################################ + +def add_valve(name: str, valve_id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet: + return api.add_valve(name, valve_id, node1, node2, diameter, type, setting, minor_loss) + +def delete_valve(name: str, valve_id: str) -> ChangeSet: + return api.delete_valve(name, valve_id) + +def get_valve_node1(name: str, valve_id: str) -> str | None: + return api.get_valve_node1(name, valve_id) + +def get_valve_node2(name: str, valve_id: str) -> str | None: + return api.get_valve_node1(name, valve_id) + +def get_valve_diameter(name: str, valve_id: str) -> float | None: + return api.get_valve_diameter(name, valve_id) + +def get_valve_type(name: str, valve_id: str) -> str | None: + return api.get_valve_type(name, valve_id) + +def get_valve_setting(name: str, valve_id: str) -> float | None: + return api.get_valve_setting(name, valve_id) + +def get_valve_minor_loss(name: str, valve_id: str) -> float | None: + return api.get_valve_minor_loss(name, valve_id) + +def set_valve_node1(name: str, valve_id: str, node1: str) -> ChangeSet: + return api.set_valve_node1(name, valve_id, node1) + +def set_valve_node2(name: str, valve_id: str, node2: str) -> ChangeSet: + return api.set_valve_node2(name, valve_id, node2) + +def set_valve_diameter(name: str, valve_id: str, diameter: float) -> ChangeSet: + return api.set_valve_diameter(name, valve_id, diameter) + +def set_valve_type(name: str, valve_id: str, type: str) -> ChangeSet: + return api.set_valve_type(name, valve_id, type) + +def set_valve_setting(name: str, valve_id: str, setting: float) -> ChangeSet: + return api.set_valve_setting(name, valve_id, setting) + +def set_valve_minor_loss(name: str, valve_id: str, minor_loss: float) -> ChangeSet: + return api.set_valve_minor_loss(name, valve_id, minor_loss) + + ############################################################ # coordinates 24.[COORDINATES] ############################################################