Skip to content

Commit

Permalink
Revert "fixes in getMSXOptions and setMSXOptions .- add test_msx_opti…
Browse files Browse the repository at this point in the history 
…ons."

This reverts commit 014d0bb.
  • Loading branch information
@Mariosmsk
Mariosmsk committed Apr 21, 2024
1 parent 014d0bb commit 3839c9c
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 236 deletions.
2 changes: 1 addition & 1 deletion epyt/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
__author__ = """Marios S. Kyriakou"""
__email__ = "[email protected]"
__version__ = "1.1.2"
__version__ = "1.1.1"
__msxversion__ = "2.0.0"
__copyright__ = """Copyright 2022, KIOS Research and Innovation Center of Excellence (KIOS CoE),
University of Cyprus (www.kios.org.cy)."""
Expand Down
168 changes: 104 additions & 64 deletions epyt/epanet.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
from inspect import getmembers, isfunction, currentframe, getframeinfo
from ctypes import cdll, byref, create_string_buffer, c_uint64, c_uint32, c_void_p, c_int, c_double, c_float, c_long, \
c_char_p
from types import SimpleNamespace
import matplotlib.pyplot as plt
from datetime import datetime
from epyt import __version__, __msxversion__
Expand Down Expand Up @@ -11423,58 +11422,66 @@ def getMSXError(self, code):
d.getMSXError(510)"""
self.msx.MSXgeterror(code)

def getMSXOptions(self):
def getMSXOptions(self, param="", getall=False):
""" Retrieves all the options.

Example:
d=epanet('net2-cl2.inp')
d.loadMSXFile('net2-cl2.msx')
d.getMSXOptions()"""
msxname = self.msxname
options = {}
options["AREA_UNITS"] = "FT2"
options["RATE_UNITS"] = "HR"
options["SOLVER"] = "EUL"
options["TIMESTEP"] = 300
options["ATOL"] = 0.01
options["RTOL"] = 0.001
options["COUPLING"] = "NONE"
options["COMPILER"] = "NONE"

# AREA_UNITS FT2/M2/CM2
# RATE_UNITS SEC/MIN/HR/DAY
# SOLVER EUL/RK5/ROS2
# COUPLING FULL/NONE
# TIMESTEP seconds
# ATOL value
# RTOL value
# COMPILER NONE/VC/GC
# SEGMENTS value
# PECLET value
try:
# Key-value pairs to search for
keys = ["AREA_UNITS", "RATE_UNITS", "SOLVER", "COUPLING", "TIMESTEP", "ATOL", "RTOL", "COMPILER", "SEGMENTS", \
"PECLET"]
float_values = ["TIMESTEP", "ATOL", "RTOL", "SEGMENTS", "PECLET"]
values = {key: None for key in keys}

# Flag to determine if we're in the [OPTIONS] section
in_options = False

# Open and read the file
with open(self.msxname, 'r') as file:
for line in file:
# Check for [OPTIONS] section
if "[OPTIONS]" in line:
in_options = True
elif "[" in line and "]" in line:
in_options = False # We've reached a new section

if in_options:
# Pattern to match the keys and extract values, ignoring comments and whitespace
pattern = re.compile(r'^\s*(' + '|'.join(keys) + r')\s+(.*?)\s*(?:;.*)?$')
match = pattern.search(line)
if match:
key, value = match.groups()
if key in float_values:
values[key] = float(value)
with open(msxname, 'r') as f:
sect = 0
for line in f:
if line.startswith("[OPTIONS]"):
sect = 1
continue
elif line.startswith("[END") or line.startswith("[REPORTS]"):
break
elif sect == 1:
if not line.strip():
continue
if line.startswith("["):
return options
key, value = line.split(None, 1)
if key == param or not param:
if key == "TIMESTEP":
options["TIMESTEP"] = float(value)
elif key == "AREA_UNITS":
options["AREA_UNITS"] = value.strip()
elif key == "RATE_UNITS":
options["RATE_UNITS"] = value.strip()
elif key == "SOLVER":
options["SOLVER"] = value.strip()
elif key == "RTOL":
options["RTOL"] = float(value)
elif key == "ATOL":
options["ATOL"] = float(value)
elif key == "COUPLING":
options["COUPLING"] = value.strip()
elif key == "COMPILER":
options["COMPILER"] = value.strip()
else:
values[key] = value
options[key] = value

if not getall and param:
return options[param]

return SimpleNamespace(**values)
except FileNotFoundError:
warnings.warn("Please load MSX File.")
return {}
return options

def getMSXTimeStep(self):
""" Retrieves the time step.
Expand All @@ -11485,7 +11492,7 @@ def getMSXTimeStep(self):
d.getMSXTimeStep()

See also setMSXTimeStep."""
return self.getMSXOptions().TIMESTEP
return self.getMSXOptions("TIMESTEP")

def getMSXRateUnits(self):
""" Retrieves rate units.
Expand All @@ -11495,7 +11502,7 @@ def getMSXRateUnits(self):
d.getMSXRateUnits()

See also setMSXRateUnits."""
return self.getMSXOptions().RATE_UNITS
return self.getMSXOptions("RATE_UNITS")

def getMSXAreaUnits(self):
""" Retrieves Are units.
Expand All @@ -11505,7 +11512,7 @@ def getMSXAreaUnits(self):
d.getMSXAreaUnits()

See also setMSXAreaUnits."""
return self.getMSXOptions().AREA_UNITS
return self.getMSXOptions("AREA_UNITS")

def getMSXCompiler(self):
""" Retrieves the chemistry function compiler code.
Expand All @@ -11522,7 +11529,7 @@ def getMSXCompiler(self):

See also setMSXCompilerNONE, setMSXCompilerVC,
setMSXCompilerGC."""
return self.getMSXOptions().COMPILER
return self.getMSXOptions("COMPILER")

def getMSXCoupling(self):
""" Retrieves the degree of coupling for solving DAE's.
Expand All @@ -11540,7 +11547,7 @@ def getMSXCoupling(self):
d.getMSXCoupling()

See also setMSXCouplingFULL, setMSXCouplingNONE."""
return self.getMSXOptions().COUPLING
return self.getMSXOptions("COUPLING")

def getMSXSolver(self):
""" Retrieves the solver method.
Expand All @@ -11556,7 +11563,7 @@ def getMSXSolver(self):
d.getMSXSolver()

See also setMSXSolverEUL, setMSXSolverRK5, setMSXSolverROS2."""
return self.getMSXOptions().SOLVER
return self.getMSXOptions("SOLVER")

def getMSXAtol(self):
""" Retrieves the absolute tolerance.
Expand All @@ -11567,7 +11574,7 @@ def getMSXAtol(self):
d.getMSXAtol()

See also getMSXRtol."""
return self.getMSXOptions().ATOL
return self.getMSXOptions("ATOL")

def getMSXRtol(self):
""" Retrieves the relative accuracy level.
Expand All @@ -11578,7 +11585,7 @@ def getMSXRtol(self):
d.getMSXRtol()

See also getMSXAtol."""
return self.getMSXOptions().RTOL
return self.getMSXOptions("RTOL")

def getMSXConstantsNameID(self, varagin=None):
""" Retrieves the constant's ID.
Expand Down Expand Up @@ -12333,22 +12340,55 @@ def getMSXSourceNodeNameID(self):
nodes.append(i)
return nodes

def setMSXOptions(self, *args):

for i in range(len(args) // 2):
argument = args[2 * i].lower()
if argument == 'areaunits':
self.areaunits = args[2 * i + 1]
self.changeMSXOptions("AREA_UNITS", args[2 * i + 1])
elif argument == 'rateunits':
self.rateunits = args[2 * i + 1]
self.changeMSXOptions("RATE_UNITS", args[2 * i + 1])
elif argument == 'solver':
self.solver = args[2 * i + 1]
self.changeMSXOptions("SOLVER", args[2 * i + 1])
elif argument == 'timestep':
self.timestep = args[2 * i + 1]
self.changeMSXOptions("TIMESTEP", args[2 * i + 1])
elif argument == 'atol':
self.atol = args[2 * i + 1]
self.changeMSXOptions("ATOL", args[2 * i + 1])
elif argument == 'rtol':
self.rtol = args[2 * i + 1]
self.changeMSXOptions("RTOL", args[2 * i + 1])
elif argument == 'coupling':
self.coupling = args[2 * i + 1]
self.changeMSXOptions("COUPLING", args[2 * i + 1])
elif argument == 'compiler':
self.compiler = args[2 * i + 1]
self.changeMSXOptions("COMPILER", args[2 * i + 1])
else:
print('Invalid property found.')
return

def changeMSXOptions(self, param, change):
with open(self.msxname, 'r+') as f:
lines = f.readlines()
options_index = -1 # Default to -1 in case the [OPTIONS] section does not exist
flag = 0
for i, line in enumerate(lines):
if line.strip() == '[OPTIONS]':
options_index = i
elif line.strip().startswith(param):
lines[i] = param + "\t" + str(change) + "\n"
flag = 1
if flag == 0 and options_index != -1:
lines.insert(options_index + 1, param + "\t" + str(change) + "\n")
f.seek(0)
f.writelines(lines)
f.truncate()
msxname = self.msxname
f = open(msxname, 'r+')
lines = f.readlines()
flag = 0
for i, line in enumerate(lines):
if line.strip() == '[OPTIONS]':
options_index = i
if line.startswith(param):
lines[i] = param + "\t" + str(change) + "\n"
flag = 1
if flag == 0:
lines = list(lines)
lines.insert(options_index + 1, param + "\t" + str(change) + "\n")
f.seek(0)
f.writelines(lines)
f.close()

def setMSXAreaUnitsCM2(self):
""" Sets the area units to square centimeters.
Expand Down Expand Up @@ -12744,7 +12784,7 @@ def getMSXComputedQualitySpecie(self, species=None):
species_index_name = self.getMSXSpeciesIndex(species)

node_count = self.getNodeCount()
link_count = self.getLinkCount()
link_count = self.getNodeCount()
node_indices = list(range(1, node_count + 1))
link_indices = list(range(1, link_count + 1))
# Initialized quality and time
Expand Down
36 changes: 0 additions & 36 deletions epyt/networks/msx-examples/example.inp
View file

This file was deleted.

58 changes: 0 additions & 58 deletions epyt/networks/msx-examples/example.msx
View file

This file was deleted.

Loading

0 comments on commit 3839c9c

Please sign in to comment.