Skip to content

Commit 4f9f8b1

Browse files
committed
Merge remote-tracking branch 'remotes/origin/develop' into chillerEIRrepairs
2 parents dfcd0c1 + 4a17be9 commit 4f9f8b1

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.github/workflows/test_pull_requests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,14 @@ jobs:
191191
${{ steps.upload_regressions.outputs.artifact-url }}
192192
193193
- uses: actions/github-script@v7
194-
if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure'
194+
if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' && github.event.pull_request.head.repo.full_name == 'NREL/EnergyPlus'
195195
with:
196196
script: |
197197
const script = require('${{ github.workspace }}/regressions/summary.js')
198198
console.log(script({github, context}))
199+
200+
- name: Fail on Regressions from Forked Repository
201+
if: always() && matrix.run_regressions && steps.regressions.outcome == 'failure' && github.event.pull_request.head.repo.full_name != 'NREL/EnergyPlus'
202+
run: |
203+
echo "::error::Regressions detected in pull request from forked repository, check job summary for details and to download regression results"
204+
exit 1

src/EnergyPlus/WindowManager.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6980,7 +6980,7 @@ namespace Window {
69806980
auto const *matShade = dynamic_cast<Material::MaterialShade const *>(mat);
69816981
assert(matShade != nullptr);
69826982

6983-
static constexpr std::string_view Format_703(" WindowMaterial:Shade,,{},{:.3R},{:.3R},{:.3R},{:.3R},{:.3R},{:.3R}\n");
6983+
static constexpr std::string_view Format_703(" WindowMaterial:Shade,{},{:.3R},{:.3R},{:.3R},{:.3R},{:.3R},{:.3R}\n");
69846984
print(state.files.eio,
69856985
Format_703,
69866986
matShade->Name,

src/Transition/OutputRulesFiles/OutputChanges24-2-0-to-25-1-0.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ This file documents the structural changes on the output of EnergyPlus that coul
77

88
This will eventually become a more structured file, but currently it isn't clear what format is best. As an intermediate solution, and to allow the form to be formed organically, this plain text file is being used. Entries should be clearly delimited. It isn't expected that there will be but maybe a couple each release at most. Entries should also include some reference back to the repo. At least a PR number or whatever.
99

10+
### Output:Constructions for WindowMaterial:Shade
11+
Data for Output:Constructions for WindowMaterial:Shade were misaligned with the column headings in the eio output and the table Initialization Summary report. Data has shifted one column to the left.
12+
13+
See PR [#10750](https://github.com/NREL/EnergyPlus/pull/10750)
14+
1015
### Table Output, Sizing Output, and Output:Variable Spelling Corrections
1116
* "Equipment Summary" table report, sub-table "VAV DX Cooling Standard Rating Details", column heading, "Assocated Fan" --> "Associated Fan".
1217

0 commit comments

Comments
 (0)