SFm prototype feature development - EnergyPlus 24.2, hydronic space heating, GAHP#15
SFm prototype feature development - EnergyPlus 24.2, hydronic space heating, GAHP#15janiksomaiya wants to merge 18 commits intosimularis:GAHP-prototypefrom
Conversation
2fba082 to
17c8bc5
Compare
…ace Heating-DHW-Boiler_V24.2) and incorparte it in Root v24_2.pxt file.
simularis
left a comment
There was a problem hiding this comment.
Note to self: I already reviewed commits on upgrade to v24.2. Need to review next commit.
simularis
left a comment
There was a problem hiding this comment.
Hi Janik, I haven't seen any problems here but requesting some new changes.
| Schedule:Compact, | ||
| Ambient Temperature Constant, !- Name | ||
| Temperature, !- Schedule Type Limits Name | ||
| Through: 12/31, !- Field 1 | ||
| For: AllDays, !- Field 2 | ||
| Until: 24:00,41; !- Field 3 |
There was a problem hiding this comment.
Comment out the Ambient Temperature Constant object. It is not referenced for pipe heat losses, but provides an alternative for testing/debugging.
There was a problem hiding this comment.
The "object" means all these rows together, starting with the object type ("Schedule:Compact") and ending with the row with a termination character (semicolon). Please comment out the whole object, not just the input field for the name.
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
3.Combi Space Heating-DHW-Boiler_V24.2.idf -> 4.Combi Space Heating-DHW-GAHP_V24.2 Without EMS.idf Combined two commits by Janik and cleaned up QC comments
There was a problem hiding this comment.
Hi @janiksomaiya, please review comments and see instructions at the bottom.
Reminder about git push
When you push to GitHub, follow these steps:
- Select the local branch name where you made the new commits (e.g. GAHP-prototype). You can see the current branch name in Git GUI. Never select 'main'.
- Select the remote destination where you want to send the commits. The names of remotes are pointers; if you don't recall where they point, enter in git bash:
git remote -v - Confirm that the remote:branch would be effectively the same as the user:branch text near the top of the GitHub pull request page (e.g.
janiksomaiya:GAHP-prototype) - Confirm that your commits show up on the GitHub pull request page.
QC comment 1: confusing commit sequence descriptions
You made three commits. The description of the first commit was inaccurate. Just for discussion, refer to these descriptions:
| Commit hash | Original description | Accurate description |
|---|---|---|
| 4a4bfdc | Reverting the Hunk Uncommit. from file 4-5. | Apply the transition from GAHP reference File 3 to File 5 |
| 36f1985 | Reverse Stage 4 to 5 CHange. Only Have File 3 to 4 changes here. | Roll back transition from GAHP reference File 5 to File 4 |
| 36cc6ca | Changes from Stage 4 to 5 | Apply transition from GAHP reference File 4 to File 5 |
QC comment 2: what was intended for commit sequence
The instructions were to make two commits. At the point when you had committed the transition from File 3 to File 5 as one step instead of File 3 to File 4, the instructions for repairing the mistake were to click the "amend commit" checkbox and redo the first commit by unstaging File 4 -> File 5 changes. With "amend commit", you should not end up with an extra commit. As intended, you would have had two commits as follows.
| Commit sequence | Description |
|---|---|
| 1 | Apply the transition from GAHP reference File 3 to File 4 |
| 2 | Apply transition from GAHP reference File 4 to File 5 |
Please look up "git amend commit" and see how it usually works.
Instruction for resolving QC comments
I created a new branch simularis:dev-GAHP-prototype-fix2 where I combined the commits for File 3 -> 5 and File 5 -> 4, and resolved my QC comments on a couple of errors and style choices. Please replace the last three commits in your branch by following these steps:
- Don't make any new commits. Only apply steps 2-5.
- Fetch from the simularis remote (it may be called "origin" or something else for you; I'm assuming it is called simularis)
- Enter the following git bash command (or perform equivalent steps in Git gui):
git reset --hard simularis/dev-GAHP-prototype-fix2(replace simularis with the name of the remote). - Note that your current branch name has not changed. It should still be
GAHP-prototype. However, the history of the local branch should now have my two commits. - Push your branch to your account in GitHub and check the box "force". This will overwrite the history in the remote copy of the branch in Github.
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
prototypes/residential/SFm-1 Story-1985-NCGF/templates/root_v24.2.pxt
Outdated
Show resolved
Hide resolved
From 4.Combi Space Heating-DHW-GAHP_V24.2 Without EMS.idf To 5.Combi Space Heating-DHW-GAHP_V24.2.idf Original commit by Janik, cleaned up and addressed QC comment
36cc6ca to
01395ec
Compare
Restored Output:Variable cooling coil total cooling energy
… "DH Load Profile Varying Flow Frac Schedule"

Here is the development work for GAHP Prototype EnergyPlus v24.2
List of the FIles
Here is a checklist with goals for this pull request that we will update as we progress.
For the curious, the next steps for this project will continue outside this pull request, including lead engineer review to determine whether this work is outdated and needs to transfer to a more recent prototype, and setting up a measure definition folder.