Merge pull request #138 from cse-sim/vsashp

VSASHP progress

Author: chipbarnaby

src/ANCREC.H

@@ -228,8 +228,9 @@ class record		// base class for records
 
 	// input-checking support functions in cncult2.cpp
     // require/disallow fields
+	RC checkN(const char* when, RC (*checkFcn)(int fn, const char* when), va_list ap);
     RC disallowN( const char* when=NULL, ...);
-    RC disallow( int fn, const char* when=NULL);
+    RC disallow( int fn, const char* when);
     RC requireN( const char* when=NULL, ...);
     RC require( int fn, const char* when=NULL);
     RC ignoreN( const char* when=NULL, ...);

src/CGCOMP.CPP

@@ -357,6 +357,13 @@ void AFMTR::amt_Accum(
 /////////////////////////////////////////////////////////////////////////////////
 // AIRSTATE
 /////////////////////////////////////////////////////////////////////////////////
+void AIRSTATE::as_Set(const AIRFLOW& af)
+// copy AIRFLOW state (ignore af_amf)
+{
+	as_tdb = af.as_tdb;
+	as_w = af.as_w;
+}	// AIRSTATE::as_Set
+//------------------------------------------------------------------------------
 int AIRSTATE::as_IsEqual( const AIRSTATE& as, double tol/*=.001*/) const
 {	return frDiff( as_tdb, as.as_tdb) < tol
         && frDiff( as_w,   as.as_w)   < tol;
@@ -2273,29 +2280,31 @@ void DUCTSEG::ds_FinalizeSh(		// finish subhour calcs
 	if (runF > 0.f && ds_leakF > 0.f)
 	{
 		double amfLk = runF * ds_amfFL * ds_leakF;	// leak amf, lb/hr
+		double tz = pRS->rs_asRet.as_tdb;
+		double wz = pRS->rs_asRet.as_w;
 		if (ds_IsSupply())
-		{	// supply (leakage is out of duct)
-#if 0
-			double tz = pRS->rs_asZn.as_tdb;
-#endif
-			double tz = pRS->rs_asRet.as_tdb;
-			double qDotIn = runF * mCpFL * ds_air[1].as_tdb;
-			double qDotOut = runF * mCpFL * (1.f - ds_leakF) * ds_air[3].as_tdb;
-			double qLeak = qDotOut - qDotIn - ds_qCond;
-			ds_qLeakSen = runF * mCpFL * ds_leakF * (ds_air[3].as_tdb - tz);
-			ds_qLeakLat = amfLk * PsyHCondWtr * ds_air[3].as_w;	// TODO
+		{	// supply (leakage: + = out of duct, heating loss > 0, cooling loss < 0)
+			ds_qLeakSen = amfLk * Top.tp_airSH * (ds_air[3].as_tdb - tz);
+			ds_qLeakLat = amfLk * PsyHCondWtr * (ds_air[3].as_w - wz);
 			if (zpx)
 				zpx->zn_ductLkI.af_AccumDry(amfLk, ds_air[3]);
 		}
 		else
 		{	// return
+			//   leakage flow is into the duct -- that is, negative per sign convention
+			//   ds_amfFL is always > 0, so amfLk must be negated
 			if (zpx)
 				zpx->zn_ductLkO.af_AccumDry(-amfLk, zpx->tz, zpx->wz);
+			// return leakage losses: duct flow * deltaT across leak
+			//  heating loss > 0, cooling loss < 0
+			ds_qLeakSen = runF * ds_amfFL * Top.tp_airSH * (ds_air[0].as_tdb - ds_air[1].as_tdb);
+			ds_qLeakLat = runF * ds_amfFL * PsyHCondWtr * (ds_air[0].as_w - ds_air[1].as_w);
 		}
 	}
 	// else ds_qLeakSen = ds_qLeakLat = 0. per ds_BegSubHr()
 
 	// populate results
+	//   results zeroed in DUCTSEG::ds_BegSubhr()
 	DUCTSEGRES_IVL_SUB& R = ds_GetDUCTSEGRES()->curr.S;
 	if (pRS->rs_mode == RSYS::rsmHEAT)
 	{	R.qhCond = ds_qCond * Top.tp_subhrDur;

src/CNCULT.CPP

@@ -1680,6 +1680,7 @@ CULT( "rsDesc",		 DAT,   RSYS_DESC,       0,       0, VEOI,   TYSTR, 0,		0,		N,
 CULT( "rsPerfMap",	 DAT,	RSYS_PERFMAP,	 0,       0, VEOI,   TYCH,  0,      C_NOYESCH_NO, N, N),
 CULT( "rsFanTy",	 DAT,	RSFAN( FANTY),   0,       0, VEOI,   TYCH,  0,      C_FANTYCH_BLOWTHRU, N, N ),
 CULT( "rsFanMotTy",  DAT,   RSFAN( MOTTY),   0,       0, VEOI,   TYCH,  0,      C_MOTTYCH_PSC,  N, N ),
+CULT( "rsAdjForFanHt", DAT, RSYS_ADJFORFANHT,0,       0, VEOI,   TYCH,  0,      C_NOYESCH_YES,  N, N),
 CULT( "rsModeCtrl",  DAT,   RSYS_MODECTRL,   0,       0, VHRLY,  TYCH,  0,    C_RSYSMODECTRLCH_AUTO, N, N),
 CULT( "rsElecMtr",   DAT,   RSYS_ELECMTRI,   0,       0, VEOI,	 TYREF, &MtriB, N,      N,   N),
 CULT( "rsFuelMtr",   DAT,   RSYS_FUELMTRI,   0,       0, VEOI,	 TYREF, &MtriB, N,      N,   N),

src/CNCULT2.CPP

@@ -2019,7 +2019,7 @@ RC record::limitCheck(		// range check, issue warning or error msg
 //        else RCxx if value out of range (msg issued)
 {
 	RC rc = RCOK;
-	if (IsSet( fn))
+	if (IsVal( fn))
 	{	int dt = DType( fn);
 		void* pV = field( fn);
 		double v = 0.;
@@ -2074,13 +2074,40 @@ RC record::limitCheckFix(	// range check, msg, set to min/max
 ///////////////////////////////////////////////////////////////////////////////
 //   'record' MEMBER FUNCTIONS TO REQUIRE/DISALLOW FIELDS (class declaration: ancrec.h)
 ///////////////////////////////////////////////////////////////////////////////
-RC CDEC record::disallowN( 			// issue "not allowed" message for each given field in 0-terminated list of field numbers
-	const char* when /*=NULL*/,	// message insert.  message handle ok (see lib\messages.cpp).
+RC record::checkN(
+	const char* when,	// message insert.  message handle ok (see messages.cpp).
+	RC (*checkFcn)(int fn, const char* when),
+	va_list ap)
+{
+	RC rc = RCOK;
+	char whenBuf[200];
+	if (!msgIsHan(when))					// not if handle given
+		if (when)   						// copy arg to local buffer in case in Tmpstr[], ...
+			when = strncpy0(whenBuf, when, sizeof(whenBuf));	// so any (possible future) strtprintf's in following loop
+																// won't overwrite it, 7-92.
+	for (; ; )
+	{
+		int fn = va_arg(ap, int);
+		if (!fn)
+			break;
+		if (fn > 1024)
+			rc |= oer((char*)MH_S0495,	// "cncult2.cpp:%s Internal error: field # %nd: probable unterminated arg list"
+					   "checkN", fn);
+		rc |= (*checkFcn)(fn, when);
+	}
+	return rc;
+}		// checkN
+//-----------------------------------------------------------------------------
+RC record::disallowN( 			// issue "not allowed" message for each given field in 0-terminated list of field numbers
+	const char* when /*=NULL*/,	// message insert.  message handle ok (see messages.cpp).
 	... )			// int field numbers, 0 ends list  REMEMBER THE 0!
 {
 	RC rc=RCOK;
 	va_list ap;
 	va_start( ap, when);
+#if 0
+	rc = checkN(when, [this](int fn, const char* when)->RC { return this->disallow(fn, when); }, ap);
+#else
 	char whenBuf[200];
 	if (!msgIsHan(when))					// not if handle given, lib\messages.cpp, 7-10-92
 		if (when)   						// copy arg to local buffer in case in Tmpstr[], ...
@@ -2095,6 +2122,7 @@ RC CDEC record::disallowN( 			// issue "not allowed" message for each given fiel
 					   "disallowN", fn);
 		rc |= disallow( fn, when);
 	}
+#endif
 	return rc;
 }		// disallowN
 //-----------------------------------------------------------------------------
@@ -2107,7 +2135,7 @@ RC record::disallow(     			// issue message if field is given
 	return RCOK;
 }			// disallow
 //-----------------------------------------------------------------------------
-RC CDEC record::requireN( 			// issue "missing" message for each omitted field in 0-terminated list of field numbers
+RC record::requireN( 			// issue "missing" message for each omitted field in 0-terminated list of field numbers
 	const char* when /*=NULL*/,	// message insert (message handle ok)
 	... )			// int field numbers, 0 ends list  REMEMBER THE 0!
 {
@@ -2140,7 +2168,7 @@ RC record::require(    			// issue message if field is not given
 	return RCOK;
 }			// require
 //-------------------------------------------------------------------------------
-RC CDEC record::ignoreN( 		// issue "ignored" message for each given field in 0-terminated list of field numbers
+RC record::ignoreN( 		// issue "ignored" message for each given field in 0-terminated list of field numbers
 	const char* when /*=NULL*/,	// message insert.  message handle ok (see messages.cpp).
 	... )			// int field numbers, 0 ends list  REMEMBER THE 0!
 {

src/CNGUTS.CPP

@@ -1439,13 +1439,13 @@ void ZNRES::zr_InitCurr()		// initialize curr mbrs
 // floats: all
 #define ZRf1 tAir							// 1st of all float members (incl avgs & sums). cnguts.cpp
 #define ZRnF ((oRes(litEu) - oRes(tAir))/sizeof(float) + 1)      	// total # float members.  cnguts.cpp
-  // floats: to average (cnguts.cpp)
+// floats: to average (cnguts.cpp)
 #define ZRa1 tAir							// 1st float to average in float mbrs.  cnguts.cpp.
 #define ZRnA ((oRes(wAir) - oRes(tAir))/sizeof(float) + 1) // # of floats to average
-  // floats: to sum: all (cnguts.cpp)
+// floats: to sum: all (cnguts.cpp)
 #define ZRs1 qCond							// first one
 #define ZRnS ((oRes(litEu) - oRes(qCond))/sizeof(float) + 1)		// #
-    // floats to sum: sensible heat balance (cgenbal.cpp)
+// floats to sum: sensible heat balance (cgenbal.cpp)
 #define ZRq1 qCond							// 1st float sum & 1st heat flow.  cnguts.cpp, cgenbal.cpp.
 #define ZRnQ ((oRes(qsMech) - oRes(qCond))/sizeof(float) + 1)     	// # of floats to sum / # heat flows. cnguts.cpp, cgenbal.cpp.
 // floats to sum: latent heat balance

src/CNLOADS.CPP

@@ -355,7 +355,6 @@ RC ZNR::zn_BegHour2()		// beginning-of-hour calcs for zone
 RC ZNR::zn_BegSubhr1()			// zone start of subhour, part 1
 // call *before* airnet and possible others needing prior-step (lagged) values
 {
-	// is following still needed? eg loadsIzxfer no longer accumulates to it... 11-95
 	memset( &ZnresB.p[ss].curr.S, 0, sizeof( ZNRES_IVL_SUB) );	// access subhr results struct in ZNRES via subscr in ZrB & 0 it.
 	ZnresB.p[ss].curr.S.nSubhr = 1L;	// count subhours by setting to 1 at subhr level & accumulating
 
@@ -1719,10 +1718,7 @@ RC RSYS::rs_CkF()
 				rs_fanPwrC = 0.f;	// fan power included in primary by default
 		}
 		else
-		{	rc |= requireN(when, RSYS_SEER, 0);
-			if (IsSetCount(RSYS_COP95, RSYS_EER95, 0) == 2)
-				rc |= oer("rsEER and rsCOP95 cannot both be given %s", when);
-		}
+			rc |= requireN(when, RSYS_SEER, 0);
 
 		// cooling model air flow correlations have limited validity range
 		//   verify air flow 150 - 550 cfm/ton (per Proctor Engineering)
@@ -2005,28 +2001,34 @@ RC RSYS::rs_TopRSys1()		// check RSYS, initial set up for run
 
 	if (rs_CanCool())
 	{	// default/harmonize 95 F COP
-		//   force rs_COP95 <-> rs_EER95 consistency
-		//   at most 1 can be input
+		//   inter-default rs_COP95 <-> rs_EER95
+		//   if both input, values can be different
+		//   rs_COP95 used for VCHP2, rs_EER95 used for single speed
 		//   EER can default from SEER
 		if (rs_IsPkgRoom())
 		{	// pkg: derive SEER from EER
 			//   abram conant fit, 6-20
 			rs_SEER = 1.07f * rs_EER95;
 			// rs_COP95 not allowed
 		}
-		else if (IsSet(RSYS_COP95))
-			rs_EER95 = rs_COP95 * BtuperWh;
-		else if (!IsSet(RSYS_EER95))
-		{	// estimate missing EER from SEER
-			//   California ACM method
-			rs_EER95 = rs_SEER < 13.f ? 10.f + 0.84f * (rs_SEER - 11.5)
-				: rs_SEER < 16.f      ? 11.3f + 0.57f * (rs_SEER - 13)
-				:                       13.f;
-			if (rs_SEER <= rs_EER95)
-				rc |= oer("rsSEER (%g) must be > rsEER (%g)", rs_SEER, rs_EER95);
+		else if (IsSet(RSYS_EER95))
+		{	if (!IsSet(RSYS_COP95))
+				rs_COP95 = rs_EER95 / BtuperWh;
+		}
+		else
+		{	if (IsSet(RSYS_COP95))
+				rs_EER95 = rs_COP95 * BtuperWh;
+			else
+			{	// estimate missing EER from SEER
+				//   California ACM method
+				rs_EER95 = rs_SEER < 13.f ? 10.f + 0.84f * (rs_SEER - 11.5)
+					: rs_SEER < 16.f ? 11.3f + 0.57f * (rs_SEER - 13)
+					: 13.f;
+				rs_COP95 = rs_EER95 / BtuperWh;
+			}
 		}
-		// rs_EER95 now set
-		rs_COP95 = rs_EER95 / BtuperWh;
+		if (rs_SEER <= rs_EER95)
+			rc |= oer("rsSEER (%g) must be > rsEER (%g)", rs_SEER, rs_EER95);	
 	}
 
 	if (IsAusz( RSYS_CAP95))
@@ -2704,10 +2706,9 @@ float RSYS::rs_FanHRtdPerTon(		// fan heat included in ratings
 // returns fan heat included in ratings, Btuh
 {
 	float fanHRtdPerTon =
-		rs_IsPkgRoom()  ? 0.f			// PkgRoom: no fan adjustment
-	                    : rs_fan.fn_motTy == C_MOTTYCH_PSC
-		                   ? 500.f	    // PSC = Permanent Split Capacitor
-	                       : 283.f;		// BPM = Brushless Permanent Magnet (aka ECM)
+		rs_IsPkgRoom() || rs_adjForFanHt == C_NOYESCH_NO      ? 0.f		// PkgRoom or user override: no fan adjustment
+	                    : rs_fan.fn_motTy == C_MOTTYCH_PSC  ? 500.f	    // PSC = Permanent Split Capacitor
+	                    :									  283.f;	// BPM = Brushless Permanent Magnet (aka ECM)
 
 	return capNomTons * fanHRtdPerTon;
 
@@ -3120,23 +3121,26 @@ x		printf("\nhit");
 	else
 	{	// total capacities and input, Btuh
 		//   include rated fan power
+		//   cap values are net Btuh, <0
 		float capClg, inpClg, capClgMin, inpClgMin;
 		RC rc = rs_GetPerfBtwxt(rs_pRgiClg, rs_tdbOut,
 			capClg, inpClg, capClgMin, inpClgMin);
 		rs_speedFMin = capClg >= 0.f ? 1.f : capClgMin / capClg;
 		float fanHAdj = rs_fanHRtdC;	// fan heat adjustment, Btuh
+		// adjust for fan power (= convert to gross cooling)
 		capClg += fanHAdj;
 		inpClg -= fanHAdj;
 		capClgMin += fanHAdj * rs_speedFMin;
 		inpClgMin -= fanHAdj * rs_speedFMin;
 
-		rs_capTotCt = capClg * rs_speedF;		// total coil capacity at current conditions and speed, Btuh
+		rs_capTotCt = capClg * rs_speedF;		// total coil capacity (= gross) at current conditions and speed, Btuh
 		rs_capSenCt = rs_SHR * rs_capTotCt;		// sensible coil capacity at current conditions and speed, Btuh
 
+		// input at current speed (Btuh)
 		float inpX = rs_speedF == 1.f
 			? inpClg
 			: inpClgMin
-			+ (inpClg - inpClgMin) * (rs_speedF - rs_speedFMin) / (1.f - rs_speedFMin);
+			   + (inpClg - inpClgMin) * (rs_speedF - rs_speedFMin) / (1.f - rs_speedFMin);
 
 		rs_effCt = abs( rs_capSenCt) / inpX;		// compressor-only COP
 	}
@@ -4553,7 +4557,7 @@ void RSYS::rs_EnteringAirState()	// RSYS entering air state
 				orWarn("dubious return temp (%.1f F)", afRet.as_tdb);
 #endif
 		}
-		rs_asRet = afRet;		// state = flow w/o amf
+		rs_asRet.as_Set( afRet);		// state = flow w/o amf
 	}
 
 	// adjust state for return duct
@@ -4998,25 +5002,28 @@ RC RSYS::rs_AllocateZoneAirVC()		//
 
 }	// RSYS::AllocateZoneAirVC()
 //-----------------------------------------------------------------------------
-RC RSYS::rs_TotalAirRequest(
+RC RSYS::rs_TotalAirRequest(		// all-zone air request at speedF
 	float speedF)
-
 {
 	RC rc = RCOK;
 
-	rs_ClearSubhrResults(1);	// init for speed re-try
-	int ret = rs_SupplyAirState(rs_mode, speedF);
-	ZNR* zp;
-	RLUPC(ZrB, zp, rs_IsZoneServed(zp))
-		zp->zn_AirRequest(this);
-
-	if (rs_amfReq[0] <= 0.)				// if any air requested (by any zone)
+	if (speedF != rs_speedF)
 	{
-		printf("\nrs_AirRequest: rs_amfReq[ 0] <= 0.");
-		return RCBAD;
-	}
 
-	rs_fxCap[0] = rs_amf / rs_amfReq[0];	// >1 = excess capacity
+		rs_ClearSubhrResults(1);	// init for speed re-try
+		int ret = rs_SupplyAirState(rs_mode, speedF);
+		ZNR* zp;
+		RLUPC(ZrB, zp, rs_IsZoneServed(zp))
+			zp->zn_AirRequest(this);
+
+		if (rs_amfReq[0] <= 0.)				// if any air requested (by any zone)
+		{
+			printf("\nrs_AirRequest: rs_amfReq[ 0] <= 0.");
+			return RCBAD;
+		}
+
+		rs_fxCap[0] = rs_amf / rs_amfReq[0];	// >1 = excess capacity
+	}
 
 	return rc;
 }		// RSYS::rs_TotalAirRequest
@@ -5050,7 +5057,7 @@ double RSYS::rs_FindAirFlow()
 
 #if defined( _DEBUG)
 	if (ret)
-		printf("\nrs_FindAirFlow(): secant ret=%d", ret);
+		printf("\nrs_FindAirFlow(): secant ret=%d  rsMode=%d", ret, rs_mode);
 	if (rs_speedF < rs_speedFMin || rs_speedF > 1.f)
 		printf("\nrs_FindAirFlow() rs_speedF=%0.2f", rs_speedF);
 #endif
@@ -5124,11 +5131,11 @@ RC RSYS::rs_FinalizeSh()
 	float runFFan = 0.f;		// subhour fan run fraction
 	if (rs_mode == rsmCOOL)
 	{
-		rs_outSen = rs_loadF * rs_capSenCt;		// average output w/o fan, Btuh (< 0)
+		rs_outSen = rs_loadF * rs_capSenCt;		// average output w/o fan (= gross cooling), Btuh (< 0)
 		rs_outLat = rs_loadF * rs_capLatCt;
 		rs_outFan = rs_inFan = rs_loadF * rs_speedF * rs_fanHeatC;	// all fan heat to air
 		runFFan = rs_loadF;
-		rs_outSenTot = rs_outSen + rs_outFan;	// gross output
+		rs_outSenTot = rs_outSen + rs_outFan;	// net cooling output, Btuh (generally < 0)
 
 		if (!rs_IsVCClg() || rs_speedF == 1.f)
 		{	rs_runF = rs_loadF;