Skip to content

Replace Hard-Coded Sensible Capacity Curves with ADP/BF #1707

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.

Sign up for GitHub

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

Merged
merged 70 commits into from
Sep 20, 2024
Merged

Replace Hard-Coded Sensible Capacity Curves with ADP/BF #1707

Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
698aaf4
Committing pseudo_code_heat_pump_sizing.txt to branch OS_ACCA_Man_S_u…
Sashadf1 Apr 2, 2024
1ac11a2
adding comment on apply_equipment_adjustments
Sashadf1 Apr 8, 2024
82e23b6
Merge remote-tracking branch 'origin/master' into acca_manual_s
Sashadf1 Apr 8, 2024
af484e8
adding explanatory comments
Sashadf1 Apr 8, 2024
49e998d
hvac_sizing.rb
Sashadf1 Apr 9, 2024
2aca92f
Committing comments for ADP/BF
Sashadf1 May 8, 2024
6861e46
Merge branch 'master' into adp_bf_method_design_shr
Sashadf1 May 8, 2024
af58345
Translating E+ coil bypass factor method to recalculate cool_cap_design
Sashadf1 May 9, 2024
c1a7827
calculating A_o_rated with correct unit conversions and methods in ps…
Sashadf1 May 10, 2024
2cdde89
renamed A_o from A_o rated because A_o is not a function of design vs…
Sashadf1 May 10, 2024
1e3ef9a
refactor add_cooling_system function variable input order convention …
Sashadf1 May 13, 2024
7905315
fixed typo in comments of CoilAoFactor method in psychrometrics.rb
Sashadf1 May 14, 2024
f9ed1b8
fixed typo in descriptive comments of psychrometrics.rb
Sashadf1 May 14, 2024
74bb5fa
removing pesky return 1.0 that shouldn't be there, preventing it from…
Sashadf1 May 14, 2024
0391906
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
yzhou601 May 17, 2024
85b2e27
work on implementing ADP/BF. coil a_o factor already calculated in hv…
Sashadf1 May 21, 2024
d37f8c1
using pre-existing coil ao factor stored in cooling additional proper…
Sashadf1 May 30, 2024
26a55b3
fixed unit conversion on cool_cap_rated so that Psychrometrics.rb doe…
Sashadf1 May 31, 2024
c721a01
iteration for ADP/BF
Sashadf1 Jun 11, 2024
f0d925c
more comments
Sashadf1 Jun 17, 2024
b177cb9
more work on iteration for design airflow
Sashadf1 Jun 18, 2024
1ca7c4a
finished writing code for ADP/BF implementation. ADP/BF method is a b…
Sashadf1 Jun 20, 2024
3f8f26d
confident in ADP/BF
Sashadf1 Jun 21, 2024
308c1f7
Fix error and minor refactoring.
shorowit Jun 21, 2024
8f4b83d
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Jun 21, 2024
a887009
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Jun 25, 2024
400a43f
Temporarily disable test to get CI results.
shorowit Jun 25, 2024
315916f
Latest results.
Jun 25, 2024
487c702
defined test_calculate_SHR() in hvac_sizing_test.rb
Sashadf1 Jun 25, 2024
38cb971
added files after git restore HPXMLtoOpenStudio to recover HPXMLtoOpe…
Sashadf1 Jul 10, 2024
f660286
test_error.xml running without failure. haven't inspected annual or t…
Sashadf1 Jul 11, 2024
4d5ceca
remove unit test for Psychrometrics.CalculateSHR(), since test_error.…
Sashadf1 Jul 11, 2024
83d3094
hvac_sizing.rb, measure.xml, and docs updates after running RuboCop
Sashadf1 Jul 11, 2024
f598241
correct hvac_sizing and removing duplicated HPXMLtoOpenStudio directo…
Sashadf1 Jul 11, 2024
0b0cc26
Merge branch 'master' into adp_bf_method_design_shr
joseph-robertson Jul 11, 2024
49fd105
Re-enable test, remove files.
shorowit Jul 12, 2024
1edc822
Latest results.
Jul 12, 2024
14f36eb
removing puts statements before PR review
Sashadf1 Jul 17, 2024
2de64ea
last explanatory comment before marking adp_bf_method PR for review
Sashadf1 Jul 17, 2024
ba79c8a
adp_bf_method branch up to date w/ master, merge conflicts resolved m…
Sashadf1 Jul 19, 2024
599ec24
resolved merge conflicts in measure.xml
Sashadf1 Jul 19, 2024
776661a
manually resolved merge conflicts in results.csv
Sashadf1 Jul 19, 2024
d373f6e
Latest results.
Jul 19, 2024
c07cb17
refactor to rename hvac_sizings.Design_SHR object property to local v…
Sashadf1 Jul 22, 2024
547cf7f
removing :Design_SHR property from HVACSizingValues class definition,…
Sashadf1 Jul 22, 2024
1d3a43a
changing comments on get_nominal_speed method to match remote master
Sashadf1 Jul 22, 2024
2373097
updating comments on HVACSizingValues attributes to match master. No …
Sashadf1 Jul 22, 2024
8b94164
successful? merge of latest master into adp_bf_method_design_shr to u…
Sashadf1 Jul 22, 2024
a7d7e41
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Aug 8, 2024
50bb972
Latest results.
Aug 8, 2024
ce0994b
/ \ line extension + divisor in hvac_sizing.rb
Sashadf1 Aug 19, 2024
18f106b
descriptive comments on get_hvac_size_limits
Sashadf1 Aug 19, 2024
0a7b1f3
fixes to get_hvac_size_limits to ensure adp_bf_branch runs without error
Sashadf1 Aug 19, 2024
49372e7
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Aug 21, 2024
18cf413
Latest results.
Aug 21, 2024
178f5da
addressing first Jon W. comment re adp_bf review
Sashadf1 Aug 22, 2024
0692d10
concluded merge from diverging local and origin adp_bf_branches
Sashadf1 Aug 26, 2024
cb5e1d1
adding informative messages to design airflow calculation for central…
Sashadf1 Aug 26, 2024
40f3831
adding comments re a_o_rated to address Jon Winkler review comment 2
Sashadf1 Aug 26, 2024
9c683e7
running Rubocop
Sashadf1 Aug 26, 2024
5df10eb
pulling in master after addressing adp_bf review comments
Sashadf1 Aug 26, 2024
1c418dc
succesfully ran Rubocop
Sashadf1 Aug 26, 2024
a71a116
accepting incoming master to get adp branch up to date
Sashadf1 Sep 16, 2024
4779ada
changed variable name from hvac_cooling_shr to hvac_cooling_shr_rated…
Sashadf1 Sep 17, 2024
12fee34
measure.xml updated after running RuboCop. no offenses detected, meas…
Sashadf1 Sep 17, 2024
c6435fa
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Sep 18, 2024
50c9c7d
Unrelated code cleanup
shorowit Sep 18, 2024
56a8713
Latest results.
Sep 18, 2024
5efcc61
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Sep 20, 2024
d315784
Cleanup comments.
shorowit Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions HPXMLtoOpenStudio/measure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ def create_unit_model(hpxml, hpxml_bldg, runner, model, epw_path, weather, debug
@hvac_unavailable_periods = Schedule.get_unavailable_periods(runner, SchedulesFile::Columns[:HVAC].name, @hpxml_header.unavailable_periods)
airloop_map = {} # Map of HPXML System ID -> AirLoopHVAC (or ZoneHVACFourPipeFanCoil)
add_ideal_system(model, spaces, weather)
add_cooling_system(model, runner, weather, spaces, airloop_map)
add_cooling_system(runner, model, weather, spaces, airloop_map)
add_heating_system(runner, model, weather, spaces, airloop_map)
add_heat_pump(runner, model, weather, spaces, airloop_map)
add_dehumidifiers(runner, model, spaces)
Expand Down Expand Up @@ -1818,7 +1818,7 @@ def add_hot_water_and_appliances(runner, model, weather, spaces)
# @param spaces [Hash] Map of HPXML locations => OpenStudio Space objects
# @param airloop_map [TODO] TODO
# @return [TODO] TODO
def add_cooling_system(model, runner, weather, spaces, airloop_map)
def add_cooling_system(runner, model, weather, spaces, airloop_map)
conditioned_zone = spaces[HPXML::LocationConditionedSpace].thermalZone.get

HVAC.get_hpxml_hvac_systems(@hpxml_bldg).each do |hvac_system|
Expand Down
18 changes: 12 additions & 6 deletions HPXMLtoOpenStudio/measure.xml
View file
Open in desktop
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>5960a8e9-5519-4da5-97cb-349ed6000c6f</version_id>
<version_modified>2024-08-08T14:00:14Z</version_modified>
<version_id>c6b51dff-a93d-4fc7-ab3d-4df0b73569d3</version_id>
<version_modified>2024-08-08T19:19:02Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -183,7 +183,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>91E70775</checksum>
<checksum>248FC4B4</checksum>
</file>
<file>
<filename>airflow.rb</filename>
Expand Down Expand Up @@ -381,13 +381,13 @@
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>621EB8F8</checksum>
<checksum>1154021B</checksum>
</file>
<file>
<filename>hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>F3D7066C</checksum>
<checksum>B606906A</checksum>
</file>
<file>
<filename>lighting.rb</filename>
Expand Down Expand Up @@ -441,7 +441,7 @@
<filename>psychrometrics.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>86A74352</checksum>
<checksum>716C98E6</checksum>
</file>
<file>
<filename>pv.rb</filename>
Expand Down Expand Up @@ -629,6 +629,12 @@
<usage_type>resource</usage_type>
<checksum>93120E27</checksum>
</file>
<file>
<filename>in.schedules.csv</filename>
<filetype>csv</filetype>
<usage_type>test</usage_type>
<checksum>1E533016</checksum>
</file>
<file>
<filename>test_airflow.rb</filename>
<filetype>rb</filetype>
Expand Down
6 changes: 5 additions & 1 deletion HPXMLtoOpenStudio/resources/hvac.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
module HVAC
AirSourceHeatRatedODB = 47.0 # degF, Rated outdoor drybulb for air-source systems, heating
AirSourceHeatRatedIDB = 70.0 # degF, Rated indoor drybulb for air-source systems, heating
# wet-bulb temperatures not required for heating
AirSourceCoolRatedODB = 95.0 # degF, Rated outdoor drybulb for air-source systems, cooling
AirSourceCoolRatedOWB = 75.0 # degF, Rated outdoor wetbulb for air-source systems, cooling
AirSourceCoolRatedIWB = 67.0 # degF, Rated indoor wetbulb for air-source systems, cooling
AirSourceCoolRatedIDB = 80.0 # degF, Rated indoor drybulb for air-source systems, cooling
CrankcaseHeaterTemp = 50.0 # degF
# temperatures for rated operating point, using terminology from Cutler (2013)

# TODO
#
Expand Down Expand Up @@ -3333,7 +3337,7 @@ def self.set_cool_rated_shrs_gross(cooling_system)
clg_ap.cool_rated_shrs_gross = [cooling_system.cooling_shr] # We don't model the fan separately, so set gross == net
else
# rated shr gross and fan speed ratios
dB_rated = 80.0 # F
dB_rated = HVAC::AirSourceCoolRatedIDB
win = 0.01118470 # Humidity ratio corresponding to 80F dry bulb/67F wet bulb (from EnergyPlus)

if cooling_system.compressor_type == HPXML::HVACCompressorTypeSingleStage
Expand Down
190 changes: 103 additions & 87 deletions HPXMLtoOpenStudio/resources/hvac_sizing.rb
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HPXMLtoOpenStudio/resources/psychrometrics.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ def self.CoilBypassFactor(dBin, p, qdot, cfm, shr, win)
# @param q [Double] Total capacity of unit (kBtu/h)
# @param cfm [Double] Volumetric flow rate of unit (CFM)
# @param ao [Double] Coil Ao factor (=UA/Cp - IN SI UNITS)
# @param win [Double] Entering humidity ratio
# @param win [Double] Entering humidity ratio (dimensionless)
# @return [Double] Sensible Heat Ratio
def self.CalculateSHR(dBin, p, q, cfm, ao, win)
mfr = UnitConversions.convert(self.CalculateMassflowRate(dBin, p, cfm, win), 'lbm/min', 'kg/s')
Expand Down
10 changes: 5 additions & 5 deletions workflow/tests/base_results/results_acca_hvac.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
HPXML,HVAC Design Temperature: Heating (F),HVAC Design Temperature: Cooling (F),HVAC Capacity: Heating (Btu/h),HVAC Capacity: Cooling (Btu/h),HVAC Capacity: Heat Pump Backup (Btu/h),HVAC Design Load: Heating: Total (Btu/h),HVAC Design Load: Heating: Ducts (Btu/h),HVAC Design Load: Heating: Windows (Btu/h),HVAC Design Load: Heating: Skylights (Btu/h),HVAC Design Load: Heating: Doors (Btu/h),HVAC Design Load: Heating: Walls (Btu/h),HVAC Design Load: Heating: Roofs (Btu/h),HVAC Design Load: Heating: Floors (Btu/h),HVAC Design Load: Heating: Slabs (Btu/h),HVAC Design Load: Heating: Ceilings (Btu/h),HVAC Design Load: Heating: Infiltration (Btu/h),HVAC Design Load: Heating: Ventilation (Btu/h),HVAC Design Load: Heating: Piping (Btu/h),HVAC Design Load: Cooling Sensible: Total (Btu/h),HVAC Design Load: Cooling Sensible: Ducts (Btu/h),HVAC Design Load: Cooling Sensible: Windows (Btu/h),HVAC Design Load: Cooling Sensible: Skylights (Btu/h),HVAC Design Load: Cooling Sensible: Doors (Btu/h),HVAC Design Load: Cooling Sensible: Walls (Btu/h),HVAC Design Load: Cooling Sensible: Roofs (Btu/h),HVAC Design Load: Cooling Sensible: Floors (Btu/h),HVAC Design Load: Cooling Sensible: Slabs (Btu/h),HVAC Design Load: Cooling Sensible: Ceilings (Btu/h),HVAC Design Load: Cooling Sensible: Infiltration (Btu/h),HVAC Design Load: Cooling Sensible: Ventilation (Btu/h),HVAC Design Load: Cooling Sensible: Internal Gains (Btu/h),HVAC Design Load: Cooling Sensible: Blower Heat (Btu/h),HVAC Design Load: Cooling Sensible: AED Excursion (Btu/h),HVAC Design Load: Cooling Latent: Total (Btu/h),HVAC Design Load: Cooling Latent: Ducts (Btu/h),HVAC Design Load: Cooling Latent: Infiltration (Btu/h),HVAC Design Load: Cooling Latent: Ventilation (Btu/h),HVAC Design Load: Cooling Latent: Internal Gains (Btu/h)
Bell_Residence.xml,9.0,97.0,30041.0,38489.0,0.0,30041.0,3004.0,10915.0,1981.0,1534.0,3586.0,0.0,0.0,3558.0,1990.0,2010.0,1463.0,0.0,30803.0,1322.0,11512.0,5462.0,830.0,1035.0,0.0,0.0,0.0,1860.0,362.0,528.0,4541.0,1707.0,1646.0,1825.0,222.0,275.0,330.0,998.0
Bob_Ross_Residence.xml,15.0,93.0,45874.0,33766.0,0.0,45874.0,7194.0,7478.0,1615.0,808.0,19073.0,0.0,0.0,2603.0,4196.0,0.0,2908.0,0.0,28037.0,4155.0,5810.0,2945.0,470.0,5166.0,0.0,0.0,0.0,3280.0,0.0,952.0,3552.0,1707.0,0.0,2891.0,584.0,0.0,1307.0,1000.0
Bell_Residence.xml,9.0,97.0,30041.0,37839.0,0.0,30041.0,3004.0,10915.0,1981.0,1534.0,3586.0,0.0,0.0,3558.0,1990.0,2010.0,1463.0,0.0,30803.0,1322.0,11512.0,5462.0,830.0,1035.0,0.0,0.0,0.0,1860.0,362.0,528.0,4541.0,1707.0,1646.0,1825.0,222.0,275.0,330.0,998.0
Bob_Ross_Residence.xml,15.0,93.0,45874.0,33741.0,0.0,45874.0,7194.0,7478.0,1615.0,808.0,19073.0,0.0,0.0,2603.0,4196.0,0.0,2908.0,0.0,28037.0,4155.0,5810.0,2945.0,470.0,5166.0,0.0,0.0,0.0,3280.0,0.0,952.0,3552.0,1707.0,0.0,2891.0,584.0,0.0,1307.0,1000.0
Cobb_Residence.xml,47.0,93.0,25707.0,25707.0,9560.0,9560.0,3134.0,3015.0,0.0,84.0,1558.0,0.0,0.0,0.0,0.0,1769.0,0.0,0.0,23988.0,1823.0,7655.0,0.0,66.0,1236.0,0.0,0.0,0.0,0.0,764.0,0.0,5224.0,1707.0,5514.0,3426.0,1236.0,1390.0,0.0,800.0
Long_Residence.xml,-5.0,89.0,41741.0,18745.0,0.0,41741.0,0.0,8696.0,0.0,1005.0,16654.0,0.0,0.0,2979.0,5438.0,6968.0,0.0,0.0,17118.0,0.0,5604.0,0.0,335.0,1949.0,0.0,0.0,0.0,3553.0,650.0,0.0,3320.0,1707.0,0.0,1949.0,0.0,1149.0,0.0,800.0
Long_Residence.xml,-5.0,89.0,41741.0,19356.0,0.0,41741.0,0.0,8696.0,0.0,1005.0,16654.0,0.0,0.0,2979.0,5438.0,6968.0,0.0,0.0,17118.0,0.0,5604.0,0.0,335.0,1949.0,0.0,0.0,0.0,3553.0,650.0,0.0,3320.0,1707.0,0.0,1949.0,0.0,1149.0,0.0,800.0
Smith_Residence.xml,-6.0,90.0,55632.0,27187.0,0.0,55632.0,977.0,9636.0,2994.0,1116.0,17560.0,0.0,1798.0,3988.0,4157.0,11249.0,2158.0,0.0,23148.0,49.0,6250.0,3734.0,382.0,2670.0,0.0,355.0,0.0,2735.0,1055.0,426.0,3320.0,1707.0,465.0,4587.0,379.0,1653.0,1756.0,800.0
Vatilo_Residence.xml,31.0,94.0,30500.0,30500.0,0.0,30500.0,10864.0,4232.0,0.0,573.0,2874.0,0.0,0.0,7383.0,1495.0,3080.0,0.0,0.0,22719.0,8565.0,5169.0,0.0,441.0,1874.0,0.0,0.0,0.0,1687.0,767.0,0.0,1890.0,1707.0,620.0,3567.0,1694.0,1272.0,0.0,600.0
Victor_Residence.xml,3.0,90.0,79419.0,32946.0,0.0,79419.0,26915.0,9977.0,470.0,984.0,6304.0,7039.0,6275.0,0.0,0.0,20008.0,1446.0,0.0,27797.0,8873.0,4369.0,1372.0,382.0,1131.0,2731.0,1405.0,0.0,0.0,2183.0,324.0,3320.0,1707.0,0.0,8077.0,2627.0,4049.0,601.0,800.0
Walker_Residence.xml,52.0,90.0,7736.0,20666.0,0.0,8726.0,0.0,1607.0,543.0,371.0,1446.0,0.0,0.0,2437.0,800.0,532.0,990.0,0.0,18696.0,2430.0,1773.0,3177.0,618.0,1336.0,0.0,0.0,0.0,1290.0,0.0,825.0,5541.0,1707.0,0.0,3081.0,591.0,0.0,1689.0,800.0
Victor_Residence.xml,3.0,90.0,79419.0,35669.0,0.0,79419.0,26915.0,9977.0,470.0,984.0,6304.0,7039.0,6275.0,0.0,0.0,20008.0,1446.0,0.0,27797.0,8873.0,4369.0,1372.0,382.0,1131.0,2731.0,1405.0,0.0,0.0,2183.0,324.0,3320.0,1707.0,0.0,8077.0,2627.0,4049.0,601.0,800.0
Walker_Residence.xml,52.0,90.0,7736.0,22599.0,0.0,8726.0,0.0,1607.0,543.0,371.0,1446.0,0.0,0.0,2437.0,800.0,532.0,990.0,0.0,18696.0,2430.0,1773.0,3177.0,618.0,1336.0,0.0,0.0,0.0,1290.0,0.0,825.0,5541.0,1707.0,0.0,3081.0,591.0,0.0,1689.0,800.0
Loading