Skip to content

Commit

Permalink
Squashed 'resources/hpxml-measures/' changes from 9d6504d6c39..b5a360…
Browse files Browse the repository at this point in the history 
…8ccd3

b5a3608ccd3 Latest results.
12ff3684fbc Fix typo.
022fb2723c8 Remove rule from epvalidator and instead max takes precedence.
8ec19a9aeaa Remove new hvac sizing test now that it is replaced in default tests.
7dfe1666df1 Update schematron and add test.
cd85f959a9a Update build measure argument descriptions.
fd7261677f4 Fix docs tables.
cd1d3cd8626 Merge branch 'master' into max-airflow-args2
fab1e24cd48 Replace high-level restriction input with optiona max airflow args.
d6fac4f185a Fix bug in new method and update tests.
5201bca29f7 Ignore OS message.
0d2ad4c32e6 Merge pull request #1590 from NREL/revert_xmlvalidator
5e0f974989b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into revert_xmlvalidator
546f504c90f Merge branch 'master' into max-airflow-args2
9b023438f93 Merge branch 'max-airflow-args2' of github.com:NREL/OpenStudio-HPXML into max-airflow-args2
9b2e5ae8d47 Start adding ductwork restriction tests for various system types.
451001898c7 Merge pull request #1589 from NREL/flatten_documentation
7cb579f0372 Some cleanup/fixes.
66619ec8299 Latest results.
6e60e7662b9 Update default tests with airflow checks.
612c71105d6 Update test.
9d22e625c04 Update BuildResHPXML measure links.
188a92825c1 Handle hot water distribution [ci skip]
53249533f4f Handle solar thermal [ci skip]
c482b8eb413 Use consistent language [ci skip]
ec645b9a5ed Handle ventilation fans. [ci skip]
32f2f2c5678 Address HVAC distribution [ci skip]
5305dbff27e Address water heaters. [ci skip]
a8a9034caf6 Clean up code in new method.
24f61d9de6a Merge branch 'master' into max-airflow-args2
80c4a2586a6 Address heat pumps [ci skip]
d0319bff915 Merge branch 'master' into max-airflow-args2
deacd79d179 Few comment updates.
1c83895eb83 Update measure.xml [ci skip]
72929792871 Try reverting XMLValidator workaround for NREL/OpenStudio#4824.
b9b2eef38b1 Flatten HVAC heating and cooling systems. [ci skip]
57dd48445ca Collapse airflow and fan adjustment into one.
184154e3c4d Merge branch 'master' into max-airflow-args
04c57c7c68e Latest results.
2b1714b99aa For now only apply fan adjustment to HP.
516e4efdbf1 Update fan adjustment and max airflow test expected values.
1a6bd6c2210 Update max_airflows method based on comments.
17ad82f65a8 Merge branch 'master' into max-airflow-args
cc8c13a1fa5 Switch v_baseline with v_upgrade, and add a commented question.
383036900a1 Set capacity to the max?
f2ae179a74a Merge branch 'master' into max-airflow-args
8b3979ba1f5 Latest results.
c1f802ac386 Update the docs.
8e27f7ce815 Move fan adjust bool to heat pump, update schematron, add sample file.
75f3797aaaa Fix the docs.
ce762cf93a8 Begin to add airflow cfm fields to docs.
44a7f2c6b88 Latest results.
0aaa5dd47c3 Skip max-airflow hvac_configuration test for now.
4cb9e587be0 Write new methods for hvac_sizing.
1beb3691411 Merge branch 'watts-per-cfm-args' into max-airflow-args
a7b2f89d3a1 Merge branch 'master' into watts-per-cfm-args
31a36babbb0 Latest results.
522f1819ae6 Forgot to actually set the new arg value.
ee6abb726ee Add bool arg for fan efficiency adjustment.
fdb5f16f79b Latest results.
4e6438e7a19 Merge branch 'watts-per-cfm-args' into max-airflow-args
35634487355 Update hpxml inputs json after merge.
69518743ec2 Merge branch 'watts-per-cfm-args' into max-airflow-args
31c271c90d0 Merge branch 'master' into watts-per-cfm-args
2551567f137 Latest results.
7ffc8206ae9 Forgot to default the new bool arg.
6d59d3257ce Switch from new methodology to just an input, and write a test.
a6dcec067af Use airflow max method.
a134d7fbd88 For now, test using a new sample file.
fc2836ec131 Update defaults for fan adjustment and airflow maximums.
e2d50c8b839 Update epvalidator for new hp sizing methodology enum.
49f9ba2bea9 Add new hp sizing methodology, and args for airflow rates.
03371101b8d Merge branch 'master' into watts-per-cfm-args
44b6e2730a2 Merge branch 'master' into watts-per-cfm-args
c6f30fa3eef Collapse new args into a single one since only a single air distribution system is supported.
41c6cee061c Regenerate the BuildResHPXML readme file.
5af4e6167bc Replace tasks.rb mods with hpxml_inputs.json updates.
f43e85faf8c Add optional blower fan efficiency args to BuildResHPXML.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: b5a3608ccd38db6c63db560801d5de16ecdea791
  • Loading branch information
@joseph-robertson
joseph-robertson committed Jan 23, 2024
1 parent 020ed80 commit 0fddc09
Show file tree
Hide file tree
Showing 21 changed files with 3,329 additions and 926 deletions.
101 changes: 83 additions & 18 deletions BuildResidentialHPXML/README.md
View file
Expand Up @@ -2596,6 +2596,71 @@ The heat load served fraction of the second heating system. Ignored if this heat

<br/>

**HVAC Distribution: Blower Fan Efficiency**

The blower fan efficiency at maximum fan speed. Applies only to Furnace heating system, central air conditioner and mini-split cooling systems, and air-to-air, mini-split, and ground-to-air heat pumps. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-heating-systems'>HPXML Heating Systems</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-cooling-systems'>HPXML Cooling Systems</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-heat-pumps'>HPXML Heat Pumps</a>) is used.

- **Name:** ``hvac_distribution_fan_watts_per_cfm``
- **Type:** ``Double``

- **Units:** ``W/CFM``

- **Required:** ``false``

<br/>

**HVAC Distribution: Heating Airflow Rate**

The heating airflow rate. If not provided, the OS-HPXML autosized default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-heating-systems'>HPXML Heating Systems</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-cooling-systems'>HPXML Cooling Systems</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-heat-pumps'>HPXML Heat Pumps</a>) is used.

- **Name:** ``hvac_distribution_heating_airflow_cfm``
- **Type:** ``Double``

- **Units:** ``CFM``

- **Required:** ``false``

<br/>

**HVAC Distribution: Cooling Airflow Rate**

The cooling airflow rate. If not provided, the OS-HPXML autosized default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-heating-systems'>HPXML Heating Systems</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-cooling-systems'>HPXML Cooling Systems</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-heat-pumps'>HPXML Heat Pumps</a>) is used.

- **Name:** ``hvac_distribution_cooling_airflow_cfm``
- **Type:** ``Double``

- **Units:** ``CFM``

- **Required:** ``false``

<br/>

**HVAC Distribution: Maximum Heating Airflow Rate**

The heating airflow rate used to (a) set the maximum allowed heating airflow rate and (b) adjust blower fan efficiency.

- **Name:** ``hvac_distribution_max_heating_airflow_cfm``
- **Type:** ``Double``

- **Units:** ``CFM``

- **Required:** ``false``

<br/>

**HVAC Distribution: Maximum Cooling Airflow Rate**

The cooling airflow rate used to (a) set the maximum allowed cooling airflow rate and (b) adjust blower fan efficiency.

- **Name:** ``hvac_distribution_max_cooling_airflow_cfm``
- **Type:** ``Double``

- **Units:** ``CFM``

- **Required:** ``false``

<br/>

**HVAC Control: Heating Weekday Setpoint Schedule**

Specify the constant or 24-hour comma-separated weekday heating setpoint schedule. Required unless a detailed CSV schedule is provided.
Expand Down Expand Up @@ -2855,7 +2920,7 @@ The type of the mechanical ventilation. Use 'none' if there is no mechanical ven

**Mechanical Ventilation: Flow Rate**

The flow rate of the mechanical ventilation. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#whole-ventilation-fan'>Whole Ventilation Fan</a>) is used.
The flow rate of the mechanical ventilation. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-mechanical-ventilation-fans'>HPXML Mechanical Ventilation Fans</a>) is used.

- **Name:** ``mech_vent_flow_rate``
- **Type:** ``Double``
Expand All @@ -2868,7 +2933,7 @@ The flow rate of the mechanical ventilation. If not provided, the OS-HPXML defau

**Mechanical Ventilation: Hours In Operation**

The hours in operation of the mechanical ventilation. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#whole-ventilation-fan'>Whole Ventilation Fan</a>) is used.
The hours in operation of the mechanical ventilation. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-mechanical-ventilation-fans'>HPXML Mechanical Ventilation Fans</a>) is used.

- **Name:** ``mech_vent_hours_in_operation``
- **Type:** ``Double``
Expand Down Expand Up @@ -2920,7 +2985,7 @@ The Unadjusted or Adjusted sensible recovery efficiency of the mechanical ventil

**Mechanical Ventilation: Fan Power**

The fan power of the mechanical ventilation. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#whole-ventilation-fan'>Whole Ventilation Fan</a>) is used.
The fan power of the mechanical ventilation. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-mechanical-ventilation-fans'>HPXML Mechanical Ventilation Fans</a>) is used.

- **Name:** ``mech_vent_fan_power``
- **Type:** ``Double``
Expand Down Expand Up @@ -3128,7 +3193,7 @@ The fan power of the second mechanical ventilation.

**Kitchen Fans: Quantity**

The quantity of the kitchen fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The quantity of the kitchen fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``kitchen_fans_quantity``
- **Type:** ``Integer``
Expand All @@ -3141,7 +3206,7 @@ The quantity of the kitchen fans. If not provided, the OS-HPXML default (see <a

**Kitchen Fans: Flow Rate**

The flow rate of the kitchen fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The flow rate of the kitchen fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``kitchen_fans_flow_rate``
- **Type:** ``Double``
Expand All @@ -3154,7 +3219,7 @@ The flow rate of the kitchen fan. If not provided, the OS-HPXML default (see <a

**Kitchen Fans: Hours In Operation**

The hours in operation of the kitchen fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The hours in operation of the kitchen fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``kitchen_fans_hours_in_operation``
- **Type:** ``Double``
Expand All @@ -3167,7 +3232,7 @@ The hours in operation of the kitchen fan. If not provided, the OS-HPXML default

**Kitchen Fans: Fan Power**

The fan power of the kitchen fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The fan power of the kitchen fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``kitchen_fans_power``
- **Type:** ``Double``
Expand All @@ -3180,7 +3245,7 @@ The fan power of the kitchen fan. If not provided, the OS-HPXML default (see <a

**Kitchen Fans: Start Hour**

The start hour of the kitchen fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The start hour of the kitchen fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``kitchen_fans_start_hour``
- **Type:** ``Integer``
Expand All @@ -3193,7 +3258,7 @@ The start hour of the kitchen fan. If not provided, the OS-HPXML default (see <a

**Bathroom Fans: Quantity**

The quantity of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The quantity of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``bathroom_fans_quantity``
- **Type:** ``Integer``
Expand All @@ -3206,7 +3271,7 @@ The quantity of the bathroom fans. If not provided, the OS-HPXML default (see <a

**Bathroom Fans: Flow Rate**

The flow rate of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The flow rate of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``bathroom_fans_flow_rate``
- **Type:** ``Double``
Expand All @@ -3219,7 +3284,7 @@ The flow rate of the bathroom fans. If not provided, the OS-HPXML default (see <

**Bathroom Fans: Hours In Operation**

The hours in operation of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The hours in operation of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``bathroom_fans_hours_in_operation``
- **Type:** ``Double``
Expand All @@ -3232,7 +3297,7 @@ The hours in operation of the bathroom fans. If not provided, the OS-HPXML defau

**Bathroom Fans: Fan Power**

The fan power of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The fan power of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``bathroom_fans_power``
- **Type:** ``Double``
Expand All @@ -3245,7 +3310,7 @@ The fan power of the bathroom fans. If not provided, the OS-HPXML default (see <

**Bathroom Fans: Start Hour**

The start hour of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#local-ventilation-fan'>Local Ventilation Fan</a>) is used.
The start hour of the bathroom fans. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-local-ventilation-fans'>HPXML Local Ventilation Fans</a>) is used.

- **Name:** ``bathroom_fans_start_hour``
- **Type:** ``Integer``
Expand All @@ -3269,7 +3334,7 @@ Whether there is a whole house fan.

**Whole House Fan: Flow Rate**

The flow rate of the whole house fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#whole-house-fan'>Whole House Fan</a>) is used.
The flow rate of the whole house fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-whole-house-fans'>HPXML Whole House Fans</a>) is used.

- **Name:** ``whole_house_fan_flow_rate``
- **Type:** ``Double``
Expand All @@ -3282,7 +3347,7 @@ The flow rate of the whole house fan. If not provided, the OS-HPXML default (see

**Whole House Fan: Fan Power**

The fan power of the whole house fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#whole-house-fan'>Whole House Fan</a>) is used.
The fan power of the whole house fan. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-whole-house-fans'>HPXML Whole House Fans</a>) is used.

- **Name:** ``whole_house_fan_power``
- **Type:** ``Double``
Expand Down Expand Up @@ -3538,7 +3603,7 @@ If the distribution system is Recirculation, the type of hot water recirculation

**Hot Water Distribution: Recirculation Piping Length**

If the distribution system is Recirculation, the length of the recirculation piping. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#recirculation'>Recirculation</a>) is used.
If the distribution system is Recirculation, the length of the recirculation piping. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#recirculation-in-unit'>Recirculation (In-Unit)</a>) is used.

- **Name:** ``hot_water_distribution_recirc_piping_length``
- **Type:** ``Double``
Expand All @@ -3551,7 +3616,7 @@ If the distribution system is Recirculation, the length of the recirculation pip

**Hot Water Distribution: Recirculation Branch Piping Length**

If the distribution system is Recirculation, the length of the recirculation branch piping. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#recirculation'>Recirculation</a>) is used.
If the distribution system is Recirculation, the length of the recirculation branch piping. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#recirculation-in-unit'>Recirculation (In-Unit)</a>) is used.

- **Name:** ``hot_water_distribution_recirc_branch_piping_length``
- **Type:** ``Double``
Expand All @@ -3564,7 +3629,7 @@ If the distribution system is Recirculation, the length of the recirculation bra

**Hot Water Distribution: Recirculation Pump Power**

If the distribution system is Recirculation, the recirculation pump power. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#recirculation'>Recirculation</a>) is used.
If the distribution system is Recirculation, the recirculation pump power. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#recirculation-in-unit'>Recirculation (In-Unit)</a>) is used.

- **Name:** ``hot_water_distribution_recirc_pump_power``
- **Type:** ``Double``
Expand Down

0 comments on commit 0fddc09

Please sign in to comment.