Skip to content

Commit

Permalink
Squashed 'hpxml-measures/' changes from e29d955f19..426260c958
Browse files Browse the repository at this point in the history
426260c958 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hers_sizing_methodology
8faaceebf8 Minor cleanup of docs/changelog. [ci skip]
4a58f367ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hers_sizing_methodology
0d5fe88fee A little code simplification/refactoring. No diffs expected.
ef7fc41102 Latest results.
650c0ad021 Merge pull request #1791 from NREL/battery-unavailable-periods
775eb0f9ef Battery charging and discharging is unavailable during an outage whether solar present or not.
df4a4f8fea Merge branch 'master' into battery-unavailable-periods
2c47fdd2f2 Catch warning for scheduled battery with outage period.
5d4c5b90f5 Revert adding battery schedules to unavailable_periods.csv.
b55992149a Merge branch 'master' into battery-unavailable-periods
a3f40fb687 Latest results.
91dda9a2d4 Downgrade error to a warning.
041f154fa5 Merge branch 'master' into battery-unavailable-periods
25a1c1dccc Latest results.
7e32f7cd34 Update used_by_unavailable_periods attrs.
0850d26fe9 Add battery charging and discharging to unavailable_periods.csv.
fd8f6ec794 Demonstrate failing battery with unavailable period sample file.

git-subtree-dir: hpxml-measures
git-subtree-split: 426260c9585413ec80c6c6c276ef73c68b5e6346
  • Loading branch information
shorowit committed Aug 9, 2024
1 parent 532cc3b commit 7641d52
Show file tree
Hide file tree
Showing 15 changed files with 805 additions and 309 deletions.
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ __New Features__
- Adds inputs for modeling skylight curbs and/or shafts.
- Allows alternative infiltration input `AirInfiltrationMeasurement/LeakinessDescription`, in which the infiltration level is estimated using age of home, climate zone, foundation type, etc.
- Central Fan Integrated Supply (CFIS) mechanical ventilation enhancements:
- Allows modeling systems with no strategy to meet remainder of ventilation target (`CFISControls/AdditionalRuntimeOperatingMode="none"`).
- CFIS systems with no strategy to meet remainder of ventilation target (`CFISControls/AdditionalRuntimeOperatingMode="none"`).
- HVAC Manual J design load and sizing calculations:
- Adds optional inputs and outputs for blower fan heat and piping load.
- Adds optional `HVACSizingControl/ManualJInputs/InfiltrationMethod` input to specify which infiltration method to use for design load calculations.
Expand Down
10 changes: 5 additions & 5 deletions HPXMLtoOpenStudio/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>hpxm_lto_openstudio</name>
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
<version_id>f16fb702-6d18-408b-a85f-fc3c31bc92ef</version_id>
<version_modified>2024-08-08T18:51:39Z</version_modified>
<version_id>2ab041da-cf56-49da-8a1b-e3f04ef6ef3a</version_id>
<version_modified>2024-08-09T17:13:39Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -315,7 +315,7 @@
<filename>data/unavailable_periods.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>73BFECE2</checksum>
<checksum>3C44FFBB</checksum>
</file>
<file>
<filename>energyplus.rb</filename>
Expand Down Expand Up @@ -387,7 +387,7 @@
<filename>hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>16F1A401</checksum>
<checksum>9A1C84AA</checksum>
</file>
<file>
<filename>lighting.rb</filename>
Expand Down Expand Up @@ -573,7 +573,7 @@
<filename>schedules.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>C1B88015</checksum>
<checksum>2778CD55</checksum>
</file>
<file>
<filename>simcontrols.rb</filename>
Expand Down
2 changes: 2 additions & 0 deletions HPXMLtoOpenStudio/resources/data/unavailable_periods.csv
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ house_fan,0,1
kitchen_fan,1,1
bath_fan,1,1
whole_house_fan,0,1
battery_charging,0,1
battery_discharging,0,1
222 changes: 62 additions & 160 deletions HPXMLtoOpenStudio/resources/hvac_sizing.rb

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions HPXMLtoOpenStudio/resources/schedules.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1787,7 +1787,8 @@ def self.unavailable_period_applies(runner, schedule_name, col_name)
end
end

fail "Could not find row='#{schedule_name}' in unavailable_periods.csv"
runner.registerWarning("Could not find row='#{schedule_name}' in unavailable_periods.csv; it will not be affected by the '#{col_name}' unavailable period.")
return false
end

# Ensure that the defined schedule value array (or string of numbers) is the correct length.
Expand Down Expand Up @@ -1895,8 +1896,8 @@ def initialize(name, used_by_unavailable_periods, can_be_stochastic, type)
WaterHeaterSetpoint: Column.new('water_heater_setpoint', false, false, :setpoint),
WaterHeaterOperatingMode: Column.new('water_heater_operating_mode', false, false, :zero_or_one),
Battery: Column.new('battery', false, false, :neg_one_to_one),
BatteryCharging: Column.new('battery_charging', false, false, nil),
BatteryDischarging: Column.new('battery_discharging', false, false, nil),
BatteryCharging: Column.new('battery_charging', true, false, nil),
BatteryDischarging: Column.new('battery_discharging', true, false, nil),
HVAC: Column.new('hvac', true, false, nil),
HVACMaximumPowerRatio: Column.new('hvac_maximum_power_ratio', false, false, :frac),
WaterHeater: Column.new('water_heater', true, false, nil),
Expand Down
3 changes: 2 additions & 1 deletion docs/source/workflow_inputs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3543,7 +3543,8 @@ Each central fan integrated supply (CFIS) system is entered as a ``/HPXML/Buildi
.. [#] HoursInOperation is combined with the flow rate to form the hourly target ventilation rate (e.g., inputs of 90 cfm and 8 hrs/day produce an hourly target ventilation rate of 30 cfm).
.. [#] If FanPower not provided, defaults to 0.58 W/cfm based on ANSI/RESNET/ICC 301-2022 Addendum C.
.. [#] HVACDistribution type cannot be :ref:`hvac_distribution_hydronic`.
.. [#] Blower airflow rate when operating in ventilation only mode (i.e., not heating or cooling mode), as a fraction of the maximum blower airflow rate.
.. [#] VentilationOnlyModeAirflowFraction only applies when AdditionalRuntimeOperatingMode="air handler fan".
Defines the blower airflow rate when operating in ventilation only mode (i.e., not heating or cooling mode), as a fraction of the maximum blower airflow rate.
This value will depend on whether the blower fan can operate at reduced airflow rates during ventilation only operation.
It is used to determine how much conditioned air is recirculated through ducts during ventilation only operation, resulting in additional duct losses.
A value of zero will result in no conditioned air recirculation, and thus no additional duct losses.
Expand Down
4 changes: 4 additions & 0 deletions workflow/hpxml_inputs.json
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,10 @@
"parent_hpxml": "sample_files/base-battery.xml",
"schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/battery.csv"
},
"sample_files/base-battery-scheduled-power-outage.xml": {
"parent_hpxml": "sample_files/base-battery-scheduled.xml",
"schedules_power_outage_periods": "Jul 1 5 - Jul 31 14"
},
"sample_files/base-bldgtype-sfa-unit.xml": {
"parent_hpxml": "sample_files/base.xml",
"geometry_unit_type": "single-family attached",
Expand Down
Loading

0 comments on commit 7641d52

Please sign in to comment.