diff --git a/api/inp_out.py b/api/inp_out.py index 8aef8d8..baad20b 100644 --- a/api/inp_out.py +++ b/api/inp_out.py @@ -1,7 +1,7 @@ import os from .project import * from .database import ChangeSet -from .sections import section_name +from .sections import * from .s1_title import inp_out_title from .s2_junctions import inp_out_junction from .s3_reservoirs import inp_out_reservoir @@ -51,93 +51,93 @@ def dump_inp(project: str, inp: str, version: str = '3'): file = open(path, mode='w') for name in section_name: - if name == 'TITLE': + if name == TITLE: file.write(f'[{name}]\n') else: file.write(f'\n[{name}]\n') - if name == 'TITLE': + if name == TITLE: file.write('\n'.join(inp_out_title(project))) - elif name == 'JUNCTIONS': # + coords + elif name == JUNCTIONS: # + coords file.write('\n'.join(inp_out_junction(project))) - elif name == 'RESERVOIRS': # + coords + elif name == RESERVOIRS: # + coords file.write('\n'.join(inp_out_reservoir(project))) - elif name == 'TANKS': # + coords + elif name == TANKS: # + coords file.write('\n'.join(inp_out_tank(project))) - elif name == 'PIPES': + elif name == PIPES: file.write('\n'.join(inp_out_pipe(project))) - elif name == 'PUMPS': + elif name == PUMPS: file.write('\n'.join(inp_out_pump(project))) - elif name == 'VALVES': + elif name == VALVES: file.write('\n'.join(inp_out_valve(project))) - elif name == 'TAGS': + elif name == TAGS: file.write('\n'.join(inp_out_tag(project))) - elif name == 'DEMANDS': + elif name == DEMANDS: file.write('\n'.join(inp_out_demand(project))) - elif name == 'STATUS': + elif name == STATUS: file.write('\n'.join(inp_out_status(project))) - elif name == 'PATTERNS': + elif name == PATTERNS: file.write('\n'.join(inp_out_pattern(project))) - elif name == 'CURVES': + elif name == CURVES: file.write('\n'.join(inp_out_curve(project))) - elif name == 'CONTROLS': + elif name == CONTROLS: file.write('\n'.join(inp_out_control(project))) - elif name == 'RULES': + elif name == RULES: file.write('\n'.join(inp_out_rule(project))) - elif name == 'ENERGY': + elif name == ENERGY: file.write('\n'.join(inp_out_energy(project))) - elif name == 'EMITTERS': + elif name == EMITTERS: file.write('\n'.join(inp_out_emitter(project))) - elif name == 'QUALITY': + elif name == QUALITY: file.write('\n'.join(inp_out_quality(project))) - elif name == 'SOURCES': + elif name == SOURCES: file.write('\n'.join(inp_out_source(project))) - elif name == 'REACTIONS': + elif name == REACTIONS: file.write('\n'.join(inp_out_reaction(project))) - elif name == 'MIXING': + elif name == MIXING: file.write('\n'.join(inp_out_mixing(project))) - elif name == 'TIMES': + elif name == TIMES: file.write('\n'.join(inp_out_time(project))) - elif name == 'REPORT': + elif name == REPORT: file.write('\n'.join(inp_out_report(project))) - elif name == 'OPTIONS': + elif name == OPTIONS: file.write('\n'.join(inp_out_option(project))) - elif name == 'COORDINATES': + elif name == COORDINATES: file.write('\n'.join(inp_out_coord(project))) - elif name == 'VERTICES': + elif name == VERTICES: file.write('\n'.join(inp_out_vertex(project))) - elif name == 'LABELS': + elif name == LABELS: file.write('\n'.join(inp_out_label(project))) - elif name == 'BACKDROP': + elif name == BACKDROP: file.write('\n'.join(inp_out_backdrop(project))) - elif name == 'END': + elif name == END: pass # :) file.write('\n') @@ -162,93 +162,93 @@ def export_inp(project: str, version: str = '3') -> ChangeSet: inp = '' for name in section_name: - if name == 'TITLE': + if name == TITLE: inp += f'[{name}]\n' else: inp += f'\n[{name}]\n' - if name == 'TITLE': + if name == TITLE: inp += '\n'.join(inp_out_title(project)) - elif name == 'JUNCTIONS': # + coords + elif name == JUNCTIONS: # + coords inp += '\n'.join(inp_out_junction(project)) - elif name == 'RESERVOIRS': # + coords + elif name == RESERVOIRS: # + coords inp += '\n'.join(inp_out_reservoir(project)) - elif name == 'TANKS': # + coords + elif name == TANKS: # + coords inp += '\n'.join(inp_out_tank(project)) - elif name == 'PIPES': + elif name == PIPES: inp += '\n'.join(inp_out_pipe(project)) - elif name == 'PUMPS': + elif name == PUMPS: inp += '\n'.join(inp_out_pump(project)) - elif name == 'VALVES': + elif name == VALVES: inp += '\n'.join(inp_out_valve(project)) - elif name == 'TAGS': + elif name == TAGS: inp += '\n'.join(inp_out_tag(project)) - elif name == 'DEMANDS': + elif name == DEMANDS: inp += '\n'.join(inp_out_demand(project)) - elif name == 'STATUS': + elif name == STATUS: inp += '\n'.join(inp_out_status(project)) - elif name == 'PATTERNS': + elif name == PATTERNS: inp += '\n'.join(inp_out_pattern(project)) - elif name == 'CURVES': + elif name == CURVES: inp += '\n'.join(inp_out_curve(project)) - elif name == 'CONTROLS': + elif name == CONTROLS: inp += '\n'.join(inp_out_control(project)) - elif name == 'RULES': + elif name == RULES: inp += '\n'.join(inp_out_rule(project)) - elif name == 'ENERGY': + elif name == ENERGY: inp += '\n'.join(inp_out_energy(project)) - elif name == 'EMITTERS': + elif name == EMITTERS: inp += '\n'.join(inp_out_emitter(project)) - elif name == 'QUALITY': + elif name == QUALITY: inp += '\n'.join(inp_out_quality(project)) - elif name == 'SOURCES': + elif name == SOURCES: inp += '\n'.join(inp_out_source(project)) - elif name == 'REACTIONS': + elif name == REACTIONS: inp += '\n'.join(inp_out_reaction(project)) - elif name == 'MIXING': + elif name == MIXING: inp += '\n'.join(inp_out_mixing(project)) - elif name == 'TIMES': + elif name == TIMES: inp += '\n'.join(inp_out_time(project)) - elif name == 'REPORT': + elif name == REPORT: inp += '\n'.join(inp_out_report(project)) - elif name == 'OPTIONS': + elif name == OPTIONS: inp += '\n'.join(inp_out_option(project)) - elif name == 'COORDINATES': + elif name == COORDINATES: inp += '\n'.join(inp_out_coord(project)) - elif name == 'VERTICES': + elif name == VERTICES: inp += '\n'.join(inp_out_vertex(project)) - elif name == 'LABELS': + elif name == LABELS: inp += '\n'.join(inp_out_label(project)) - elif name == 'BACKDROP': + elif name == BACKDROP: inp += '\n'.join(inp_out_backdrop(project)) - elif name == 'END': + elif name == END: pass # :) inp += '\n'