CSE 0.845

Added DHWHEATER whUAMult

Author: chipbarnaby

src/CNCULT.CPP

@@ -1771,6 +1771,7 @@ CULT( "whASHPSrcZn", DAT,   DHWHEATER_ASHPSRCZNTI,0,  0, VEOI,   TYREF, &ZiB,
 CULT( "whASHPSrcT",  DAT,   DHWHEATER_ASHPTSRC,0,     0, VSUBHRLY,TYFL, 0,      70.f,               N, N),
 CULT( "whASHPResUse",DAT,   DHWHEATER_ASHPRESUSE,0,   0, VEOI,   TYFL,  0,      7.22f,              N, N),
 CULT( "whVol",		 DAT,   DHWHEATER_VOL,     0,     0, VEOI,   TYFL,  0,      0.f,    N, N),
+CULT( "whUAMult",	 DAT,   DHWHEATER_UAMULT,  0,     0, VEOI,   TYFL,  0,      1.f,    N, N),
 CULT( "whEF",		 DAT,   DHWHEATER_EF,      0,     0, VEOI,   TYFL,  0,      0.82f,  N, N),
 CULT( "whUEF",		 DAT,   DHWHEATER_UEF,     0,     0, VEOI,   TYFL,  0,        0.f,  N, N),
 CULT( "whStbyElec",  DAT,   DHWHEATER_STBYELEC,  0,   0, VEOI,   TYFL,  0,        4.f,  N, N),

src/CNRECS.DEF

@@ -3435,6 +3435,9 @@ RECORD DHWHEATER "DHWHeater" *RAT	// input / runtime DHW heater
 								//    applicable to STRGxx types
 								//    used only for HPWH ResistanceX, 5-2016
 								//    default=50 if STRGxx else 0
+  *i FLOAT_GZ wh_UAMult;		// storage tank UA multiplier, default=1
+								//    applied to implicit tank UA re e.g. tank blanket
+								//    used only re HPWH ASHPX and ResistanceX
   *i FLOAT_GZ wh_EF;			// rated energy factor
   *i FLOAT_GZ wh_LDEF;			// load-dependent energy factor
   *i FLOAT_GZ wh_UEF;			// rated uniform energy factor

src/DHWCalc.cpp

@@ -958,7 +958,10 @@ RC DHWHEATER::wh_CkF()		// water heater input check / default
 		rc |= disallowN( "when 'whTEx' is specified", DHWHEATER_ZNTI, 0);
 
 	if (wh_heatSrc != C_WHHEATSRCCH_ELRESX)
-		ignoreN( whenHs, DHWHEATER_RESHTPWR, DHWHEATER_RESHTPWR2, 0);
+	{	ignoreN( whenHs, DHWHEATER_RESHTPWR, DHWHEATER_RESHTPWR2, 0);
+		if (wh_heatSrc != C_WHHEATSRCCH_ASHPX)
+			ignore( DHWHEATER_UAMULT, whenHs);
+	}
 
 	if (wh_type != C_WHTYPECH_STRGSML)
 	{	if (wh_type == C_WHTYPECH_INSTUEF)
@@ -1420,7 +1423,15 @@ RC DHWHEATER::wh_HPWHInit()		// initialize HPWH model
 		if (volX > 0.f && wh_pHPWH->setTankSize( volX, HPWH::UNITS_GAL) != 0)
 			rc = RCBAD;
 		if (UAX > 0.f && wh_pHPWH->setUA( UAX, HPWH::UNITS_BTUperHrF) != 0)
-			rc = RCBAD;
+				rc = RCBAD;
+		if (wh_UAMult != 1.f)
+		{	// apply user-specified adjustment to implicit UA
+			//    approximates effect of e.g. tank wrap insulation
+			double UAdflt;
+			int ret = wh_pHPWH->getUA( UAdflt);
+			if (ret || wh_pHPWH->setUA( UAdflt*wh_UAMult) != 0)
+				rc = RCBAD;
+		}
 	}
 
 	if (!rc)

src/csevrsn.h

@@ -14,14 +14,15 @@
 // version # for current build
 // change ONLY here
 #define CSEVRSN_MAJOR 0
-#define CSEVRSN_MINOR 844
+#define CSEVRSN_MINOR 845
 
 // version # as quoted text ("x.xxx")
 #define CSEVRSN_TEXT MAKE_LIT(CSEVRSN_MAJOR##.##CSEVRSN_MINOR)
 
 // ONLY comments below here
 
 /* History:
+   0.845: added DHWHEATER whUAMult, 10-18-2017
    0.844: HPWH debug export enhanced, 10-17-2017
    0.843: BATTERY last hour values; DESCOND prelim version; 10-10-17
    0.842: btChgReq eval stage bug fix (cncult.cpp), 9-12-2017

vendor/hpwh/HPWH.cc

@@ -707,6 +707,22 @@ int HPWH::setUA(double UA, UNITS units) {
 	return 0;
 }
 
+int HPWH::getUA(double& UA, UNITS units/*=UNITS_kJperHrC*/) const
+{
+	int ret = 0;
+	if (units == UNITS_kJperHrC)
+		UA = tankUA_kJperHrC;
+	else if (units == UNITS_BTUperHrF)
+		UA = tankUA_kJperHrC / UAf_TO_UAc( 1.);
+	else
+	{	if (hpwhVerbosity >= VRB_reluctant)
+			msg("Incorrect unit specification for getUA.  \n");
+		UA = -1.;
+		ret = HPWH_ABORT;
+	}
+	return ret;
+}
+
 int HPWH::getNumNodes() const {
 	return numNodes;
 }

vendor/hpwh/HPWH.hh

@@ -245,6 +245,10 @@ class HPWH {
   int setUA(double UA_kJperHrC);
   int setUA(double UA, UNITS units);
   /**< This is a setter for the UA, with or without units specified - default is metric */
+
+  int getUA( double& UA, UNITS units=UNITS_kJperHrC) const;
+
+  
 
 	int getNumNodes() const;
 	/**< returns the number of nodes  */