From c160ae974a306e79bb9e120246e6d7bb1117d161 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Sat, 12 Nov 2022 15:25:15 +0800 Subject: [PATCH] Skip comment --- api/s2_junctions.py | 3 +++ api/s3_reservoirs.py | 3 +++ api/s4_tanks.py | 3 +++ api/s5_pipes.py | 3 +++ 4 files changed, 12 insertions(+) diff --git a/api/s2_junctions.py b/api/s2_junctions.py index 7607263..40a5bd7 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -138,6 +138,9 @@ class InpJunction: def inp_in_junction(section: list[str]) -> ChangeSet: cs = ChangeSet() for s in section: + # skip comment + if s.startswith(';'): + continue obj = InpJunction(s) cs.append({'operation': API_ADD, 'type': 'junction', 'id': obj.id, 'elevation': obj.elevation, 'demand': obj.demand, 'pattern': obj.pattern}) return cs diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py index 0904eb1..d8422f5 100644 --- a/api/s3_reservoirs.py +++ b/api/s3_reservoirs.py @@ -133,6 +133,9 @@ class InpReservoir: def inp_in_reservoir(section: list[str]) -> ChangeSet: cs = ChangeSet() for s in section: + # skip comment + if s.startswith(';'): + continue obj = InpReservoir(s) cs.append({'operation': API_ADD, 'type': 'reservoir', 'id': obj.id, 'head': obj.head, 'pattern': obj.pattern}) return cs diff --git a/api/s4_tanks.py b/api/s4_tanks.py index a6e1a16..401b1ba 100644 --- a/api/s4_tanks.py +++ b/api/s4_tanks.py @@ -167,6 +167,9 @@ class InpTank: def inp_in_tank(section: list[str]) -> ChangeSet: cs = ChangeSet() for s in section: + # skip comment + if s.startswith(';'): + continue obj = InpTank(s) cs.append({'operation': API_ADD, 'type': 'tank', 'id': obj.id, 'elevation': obj.elevation, 'init_level': obj.init_level, 'min_level': obj.min_level, 'max_level': obj.max_level, 'diameter': obj.diameter, 'min_vol': obj.min_vol, 'vol_curve': obj.vol_curve, 'overflow': obj.overflow}) return cs diff --git a/api/s5_pipes.py b/api/s5_pipes.py index 0b4d364..8b7a482 100644 --- a/api/s5_pipes.py +++ b/api/s5_pipes.py @@ -146,6 +146,9 @@ class InpPipe: def inp_in_pipe(section: list[str]) -> ChangeSet: cs = ChangeSet() for s in section: + # skip comment + if s.startswith(';'): + continue obj = InpPipe(s) cs.append({'operation': API_ADD, 'type': 'pipe', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'length': obj.length, 'diameter': obj.diameter, 'roughness': obj.roughness, 'minor_loss': obj.minor_loss, 'status': obj.status}) return cs