Addresses #403, remove redundant enduses #405
Merged
Conversation
This file contains 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
rajeee
reviewed
Feb 17, 2020
| arg.setDisplayName("Include End Use Subcategories") | ||
| arg.setDescription("Whether to report end use subcategories: appliances, plug loads, fans, large uncommon loads.") | ||
| arg.setDisplayName("Include Disaggregated Interior Equipment") | ||
| arg.setDescription("Whether to report interior equipment broken out into components: appliances, plug loads, exhaust fans, large uncommon loads, etc. For each fuel type, total/net energy consumption will not be reported.") | ||
| arg.setDefaultValue(false) |
There was a problem hiding this comment.
Can we default this to True?
There was a problem hiding this comment.
Yes, although I think this would then require change to buildstockbatch, right?
rajeee
reviewed
Feb 17, 2020
| @@ -37,8 +37,8 @@ def arguments | |||
|
|
|||
| # make an argument for including optional end use subcategories | |||
| arg = OpenStudio::Measure::OSArgument::makeBoolArgument("include_enduse_subcategories", true) | |||
There was a problem hiding this comment.
Maybe change argument name to "disaggregate_interior_equipment" ?
There was a problem hiding this comment.
I intentionally left it so that no changes to buildstockbatch would need to be made. Perhaps though we shouldn't take the easy road.
rajeee
reviewed
Feb 17, 2020
| report_sim_output(runner, "net_site_electricity_kwh", electricity.total_end_uses[0] - electricity.photovoltaics[0], "GJ", elec_site_units) | ||
| unless include_enduse_subcategories | ||
| report_sim_output(runner, "total_site_electricity_kwh", electricity.total_end_uses[0], "GJ", elec_site_units) | ||
| report_sim_output(runner, "net_site_electricity_kwh", electricity.total_end_uses[0] + electricity.photovoltaics[0], "GJ", elec_site_units) |
There was a problem hiding this comment.
We probably don't need both net_site_electricity_kwh and total_site_electricity_kwh.
And, we probably want total_site_electricity_kwh, regardless of include_enduse_subcategories is true or false.
There was a problem hiding this comment.
We talked. We decided to:
- Remove all the net site columns
- Leave total columns for both true and false
- Total columns become net of pv
- Change the default from false to true
The only difference between false and true is that interior equipment is replaced with each of its components.
|
@rajeee You good with this now? |
rajeee
reviewed
Feb 21, 2020
| @@ -649,19 +648,16 @@ def fuel_oil(sql_file, ann_env_pd) | |||
|
|
|||
| fuelOilHeating = add_unit(sql_file, fuelOilHeating, units_represented, "SELECT VariableValue/1000000000 FROM ReportMeterData WHERE ReportMeterDataDictionaryIndex IN (SELECT ReportMeterDataDictionaryIndex FROM ReportMeterDataDictionary WHERE VariableType='Sum' AND VariableName IN ('#{unit_name}:FUELOILHEATING') AND ReportingFrequency='#{@reporting_frequency_eplus}' AND VariableUnits='J') AND TimeIndex IN (SELECT TimeIndex FROM Time WHERE EnvironmentPeriodIndex='#{env_period_ix}')") | |||
| centralFuelOilHeating = apportion_central(centralFuelOilHeating, modeledCentralFuelOilHeating, units_represented, units.length) | |||
| fuelOilInteriorEquipment = add_unit(sql_file, fuelOilInteriorEquipment, units_represented, "SELECT VariableValue/1000000000 FROM ReportMeterData WHERE ReportMeterDataDictionaryIndex IN (SELECT ReportMeterDataDictionaryIndex FROM ReportMeterDataDictionary WHERE VariableType='Sum' AND VariableName IN ('#{unit_name}:FUELOILINTERIOREQUIPMENT') AND ReportingFrequency='#{@reporting_frequency_eplus}' AND VariableUnits='J') AND TimeIndex IN (SELECT TimeIndex FROM Time WHERE EnvironmentPeriodIndex='#{env_period_ix}')") | |||
There was a problem hiding this comment.
Why is fuelOilInteriorEquipment removed?
There was a problem hiding this comment.
We don't model any interior equipment that consumes fuel oil.
joseph-robertson
added a commit
that referenced
this pull request
Jun 4, 2020
abe59f87e Add schedule args for refrigerator, range. f8afa69be Merge branch 'master' into build-res-hpxml-v3 036948c90 Merge pull request #408 from NREL/appl-schedules 2905a5c22 Clarify that elements are on the CookingRange, not Oven, element. [ci skip] 7f7a9a5c3 Small update to docs. [ci skip] 12728f67d Update docs for optional schedules. 402655e73 Update epvalidator for optional schedules. a3ca8fdfb Remove hardcoded schedules for refrigerator, cooking range. 65f888e71 Default refrigerator, cooking range schedules. bd0821073 Add schedule fracs and mults to refrigerator, cooking range classes. a5392f2e0 Merge pull request #405 from NREL/cleanup_sample_files 4b8caa56d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cleanup_sample_files 0459c7238 Merge pull request #406 from NREL/conditioned_ducts_lto_warning 88208ff0f Update test. b1d5070d0 Adds a warning if a HVACDistribution system has ducts entirely within conditioned space and non-zero leakage to the outside. 415dc76f8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cleanup_sample_files 354755974 Cleanup sample files. fd3526eda Merge pull request #403 from NREL/hp_defrost_control d5474a4bd Changes heat pump defrost control from OnDemand to Timed. git-subtree-dir: resources/hpxml-measures git-subtree-split: abe59f87e214dea8c1a4a0b34365520aba0c353b
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Addresses #403.
Pull Request Description
include_enduse_subcategoriesfrom false to trueChecklist
Not all may apply:
project_testingproject_testingruns without any failuresFor more information on how to perform these checklist items, see the documentation's Advanced Tutorial.