Skip to content

Commit 5370f55

Browse files
nealkruisnealkruis
authored
Merge pull request #22 from cse-sim/836b-merge
Merge HPWH fixes into master
2 parents 562df62 + c726e08 commit 5370f55

40 files changed

+6243
-5911
lines changed

‎doc/src/records/dhwheater.md‎

Lines changed: 35 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -180,59 +180,42 @@ Water heater surround temperature, used only in detailed HPWH models (whHeatSrc=
180180

181181
Air source heat pump type, valid only if whHeatSrc=ASHPX. These choices are supported by the detailed HPWH model. Except for Generic, all heater characteristics are set by HPWH based on whASHPType.
182182

183-
----------------------------------------------------------------------
184-
Choice Specified type
185-
------------------ ---------------------------------------
186-
Generic General generic (parameterized by wh_EF and wh_vol)
183+
<%= csv_table(<<END, :row_header=> true)
184+
"Choice","Specified type"
185+
"Generic","General generic (parameterized by wh_EF and wh_vol)"
186+
"AOSmithPHPT60","60 gallon Voltex"
187+
"AOSmithPHPT80","80 gallon Voltex"
188+
"AOSmithHPTU50","50 gallon AOSmith HPTU"
189+
"AOSmithHPTU66","66 gallon AOSmith HPTU"
190+
"AOSmithHPTU80","80 gallon AOSmith HPTU"
191+
"Sanden40","Sanden 40 gallon CO2 external heat pump"
192+
"Sanden80","Sanden 80 gallon CO2 external heat pump"
193+
"GE2012","2012 era GeoSpring"
194+
"GE2014","2014 50 gal GE run in the efficiency mode"
195+
"GE2014StdMode","2014 50 gal GE run in standard mode"
196+
"GE2014StdMode80","2014 80 gal GE run in standard mode"
197+
"RheemHB50","newish Rheem (2014 model?)"
198+
"RheemHBDR2250","50 gallon, 2250 W resistance Rheem HB Duct Ready"
199+
"RheemHBDR4550","50 gallon, 4500 W resistance Rheem HB Duct Ready"
200+
"RheemHBDR2265","65 gallon, 2250 W resistance Rheem HB Duct Ready"
201+
"RheemHBDR4565","65 gallon, 4500 W resistance Rheem HB Duct Ready"
202+
"RheemHBDR2280","80 gallon, 2250 W resistance Rheem HB Duct Ready"
203+
"RheemHBDR4580","80 gallon, 4500 W resistance Rheem HB Duct Ready"
204+
"Stiebel220E","Stiebel Eltron (2014 model?)"
205+
"GenericTier1","Generic Tier 1"
206+
"GenericTier2","Generic Tier 2"
207+
"GenericTier3","Generic Tier 3"
208+
"UEF2Generic","Experimental UEF=2"
209+
"BasicIntegrated","Typical integrated HPWH"
210+
"ResTank","Resistance heater (no compressor). Superceded by whHeatSrc=RESITANCEX"
211+
"ResTankNoUA","Resistance heater (no compressor) with no tank losses. Superseded by whHeatSrc=RESISTANCEX."
212+
"AOSmithHPTU80DR","80 gallon AOSmith HPTU with fixed backup setpoint (experimental for demand response testing)"
213+
"AOSmithSHPT50","50 gal AOSmith SHPT"
214+
"AOSmithSHPT66","66 gal AOSmith SHPT"
215+
"AOSmithSHPT80","80 gal AOSmith SHPT"
216+
END
217+
%>
187218

188-
AOSmithPHPT60 60 gallon Voltex
189-
190-
AOSmithPHPT80 80 gallon Voltex
191-
192-
AOSmithHPTU50 50 gallon AOSmith HPTU
193-
194-
AOSmithHPTU66 66 gallon AOSmith HPTU
195-
196-
AOSmithHPTU80 80 gallon AOSmith HPTU
197-
198-
Sanden40 Sanden 40 gallon CO2 external heat pump
199-
200-
Sanden80 Sanden 80 gallon CO2 external heat pump
201-
202-
GE2012 2012 era GeoSpring
203-
204-
GE2014 2014 50 gal GE run in the efficiency mode
205-
206-
GE2014StdMode 2014 50 gal GE run in standard mode
207-
208-
GE2014StdMode80 2014 80 gal GE run in standard mode
209-
210-
RheemHB50 newish Rheem (2014 model?)
211-
212-
Stiebel220E Stiebel Eltron (2014 model?)
213-
214-
GenericTier1 Generic Tier 1
215-
216-
GenericTier2 Generic Tier 2
217-
218-
GenericTier3 Generic Tier 3
219-
220-
UEF2Generic Experimental UEF=2
221-
222-
BasicIntegrated Typical integrated HPWH
223-
224-
ResTank Resistance heater (no compressor). Superceded by whHeatSrc=RESITANCEX
225-
226-
ResTankNoUA Resistance heater (no compressor) with no tank losses. Superseded by whHeatSrc=RESISTANCEX.
227-
228-
AOSmithHPTU80DR 80 gallon AOSmith HPTU with fixed backup setpoint (experimental for demand response testing)
229-
230-
AOSmithSHPT50 50 gal AOSmith SHPT
231-
232-
AOSmithSHPT66 66 gal AOSmith SHPT
233-
234-
AOSmithSHPT80 80 gal AOSmith SHPT
235-
------------------------------------------------------------------------------------
236219

237220
**Units** **Legal Range** **Default** **Required** **Variability**
238221
----------- ---------------------- ------------- ---------------------- -----------------

‎src/CNDTYPES.DEF‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,12 @@ DUCTSEGP -- "class DUCTSEG*" 4 none
379379
GE2014STDMODE_80 "GE2014StdMode80" // 2014 80 gal GE run in standard mode
380380

381381
RHEEMHB50 "RheemHB50" // newish Rheem (2014 model?)
382+
RHEEMHBDR2250 "RheemHBDR2250" // 50 gallon, 2250 W resistance Rheem HB Duct Ready
383+
RHEEMHBDR4550 "RheemHBDR4550" // 50 gallon, 4500 W resistance Rheem HB Duct Ready
384+
RHEEMHBDR2265 "RheemHBDR2265" // 65 gallon, 2250 W resistance Rheem HB Duct Ready
385+
RHEEMHBDR4565 "RheemHBDR4565" // 65 gallon, 4500 W resistance Rheem HB Duct Ready
386+
RHEEMHBDR2280 "RheemHBDR2280" // 80 gallon, 2250 W resistance Rheem HB Duct Ready
387+
RHEEMHBDR4580 "RheemHBDR4580" // 80 gallon, 4500 W resistance Rheem HB Duct Ready
382388
STIEBEL220E "Stiebel220E" // Stiebel Eltron (2014 model?)
383389
GENERIC1 "GenericTier1" // Generic Tier 1
384390
GENERIC2 "GenericTier2" // Generic Tier 2

‎src/CNGLOB.H‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ template< typename T> inline T bracketWarn( T vMin, T v, T vMax)
248248
warn( "bracketWarn: hit limit\n");
249249
return vx;
250250
}
251-
template< typename T> inline void swap( T v1, T v2)
251+
template< typename T> inline void tswap( T v1, T v2)
252252
{ T vx = v1; v1 = v2; v2 = vx; }
253253

254254
// snap to -1, 0, or 1

‎src/DHWCalc.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,12 @@ RC DHWHEATER::wh_HPWHInit() // initialize HPWH model
14051405
: wh_ashpTy == C_WHASHPTYCH_GE2014STDMODE ? HPWH::MODELS_GE2014STDMode
14061406
: wh_ashpTy == C_WHASHPTYCH_GE2014STDMODE_80 ? HPWH::MODELS_GE2014STDMode_80
14071407
: wh_ashpTy == C_WHASHPTYCH_RHEEMHB50 ? HPWH::MODELS_RheemHB50
1408+
: wh_ashpTy == C_WHASHPTYCH_RHEEMHBDR2250 ? HPWH::MODELS_RheemHBDR2250
1409+
: wh_ashpTy == C_WHASHPTYCH_RHEEMHBDR4550 ? HPWH::MODELS_RheemHBDR4550
1410+
: wh_ashpTy == C_WHASHPTYCH_RHEEMHBDR2265 ? HPWH::MODELS_RheemHBDR2265
1411+
: wh_ashpTy == C_WHASHPTYCH_RHEEMHBDR4565 ? HPWH::MODELS_RheemHBDR4565
1412+
: wh_ashpTy == C_WHASHPTYCH_RHEEMHBDR2280 ? HPWH::MODELS_RheemHBDR2280
1413+
: wh_ashpTy == C_WHASHPTYCH_RHEEMHBDR4580 ? HPWH::MODELS_RheemHBDR4580
14081414
: wh_ashpTy == C_WHASHPTYCH_STIEBEL220E ? HPWH::MODELS_Stiebel220E
14091415
: wh_ashpTy == C_WHASHPTYCH_GENERIC1 ? HPWH::MODELS_Generic1
14101416
: wh_ashpTy == C_WHASHPTYCH_GENERIC2 ? HPWH::MODELS_Generic2

‎src/PSYCHRO.CPP‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,8 @@ float psyTWEnthMu( // dry bulb and humidity ratio from enthalpy and degree of sa
461461
float h1 = psyEnthalpy2( t1, mu, w);
462462
float h2 = psyEnthalpy2( t2, mu, w2);
463463
if (fabs(h-h1) > fabs(h-h2)) // make point 1 the closer
464-
{ swap( t1, t2);
465-
swap( h1, h2);
464+
{ tswap( t1, t2);
465+
tswap( h1, h2);
466466
w = w2;
467467
}
468468

@@ -507,8 +507,8 @@ float psyTWEnthRh( // dry bulb and humidity ratio from enthalpy and relative hum
507507
float h1 = psyEnthalpy3( t1, rh, w);
508508
float h2 = psyEnthalpy3( t2, rh, w2);
509509
if (fabs(h-h1) > fabs(h-h2)) // make point 1 the closer
510-
{ swap( t1, t2);
511-
swap( h1, h2);
510+
{ tswap( t1, t2);
511+
tswap( h1, h2);
512512
w = w2;
513513
}
514514

‎src/RCDEF.CPP‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ const int MAXFDREC=600; // Max fields in a record. Separated from MAXFIELDS, 4-
207207

208208
const int MAXDTH=500; // max+1 data type handle. 800-->200 1-92 ->400 3-92. ->432(0x1b0) 2-94. ->352 (0x160) 5-95.
209209
// 352->400, 1-16; 400->500, 4-16
210-
const int MAXDTC=30; // maximum number of choices for choice data type.
210+
const int MAXDTC=40; // maximum number of choices for choice data type.
211211
//#define MAXARRAY 20 // largest number of record array structure members * NOT checked, but should be.
212212
#define MAXNAMEL 40 // Max length of name, etc ("s" token)
213213
#define MAXQSTRL 512 /* Max length for quoted string ("q" token). assumed >= MAXNAMEL for array allocations.

0 commit comments

Comments
 (0)