Skip to content

Commit d4fbeda

Browse files
jmarrecjmarrec
authored
Merge pull request #729 from openstudiocoalition/721_SpaceInfiltration_at_space_level
Fix #721 - Allow space infiltration at space level, and fix #728 - Crash when adding ERV to ThermalZone
2 parents bcae7d2 + dcf5438 commit d4fbeda

File tree

2 files changed

+128
-137
lines changed

2 files changed

+128
-137
lines changed

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

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4048,7 +4048,7 @@ OS:Curve:Quadratic,
40484048
OS:Table:Lookup,
40494049
{f0227845-042c-4180-85c3-c0a106761243}, !- Handle
40504050
Air-to-Air Plate HX_SensHeatEff, !- Name
4051-
{b5b58d9a-e527-4719-a1ea-f7efa259a5c7}, !- Independent Variable List Name
4051+
{15b35fef-e20c-4ddf-a0f9-6a58d8cfb0d1}, !- Independent Variable List Name
40524052
DivisorOnly, !- Normalization Method
40534053
0.76, !- Normalization Divisor
40544054
0, !- Minimum Output {BasedOnField A5}
@@ -4060,10 +4060,15 @@ OS:Table:Lookup,
40604060
0.81, !- Output Value 1 {BasedOnField A5}
40614061
0.76; !- Output Value 2 {BasedOnField A5}
40624062

4063+
OS:ModelObjectList,
4064+
{15b35fef-e20c-4ddf-a0f9-6a58d8cfb0d1}, !- Handle
4065+
Air-to-Air Plate HX_IndependentVariableList_SensHeatEff, !- Name
4066+
{90736c0d-c1e4-4db8-b727-0c6eb065ad4f}; !- Model Object 1
4067+
40634068
OS:Table:Lookup,
40644069
{39b68410-4169-409f-84a4-e2287999cd10}, !- Handle
40654070
Air-to-Air Plate HX_LatHeatEff, !- Name
4066-
{b5b58d9a-e527-4719-a1ea-f7efa259a5c7}, !- Independent Variable List Name
4071+
{109e9341-04da-45cb-bcc8-100cea7fd905}, !- Independent Variable List Name
40674072
DivisorOnly, !- Normalization Method
40684073
0.68, !- Normalization Divisor
40694074
0, !- Minimum Output {BasedOnField A5}
@@ -4075,10 +4080,15 @@ OS:Table:Lookup,
40754080
0.73, !- Output Value 1 {BasedOnField A5}
40764081
0.68; !- Output Value 2 {BasedOnField A5}
40774082

4083+
OS:ModelObjectList,
4084+
{109e9341-04da-45cb-bcc8-100cea7fd905}, !- Handle
4085+
Air-to-Air Plate HX_IndependentVariableList_LatHeatEff, !- Name
4086+
{90736c0d-c1e4-4db8-b727-0c6eb065ad4f}; !- Model Object 1
4087+
40784088
OS:Table:Lookup,
40794089
{dd26796b-ef95-4b8b-86c6-4e79b336233a}, !- Handle
40804090
Air-to-Air Plate HX_SensCoolEff, !- Name
4081-
{b5b58d9a-e527-4719-a1ea-f7efa259a5c7}, !- Independent Variable List Name
4091+
{7b2fe2ae-2dad-42f7-988c-6f6fb118ec57}, !- Independent Variable List Name
40824092
DivisorOnly, !- Normalization Method
40834093
0.76, !- Normalization Divisor
40844094
0, !- Minimum Output {BasedOnField A5}
@@ -4090,6 +4100,11 @@ OS:Table:Lookup,
40904100
0.81, !- Output Value 1 {BasedOnField A5}
40914101
0.76; !- Output Value 2 {BasedOnField A5}
40924102

4103+
OS:ModelObjectList,
4104+
{7b2fe2ae-2dad-42f7-988c-6f6fb118ec57}, !- Handle
4105+
Air-to-Air Plate HX_IndependentVariableList_SensCoolEff, !- Name
4106+
{90736c0d-c1e4-4db8-b727-0c6eb065ad4f}; !- Model Object 1
4107+
40934108
OS:Table:Lookup,
40944109
{10df5c60-2f34-4291-ac47-4ddc76c72a0f}, !- Handle
40954110
Air-to-Air Plate HX_LatCoolEff, !- Name
@@ -4105,6 +4120,11 @@ OS:Table:Lookup,
41054120
0.73, !- Output Value 1 {BasedOnField A5}
41064121
0.68; !- Output Value 2 {BasedOnField A5}
41074122

4123+
OS:ModelObjectList,
4124+
{b5b58d9a-e527-4719-a1ea-f7efa259a5c7}, !- Handle
4125+
Air-to-Air Plate HX_IndependentVariableList_LatCoolEff, !- Name
4126+
{90736c0d-c1e4-4db8-b727-0c6eb065ad4f}; !- Model Object 1
4127+
41084128
OS:HeatExchanger:AirToAir:SensibleAndLatent,
41094129
{648d1052-42c2-4c83-82e9-af6299097461}, !- Handle
41104130
Air-to-Air Plate HX, !- Name
@@ -4131,11 +4151,6 @@ OS:HeatExchanger:AirToAir:SensibleAndLatent,
41314151
{dd26796b-ef95-4b8b-86c6-4e79b336233a}, !- Sensible Effectiveness of Cooling Air Flow Curve Name
41324152
{10df5c60-2f34-4291-ac47-4ddc76c72a0f}; !- Latent Effectiveness of Cooling Air Flow Curve Name
41334153

4134-
OS:ModelObjectList,
4135-
{b5b58d9a-e527-4719-a1ea-f7efa259a5c7}, !- Handle
4136-
Air-to-Air Plate HX_IndependentVariableList, !- Name
4137-
{90736c0d-c1e4-4db8-b727-0c6eb065ad4f}; !- Model Object 1
4138-
41394154
OS:Table:IndependentVariable,
41404155
{90736c0d-c1e4-4db8-b727-0c6eb065ad4f}, !- Handle
41414156
Air-to-Air Plate HX_IndependentVariable, !- Name
@@ -10617,7 +10632,7 @@ OS:ZoneHVAC:EnergyRecoveryVentilator:Controller,
1061710632
OS:Table:Lookup,
1061810633
{98c84134-9027-4020-82df-218e43ba83e6}, !- Handle
1061910634
ERV HX_SensHeatEff, !- Name
10620-
{5ccc3232-56b9-43f7-be96-31799d015bde}, !- Independent Variable List Name
10635+
{77b26c6a-1c62-41ac-9a7c-77191deaaa6c}, !- Independent Variable List Name
1062110636
DivisorOnly, !- Normalization Method
1062210637
0.76, !- Normalization Divisor
1062310638
0, !- Minimum Output {BasedOnField A5}
@@ -10629,10 +10644,15 @@ OS:Table:Lookup,
1062910644
0.81, !- Output Value 1 {BasedOnField A5}
1063010645
0.76; !- Output Value 2 {BasedOnField A5}
1063110646

10647+
OS:ModelObjectList,
10648+
{77b26c6a-1c62-41ac-9a7c-77191deaaa6c}, !- Handle
10649+
ERV HX_IndependentVariableList_SensHeatEff, !- Name
10650+
{0fdb002d-dfe6-4f9b-9c36-ea6addfed54d}; !- Model Object 1
10651+
1063210652
OS:Table:Lookup,
1063310653
{9b0e8338-021a-47be-afbf-e043f5aea93c}, !- Handle
1063410654
ERV HX_LatHeatEff, !- Name
10635-
{5ccc3232-56b9-43f7-be96-31799d015bde}, !- Independent Variable List Name
10655+
{39b38d45-cf53-41ac-9c97-34365f0e717f}, !- Independent Variable List Name
1063610656
DivisorOnly, !- Normalization Method
1063710657
0.68, !- Normalization Divisor
1063810658
0, !- Minimum Output {BasedOnField A5}
@@ -10644,10 +10664,15 @@ OS:Table:Lookup,
1064410664
0.73, !- Output Value 1 {BasedOnField A5}
1064510665
0.68; !- Output Value 2 {BasedOnField A5}
1064610666

10667+
OS:ModelObjectList,
10668+
{39b38d45-cf53-41ac-9c97-34365f0e717f}, !- Handle
10669+
ERV HX_IndependentVariableList_LatHeatEff, !- Name
10670+
{0fdb002d-dfe6-4f9b-9c36-ea6addfed54d}; !- Model Object 1
10671+
1064710672
OS:Table:Lookup,
1064810673
{c2a6137d-c8c8-44cf-af0b-0c21d40453f8}, !- Handle
1064910674
ERV HX_SensCoolEff, !- Name
10650-
{5ccc3232-56b9-43f7-be96-31799d015bde}, !- Independent Variable List Name
10675+
{357cce29-6cb3-4f8d-8634-18066f18ccbd}, !- Independent Variable List Name
1065110676
DivisorOnly, !- Normalization Method
1065210677
0.76, !- Normalization Divisor
1065310678
0, !- Minimum Output {BasedOnField A5}
@@ -10659,6 +10684,11 @@ OS:Table:Lookup,
1065910684
0.81, !- Output Value 1 {BasedOnField A5}
1066010685
0.76; !- Output Value 2 {BasedOnField A5}
1066110686

10687+
OS:ModelObjectList,
10688+
{357cce29-6cb3-4f8d-8634-18066f18ccbd}, !- Handle
10689+
ERV HX_IndependentVariableList_SensCoolEff, !- Name
10690+
{0fdb002d-dfe6-4f9b-9c36-ea6addfed54d}; !- Model Object 1
10691+
1066210692
OS:Table:Lookup,
1066310693
{7493fdcc-67ee-4954-9bca-73833b34d668}, !- Handle
1066410694
ERV HX_LatCoolEff, !- Name
@@ -10674,6 +10704,11 @@ OS:Table:Lookup,
1067410704
0.73, !- Output Value 1 {BasedOnField A5}
1067510705
0.68; !- Output Value 2 {BasedOnField A5}
1067610706

10707+
OS:ModelObjectList,
10708+
{5ccc3232-56b9-43f7-be96-31799d015bde}, !- Handle
10709+
ERV HX_IndependentVariableList_LatCoolEff, !- Name
10710+
{0fdb002d-dfe6-4f9b-9c36-ea6addfed54d}; !- Model Object 1
10711+
1067710712
OS:HeatExchanger:AirToAir:SensibleAndLatent,
1067810713
{865903c0-b04d-453a-80e3-217d60f8a56d}, !- Handle
1067910714
ERV HX, !- Name
@@ -10700,11 +10735,6 @@ OS:HeatExchanger:AirToAir:SensibleAndLatent,
1070010735
{c2a6137d-c8c8-44cf-af0b-0c21d40453f8}, !- Sensible Effectiveness of Cooling Air Flow Curve Name
1070110736
{7493fdcc-67ee-4954-9bca-73833b34d668}; !- Latent Effectiveness of Cooling Air Flow Curve Name
1070210737

10703-
OS:ModelObjectList,
10704-
{5ccc3232-56b9-43f7-be96-31799d015bde}, !- Handle
10705-
ERV HX_IndependentVariableList, !- Name
10706-
{0fdb002d-dfe6-4f9b-9c36-ea6addfed54d}; !- Model Object 1
10707-
1070810738
OS:Table:IndependentVariable,
1070910739
{0fdb002d-dfe6-4f9b-9c36-ea6addfed54d}, !- Handle
1071010740
ERV HX_IndependentVariable, !- Name

0 commit comments

Comments
 (0)