Demand response initial test version

Author: chipbarnaby

src/CGCOMP.CPP

@@ -1053,10 +1053,6 @@ void IZXRAT::iz_SetupAfMtrs()
 
 	// AFMTR ptrs: NULL if no meter specified -> no air flow accounting
 	//  one pointer for positive flows, one for negative
-#if defined( _DEBUG)
-	if (iz_pAfMtr1 != NULL)
-		printf("\nTrouble");
-#endif
 	iz_pAfMtr1 = iz_pAfMtr2 = NULL;	// insurance
 	if (iz_afMtrCat1 != C_AFCAT_NONE)
 	{	// set up ptrs to AFMTR(s)

src/CNCULT.CPP

@@ -2072,7 +2072,7 @@ CULT( "wsTUse",		 DAT,   DHWSYS_TUSE,	 0,       0, VHRLY,  TYFL,  0,    120.f,	N
 CULT( "wsTSetpoint", DAT,   DHWSYS_TSETPOINT,0,       0, VHRLY,  TYFL,  0,    120.f,	N, N),
 CULT( "wsTSetpointLH",DAT,  DHWSYS_TSETPOINTLH,0,     0, VHRLY,  TYFL,  0,    120.f,	N, N),
 CULT( "wsDRMethod",  DAT,   DHWSYS_DRMETHOD, 0,       0, VEOI,   TYCH,  0,      C_DHWDRMETH_NONE, N, N),
-CULT( "wsDRSignal",  DAT,   DHWSYS_DRSIGNAL, 0,       0, VHRLY,  TYLLI, 0,      0, N, N),
+CULT( "wsDRSignal",  DAT,   DHWSYS_DRSIGNAL, 0,       0, VHRLY,  TYCH, 0,     nc( C_DHWDRSIG_ON), 0.f, N, N),
 CULT( "wsDayUse",    DAT,   DHWSYS_DAYUSENAME,0,      0, VDAILY, TYSTR, 0,      N,      N, N),
 CULT( "wsWHhwMtr",   DAT,   DHWSYS_WHHWMTRI, 0,       0, VEOI,	 TYREF, &WMtriB,N,      N, N),
 CULT( "wsFXhwMtr",   DAT,   DHWSYS_FXHWMTRI, 0,       0, VEOI,	 TYREF, &WMtriB,N,      N, N),

src/CNDTYPES.DEF

@@ -356,6 +356,7 @@ PIPESEGP -- "class PIPESEG*"	 4	    none
 		  }
 
 // DHW choices
+
 *choicb WSCALCMODECH {
 			PRERUN "PreRun"
 			SIM "Simulate"
@@ -739,6 +740,17 @@ PIPESEGP -- "class PIPESEG*"	 4	    none
 			TDVPEAKSAVE "TDVPeakSave"
 			}
 
+*choicn DHWDRSIG {
+	ON "On"
+	TOO "TOO"
+	TXO "TXO"
+	TOT "TOT"
+	TXT "TXT"
+	LOC "LOC"
+	LOR "LOR"
+	LOX "LOX"
+	COUNT "*Count"	// hidden
+  }
 
 /**********************************************************************************************************************
 ** === CHOICN types: can hold these choices (as NAN), or float number 

src/CNFIELDS.DEF

@@ -169,9 +169,9 @@ RSYSMODECTRLCH RSYSMODECTRLCH LMNONE UNNONE
 RSYSTYCH	  RSYSTYCH	   LMNONE	 UNNONE
 RSYSOAVTYCH	  RSYSOAVTYCH  LMNONE	 UNNONE
 RSYSDEFROSTMODELCH	  RSYSDEFROSTMODELCH  LMNONE	 UNNONE
+WHTYPECH      WHTYPECH     LMNONE    UNNONE
 WHHEATSRCCH	  WHHEATSRCCH  LMNONE	 UNNONE
 WSCALCMODECH  WSCALCMODECH LMNONE	 UNNONE
-WHTYPECH	  WHTYPECH     LMNONE    UNNONE
 WHASHPTYCH	  WHASHPTYCH   LMNONE    UNNONE
 DHWEUCH		  DHWEUCH      LMNONE    UNNONE
 DHWEUXCH	  DHWEUXCH     LMNONE    UNNONE
@@ -222,6 +222,7 @@ NOYESVC       NOYESVC      LMNONE    UNNONE
 OFFAVAILONVC  OFFAVAILONVC LMNONE    UNNONE
 VENTAVAILVC	  VENTAVAILVC  LMNONE	 UNNONE
 BATCTRLALGVC  BATCTRLALGVC LMNONE    UNNONE
+DHWDRSIG      DHWDRSIG     LMNONE    UNNONE
 
 // number/choice (NC choicn) types
 TEMP_TSCM     TSCMNC       LMNONE    UNTEMP	

src/CNRECS.DEF

@@ -3663,7 +3663,10 @@ RECORD DHWSYS "DHWSys" *RAT		// input / runtime DHW system
 							//   default = ws_tUse
   *r DHWDRMETH ws_drMethod	// DHW demand response control method
 							//   C_DHWDRMETH_NONE, C_DHWDRMETH_SCHED, 
-  *h LI ws_drSignal;		// DHW demand response control signal
+  *h DHWDRSIG ws_drSignal;	// DHW demand response control signal
+  *h *e INT ws_drModeHPWH;	// DHW demand response HPWHsim base mode for hour
+							//   may be modified at subhour or tick ivl
+
   *s *hide DBL ws_tOutPrimSum;	// working var re ws_tOutPrimLT
   *s *e FLOAT ws_tOutPrimLT;	// primary water heater outlet temp, F
 								//   for HPWH only, re DHWLOOPHEATER entering temp
@@ -3918,6 +3921,7 @@ RECORD DHWHEATER "DHWHeater" *RAT	// input / runtime DHW heater
   *declare "int wh_ReportBalErrorsIf() const;"
   *declare "virtual void ReceiveRuntimeMessage( const char* msg);"
   *declare "RC wh_HPWHInit();"
+  *declare "static int wh_MapDRSigToDRModeHPWH( DHWDRSIG drSig);"
 
   *r FLOAT_GEZ wh_mult;			// count of identical water heaters (default 1)
 								//   models as if repeated identical input

src/DHWCalc.cpp

@@ -1202,6 +1202,17 @@ RC DHWSYS::ws_DoHour(		// hourly calcs
 	}
 #endif
 
+	// Demand response (DR) hourly setup
+	ws_drModeHPWH = HPWH::DR_ALLOW;
+	if (!ws_HasCentralDHWSYS())
+	{	int drSig = CHN(ws_drSignal);	// decode variable choice
+		ws_drModeHPWH = ws_drMethod == C_DHWDRMETH_SCHED
+			? DHWHEATER::wh_MapDRSigToDRModeHPWH( drSig)
+			: HPWH::DR_ALLOW;
+	}
+	else
+		ws_drModeHPWH = HPWH::DR_ALLOW;		// no DR for child DHWSYSs (no DHWHEATERs)
+	
 	if (ws_wpCount > 0)		// if any child pumps
 	{	DHWPUMP* pWP;
 		RLUPC(WpR, pWP, pWP->ownTi == ss)
@@ -1216,6 +1227,7 @@ RC DHWSYS::ws_DoHour(		// hourly calcs
 		if (ws_wlhCount > 0) RLUPC(WlhR, pWH, pWH->ownTi == ss)
 			rc |= pWH->wh_DoHour();
 	}
+
 	// DHWSYS energy use
 	ws_inElec += ws_parElec * BtuperWh;	// parasitics for e.g. circulation pumping
 										//   associated heat gain is ignored
@@ -2921,6 +2933,7 @@ RC HPWHLINK::hw_DoSubhrTick(		// calcs for 1 tick
 		  "vLoss",     drawLoss,			UNLVOLUME2, 5,
 		  "vRL",       drawRL,				UNLVOLUME2, 5,
 		  "vTot",	   drawForTick,			UNLVOLUME2, 5,
+		  "DR",        double(drMode),      UNNONE, 1,
 		  "tMains",    tMains > 0. ? tMains : CSVItem::ci_UNSET,
 											UNTEMP, 5,
 		  "tDWHR",     tk.wtk_tInletX,		UNTEMP, 5,
@@ -3578,10 +3591,55 @@ RC DHWHEATER::wh_HPWHInit()		// initialize HPWH model
 				pWS->ignore(fn,
 					strtprintf("-- HPWH '%s' has a fixed setpoint.", name));
 		}
+		wh_MapDRSigToDRModeHPWH(-1);	// validate DRMODE mapping
 	}
 	return rc;
 }		// DHWHEATER::wh_HPWHInit
 //-----------------------------------------------------------------------------
+/* static*/ int DHWHEATER::wh_MapDRSigToDRModeHPWH(
+	DHWDRSIG drSig)		// CSE DR choice value
+						//   -1: validate table
+// returns HPWH-compatible DRMODES value corresponding to CSE choice
+{
+struct DRMAP
+{	int drSig;
+	int drModeHPWH;
+};
+static const DRMAP drMap[] =
+{   C_DHWDRSIG_ON,  HPWH::DR_ALLOW,
+	C_DHWDRSIG_TOO, HPWH::DR_TOO,
+	C_DHWDRSIG_TXO, HPWH::DR_TOO | HPWH::DR_LOR,
+	C_DHWDRSIG_TOT, HPWH::DR_TOT,
+	C_DHWDRSIG_TXT, HPWH::DR_TOT | HPWH::DR_LOR,
+	C_DHWDRSIG_LOC, HPWH::DR_LOC,
+	C_DHWDRSIG_LOR, HPWH::DR_LOR,
+	C_DHWDRSIG_LOX, HPWH::DR_LOR | HPWH::DR_LOC,
+	-1,				-1
+};
+	
+	if (drSig < 0)
+	{	// validate table
+		//   correct table allows access by idx, avoids search
+		bool bMunge = false;
+		int ix;
+		for (ix = 0; !bMunge && drMap[ix].drSig >= 0; ix++)
+		{	if (drMap[ix].drSig != ix + C_DHWDRSIG_ON)
+				bMunge = true;
+		}
+		if (bMunge || ix != C_DHWDRSIG_COUNT - C_DHWDRSIG_ON)
+			// table out of order or wrong # of entries
+			errCrit(PABT, "DHWHEATER::wh_MapDRSigToDRModeHPWH() validation failure.");
+		return 0;
+	}
+
+	int ixDrSig = drSig - C_DHWDRSIG_ON;	// choice values assigned sequencially
+
+	int drMode = drMap[ixDrSig].drModeHPWH;
+
+	return drMode;
+
+}	// DHWHEATER::wh_MapDRSigToDRModeHPWH
+//-----------------------------------------------------------------------------
 RC DHWHEATER::wh_DoSubhrStart()
 {
 	RC rc = RCOK;
@@ -3648,10 +3706,7 @@ RC DHWHEATER::wh_DoSubhrTick(		// DHWHEATER energy use for 1 tick
 	  : pWS->ws_pDHWSOLARSYS     ? pWS->ws_pDHWSOLARSYS->sw_GetAvailableTemp()
 	  :                            tk.wtk_tInletX;
 
-	int drMode = 0;
-	if (pWS->ws_drMethod == C_DHWDRMETH_SCHED)
-	{	drMode = pWS->ws_drSignal;
-	}
+
 
 #if 0 && defined( _DEBUG)
 	if (tInletWH > pWS->ws_tUse)
@@ -3665,7 +3720,18 @@ RC DHWHEATER::wh_DoSubhrTick(		// DHWHEATER energy use for 1 tick
 	double drawForTick = 0.;
 
 	if (wh_IsHPWHModel())
-	{
+	{	// demand response (DR)
+		//   use DHWSYS hourly base value
+		//   turn off hour-start one-shot signals if not hour start
+		int drMode;
+		if (whfcn == whfcnPRIMARY)
+		{	drMode = pWS->ws_drModeHPWH;
+			if (tk.wtk_startMin > 0.f)
+				drMode &= ~(HPWH::DR_TOO | HPWH::DR_TOT);
+		}
+		else
+			drMode = HPWH::DR_ALLOW;
+
 		rc |= wh_HPWH.hw_DoSubhrTick(tk, tInletWH, scaleWH, tMix, pWS->ws_tInlet,
 					&tOutNoMix, drMode);