Skip to content

Commit 47e2573

Browse files
author
Noel Merket
committed
Merge branch 'develop' into 4558_hpwh_coil_removing_heat_from_tank
2 parents 95b90ba + 43e5f57 commit 47e2573

29 files changed

Lines changed: 6214 additions & 829 deletions

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}
66

77
set( CMAKE_VERSION_MAJOR 8 )
88
set( CMAKE_VERSION_MINOR 2 )
9-
set( CMAKE_VERSION_PATCH 5 )
9+
set( CMAKE_VERSION_PATCH 6 )
1010

1111
set( ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}" )
1212

‎cmake/CMakeCPackOptions.cmake.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if(CPACK_GENERATOR MATCHES "NSIS")
6969

7070
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
7171
WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"AutoCheck\" \"True\"
72-
WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"CheckURL\" \"https://raw.githubusercontent.com/NREL/EnergyPlusRelease/master/.epupdate\"
72+
WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"CheckURL\" \"http://nrel.github.io/EnergyPlus/epupdate.htm\"
7373
StrCpy $0 \"#@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@-@CPACK_PACKAGE_VERSION_BUILD@\"
7474
WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"LastAnchor\" $0
7575
\${If} \${RunningX64}

‎idd/Energy+.idd.in‎

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19974,6 +19974,90 @@ ZoneBaseboard:OutdoorTemperatureControlled,
1997419974
\retaincase
1997519975
\default General
1997619976

19977+
19978+
SwimmingPool:Indoor,
19979+
A1, \field Name
19980+
\required-field
19981+
\type alpha
19982+
A2, \field Surface Name
19983+
\required-field
19984+
\note To be matched with a construction in this input file
19985+
\type object-list
19986+
\object-list ConstructionNames
19987+
\reference SurfaceNames
19988+
\reference SurfAndSubSurfNames
19989+
\reference AllHeatTranSurfNames
19990+
\reference HeatTranBaseSurfNames
19991+
\reference OutFaceEnvNames
19992+
\reference AllHeatTranAngFacNames
19993+
\reference RadGroupAndSurfNames
19994+
\reference SurfGroupAndHTSurfNames
19995+
\reference AllShadingAndHTSurfNames
19996+
N1, \field Average Depth
19997+
\required-field
19998+
\type real
19999+
\units m
20000+
A3, \field Activity Factor Schedule Name
20001+
\required-field
20002+
\type object-list
20003+
\object-list ScheduleNames
20004+
A4, \field Make-up Water Supply Schedule Name
20005+
\required-field
20006+
\type object-list
20007+
\object-list ScheduleNames
20008+
A5, \field Cover Schedule Name
20009+
\required-field
20010+
\type object-list
20011+
\object-list ScheduleNames
20012+
N2, \field Cover Evaporation Factor
20013+
\type real
20014+
\minimum 0.0
20015+
\maximum 1.0
20016+
\default 0.0
20017+
N3, \field Cover Convection Factor
20018+
\type real
20019+
\minimum 0.0
20020+
\maximum 1.0
20021+
\default 0.0
20022+
N4, \field Cover Short-Wavelength Radiation Factor
20023+
\type real
20024+
\minimum 0.0
20025+
\maximum 1.0
20026+
\default 0.0
20027+
N5, \field Cover Long-Wavelength Radiation Factor
20028+
\required-field
20029+
\type real
20030+
\minimum 0.0
20031+
\maximum 1.0
20032+
\default 0.0
20033+
A6, \field Pool Water Inlet Node
20034+
\required-field
20035+
\type node
20036+
A7, \field Pool Water Outlet Node
20037+
\required-field
20038+
\type node
20039+
N6, \field Pool Heating System Maximum Water Flow Rate
20040+
\type real
20041+
\units m3/s
20042+
\minimum 0.0
20043+
N7, \field Pool Miscellaneous Equipment Power
20044+
\units W/(m3/s of pool water flow)
20045+
\type real
20046+
\minimum 0.0
20047+
A8, \field Setpoint Temperature Schedule
20048+
\required-field
20049+
\type object-list
20050+
\object-list ScheduleNames
20051+
N8, \field Maximum Number of People
20052+
\required-field
20053+
\minimum 0.0
20054+
A9, \field People Schedule
20055+
\type object-list
20056+
\object-list ScheduleNames
20057+
A10; \field People Heat Gain Schedule
20058+
\type object-list
20059+
\object-list ScheduleNames
20060+
1997720061
ZoneContaminantSourceAndSink:CarbonDioxide,
1997820062
\memo Represents internal CO2 gains and sinks in the zone.
1997920063
A1 , \field Name
@@ -91608,4 +91692,3 @@ Output:PreprocessorMessage,
9160891692
\retaincase
9160991693
A12; \field Message Line 10
9161091694
\retaincase
91611-

‎src/EnergyPlus/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,8 @@ SET( SRC
433433
SurfaceGeometry.hh
434434
SurfaceGroundHeatExchanger.cc
435435
SurfaceGroundHeatExchanger.hh
436+
SwimmingPool.cc
437+
SwimmingPool.hh
436438
SystemAvailabilityManager.cc
437439
SystemAvailabilityManager.hh
438440
SystemReports.cc

‎src/EnergyPlus/CrossVentMgr.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ namespace CrossVentMgr {
831831
}
832832

833833
SumAllInternalConvectionGains( ZoneNum, ConvGains );
834-
ConvGains += SumConvHTRadSys( ZoneNum ) + SysDepZoneLoadsLagged( ZoneNum ) + NonAirSystemResponse( ZoneNum ) / ZoneMult;
834+
ConvGains += SumConvHTRadSys( ZoneNum ) + SumConvPool( ZoneNum ) + SysDepZoneLoadsLagged( ZoneNum ) + NonAirSystemResponse( ZoneNum ) / ZoneMult;
835835

836836
// Add heat to return air if zonal system (no return air) or cycling system (return air frequently very low or zero)
837837
if ( Zone( ZoneNum ).NoHeatToReturnAir ) {

‎src/EnergyPlus/DataHeatBalFanSys.cc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ namespace DataHeatBalFanSys {
4040
// MODULE VARIABLE DECLARATIONS:
4141
FArray1D< Real64 > SumConvHTRadSys; // Sum of convection to zone air from hi temp radiant heaters
4242
FArray1D< Real64 > SumLatentHTRadSys; // Sum of latent gains from hi temp radiant heaters
43+
FArray1D< Real64 > SumConvPool; // Sum of convection to zone air from pools
44+
FArray1D< Real64 > SumLatentPool; // Sum of latent gains from pools
4345
FArray1D< Real64 > QHTRadSysToPerson; // Sum of radiant gains to people from hi temp radiant heaters
4446
FArray1D< Real64 > QHWBaseboardToPerson; // Sum of radiant gains to people from hot water baseboard heaters
4547
FArray1D< Real64 > QSteamBaseboardToPerson; // Sum of radiant gains to people from steam baseboard heaters
@@ -138,6 +140,8 @@ namespace DataHeatBalFanSys {
138140
// of steam baseboard heaters
139141
FArray1D< Real64 > QElecBaseboardSurf; // Current radiant heat flux at a surface due to the presence
140142
// of electric baseboard heaters
143+
FArray1D< Real64 > QPoolSurfNumerator; // Current pool heat flux impact at the surface (numerator of surface heat balance)
144+
FArray1D< Real64 > PoolHeatTransCoefs; // Current pool heat transfer coefficients (denominator of surface heat balance)
141145
FArray1D< Real64 > RadSysTiHBConstCoef; // Inside heat balance coefficient that is constant
142146
FArray1D< Real64 > RadSysTiHBToutCoef; // Inside heat balance coefficient that modifies Toutside
143147
FArray1D< Real64 > RadSysTiHBQsrcCoef; // Inside heat balance coefficient that modifies source/sink
@@ -187,7 +191,7 @@ namespace DataHeatBalFanSys {
187191
FArray1D< ZoneComfortControlsFangerData > ZoneComfortControlsFanger;
188192

189193
// NOTICE
190-
// Copyright © 1996-2014 The Board of Trustees of the University of Illinois
194+
// Copyright � 1996-2014 The Board of Trustees of the University of Illinois
191195
// and The Regents of the University of California through Ernest Orlando Lawrence
192196
// Berkeley National Laboratory. All rights reserved.
193197
// Portions of the EnergyPlus software package have been developed and copyrighted

‎src/EnergyPlus/DataHeatBalFanSys.hh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ namespace DataHeatBalFanSys {
3232
// MODULE VARIABLE DECLARATIONS:
3333
extern FArray1D< Real64 > SumConvHTRadSys; // Sum of convection to zone air from hi temp radiant heaters
3434
extern FArray1D< Real64 > SumLatentHTRadSys; // Sum of latent gains from hi temp radiant heaters
35+
extern FArray1D< Real64 > SumConvPool; // Sum of convection to zone air from pools
36+
extern FArray1D< Real64 > SumLatentPool; // Sum of latent gains from pools
3537
extern FArray1D< Real64 > QHTRadSysToPerson; // Sum of radiant gains to people from hi temp radiant heaters
3638
extern FArray1D< Real64 > QHWBaseboardToPerson; // Sum of radiant gains to people from hot water baseboard heaters
3739
extern FArray1D< Real64 > QSteamBaseboardToPerson; // Sum of radiant gains to people from steam baseboard heaters
@@ -130,6 +132,8 @@ namespace DataHeatBalFanSys {
130132
// of steam baseboard heaters
131133
extern FArray1D< Real64 > QElecBaseboardSurf; // Current radiant heat flux at a surface due to the presence
132134
// of electric baseboard heaters
135+
extern FArray1D< Real64 > QPoolSurfNumerator; // Current pool heat flux impact at the surface (numerator of surface heat balance)
136+
extern FArray1D< Real64 > PoolHeatTransCoefs; // Current pool heat transfer coefficients (denominator of surface heat balance)
133137
extern FArray1D< Real64 > RadSysTiHBConstCoef; // Inside heat balance coefficient that is constant
134138
extern FArray1D< Real64 > RadSysTiHBToutCoef; // Inside heat balance coefficient that modifies Toutside
135139
extern FArray1D< Real64 > RadSysTiHBQsrcCoef; // Inside heat balance coefficient that modifies source/sink

0 commit comments

Comments
 (0)