Skip to content

Commit 4cbabd9

Browse files
macumbermacumber
committed
Update other resource files, update actions files dependencies
1 parent d5ae468 commit 4cbabd9

File tree

4 files changed

+115
-19
lines changed

4 files changed

+115
-19
lines changed

‎.github/workflows/check_osm_versions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- uses: ruby/setup-ruby@v1
1515
with:
16-
ruby-version: 2.7
16+
ruby-version: 3.2
1717

1818
- name: Verify that OSMs have been updated
1919
shell: bash

‎.github/workflows/export_standards_data.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ on:
1212

1313
jobs:
1414
export-os-standards:
15-
runs-on: ubuntu-24.04
15+
runs-on: ubuntu-latest
1616

1717
steps:
1818
- uses: actions/checkout@v4
1919

2020
- uses: actions/setup-python@v5
2121
with:
22-
python-version: '3.8.x'
22+
python-version: '3.12.x'
2323

2424
- name: Extract OS SDK version from FindOpenStudioSDK.cmake
2525
shell: python

‎src/openstudio_app/Resources/default/hvac_library.osm‎

Lines changed: 58 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
OS:Version,
3-
{b91bd01a-6a42-441c-8cbd-78317f4cf7bf}, !- Handle
4-
3.10.0; !- Version Identifier
3+
{23f35e4a-9e0f-407a-bb86-d93af65b1363}, !- Handle
4+
3.11.0; !- Version Identifier
55

66
! Always OnOff Discrete Schedule Type Limits
77
OS:ScheduleTypeLimits,
@@ -851,13 +851,14 @@ OS:EvaporativeFluidCooler:SingleSpeed,
851851
0.03, !- Design Spray Water Flow Rate {m3/s}
852852
UFactorTimesAreaAndDesignWaterFlowRate, !- Performance Input Method
853853
, !- Outdoor Air Inlet Node Name
854+
1.25, !- Heat Rejection Capacity and Nominal Capacity Sizing Ratio
854855
, !- Standard Design Capacity {W}
855856
autosize, !- U-factor Times Area Value at Design Air Flow Rate {W/K}
856857
autosize, !- Design Water Flow Rate {m3/s}
857858
, !- User Specified Design Capacity {W}
858-
, !- Design Entering Water Temperature {C}
859-
, !- Design Entering Air Temperature {C}
860-
, !- Design Entering Air Wet-bulb Temperature {C}
859+
Autosize, !- Design Entering Water Temperature {C}
860+
35, !- Design Entering Air Temperature {C}
861+
25.6, !- Design Entering Air Wet-bulb Temperature {C}
861862
FanCycling, !- Capacity Control
862863
1, !- Sizing Factor
863864
SaturatedExit, !- Evaporation Loss Mode
@@ -893,9 +894,9 @@ OS:EvaporativeFluidCooler:TwoSpeed,
893894
, !- High Speed User Specified Design Capacity {W}
894895
autosize, !- Low Speed User Specified Design Capacity {W}
895896
0.5, !- Low Speed User Specified Design Capacity Sizing Factor
896-
, !- Design Entering Water Temperature {C}
897-
, !- Design Entering Air Temperature {C}
898-
, !- Design Entering Air Wet-bulb Temperature {C}
897+
Autosize, !- Design Entering Water Temperature {C}
898+
35, !- Design Entering Air Temperature {C}
899+
25.6, !- Design Entering Air Wet-bulb Temperature {C}
899900
1, !- High Speed Sizing Factor
900901
SaturatedExit, !- Evaporation Loss Mode
901902
, !- Evaporation Loss Factor {percent/K}
@@ -1837,7 +1838,8 @@ OS:ZoneHVAC:PackagedTerminalHeatPump,
18371838
Autosize, !- Maximum Supply Air Temperature from Supplemental Heater {C}
18381839
, !- Maximum Outdoor Dry-Bulb Temperature for Supplemental Heater Operation {C}
18391840
, !- Fan Placement
1840-
{9f54092d-a4a8-41b8-a381-c4c332ecb843}; !- Supply Air Fan Operating Mode Schedule Name
1841+
{9f54092d-a4a8-41b8-a381-c4c332ecb843}, !- Supply Air Fan Operating Mode Schedule Name
1842+
1; !- DX Heating Coil Sizing Ratio
18411843

18421844
OS:Coil:Heating:DX:SingleSpeed,
18431845
{cff8b2af-5e9b-4b82-9e96-35b6084412ca}, !- Handle
@@ -2419,9 +2421,24 @@ OS:WaterHeater:HeatPump,
24192421
Simultaneous, !- Tank Element Control Logic
24202422
Heater1; !- Control Sensor Location In Stratified Tank
24212423

2424+
OS:Schedule:Constant,
2425+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Handle
2426+
Always On Discrete, !- Name
2427+
{4e2b3642-4a48-48d6-879f-e31eb27b3ff4}, !- Schedule Type Limits Name
2428+
1; !- Value
2429+
2430+
OS:ScheduleTypeLimits,
2431+
{4e2b3642-4a48-48d6-879f-e31eb27b3ff4}, !- Handle
2432+
Always On Discrete Limits, !- Name
2433+
0, !- Lower Limit Value
2434+
1, !- Upper Limit Value
2435+
Discrete, !- Numeric Type
2436+
Availability; !- Unit Type
2437+
24222438
OS:Coil:WaterHeating:AirToWaterHeatPump,
24232439
{8812d392-ab70-47ea-a32d-1e6030e7cd7e}, !- Handle
24242440
HPWH DX Coil, !- Name
2441+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
24252442
4000, !- Rated Heating Capacity {W}
24262443
3.2, !- Rated COP {W/W}
24272444
0.6956, !- Rated Sensible Heat Ratio
@@ -2715,6 +2732,7 @@ OS:WaterHeater:HeatPump:WrappedCondenser,
27152732
OS:Coil:WaterHeating:AirToWaterHeatPump:Wrapped,
27162733
{37684bc6-3ecb-4d0c-8858-aca36abd4a69}, !- Handle
27172734
Coil Water Heating Air To Water Heat Pump Wrapped, !- Name
2735+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
27182736
2349.6, !- Rated Heating Capacity {W}
27192737
2.4, !- Rated COP {W/W}
27202738
0.981, !- Rated Sensible Heat Ratio
@@ -3425,6 +3443,7 @@ OS:Curve:Cubic,
34253443
OS:Coil:Heating:WaterToAirHeatPump:EquationFit,
34263444
{d683b8e6-1a67-4e2b-aa32-8a4aa6cedd5d}, !- Handle
34273445
Wtr-to-Air HP Elec Backup HP Htg Coil, !- Name
3446+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
34283447
, !- Water Inlet Node Name
34293448
, !- Water Outlet Node Name
34303449
, !- Air Inlet Node Name
@@ -3477,6 +3496,7 @@ OS:Curve:QuadLinear,
34773496
OS:Coil:Cooling:WaterToAirHeatPump:EquationFit,
34783497
{497dcb6a-5e26-44b9-ad01-3a2cee449abb}, !- Handle
34793498
Wtr-to-Air HP Elec Backup HP Clg Coil, !- Name
3499+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
34803500
, !- Water Inlet Node Name
34813501
, !- Water Outlet Node Name
34823502
, !- Air Inlet Node Name
@@ -3571,6 +3591,7 @@ OS:Fan:OnOff,
35713591
OS:Coil:Heating:WaterToAirHeatPump:EquationFit,
35723592
{3ad65a6c-58cf-4c1f-937d-359611c4d472}, !- Handle
35733593
Wtr-to-Air HP Gas Backup HP Htg Coil, !- Name
3594+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
35743595
, !- Water Inlet Node Name
35753596
, !- Water Outlet Node Name
35763597
, !- Air Inlet Node Name
@@ -3623,6 +3644,7 @@ OS:Curve:QuadLinear,
36233644
OS:Coil:Cooling:WaterToAirHeatPump:EquationFit,
36243645
{e6f679f1-9fe3-4189-af37-13d8cb88d7d8}, !- Handle
36253646
Wtr-to-Air HP Gas Backup HP Clg Coil, !- Name
3647+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
36263648
, !- Water Inlet Node Name
36273649
, !- Water Outlet Node Name
36283650
, !- Air Inlet Node Name
@@ -3717,6 +3739,7 @@ OS:Fan:OnOff,
37173739
OS:Coil:Heating:WaterToAirHeatPump:EquationFit,
37183740
{54669793-36af-4393-aafe-d99188dfc46f}, !- Handle
37193741
Wtr-to-Air HP HW Backup HP Htg Coil, !- Name
3742+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
37203743
, !- Water Inlet Node Name
37213744
, !- Water Outlet Node Name
37223745
, !- Air Inlet Node Name
@@ -3769,6 +3792,7 @@ OS:Curve:QuadLinear,
37693792
OS:Coil:Cooling:WaterToAirHeatPump:EquationFit,
37703793
{7b550b0c-a709-4422-8f21-690b52ad8519}, !- Handle
37713794
Wtr-to-Air HP HW Backup HP Clg Coil, !- Name
3795+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
37723796
, !- Water Inlet Node Name
37733797
, !- Water Outlet Node Name
37743798
, !- Air Inlet Node Name
@@ -3908,7 +3932,10 @@ OS:ZoneHVAC:WaterToAirHeatPump,
39083932
, !- Outdoor Dry-Bulb Temperature Sensor Node Name
39093933
, !- Fan Placement
39103934
, !- Supply Air Fan Operating Mode Schedule Name
3911-
; !- Availability Manager List Name
3935+
, !- Availability Manager List Name
3936+
, !- Heat Pump Coil Water Flow Mode
3937+
, !- Design Specification ZoneHVAC Sizing Object Name
3938+
1; !- DX Heating Coil Sizing Ratio
39123939

39133940
OS:Curve:Linear,
39143941
{9b0d1548-c685-4940-9921-42150d66f517}, !- Handle
@@ -3945,7 +3972,10 @@ OS:ZoneHVAC:WaterToAirHeatPump,
39453972
, !- Outdoor Dry-Bulb Temperature Sensor Node Name
39463973
, !- Fan Placement
39473974
, !- Supply Air Fan Operating Mode Schedule Name
3948-
; !- Availability Manager List Name
3975+
, !- Availability Manager List Name
3976+
, !- Heat Pump Coil Water Flow Mode
3977+
, !- Design Specification ZoneHVAC Sizing Object Name
3978+
1; !- DX Heating Coil Sizing Ratio
39493979

39503980
OS:Curve:Linear,
39513981
{4ee36f17-a9cd-46ed-a4f1-a285e2098b45}, !- Handle
@@ -3982,7 +4012,10 @@ OS:ZoneHVAC:WaterToAirHeatPump,
39824012
, !- Outdoor Dry-Bulb Temperature Sensor Node Name
39834013
, !- Fan Placement
39844014
, !- Supply Air Fan Operating Mode Schedule Name
3985-
; !- Availability Manager List Name
4015+
, !- Availability Manager List Name
4016+
, !- Heat Pump Coil Water Flow Mode
4017+
, !- Design Specification ZoneHVAC Sizing Object Name
4018+
1; !- DX Heating Coil Sizing Ratio
39864019

39874020
OS:Curve:Linear,
39884021
{ee3b8796-427d-41cb-b097-080c37e32ff7}, !- Handle
@@ -7639,6 +7672,7 @@ OS:Curve:Cubic,
76397672
OS:Coil:Cooling:WaterToAirHeatPump:EquationFit,
76407673
{3fca92a4-d330-424e-b370-5ad77441d416}, !- Handle
76417674
Wtr-to-Air HP Clg Coil 1, !- Name
7675+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
76427676
, !- Water Inlet Node Name
76437677
, !- Water Outlet Node Name
76447678
, !- Air Inlet Node Name
@@ -7718,6 +7752,7 @@ OS:Curve:QuadLinear,
77187752
OS:Coil:Heating:WaterToAirHeatPump:EquationFit,
77197753
{07468aec-7855-4a75-8aec-93bcb433af35}, !- Handle
77207754
Wtr-to-Air HP Htg Coil 1, !- Name
7755+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
77217756
, !- Water Inlet Node Name
77227757
, !- Water Outlet Node Name
77237758
, !- Air Inlet Node Name
@@ -10583,7 +10618,7 @@ OS:ThermalStorage:ChilledWater:Stratified,
1058310618
2.5, !- Deadband Temperature Difference {deltaC}
1058410619
, !- Temperature Sensor Height {m}
1058510620
, !- Minimum Temperature Limit {C}
10586-
, !- Nominal Cooling Capacity {W}
10621+
0, !- Nominal Cooling Capacity {W}
1058710622
Outdoors, !- Ambient Temperature Indicator
1058810623
{c3199601-9088-4db1-80a2-a72ce5be2376}, !- Ambient Temperature Schedule Name
1058910624
, !- Ambient Temperature Thermal Zone Name
@@ -10618,6 +10653,14 @@ OS:ThermalStorage:ChilledWater:Stratified,
1061810653
0, !- Node 9 Additional Loss Coefficient {W/m2-K}
1061910654
0; !- Node 10 Additional Loss Coefficient {W/m2-K}
1062010655

10656+
OS:WaterHeater:Sizing,
10657+
{4c39881e-d342-487b-8728-86c7396bc880}, !- Handle
10658+
{96287772-bccf-4162-a1d1-593d0c5d91c4}, !- WaterHeater Name
10659+
PeakDraw, !- Design Mode
10660+
0.538503, !- Time Storage Can Meet Peak Draw {hr}
10661+
0, !- Time for Tank Recovery {hr}
10662+
1; !- Nominal Tank Volume for Autosizing Plant Connections {m3}
10663+
1062110664
OS:Schedule:Ruleset,
1062210665
{c3199601-9088-4db1-80a2-a72ce5be2376}, !- Handle
1062310666
Thermal Storage - Chilled Water Stratified Ambient Temp Schedule, !- Name
@@ -13319,7 +13362,7 @@ OS:AirLoopHVAC:UnitaryHeatPump:AirToAir:MultiSpeed,
1331913362
DrawThrough, !- Supply Air Fan Placement
1332013363
{9f54092d-a4a8-41b8-a381-c4c332ecb843}, !- Supply Air Fan Operating Mode Schedule
1332113364
{3b1fedfa-eb94-4c41-9ff0-eb695f74535d}, !- Heating Coil
13322-
-8, !- Minimum Outdoor Dry-Bulb Temperature for Compressor Operation {C}
13365+
1, !- DX Heating Coil Sizing Ratio
1332313366
{a76a42fb-2594-4514-afb9-fd45a05494fc}, !- Cooling Coil
1332413367
{696dbe2d-bf31-49c0-833d-58a97afe9b6c}, !- Supplemental Heating Coil
1332513368
autosize, !- Maximum Supply Air Temperature from Supplemental Heater {C}
@@ -13345,6 +13388,7 @@ OS:AirLoopHVAC:UnitaryHeatPump:AirToAir:MultiSpeed,
1334513388
OS:Coil:Cooling:DX:VariableSpeed,
1334613389
{3ef4dbff-bbcf-4645-93ab-fcd09507f984}, !- Handle
1334713390
Coil Cooling DX Variable Speed - Two Speeds, !- Name
13391+
{a3fc4cc6-f700-4c7d-856a-bfef340038b7}, !- Availability Schedule Name
1334813392
, !- Indoor Air Inlet Node Name
1334913393
, !- Indoor Air Outlet Node Name
1335013394
2, !- Nominal Speed Level {dimensionless}

0 commit comments

Comments
 (0)