Skip to content

Take PLR into account in the calculation of leaving water temperature of Coil:Heating:Water for cycling operations #11060

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

Draft
lymereJ wants to merge 12 commits into
base: develop
Choose a base branch
from
+299 −0
Draft

Take PLR into account in the calculation of leaving water temperature of Coil:Heating:Water for cycling operations #11060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c5f1791
Recalculate outlet water temperature.
lymereJ May 16, 2025
fa23414
Catch div by 0.
lymereJ May 17, 2025
2001924
Merge branch 'develop' into recalc_t_wtr_out_cycl
May 17, 2025
e47dd65
Merge branch 'develop' into recalc_t_wtr_out_cycl
lymereJ May 20, 2025
1a5da07
Merge branch 'develop' into recalc_t_wtr_out_cycl
lymereJ May 25, 2025
eb50425
Better fix.
lymereJ May 26, 2025
f773cfd
Merge remote-tracking branch 'origin/develop' into recalc_t_wtr_out_cycl
Myoldmopar Jun 12, 2025
6397638
Try a regression update on a branch with diffs
Myoldmopar Jun 13, 2025
ac19caf
Annotate the GHA workflow a little, break out html plotter template, …
Myoldmopar Jun 13, 2025
c86e252
Merge remote-tracking branch 'origin/develop' into recalc_t_wtr_out_cycl
Myoldmopar Jun 13, 2025
701a951
Merge branch 'develop' into recalc_t_wtr_out_cycl
lymereJ Oct 3, 2025
7fe98e1
Merge branch 'develop' into recalc_t_wtr_out_cycl
lymereJ Feb 3, 2026
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
11 changes: 11 additions & 0 deletions .github/workflows/test_pull_requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ jobs:
if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure' # always run this step as long as we actually built
run: pip install energyplus-regressions>=2.1.4

# This will build out a ./regressions package as well as a ./regressions-plotter-{{matric.os}}.html report
Copy link
Collaborator Author

@lymereJ lymereJ Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mitchute - I'll likely come back to work on this PR soon. Do you need any of the changes that Edwin had made here?

- name: Run Regressions
if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure' # always run this step as long as we actually built
id: regressions
Expand All @@ -255,6 +256,15 @@ jobs:
name: "regressions-${{ matrix.os }}-${{ github.event.pull_request.head.sha }}"
path: "${{ github.workspace }}/regressions"

- name: Upload Regressions Plotter HTML
uses: actions/upload-artifact@v4
id: upload_regression_plotter
if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' # only run this if regressions were encountered "failed"
with:
name: "regressions-plotter-${{ matrix.os }}"
path: "${{ github.workspace }}/regression_plotter.html"

# This executes a Python script that reads regressions results and produces a JavaScript file meant to run on GitHub
- name: Generate Regression Summary GitHub Script
if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure'
run: >
Expand All @@ -276,6 +286,7 @@ jobs:

# - uses: lhotari/action-upterm@v1

# Unfortunately I can't get forked repository runs to post onto the original PR, so this is needed to alert for regressions
- name: Fail on Regressions from Forked Repository
if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' && github.event.pull_request.head.repo.full_name != 'NatLabRockies/EnergyPlus'
run: |
Expand Down
43 changes: 43 additions & 0 deletions scripts/dev/gha_regressions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,43 @@ def generate_markdown_summary(self, bundle_root: Path):
</details>"""
(bundle_root / "summary.md").write_text(content)

@staticmethod
def read_csv_to_columns(file_path: Path) -> dict[str, list[str | float]]:
columns = {}
with open(file_path, 'r', newline='') as file:
reader = csv.reader(file)
header = next(reader) # Read header row
for i, col_name in enumerate(header):
columns[col_name.strip()] = []
for row in reader:
for i, value in enumerate(row):
value = value.strip()
variable = header[i].strip()
try:
v = float(value)
columns[variable].append(v)
except ValueError: # just take the string timestamp
columns[variable].append(value)
return columns

@staticmethod
def generate_regression_plotter(bundle_root: Path, metadata_object: dict, results_object: dict, limit: bool):
metadata_string = "metadata = " + json.dumps(metadata_object, indent=4) + ';'
results_string = "results = " + json.dumps(results_object, indent=4) + ';'
limit_string = ""
if limit:
limit_string = r"""<div id="size-alert" class="alert alert-warning" role="alert">The regressions hit a size limit and were truncated, not all files may be represented here. Double check the full regression package.</div>"""
template_file = Path(__file__).resolve().parent / 'regression_plotter.in.html'
content = template_file.read_text()
patches = {
'<!--METADATA OVERRIDE-->': metadata_string,
'<!--RESULTS OVERRIDE-->': results_string,
'<!--LIMIT-->': limit_string
}
for key, value in patches.items():
content = content.replace(key, value)
(bundle_root / 'regression_plotter.html').write_text(content)

def check_all_regressions(self, base_testfiles: Path, mod_testfiles: Path, bundle_root: Path) -> bool:
any_diffs = False
bundle_root.mkdir(exist_ok=True)
Expand Down Expand Up @@ -569,6 +606,12 @@ def check_all_regressions(self, base_testfiles: Path, mod_testfiles: Path, bundl
print(f"* Diffs by Type *:\n{json.dumps(self.diffs_by_type, indent=2, sort_keys=True)}\n")
if any_diffs:
self.generate_markdown_summary(bundle_root)
self.generate_regression_plotter(
bundle_root, metadata_object, results_object, hit_max_limit
)
self.generate_regression_plotter(
bundle_root.parent, metadata_object, results_object, hit_max_limit
)
# print("::warning title=Regressions::Diffs Detected")
return any_diffs

Expand Down
Loading
Loading