Merge pull request #99 from cse-sim/largeHPWHs

Activated ColmacCxV5

Author: chipbarnaby

src/CNDTYPES.DEF

@@ -423,9 +423,7 @@ PIPESEGP -- "class PIPESEG*"	 4	    none
 			AOSMITHSHPT66 "AOSmithSHPT66"
 			AOSMITHSHPT80 "AOSmithSHPT80"
 
-#if 0
 			COLMACCXV5_SP  "ColmacCxV5_SP"	// Colmac CxA-xx modular external HPWHs (single pass mode)
-#endif
 			COLMACCXA10_SP "ColmacCxA10_SP"
 			COLMACCXA15_SP "ColmacCxA15_SP"
 			COLMACCXA20_SP "ColmacCxA20_SP"

src/DHWCalc.cpp

@@ -2362,9 +2362,7 @@ RC HPWHLINK::hw_InitResistance(		// set up HPWH has EF-rated resistance heater
 
 // large
 	{ C_WHASHPTYCH_SANDENGS3,       hwatLARGE | HPWH::MODELS_Sanden_GS3_45HPA_US_SP },
-#if 0
 	{ C_WHASHPTYCH_COLMACCXV5_SP,   hwatLARGE | HPWH::MODELS_ColmacCxV_5_SP },
-#endif
 	{ C_WHASHPTYCH_COLMACCXA10_SP,  hwatLARGE | HPWH::MODELS_ColmacCxA_10_SP },
 	{ C_WHASHPTYCH_COLMACCXA15_SP,  hwatLARGE | HPWH::MODELS_ColmacCxA_15_SP },
 	{ C_WHASHPTYCH_COLMACCXA20_SP,  hwatLARGE | HPWH::MODELS_ColmacCxA_20_SP },