-
Notifications
You must be signed in to change notification settings - Fork 15
SWHC004 residential revision due to QC findings #117
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.
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
Open
behzadsalimian
wants to merge
13
commits into
sound-data:main
Choose a base branch
from
simularis:dev-SWHC004-residential-qc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
ae69fb8
Parameterized outdoor air reset temperature
behzadsalimian 61020a2
Modified cases files
behzadsalimian 68973d7
Revised conversion factor for W to kBtu/h
behzadsalimian f6ec3d8
Changed the column header "boiler_eff" to "steam_boiler_eff" to match…
behzadsalimian f36331e
Move prototypes to "templates" subfolder following convention
nfette 415853b
Removed model setup folder for the "New" vintage
behzadsalimian 52b1d1b
Revised OutdoorAirReset object in the prototype
behzadsalimian 1f3ff1d
Revised OutdoorAirReset object in the prototype
behzadsalimian d4c1c5c
Revised OutdoorAireReset temperature in the prototype
behzadsalimian f5ba2a4
Commented out the OutdoorAirReset temperature for the steam boiler
behzadsalimian 1d97f2d
Revised cases files
behzadsalimian b6755f2
Removed comments for SetpointManager:OutdoorAirReset object
behzadsalimian 5faaa6d
Merge pull request #58 from simularis/dev-SWHC004-residential-qc2
behzadsalimian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 7 additions & 8 deletions
15
...HC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__HotWaterBoiler.csv
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
| skip,case_name,:boiler_eff,:boiler_eff_curve,:curve_evaluation_variable | ||
| ,AFUE_84_Non-Condensing_baseline,0.84,NonCond_Boiler_Eff,LeavingBoiler | ||
| ,AFUE_83_Non-Condensing_baseline,0.83,NonCond_Boiler_Eff,LeavingBoiler | ||
| #,AFUE_85_Non-Condensing_baseline,0.85,NonCond_Boiler_Eff,LeavingBoiler | ||
| ,Msr_AFUE_93_ Condensing_ECM,0.93,Cond_Boiler_Eff,EnteringBoiler | ||
| ,Msr_AFUE_94_ Condensing_ECM,0.94,Cond_Boiler_Eff,EnteringBoiler | ||
| ,Msr_AFUE_85_Non-Condensing_ECM,0.85,NonCond_Boiler_Eff,LeavingBoiler | ||
| ,Msr_AFUE_85.3_Non-Condensing_ECM,0.853,NonCond_Boiler_Eff,LeavingBoiler | ||
| skip,case_name,:boiler_eff,:boiler_eff_curve,:curve_evaluation_variable,:setpoint_oa_low_temp,:setpoint_oa_high_temp | ||
| ,RG-SpaceHtg_eq-Boiler-Non-Cond-83-TE,0.83,NonCond_Boiler_Eff,LeavingBoiler,130['F'],105['F'] | ||
| ,RG-SpaceHtg_eq-Boiler-Non-Cond-84-TE,0.84,NonCond_Boiler_Eff,LeavingBoiler,130['F'],105['F'] | ||
| ,RG-SpaceHtg_eq-Boiler-Cond-94-TE,0.94,Cond_Boiler_Eff,EnteringBoiler,130['F'],105['F'] | ||
| ,RG-SpaceHtg_eq-Boiler-Cond-93-TE,0.93,Cond_Boiler_Eff,EnteringBoiler,130['F'],105['F'] | ||
| ,RG-SpaceHtg_eq-Boiler-Non-Cond-85-TE,0.85,NonCond_Boiler_Eff,LeavingBoiler,130['F'],105['F'] | ||
| ,RG-SpaceHtg_eq-Boiler-Non-Cond-85.3-TE,0.853,NonCond_Boiler_Eff,LeavingBoiler,130['F'],105['F'] |
4 changes: 2 additions & 2 deletions
4
.../SWHC004-07 Space Heating Boiler_MFm_Ex/cases/MFm&0&rNCHW&Ex&SpaceHtg_eq__SteamBoiler.csv
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| skip,case_name,:steam_boiler_eff | ||
| ,TE_81_Steam_baseline,0.81 | ||
| ,Msr_TE_82_ECM,0.82 | ||
| ,RG-SpaceHtg_eq-Boiler-Steam-82-TE,0.82 | ||
| ,RG-SpaceHtg_eq-Boiler-Steam-81-TE,0.81 |
8 changes: 0 additions & 8 deletions
8
...004-07 Space Heating Boiler_MFm_New/cases/MFm&0&rNCHW&New&SpaceHtg_eq__HotWaterBoiler.csv
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
...WHC004-07 Space Heating Boiler_MFm_New/cases/MFm&0&rNCHW&New&SpaceHtg_eq__SteamBoiler.csv
This file was deleted.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
...ures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/climates.csv
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
...sures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/cohorts.csv
This file was deleted.
Oops, something went wrong.
29 changes: 0 additions & 29 deletions
29
...easures/SWHC004-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/query.txt
This file was deleted.
Oops, something went wrong.
32 changes: 0 additions & 32 deletions
32
...4-07 Space Heating Boiler/SWHC004-07 Space Heating Boiler_MFm_New/query_boiler_sizing.txt
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Confirm name of boiler efficiency for this cohort. Previously steam_boiler_eff.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed "boiler_eff" to "steam_boiler_eff" to match the defined parameter in the prototype.