Skip to content

125 bug step file not read when step used with type 25 #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahobeost merged 14 commits into from
Aug 5, 2025
Merged

125 bug step file not read when step used with type 25 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a73f246
Check both types of step files with "_step.prt".
Aug 5, 2025
7a90773
Refactored test as it was not producing any feedback.
Aug 5, 2025
dcb4b42
Updated version to 0.0.28
Aug 5, 2025
e97b13e
CI changes
Aug 5, 2025
711ca4f
Slight refactoring to fix file not found error on linux
Aug 5, 2025
dde2869
Debugging statements for paths.
Aug 5, 2025
5e95d73
Temporary change to reduce CI to one test.
Aug 5, 2025
6a1d386
Reduce linux job to just test.
Aug 5, 2025
3d2526d
Checking whether there are dependencies between tests.
Aug 5, 2025
784dba1
Use caplog instead of reading file.
Aug 5, 2025
08c61a5
CI changes
Aug 5, 2025
178222e
Ensured newly uncovered code is covered again and some refactoring.
Aug 5, 2025
e6393f8
Fixed deprecation warning.
Aug 5, 2025
c357835
CI cleanup
Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "pytrnsys_process"
version = "0.0.27"
version = "0.0.28"
authors = [
{ name="Alex Hobé", email="alex.hobe@ost.ch" },
{ name="Sebastian Swoboda", email="sebastian@swoboda.ch" },
Expand Down
2 changes: 1 addition & 1 deletion pytrnsys_process/plot/plotters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def _do_plot(

cmap = self.get_cmap(kwargs)
if cmap:
cm = _plt.cm.get_cmap(cmap)
cm = _plt.get_cmap(cmap)
colors = cm(_np.linspace(0, 1, len(columns)))
else:
colors = [None] * len(columns)
Expand Down
13 changes: 10 additions & 3 deletions pytrnsys_process/process/process_sim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,16 @@ def _process_file(
file_type == conf.FileType.TIMESTEP
and conf.global_settings.reader.read_step_files
):
simulation_data_collector.step.append(
_read_file(file_path, conf.FileType.TIMESTEP)
)
# There are two ways to have a step file:
# - using type 25
# - using type 46
# The user can copy and paste both, and they would like to use '_step.prt'.
# Here we try both, as a temporary solution, till the file reading is fully refactored.
try:
step_df = _read_file(file_path, conf.FileType.TIMESTEP)
except KeyError:
step_df = _read_file(file_path, conf.FileType.HYDRAULIC)
simulation_data_collector.step.append(step_df)
elif (
file_type == conf.FileType.HYDRAULIC
and conf.global_settings.reader.read_step_files
Expand Down
40 changes: 40 additions & 0 deletions tests/pytrnsys_process/data/process-sim/sim-2/temp/ENERGY_BALANCE_MO_HP_60_incorrect.Prt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Label not available Label not available Label not available Label not available
Period TIME QSnk60PauxEvap_kW QSnk60PelAuxComp_kW QSnk60PauxCondSwitch_kW
November +0.8016000000000000E+004 +0.2161358340750096E+005 +0.5776788628296898E+004 +0.2739037203579770E+005
December +0.8760000000000000E+004 +0.2838888210807185E+005 +0.8140286109162899E+004 +0.3652916821723460E+005
January +0.9504000000000000E+004 +0.3099081794071290E+005 +0.9306178154672469E+004 +0.4029699609538541E+005
February +0.1017600000000000E+005 +0.2580109312781669E+005 +0.7868013262659784E+004 +0.3366910639047660E+005
March +0.1092000000000000E+005 +0.2120961830858527E+005 +0.6169001827384862E+004 +0.2737862013597025E+005
April +0.1164000000000000E+005 +0.1486670395882630E+005 +0.3978451920217696E+004 +0.1884515587904413E+005
May +0.1238400000000000E+005 +0.7628377358636680E+004 +0.1915581261331994E+004 +0.9543958619968678E+004
June +0.1310400000000000E+005 +0.2731920242477886E+004 +0.6593262316230313E+003 +0.3391246474100910E+004
July +0.1384800000000000E+005 +0.1063312304434059E+004 +0.2777601024093779E+003 +0.1341072406843437E+004
August +0.1459200000000000E+005 +0.2057131024277858E+004 +0.4836754477946225E+003 +0.2540806472072484E+004
September +0.1531200000000000E+005 +0.4886254979749180E+004 +0.1108116448792786E+004 +0.5994371428541986E+004
October +0.1605600000000000E+005 +0.1312982789194613E+005 +0.3133620291843777E+004 +0.1626344818378989E+005
November +0.1677600000000000E+005 +0.2141597363167885E+005 +0.5715598281347823E+004 +0.2713157191302666E+005
December +0.1752000000000000E+005 +0.2837193267579600E+005 +0.8142118404336021E+004 +0.3651405108013218E+005

Maximum Instantaneous Values
Label not available Label not available Label not available Label not available
Maximum Value +0.1752000000000000E+005 +0.1301301130104686E+003 +0.3577578501555571E+002 +0.1567056145561912E+003
Time of Maximum +0.1752000000000000E+005 +0.1453096666666667E+005 +0.1429330000000000E+005 +0.1453096666666667E+005

Minimum Instantaneous Values
Label not available Label not available Label not available Label not available
Minimum Value +0.7300033333333334E+004 +0.0000000000000000E+000 +0.0000000000000000E+000 +0.0000000000000000E+000
Time of Minimum +0.7300033333333334E+004 +0.1752000000000000E+005 +0.1752000000000000E+005 +0.1752000000000000E+005

Maximum Integrated Values
Label not available Label not available Label not available Label not available
Maximum Value +0.1752000000000000E+005 +0.3099081794071290E+005 +0.9306178154672469E+004 +0.4029699609538541E+005
Time of Maximum +0.1752000000000000E+005 +0.9504000000000000E+004 +0.9504000000000000E+004 +0.9504000000000000E+004

Minimum Integrated Values
Label not available Label not available Label not available Label not available
Minimum Value +0.8016000000000000E+004 +0.1063312304434059E+004 +0.2777601024093779E+003 +0.1341072406843437E+004
Time of Minimum +0.8016000000000000E+004 +0.1384800000000000E+005 +0.1384800000000000E+005 +0.1384800000000000E+005

Sum (note: sums are set to zero for inputs that were not integrated.)
Label not available Label not available Label not available Label not available
Total +0.0000000000000000E+000 +0.2241554289605119E+006 +0.6267451637187461E+005 +0.2868299453323836E+006
6 changes: 6 additions & 0 deletions tests/pytrnsys_process/data/process-sim/sim-2/temp/HPCtrlPrinter_step.Prt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TIME HPCtrl PriceCtrl ElPrice HotWatCtrl HotWatProportion
+0.0000000000000000E+00 +0.0000000000000000E+00 +1.0000000000000000E+00 +2.0997000000000000E+01 +2.0000000000000000E+00 +9.9999837206454878E-01
+1.6666666666666666E-01 +1.0000000000000000E+00 +1.0000000000000000E+00 +1.5273000000000000E+01 +2.0000000000000000E+00 +9.9999837206454878E-01
+3.3333333333333331E-01 +1.0000000000000000E+00 +1.0000000000000000E+00 +1.5273000000000000E+01 +2.0000000000000000E+00 +9.9999837206454878E-01
+5.0000000000000000E-01 +1.0000000000000000E+00 +1.0000000000000000E+00 +1.5273000000000000E+01 +2.0000000000000000E+00 +9.9999837206454878E-01
+6.6666666666666663E-01 +1.0000000000000000E+00 +1.0000000000000000E+00 +1.5273000000000000E+01 +2.0000000000000000E+00 +9.9999837206454878E-01
48 changes: 38 additions & 10 deletions tests/pytrnsys_process/test_process_sim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,40 @@
import logging as _logging

import pandas as _pd
import pytest as _pt

import tests.pytrnsys_process.constants as const
from pytrnsys_process import util
from pytrnsys_process.process import process_sim as ps

PATH_TO_RESULTS = const.DATA_FOLDER / "process-sim/sim-1"
PATH_TO_RESULTS = const.DATA_FOLDER / "process-sim" / "sim-1"
PATH_TO_RESULTS_2 = const.DATA_FOLDER / "process-sim" / "sim-2"


class TestProcessSim:

def test_process_sim_prt(self, monkeypatch):
@staticmethod
def run_process_sim_with_caplog(files, results_path, caplog):
caplog.clear()
with caplog.at_level(_logging.INFO):
return ps.process_sim(files, results_path)

def test_process_sim_prt(self, monkeypatch, caplog):
# The following monkeypatch is needed, as otherwise these tests do not
# incorporate the changed setting properly.
monkeypatch.setattr(
"pytrnsys_process.config.global_settings.reader.read_step_files",
True,
)
sim_files = util.get_files([PATH_TO_RESULTS], get_mfr_and_t=True)
simulation = ps.process_sim(sim_files, PATH_TO_RESULTS)

with _pt.raises(Exception) as exc_info:
assert (
"don-not-process.xlsx: No columns to parse from file"
in str(exc_info.value)
)
simulation = self.run_process_sim_with_caplog(
sim_files, PATH_TO_RESULTS, caplog
)

assert (
"don-not-process.xlsx: No columns to parse from file"
in caplog.text
)
self.do_assert(simulation)
assert simulation.scalar.shape == (1, 10)

Expand Down Expand Up @@ -57,7 +69,23 @@ def test_process_sim_ignore_deck(self, monkeypatch):
simulation = ps.process_sim(sim_files, PATH_TO_RESULTS)
assert simulation.scalar.shape == (0, 0)

def do_assert(self, simulation):
def test_process_sim_type_25_step(self, monkeypatch, caplog):
monkeypatch.setattr(
"pytrnsys_process.config.global_settings.reader.read_step_files",
True,
)
sim_files = util.get_files(
[PATH_TO_RESULTS_2], get_mfr_and_t=False, read_deck_files=False
)
simulation = self.run_process_sim_with_caplog(
sim_files, PATH_TO_RESULTS_2, caplog
)
assert "KeyError: 'Month'" in caplog.text

assert simulation.step.shape == (5, 5)

@staticmethod
def do_assert(simulation):
assert simulation.hourly.shape == (3, 18)
assert simulation.monthly.shape == (14, 11)
assert simulation.step.shape == (5, 142)
Expand Down