From b5e1d0fed60e2fba06bf7331aaebcb3c39b94a7e Mon Sep 17 00:00:00 2001 From: kbonney Date: Tue, 14 Nov 2023 09:50:24 -0500 Subject: [PATCH] refactoring changes for results name change --- wntr/epanet/io.py | 4 ++-- wntr/sim/__init__.py | 2 +- wntr/sim/core.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wntr/epanet/io.py b/wntr/epanet/io.py index 27936ba3c..6d2506bc8 100644 --- a/wntr/epanet/io.py +++ b/wntr/epanet/io.py @@ -2511,7 +2511,7 @@ def __init__(self, result_types=None, network=False, energy=False, statistics=Fa self.chem_units = None self.inp_file = None self.report_file = None - self.results = wntr.sim.SimulationResults() + self.results = wntr.sim.HydraulicResults() if result_types is None: self.items = [ member for name, member in ResultType.__members__.items() ] else: @@ -2599,7 +2599,7 @@ def read(self, filename, convergence_error=False, darcy_weisbach=False, convert= object returns a WaterNetworkResults object """ - self.results = wntr.sim.SimulationResults() + self.results = wntr.sim.HydraulicResults() logger.debug('Read binary EPANET data from %s',filename) dt_str = 'u1' #.format(self.idlen) diff --git a/wntr/sim/__init__.py b/wntr/sim/__init__.py index 3c485b2c6..0f7f9405c 100644 --- a/wntr/sim/__init__.py +++ b/wntr/sim/__init__.py @@ -3,6 +3,6 @@ simulations using the water network model. """ from wntr.sim.core import WaterNetworkSimulator, WNTRSimulator -from wntr.sim.results import SimulationResults +from wntr.sim.results import HydraulicResults from wntr.sim.solvers import NewtonSolver from wntr.sim.epanet import EpanetSimulator \ No newline at end of file diff --git a/wntr/sim/core.py b/wntr/sim/core.py index 663b5e5a0..a0bf8d596 100644 --- a/wntr/sim/core.py +++ b/wntr/sim/core.py @@ -1228,7 +1228,7 @@ def run_sim(self, solver=NewtonSolver, backup_solver=None, solver_options=None, self._register_controls_with_observers() node_res, link_res = wntr.sim.hydraulics.initialize_results_dict(self._wn) - results = wntr.sim.results.SimulationResults() + results = wntr.sim.results.HydraulicResults() results.error_code = None results.time = [] results.network_name = self._wn.name