Skip to content

Commit

Permalink
Merge commit 'e67a6ec4b6df3a50397cdf998527f1f919ee1fdb' into ansi_301…
Browse files Browse the repository at this point in the history 
…_2022_airflow
  • Loading branch information
@shorowit
shorowit committed Jan 6, 2024
2 parents 3ca7c02 + e67a6ec commit 36cc3a1
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 92 deletions.
6 changes: 3 additions & 3 deletions hpxml-measures/HPXMLtoOpenStudio/measure.xml
View file
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>cae1b905-8be7-4d40-b876-bafce627be14</version_id>
<version_modified>2024-01-06T00:34:12Z</version_modified>
<version_id>5228cf4d-3a13-4bfe-bca6-fa7f994008e1</version_id>
<version_modified>2024-01-06T02:18:46Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -148,7 +148,7 @@
<filename>airflow.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>A5E9FF8C</checksum>
<checksum>956E8BC4</checksum>
</file>
<file>
<filename>battery.rb</filename>
Expand Down
6 changes: 5 additions & 1 deletion hpxml-measures/HPXMLtoOpenStudio/resources/airflow.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,11 @@ def self.get_mech_vent_qfan_cfm(q_tot, q_inf, is_balanced, frac_imbal, a_ext, bl
q_fan = q_tot - q_inf_eff
else
q_inf_eff = q_inf * a_ext
q_fan = ((frac_imbal**2.0 * q_tot**2.0 - 4.0 * frac_imbal * q_inf_eff**2.0 + 2.0 * frac_imbal * q_inf_eff * q_tot + q_inf_eff**2.0)**0.5 + frac_imbal * q_tot - q_inf_eff) / (2.0 * frac_imbal)
if q_inf_eff >= q_tot
q_fan = 0.0
else
q_fan = ((frac_imbal**2.0 * q_tot**2.0 - 4.0 * frac_imbal * q_inf_eff**2.0 + 2.0 * frac_imbal * q_inf_eff * q_tot + q_inf_eff**2.0)**0.5 + frac_imbal * q_tot - q_inf_eff) / (2.0 * frac_imbal)
end
end
elsif Constants.ERIVersions.index(eri_version) >= Constants.ERIVersions.index('2019')
if is_balanced
Expand Down
22 changes: 11 additions & 11 deletions hpxml-measures/workflow/tests/base_results/results_sizing.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,22 +108,22 @@ denver-hvac-autosize-install-quality-air-to-air-heat-pump-1-speed-sizing-methodo
denver-hvac-autosize-install-quality-air-to-air-heat-pump-1-speed-sizing-methodology-HERS.xml,35174.0,36638.0,31147.0,832.0,1143.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-1-speed-sizing-methodology-MaxLoad.xml,74430.0,77528.0,31147.0,1761.0,2418.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-2-speed-sizing-methodology-ACCA.xml,27282.0,28282.0,31147.0,645.0,882.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-2-speed-sizing-methodology-HERS.xml,35133.0,36421.0,31147.0,831.0,1136.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-2-speed-sizing-methodology-HERS.xml,35132.0,36421.0,31147.0,831.0,1136.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-2-speed-sizing-methodology-MaxLoad.xml,73958.0,76670.0,31147.0,1750.0,2391.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-ACCA.xml,29280.0,30497.0,31147.0,693.0,951.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-HERS.xml,35188.0,36653.0,31147.0,832.0,1143.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-MaxLoad.xml,55269.0,57566.0,31147.0,1307.0,1795.0
denver-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-MaxLoad.xml,55269.0,57570.0,31147.0,1307.0,1795.0
denver-hvac-autosize-install-quality-furnace-gas-central-ac-1-speed.xml,32235.0,25066.0,0.0,534.0,782.0
denver-hvac-autosize-install-quality-furnace-gas-central-ac-2-speed.xml,32235.0,24373.0,0.0,534.0,760.0
denver-hvac-autosize-install-quality-furnace-gas-central-ac-var-speed.xml,32235.0,23459.0,0.0,534.0,732.0
denver-hvac-autosize-install-quality-furnace-gas-only.xml,32235.0,0.0,0.0,534.0,0.0
denver-hvac-autosize-install-quality-ground-to-air-heat-pump-sizing-methodology-ACCA.xml,35169.0,36836.0,31147.0,832.0,967.0
denver-hvac-autosize-install-quality-ground-to-air-heat-pump-sizing-methodology-HERS.xml,35169.0,36836.0,31147.0,832.0,1149.0
denver-hvac-autosize-install-quality-ground-to-air-heat-pump-sizing-methodology-MaxLoad.xml,39186.0,41044.0,31147.0,927.0,1280.0
denver-hvac-autosize-install-quality-mini-split-air-conditioner-only-ducted.xml,0.0,20424.0,0.0,0.0,637.0
denver-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-ACCA.xml,23855.0,24848.0,26181.0,564.0,775.0
denver-hvac-autosize-install-quality-mini-split-air-conditioner-only-ducted.xml,0.0,20423.0,0.0,0.0,637.0
denver-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-ACCA.xml,23855.0,24847.0,26181.0,564.0,775.0
denver-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-HERS.xml,29578.0,30810.0,26181.0,700.0,961.0
denver-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-MaxLoad.xml,46458.0,48389.0,26181.0,1099.0,1509.0
denver-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-MaxLoad.xml,46458.0,48392.0,26181.0,1099.0,1509.0
denver-hvac-autosize-mini-split-air-conditioner-only-ducted.xml,0.0,17356.0,0.0,0.0,722.0
denver-hvac-autosize-mini-split-air-conditioner-only-ductless.xml,0.0,14282.0,0.0,0.0,476.0
denver-hvac-autosize-mini-split-heat-pump-ducted-cooling-only-sizing-methodology-ACCA.xml,0.0,17356.0,0.0,0.0,722.0
Expand Down Expand Up @@ -294,18 +294,18 @@ houston-hvac-autosize-install-quality-air-to-air-heat-pump-1-speed-sizing-method
houston-hvac-autosize-install-quality-air-to-air-heat-pump-2-speed-sizing-methodology-ACCA.xml,33606.0,31949.0,20038.0,657.0,996.0
houston-hvac-autosize-install-quality-air-to-air-heat-pump-2-speed-sizing-methodology-HERS.xml,31136.0,29600.0,20038.0,608.0,923.0
houston-hvac-autosize-install-quality-air-to-air-heat-pump-2-speed-sizing-methodology-MaxLoad.xml,37407.0,35562.0,20038.0,731.0,1109.0
houston-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-ACCA.xml,30106.0,28785.0,20038.0,588.0,898.0
houston-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-HERS.xml,31157.0,29787.0,20038.0,609.0,929.0
houston-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-MaxLoad.xml,35707.0,34137.0,20038.0,698.0,1065.0
houston-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-ACCA.xml,30106.0,28783.0,20038.0,588.0,898.0
houston-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-HERS.xml,31157.0,29789.0,20038.0,609.0,929.0
houston-hvac-autosize-install-quality-air-to-air-heat-pump-var-speed-sizing-methodology-MaxLoad.xml,35707.0,34140.0,20038.0,698.0,1065.0
houston-hvac-autosize-install-quality-furnace-gas-central-ac-1-speed.xml,21260.0,31852.0,0.0,291.0,993.0
houston-hvac-autosize-install-quality-furnace-gas-central-ac-2-speed.xml,21260.0,31949.0,0.0,291.0,996.0
houston-hvac-autosize-install-quality-furnace-gas-central-ac-var-speed.xml,21260.0,28785.0,0.0,291.0,898.0
houston-hvac-autosize-install-quality-furnace-gas-central-ac-var-speed.xml,21260.0,28783.0,0.0,291.0,898.0
houston-hvac-autosize-install-quality-furnace-gas-only.xml,21260.0,0.0,0.0,291.0,0.0
houston-hvac-autosize-install-quality-ground-to-air-heat-pump-sizing-methodology-ACCA.xml,40845.0,39322.0,20038.0,798.0,819.0
houston-hvac-autosize-install-quality-ground-to-air-heat-pump-sizing-methodology-HERS.xml,31097.0,29938.0,20038.0,608.0,624.0
houston-hvac-autosize-install-quality-ground-to-air-heat-pump-sizing-methodology-MaxLoad.xml,40845.0,39322.0,20038.0,798.0,819.0
houston-hvac-autosize-install-quality-mini-split-air-conditioner-only-ducted.xml,0.0,24438.0,0.0,0.0,762.0
houston-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-ACCA.xml,25560.0,24438.0,16055.0,499.0,762.0
houston-hvac-autosize-install-quality-mini-split-air-conditioner-only-ducted.xml,0.0,24436.0,0.0,0.0,762.0
houston-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-ACCA.xml,25560.0,24436.0,16055.0,499.0,762.0
houston-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-HERS.xml,24097.0,23040.0,16055.0,471.0,719.0
houston-hvac-autosize-install-quality-mini-split-heat-pump-ducted-sizing-methodology-MaxLoad.xml,27617.0,26405.0,16055.0,540.0,823.0
houston-hvac-autosize-mini-split-air-conditioner-only-ducted.xml,0.0,20779.0,0.0,0.0,864.0
Expand Down
Loading

0 comments on commit 36cc3a1

Please sign in to comment.