Merge pull request #134 from cse-sim/dhwloopheater

DHWHEATER whResType; HPWH resistance swingtank variant
Bug fix: long object names
Bug fix: cooling autosizing with inverted supply temp

Author: chipbarnaby

src/CGCOMP.CPP

@@ -1264,8 +1264,10 @@ TI ZNR::zn_AddIZXFER(	// add IZXFER coupled to this zone
 	IZXRAT* ize;
 	IzxR.add( &ize, ABT);
 
-	strcpy( ize->name, name);
-	strCatIf( ize->name, sizeof( ize->name), "-", nmSfx);
+	ize->SetName( name);
+	// append suffix
+	int catOption = 1;		// attempt to truncate name size exceeded
+	strCatIf( ize->name, sizeof( ize->name), "-", nmSfx, catOption);
 	ize->iz_zi1 = ss;		// idx of this zone
 	ize->iz_nvcntrl = ty;
 	ize->iz_pAF = pAF;

src/CNCULT.CPP

@@ -1852,6 +1852,7 @@ CULT( "whType",	     DAT,   DHWHEATER_TYPE,    0,     0, VEOI,   TYCH,  0,
 CULT( "whHeatSrc",	 DAT,   DHWHEATER_HEATSRC, 0,     0, VEOI,   TYCH,  0,      C_WHHEATSRCCH_FUEL, N, N),
 CULT( "whZone",      DAT,   DHWHEATER_ZNTI,    0,     0, VEOI,   TYREF, &ZiB,   0,                  N, N),
 CULT( "whTEx",       DAT,   DHWHEATER_TEX,     0,     0, VSUBHRLY,TYFL, 0,      70.f,               N, N),
+CULT( "whResType",	 DAT,   DHWHEATER_RESTY,   0,     0, VEOI,   TYCH,  0,      C_WHRESTYCH_TYPICAL,N, N),
 CULT( "whASHPType",	 DAT,   DHWHEATER_ASHPTY,  0,     0, VEOI,   TYCH,  0,      -1,                 N, N),
 CULT( "whASHPSrcZn", DAT,   DHWHEATER_ASHPSRCZNTI,0,  0, VEOI,   TYREF, &ZiB,   0,                  N, N),
 CULT( "whASHPSrcT",  DAT,   DHWHEATER_ASHPTSRC,0,     0, VSUBHRLY,TYFL, 0,      70.f,               N, N),

src/CNCULT4.CPP

@@ -142,9 +142,9 @@ LOCAL RC addRep( TI rfi, char *name, RPTYCH rpTy, TI zi, IVLCH freq, SI putAtEnd
 	UCH *fs;
 	RC rc;
 
-	E( RiB.add( &rp, WRN) ) 			// add report input record (ancrec.cpp) / return if error
-	strncpy( rp->name, name, sizeof(ANAME)-1 );	// record name, for like/alter/delete
-	rp->zi = zi;				// 0, TI_SUM, or TI_ALL (or reference to a zone)
+	E( RiB.add( &rp, WRN) ) 		// add report input record (ancrec.cpp) / return if error
+	rp->SetName( name);				// record name, for like/alter/delete
+	rp->zi = zi;					// 0, TI_SUM, or TI_ALL (or reference to a zone)
 	rp->ownTi = rfi;       			// reference to report file
 	rp->rpTy = rpTy;     			// type of report
 	rp->rpFreq = freq;  			// 0 or frequency of report
@@ -1817,10 +1817,10 @@ LOCAL void addHdayDate( char *name, DOY date) 		// add holiday celebrated on spe
 {
 	// for topPrfHday
 	HDAY *hdi;
-	if (HdayiB.add( &hdi, WRN))  return; 		// add holiday input record (ancrec.cpp) / return if error (msg issued)
-	strncpy( hdi->name, name, sizeof(ANAME)-1 );	// record name, for like/alter/delete and error messages
-	hdi->hdDateTrue = date;				// store true date
-	hdi->hdOnMonday = C_NOYESCH_YES;			// say observe on following monday if falls on weekend
+	if (HdayiB.add( &hdi, WRN))  return; 	// add holiday input record (ancrec.cpp) / return if error (msg issued)
+	hdi->SetName( name);					// record name, for like/alter/delete and error messages
+	hdi->hdDateTrue = date;					// store true date
+	hdi->hdOnMonday = C_NOYESCH_YES;		// say observe on following monday if falls on weekend
 	// topHday will set hdDateObs.
 }					// addHdayDate
 //---------------------------------------------------------------------------------------------------------------------------
@@ -1829,9 +1829,9 @@ LOCAL void addHdayRule( char *name, HDAYCASECH hdCase, DOWCH dow, MONTH mon)
 {
 	// for topPrfHday
 	HDAY *hdi;
-	if (HdayiB.add( &hdi, WRN))  return; 		// add holiday input record (ancrec.cpp) / return if error (msg issued)
-	strncpy( hdi->name, name, sizeof(ANAME)-1 );	// record name, for like/alter/delete
-	hdi->hdCase = hdCase;				// store arguments
+	if (HdayiB.add( &hdi, WRN))  return;	// add holiday input record (ancrec.cpp) / return if error (msg issued)
+	hdi->SetName( name);					// record name, for like/alter/delete
+	hdi->hdCase = hdCase;					// store arguments
 	hdi->hdDow = dow;
 	hdi->hdMon = mon;
 	// topHday will set hdDateTrue and hdDateObs.

src/CNDTYPES.DEF

@@ -470,6 +470,11 @@ PIPESEGP -- "class PIPESEG*"	 4	    none
 			SCALABLE_SP "Scalable_SP"		// scalable type for autosized standard design
 		}
 
+*choicb WHRESTYCH {			// resistance heater types
+       TYPICAL "Typical"
+	   SWINGTANK "SwingTank"
+}
+
 *choicb DHWEUCH {			// hot end uses
 			FAUCET "Faucet"
 			SHOWER "Shower"

src/CNFIELDS.DEF

@@ -176,6 +176,7 @@ WHTYPECH      WHTYPECH     LMNONE    UNNONE
 WHHEATSRCCH	  WHHEATSRCCH  LMNONE	 UNNONE
 WSCALCMODECH  WSCALCMODECH LMNONE	 UNNONE
 WHASHPTYCH	  WHASHPTYCH   LMNONE    UNNONE
+WHRESTYCH	  WHRESTYCH    LMNONE    UNNONE
 DHWEUCH		  DHWEUCH      LMNONE    UNNONE
 DHWEUXCH	  DHWEUXCH     LMNONE    UNNONE
 DHWBRANCHMODELCH  DHWBRANCHMODELCH LMNONE	 UNNONE

src/CNLOADS.CPP

@@ -2055,10 +2055,10 @@ void RSYS::rs_RddiInit()		// init before each autosize design day ITERATION
 	}
 }		// RSYS::rs_RddiInit
 //-----------------------------------------------------------------------------
-RC RSYS::rs_endP1DsdIter()
+RC RSYS::rs_endP1DsdIter(		// autosizing end of day
+	int auszMode)		// rsmHEAT, rsmCOOL
 {
 	RC rc = RCOK;
-	int auszMode = rs_IsAutoSizing();
 	if (auszMode == rsmHEAT)
 	{	// note: rs_fxCapHDay = 20 if no load
 		float f = rs_fxCapHAsF / max( rs_fxCapHDay, .01f);
@@ -2107,13 +2107,10 @@ RC RSYS::rs_endP1DsdIter()
 			float fX = bracket( .9f, errX+1.f, 1.1f);
 			rs_cap95 *= fX;
 
-#if 1
-			if (rs_cap95 < 1200.f)
-				rs_cap95 = 1200.f;			// never < 0.1 ton
-			else
-#endif
-			if (rs_cap95 < rs_auszC.az_b)
-				rs_cap95 = rs_auszC.az_b;	// never < previous design day peak
+			float cap95min = max(rs_auszC.az_b, 1200.f);
+			if (rs_cap95 < cap95min)
+				rs_cap95 = cap95min;	// never < 0.1 ton
+										// never < previous design day peak
 		}
 
 		setToMax( rs_auszC.ldPk, rs_cap95);	// peak
@@ -2819,8 +2816,13 @@ RC RSYS::rs_AfterHour()
 
 	if (Top.isEndDay)
 	{	// last step of day
-		rc = rs_endP1DsdIter();
+		int auszMode = rs_IsAutoSizing();
+		if (auszMode != rsmOFF)
+			rc = rs_endP1DsdIter( auszMode);
 	}
+
+	// prior interval values: none
+
 	return rc;
 }		// RSYS::rs_AfterHour
 //-----------------------------------------------------------------------------
@@ -4336,15 +4338,21 @@ double RSYS::rs_ZoneAirRequest(		// air quantity needed by zone
 	if (znSupReq > 1.e10)	// znSupReq = DBL_MAX if supplyDT is tiny
 		znSupReq = rs_amf;
 	else if (znSupReq < 0.)
-		// reverse flow (caused by "backwards" supplyDT)
+		// reverse flow
+		//   caused by "flipped" supply DT
+		//   due to e.g. big duct losses
 		znSupReq =
-#if 1
+#if 1	// attempt to fix small load sizing, 7-16-2021
+			2. * rs_amf;		// request "a lot"
+#else
+#if 1	// unknown date
 			Top.tp_autoSizing
 #else
 			Top.tp_pass1A
 #endif
 					? 1.				// autosize warmup: ignore
 					: 2. * rs_amf;		// simulation: request "a lot"
+#endif
 
 	double znAmfSys = znSupReq / rs_ducts[ rs_DsHC()].ductLkXF[ 0];
 	rs_amfReq[ iAux] += znAmfSys;		// all-zone total at system
@@ -4827,12 +4835,13 @@ static RC loadsIzxSh2()   		// interzone transfers, part 2
 	return rc;
 }		// ::loadsIzxSh2
 //--------------------------------------------------------------------
-static RC loadsXFans()
+static RC loadsXFans()	// SIMULATE zone exhaust fans (xfans)
 {
+	RC rc = RCOK;
 	ZNR* zp;
 	RLUP( ZrB, zp)
-		zp->zn_XFan();
-	return RCOK;
+		rc |= zp->zn_XFan();
+	return rc;
 }	// ::loadsXFans
 //--------------------------------------------------------------------
 RC ZNR::zn_XFan()		// zone exhaust fan calcs (hourly)

src/CNRECS.DEF

@@ -3068,7 +3068,7 @@ RECORD RSYS "RSYS" *RAT	// residential HVAC system
 *declare "void rs_RddiInit();"
 *declare "RC rs_pass1AtoB();"
 *declare "RC rs_begP1b();"
-*declare "RC rs_endP1DsdIter();"
+*declare "RC rs_endP1DsdIter( int auszMode);"
 *declare "RC rs_endAutosize();"
 *declare "void rs_AuszFinal();"
 *declare "float rs_ClgCapNomTons( float nearest=-1.f);"
@@ -3939,7 +3939,7 @@ RECORD HPWHLINK "HPWHLink" *SUBSTRUCT	// Ecotope's HPWH tank and heater
 *declare "static int hw_HPWHInfo( WHASHPTYCH ashpTy, int& attrs);"
 *declare "static int hw_IsAttr( WHASHPTYCH ashpTy, int attr) { int attrs; return hw_HPWHInfo( ashpTy, attrs) >= 0 ? (attr & attrs) != 0 : -1; }"
 *declare "RC hw_InitPreset( WHASHPTYCH ashpTy);"
-*declare "RC hw_InitResistance( float vol, float EF, float resHt, float resHt2);"
+*declare "RC hw_InitResistance( WHRESTYCH resTy, float vol, float EF, float resHt, float resHt2, float tUse);"
 *declare "RC hw_InitTank( float vol);"
 *declare "RC hw_AdjustUAIf( float UA, float insulR, float tankCount=1.f);"
 *declare "RC hw_InitFinalize( float inHtSupply, float inHtLoopRet);"
@@ -4073,8 +4073,10 @@ RECORD DHWHEATER "DHWHeater" *RAT	// input / runtime DHW heater
   *declare "int wh_GetFunction() const { return wh_fcn & 0xff; }"
   *declare "int wh_SetFunction();"
   *declare "bool wh_IsLastHeater() const { return (wh_fcn & whfcnLASTHEATER) != 0; }"
-  *i WHASHPTYCH wh_ashpTy;		// air source heat pump (HPWH) type, required iff ASHPX, else ignored
+  *i WHASHPTYCH wh_ashpTy;		// air source heat pump (HPWH) type, required iff wh_heatSrc=ASHPX, else ignored
 								//	  C_WHASHPTYCH_xxx, etc
+  *i WHRESTYCH wh_resTy;		// resistance heater type, used iff wh_heatSrc=_ELRESX, else ignored
+								//	  C_WHRESTYCH_xxx, etc
   *i TI wh_znTi;				// DHWHEATER location zone re tank loss
 								//    0 iff wh_tEx being used
 								//	  heat losses go to half to zone air / half radiant

src/CUL.CPP

@@ -1293,7 +1293,7 @@ x                      name,  strlen(name),  sizeof(ANAME)-1 );
 		   New record is all 0's (inits FsSET, FsVAL, FsERR, FsFROZ, etc to 0).
 		   Default data can be supplied via STAR entry: see nuCult.  Still??7-92 */
 		if (name)						// if name given
-			strncpy( e->name, name, sizeof(ANAME)-1);		// copy name into record
+			e->SetName( name);			// copy name into record
 		// .fileIx & .line are set below, after LIKE/COPY/USETYPE
 
 		// do LIKE/COPY if given: look up record in this basAnc, copy data after name

src/DHWCalc.cpp

@@ -2661,17 +2661,25 @@ RC HPWHLINK::hw_InitGeneric(		// init HPWH as generic ASHP
 }	// HPWHLINK::hw_InitGeneric
 //-----------------------------------------------------------------------------
 RC HPWHLINK::hw_InitResistance(		// set up HPWH has EF-rated resistance heater
-	float vol,		// tank volume, gal
-	float EF,		// rated EF
-	float resHtPwr,	// upper resistance heat element power, W
-	float resHtPwr2)// lower resistance heat element power, W
+	WHRESTYCH resTy,	// resistance heater type
+	float vol,			// tank volume, gal
+	float EF,			// rated EF
+	float resHtPwr,		// upper resistance heat element power, W
+	float resHtPwr2,	// lower resistance heat element power, W
+	float tUse)			// use temp, F
 // returns RCOK iff success
 {
 	RC rc = RCOK;
 
-	if (hw_pHPWH->HPWHinit_resTank(GAL_TO_L(max(vol, 1.f)), EF,
-		resHtPwr, resHtPwr2) != 0)
+	int ret = resTy == C_WHRESTYCH_SWINGTANK
+		? hw_pHPWH->HPWHinit_resSwingTank(GAL_TO_L(max(vol, 1.f)), EF,
+		   resHtPwr, resHtPwr2, F_TO_C( tUse))
+		: hw_pHPWH->HPWHinit_resTank(GAL_TO_L(max(vol, 1.f)), EF,
+			resHtPwr, resHtPwr2);
+	   
+	if (ret)
 		rc |= RCBAD;
+
 	return rc;
 }		// HPWHLINK::hw_InitResistance
 //-----------------------------------------------------------------------------
@@ -3614,7 +3622,7 @@ RC DHWHEATER::wh_CkF()		// water heater input check / default
 	else if (wh_heatSrc == C_WHHEATSRCCH_ASHPX)
 	{	// STRGSML or BUILTUP HPWH model
 		// TODO: more specific checking for ASHPX
-		ignoreN( whenHs, DHWHEATER_LDEF, DHWHEATER_RESHTPWR, DHWHEATER_RESHTPWR2, 0);
+		ignoreN( whenHs, DHWHEATER_LDEF, DHWHEATER_RESHTPWR, DHWHEATER_RESHTPWR2, DHWHEATER_RESTY, 0);
 		RC rc1 = requireN( whenHs, DHWHEATER_ASHPTY, 0);
 		rc |= rc1;
 		if (!rc1)
@@ -3703,7 +3711,7 @@ RC DHWHEATER::wh_CkF()		// water heater input check / default
 
 	if (IsSet(DHWHEATER_VOLRUNNING))
 	{	if (!wh_CanSetVolFromVolRunning())
-			rc |= disallow(DHWHEATER_VOLRUNNING, whenTy);
+			rc |= disallow(DHWHEATER_VOLRUNNING, whenHs);
 		else if (IsSet(DHWHEATER_VOL))
 			rc |= oer("whVol and whVolRunning cannot both be specified");
 	}
@@ -3753,13 +3761,14 @@ int DHWHEATER::wh_CanSetVolFromVolRunning() const	// can volume be derived from
 //        -1: maybe (re HPWH pending HPWHLINK setup)
 {
 	int ret = 0;
-	if (wh_IsHPWHModel())
+	if (wh_heatSrc == C_WHHEATSRCCH_ASHPX)
 	{	ret = -1;
-		if (wh_HPWH.hw_HasCompressor()
+		if (wh_HPWH.hw_HasCompressor()	// redundant *but* false if !hw_pHPWH
 		 && !wh_HPWH.hw_pHPWH->isTankSizeFixed())
 			ret = 1;
 	}
 	// else
+	// 	Other type (including C_WHHEATSRCCH_ELRESX): volRunning not supported
 	//	ret = 0;
 
 	return ret;
@@ -4105,7 +4114,8 @@ RC DHWHEATER::wh_HPWHInit()		// initialize HPWH model
 	if (wh_heatSrc == C_WHHEATSRCCH_ELRESX)
 	{	// resistance tank (no preset)
 		rc |= wh_HPWH.hw_InitResistance(
-			wh_vol, wh_EF, wh_resHtPwr, wh_resHtPwr2);
+			wh_resTy, wh_vol, wh_EF, wh_resHtPwr, wh_resHtPwr2, pWS->ws_tUse);
+		// bVolMaybeModifiable = true;
 	}
 	else if (wh_ashpTy == C_WHASHPTYCH_GENERIC)
 	{	// generic HPWH (no preset)
@@ -4160,17 +4170,16 @@ RC DHWHEATER::wh_HPWHInit()		// initialize HPWH model
 			else if (IsSet(DHWHEATER_VOLRUNNING))
 			{	// semi-redundant check
 				if (!wh_CanSetVolFromVolRunning())
-					rc |= ooer(DHWHEATER_VOLRUNNING, "no can do");
+					oInfo("%s is ignored (tank volume is fixed at %0.0f gal)",
+						what, wh_HPWH.hw_pHPWH->getTankSize(HPWH::UNITS_GAL));
 				else
-				{
-					RC rc2 = wh_HPWH.hw_DeriveVolFromVolRunning(
+				{	RC rc2 = wh_HPWH.hw_DeriveVolFromVolRunning(
 						wh_volRunning,
 						wh_heatingCap,
 						pWS->ws_tSetpointDes - pWS->ws_tInletDes,
 						vol);
 					if (rc2)
 						rc |= err(PERR, "DHWHEATER::wh_HPWHInit: hw_CanSetVolFromVolRunning() inconsistency.");
-					// else wh_vol already known
 				}
 			}
 			else // IsSet( DHWHEATER_VOL)

src/IMPF.CPP

@@ -442,7 +442,7 @@ LOCAL RC impFcnFile( 			// find or add IFFNM record
 		*pIffnmi = iffnm->ss;					// return added record subscript
 
 		// use IMPORTFILE given object name as record name, for later association with IMPORTFILEs.
-		strncpy( iffnm->name, impfName, sizeof(ANAME)-1 );
+		iffnm->SetName( impfName);
 
 		// put source file index and line in record so (first) use can be reported in errmsg eg if no IMPF for IFFNM.
 		iffnm->fileIx = fileIx;