Read new types into inp

api/parser.py

@@ -7,6 +7,14 @@ from .s4_tanks import *
 from .s5_pipes import *
 from .s6_pumps import *
 from .s7_valves import *
+from .s9_demands import *
+from .s10_status import *
+from .s11_patterns import *
+from .s12_curves import *
+from .s16_emitters import *
+from .s21_times import *
+from .s23_options import *
+
 
 def read_inp(name: str, inp: str):
     if is_project_open(name):
@@ -18,19 +26,30 @@ def read_inp(name: str, inp: str):
     create_project(name)
     open_project(name)
 
+    section = ''
+
+    title : str = ''
     junctions : dict[str, dict[str, Any]] = {}
     reservoirs : dict[str, dict[str, Any]] = {}
     tanks : dict[str, dict[str, Any]] = {}
     pipes : dict[str, dict[str, Any]] = {}
     pumps : dict[str, dict[str, Any]] = {}
     valves : dict[str, dict[str, Any]] = {}
-    section = ''
+    demands : dict[str, list[dict[str, Any]]] = {}
+    status : dict[str, dict[str, Any]] = {}
+    patterns : dict[str, list[float]] = {}
+    curves : dict[str, list[dict[str, float]]] = {}
+    emitters : dict[str, float] = {}
+    times : dict[str, str] = {}
+    options : dict[str, str] = {}
 
     for line in open(inp):
-        line = line.lstrip()
+        line = line.strip()
 
         if line.startswith(';'):
             continue
+        if line.endswith(';'):
+            line = line.removesuffix(';')
 
         if line.startswith('[TITLE'):
             section = 'title'
@@ -53,6 +72,27 @@ def read_inp(name: str, inp: str):
         if line.startswith('[VALVE'):
             section = VALVE
             continue
+        if line.startswith('[DEMAND'):
+            section = 'demand'
+            continue
+        if line.startswith('[STATUS'):
+            section = 'status'
+            continue
+        if line.startswith('[PATTERN'):
+            section = PATTERN
+            continue
+        if line.startswith('[CURVE'):
+            section = CURVE
+            continue
+        if line.startswith('[EMITTER'):
+            section = 'emitter'
+            continue
+        if line.startswith('[TIME'):
+            section = 'time'
+            continue
+        if line.startswith('[OPTION'):
+            section = 'option'
+            continue
         if line.startswith('[COORDINATE'):
             section = 'coordinate'
             continue
@@ -60,38 +100,98 @@ def read_inp(name: str, inp: str):
             section = ''
             continue
 
-        tokens = line.split()
+        tokens = []
-        if len(tokens) == 0:
+        if section == 'time' or section == 'option':
+            tokens = line.upper().split()
+        else:
+            tokens = line.split()
+        tokens_len = len(tokens)
+        if tokens_len == 0:
             continue
 
         if section == 'title':
-            # set_title(name, ChangeSet({'value': tokens[0]}))
+            if title == '':
+                title += '\n'
+            title += line
             continue
         elif section == JUNCTION:
-            if tokens[0] not in junctions:
+            junction_demand = float(tokens[2]) if tokens_len >= 3 else None
-                junctions[tokens[0]] = {}
+            junction_pattern = tokens[3] if tokens_len == 4 else None
-            junctions[tokens[0]] |= {'id': tokens[0], 'elevation': tokens[1]}
+            junctions[tokens[0]] = {'id': tokens[0], 'elevation': tokens[1], 'demand': junction_demand, 'pattern': junction_pattern}
             continue
         elif section == RESERVOIR:
-            if tokens[0] not in reservoirs:
+            reservoir_pattern = tokens[2] if tokens_len == 3 else None
-                reservoirs[tokens[0]] = {}
+            reservoirs[tokens[0]] = {'id': tokens[0], 'head': tokens[1], 'pattern': reservoir_pattern}
-            reservoirs[tokens[0]] |= {'id': tokens[0], 'head': tokens[1]}
             continue
         elif section == TANK:
-            if tokens[0] not in tanks:
+            tank_vol_curve = tokens[7] if tokens_len >= 8 else None
-                tanks[tokens[0]] = {}
+            tank_overflow = tokens[8].upper() if tokens_len == 9 else None
-            tanks[tokens[0]] = {'id': tokens[0], 'elevation': tokens[1], 'init_level': tokens[2], 'min_level': tokens[3], 'max_level': tokens[4], 'diameter': tokens[5], 'min_vol': tokens[6]}
+            tanks[tokens[0]] = {'id': tokens[0], 'elevation': tokens[1], 'init_level': tokens[2], 'min_level': tokens[3], 'max_level': tokens[4], 'diameter': tokens[5], 'min_vol': tokens[6], 'vol_curve': tank_vol_curve, 'overflow': tank_overflow}
             continue
         elif section == PIPE:
-            if len(tokens) == 7:
+            # status is must-have, here fix input
-                tokens.append(PIPE_STATUS_OPEN)
+            pipe_status = tokens[7].upper() if tokens_len == 8 else PIPE_STATUS_OPEN
-            pipes[tokens[0]] = {'id': tokens[0], 'node1': tokens[1], 'node2': tokens[2], 'length': tokens[3], 'diameter': tokens[4], 'roughness': tokens[5], 'minor_loss': tokens[6], 'status': tokens[7].lower()}
+            pipes[tokens[0]] = {'id': tokens[0], 'node1': tokens[1], 'node2': tokens[2], 'length': tokens[3], 'diameter': tokens[4], 'roughness': tokens[5], 'minor_loss': tokens[6], 'status': pipe_status}
             continue
         elif section == PUMP:
             pumps[tokens[0]] = {'id': tokens[0], 'node1': tokens[1], 'node2': tokens[2]}
+            for i in range(3, tokens_len, 2):
+                pumps[tokens[0]] |= { tokens[i].lower(): tokens[i + 1] }
             continue
         elif section == VALVE:
-            valves[tokens[0]] = {'id': tokens[0], 'node1': tokens[1], 'node2': tokens[2], 'diameter': tokens[3], 'v_type': tokens[4].lower(), 'setting': tokens[5], 'minor_loss': tokens[6]}
+            valves[tokens[0]] = {'id': tokens[0], 'node1': tokens[1], 'node2': tokens[2], 'diameter': tokens[3], 'v_type': tokens[4], 'setting': tokens[5], 'minor_loss': tokens[6]}
+            continue
+        elif section == 'demand':
+            demand_pattern = tokens[2] if tokens_len >= 3 else None
+            demand_category = tokens[3] if tokens_len == 4 else None
+            demands[tokens[0]].append({'demand': tokens[1], 'pattern': demand_pattern, 'category': demand_category})
+            continue
+        elif section == 'status':
+            if tokens[0] not in status:
+                status[tokens[0]] = {}
+            setting = None
+            try:
+                setting = float(tokens[1])
+            except:
+                setting = None
+            if setting != None:
+                status[tokens[0]]['setting'] = setting
+            else:
+                status[tokens[0]]['status'] = tokens[1].upper()
+            continue
+        elif section == PATTERN:
+            if tokens[0] not in patterns:
+                patterns[tokens[0]] = []
+            for i in range(1, tokens_len):
+                patterns[tokens[0]].append(float(tokens[i]))
+            continue
+        elif section == CURVE:
+            if tokens[0] not in curves:
+                curves[tokens[0]] = []
+            for i in range(1, tokens_len, 2):
+                curves[tokens[0]].append({ 'x': float(tokens[i]), 'y': float(tokens[i + 1]) })
+            continue
+        elif section == 'emitter':
+            emitters[tokens[0]] = float(tokens[1])
+            continue
+        elif section == 'time':
+            if tokens_len == 2:
+                times[tokens[0]] = tokens[1]
+            elif tokens_len == 3:
+                times[tokens[0] + ' ' + tokens[1]] = tokens[2]
+            elif tokens_len == 4:
+                times[tokens[0] + ' ' + tokens[1]] = tokens[2] + ' ' + tokens[3]
+            continue
+        elif section == 'option':
+            if tokens[0] == 'HYDRAULICS' or tokens[0] == 'MAP':
+                continue
+            if tokens_len == 2:
+                options[tokens[0]] = tokens[1]
+            elif tokens_len == 3:
+                if tokens[0] == 'UNBALANCED' or tokens[0] == 'QUALITY':
+                    options[tokens[0]] = tokens[1] + ' ' + tokens[2]
+                else:
+                    options[tokens[0] + ' ' + tokens[1]] = tokens[2]
             continue
         elif section == 'coordinate':
             if tokens[0] in junctions:
@@ -102,27 +202,69 @@ def read_inp(name: str, inp: str):
                 tanks[tokens[0]] |= {'x': tokens[1], 'y': tokens[2]}
             continue
 
+    # title
+    set_title(name, ChangeSet({ 'value': title }))
+
+    # pattern
+    for key, value in patterns.items():
+        set_pattern(name, ChangeSet({'id': key, 'factors': value}))
+
+    # curve
+    for key, value in curves.items():
+        set_curve(name, ChangeSet({'id': key, 'coords': value}))
+
+    # junction
     for value in junctions.values():
         if 'x' not in value:
             value['x'] = 0.0
         if 'y' not in value:
             value['y'] = 0.0
         add_junction(name, ChangeSet(value))
+
+    # reservoir
     for value in reservoirs.values():
         if 'x' not in value:
             value['x'] = 0.0
         if 'y' not in value:
             value['y'] = 0.0
         add_reservoir(name, ChangeSet(value))
+
+    # tank
     for value in tanks.values():
         if 'x' not in value:
             value['x'] = 0.0
         if 'y' not in value:
             value['y'] = 0.0
         add_tank(name, ChangeSet(value))
+
+    # pipe
     for value in pipes.values():
         add_pipe(name, ChangeSet(value))
+
+    # pump
     for value in pumps.values():
         add_pump(name, ChangeSet(value))
+
+    # valve
     for value in valves.values():
         add_valve(name, ChangeSet(value))
+
+    # demand
+    for key, value in demands.items():
+        set_demand(name, ChangeSet({'junction': key, 'demands': value}))
+
+    # status
+    for key, value in status.items():
+        set_status(name, ChangeSet({'link': key} | value))
+
+    # emitter
+    for key, value in emitters.items():
+        set_emitter(name, ChangeSet({'junction': key, 'coefficient': value}))
+
+    # time
+    set_time(name, ChangeSet(times))
+
+    # option
+    set_option(name, ChangeSet(options))
+
+    close_project(name)

parser_demo.py

@@ -1,7 +1,7 @@
 from tjnetwork import *
 
 def inp2db():
-    read_inp('changshu', './inp/v-16常熟模型.inp')
+    read_inp('net3', './inp/net3.inp')
 
 if __name__ == '__main__':
     inp2db()