From b2431d4ed983473fc9b9195c23a64baf094706d4 Mon Sep 17 00:00:00 2001 From: Joey Wang Date: Thu, 2 Mar 2023 19:20:20 +0800 Subject: [PATCH] Add EPANET3 format --- api/s2_junctions.py | 8 +++++++- api/s3_reservoirs.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/s2_junctions.py b/api/s2_junctions.py index 5c034fb..860da1a 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -113,12 +113,18 @@ def delete_junction(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2] +# [EPA2] # [IN] # id elev. (demand) (demand pattern) ;desc # [OUT] # id elev. ;desc #-------------------------------------------------------------- +# [EPA3] +# [IN] +# id elev. (demand) (demand pattern) +# [OUT] +# id elev. * * minpressure fullpressure +#-------------------------------------------------------------- class InpJunction: def __init__(self, line: str) -> None: tokens = line.split() diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py index 0235a8e..3a9760a 100644 --- a/api/s3_reservoirs.py +++ b/api/s3_reservoirs.py @@ -117,7 +117,7 @@ def delete_reservoir(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # id elev (pattern) ;desc #-------------------------------------------------------------- class InpReservoir: