Skip to content
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

Standalone HVAC bug fix #98

Merged
merged 5 commits into from
Feb 19, 2024
Merged

Standalone HVAC bug fix #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e0c96c
v0.8.4 (#81)
jmaguire1 Oct 6, 2023
79fd6ad
Update changelog.md
mnblonsky Oct 6, 2023
61094fd
fix bug in run_hvac
mnblonsky Jan 4, 2024
7092d8c
update changelog
mnblonsky Jan 4, 2024
f732e3d
Merge branch 'dev' into simple-env-bug
mnblonsky Jan 4, 2024
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
3 changes: 2 additions & 1 deletion changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Changes from PRs

- Fixed bug with accounting for HVAC delivered heat for standalone HVAC runs
- Fixed bug with ASHP backup heater units
- Added OCHREException class to handle errors

Expand Down Expand Up @@ -43,4 +44,4 @@
- Added OS-HPXML sample files for testing (testing not started)
- Added documentation files and pushed to readthedocs
- Added PR template
- Added changelog
- Added changelog
6 changes: 3 additions & 3 deletions ochre/Equipment/Equipment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@ def update_model(self, control_signal=None):
# calculate electric and gas power and heat gains
heat_data = self.calculate_power_and_heat()

# Run update for subsimulators (e.g., water tank, battery thermal model)
super().update_model(heat_data)

# Add heat gains to zone
self.add_gains_to_zone()

# Run update for subsimulators (e.g., water tank, battery thermal model)
super().update_model(heat_data)

# Update electric real/reactive power with ZIP model
self.run_zip(voltage)

Expand Down