AFMETER WIP

Author: chipbarnaby

src/CGCOMP.CPP

@@ -265,27 +265,40 @@ float TOPRAT::tp_WindPresV(			// wind velocity pressure
 // NAFCATS s/b same as AFCAT choices + 1 (for total)
 static_assert(AFMTR_IVL::NAFCATS == C_AFCAT_COUNT+1, "Inconsistent AFMTR constants");
 //-----------------------------------------------------------------------------
-void AFMTR_IVL::amt_Copy(
-	const AFMTR_IVL* s)
+void AFMTR_IVL::amt_Copy(			// copy 
+	const AFMTR_IVL* sIvl,	// source
+	float mult /*=1.f*/)	// optional multiplier
 {
-	memcpy(this, s, sizeof(AFMTR_IVL));
+	if (mult == 1.f)
+		memcpy(this, sIvl, sizeof(AFMTR_IVL));
+	else
+	{	amt_count = sIvl->amt_count;
+		VCopy(&amt_total, NAFCATS, &sIvl->amt_total, double(mult));
+	}
 }	// AFMTR_IVL::amt_Copy
 //-----------------------------------------------------------------------------
 void AFMTR_IVL::amt_Accum(			// accumulate
 	const AFMTR_IVL* sIvl,		// source
 	int firstFlg,				// true iff first accum into this (beg of ivl)
-	int lastFlg)				// true iff last accum into this (end of ivl)
-
+	int lastFlg,				// true iff last accum into this (end of ivl)
+	int options /*=0*/)			// option bits
+								//   1: use sIvl.amt_count to scale totals
+								//      effectively averages by day for annual values
+								//   2: sum only (do not average)
 {
+	int count = (options & 1) ? sIvl->amt_count : 1;
 	if (firstFlg)
-	{	amt_Copy(sIvl);
-		amt_count = 1;
+	{	amt_Copy(sIvl, float( count));
+		amt_count = count;
 	}
 	else
-	{	VAccum(&amt_total, NAFCATS, &sIvl->amt_total);
-		amt_count++;
+	{	VAccum(&amt_total, NAFCATS, &sIvl->amt_total, float( count));
+		amt_count += count;
 	}
-	if (lastFlg)
+
+	// average unless caller says don't
+	//  Note: VMul1() nops if amt_count==1
+	if (lastFlg && !(options & 2))
 		VMul1(&amt_total, NAFCATS, 1.f / amt_count);
 }		// AFMTR_IVL
 //-----------------------------------------------------------------------------
@@ -320,9 +333,25 @@ void AFMTR::amt_Accum(
 												// ASSUMES interval members ordered like DTIVLCH choices
 	AFMTR_IVL* sIvl = dIvl + 1;				// source: next shorter interval
 
-	// accumulate: copy on first call (in lieu of 0'ing dIvl).
-	//   Note: amt_Init() call in doBegIvl 0s H values
-	dIvl->amt_Accum(sIvl, firstFlg, lastFlg);
+	int options = 0;	// default: track average
+#if 0
+	if (amt_IsSumOf())
+	{	if (ivl < C_IVLCH_H)
+			options = 2;
+	}
+	else
+#endif
+		if (ivl == C_IVLCH_Y)
+		options = 1;	// average by day for non-sum-of year values
+						//   handles diffs due to month length
+	dIvl->amt_Accum(sIvl, firstFlg, lastFlg, options);
+
+	if (lastFlg)
+	{
+		AFMTR* pAM = AfMtrR.p + AfMtrR.n;
+		AFMTR_IVL* dIvlSum = &pAM->Y + (ivl - C_IVLCH_Y);
+		dIvlSum->amt_Accum(dIvl, ss == 1, 0);
+	}
 }		// AFMTR::amt_Accum
 //=============================================================================
 
@@ -518,23 +547,13 @@ double ZNR::zn_Rho0() const		// zone air density
 // returns moist air density lb/ft3 at nominal z=0 for current zone conditions
 //   Note: not *dry* air
 {
-#if 1	// air density rework, 10-18-2012
 	double rho = psyDenMoistAir( tz, wz, LbSfToInHg( zn_pz0));
 	if (rho < .0001)
 	{	err( WRN, "Zone '%s', %s: moist air density <= 0\n",
 					name, Top.When( C_IVLCH_S));
 		rho = 0.01;		// set to small but physically possible value
 	}
 	return rho;
-#elif 1
-x	double rho1 = psyDenMoistAir( tz, wz, LbSfToInHg( zn_pz0));
-x	double rho2 = psyDensity( tz, wz, LbSfToInHg( zn_pz0));
-x	if (FEQX( rho1, rho2) > .001)
-x		printf( "Mismatch\n");
-x	return rho2;
-#else
-x	return psyDensity( tz, wz, LbSfToInHg( zn_pz0));
-#endif
 }	// ZNR::zn_Rho0
 //------------------------------------------------------------------------------
 void ZNR::zn_AccumAirFlow(		// accumulate zone bal values due to air flow
@@ -1035,13 +1054,18 @@ void IZXRAT::iz_SetupAfMtrs()
 	// AFMTR ptrs: NULL if no meter specified -> no air flow accounting
 	//  one pointer for positive flows, one for negative
 	const ZNR* zp;
+	iz_pPosAfMtr = iz_pNegAfMtr = NULL;	// insurance
 	if (iz_zi1 > 0)
 	{	zp = ZrB.GetAt(iz_zi1);
 		iz_pPosAfMtr = AfMtrR.GetAtSafe(zp->i.zn_afMtri);
 	}
+
 	if (iz_zi2 > 0)
-	{	zp = ZrB.GetAt(iz_zi2);
-		iz_pNegAfMtr = AfMtrR.GetAtSafe(zp->i.zn_afMtri);
+	{	// interzone transfers recorded iff to a different meter
+		zp = ZrB.GetAt(iz_zi2);
+		AFMTR* pAM = AfMtrR.GetAtSafe(zp->i.zn_afMtri);
+		if (pAM && pAM != iz_pPosAfMtr)
+			iz_pNegAfMtr = pAM;		// z2 meter specified and differs from z1
 	}
 }		// IZXRAT::iz_SetupAfMtrs
 //-----------------------------------------------------------------------------

src/CGRESULT.CPP

@@ -1258,9 +1258,9 @@ o    &&  dvrip->rpDayEnd >= Top.tp_endDay )	<--- new year's bug! 2-94
 			vpRxRow( dvrip, &rxt, pIvl, shortIvlTexts[rxt.fq]);	// do DHWMTR rpt row.  Uses rxt.flags, colDef.
 		}
 
-		else if (dvrip->rpTy == C_RPTYCH_AFMTR)		// if DHW meter report
+		else if (dvrip->rpTy == C_RPTYCH_AFMTR)		// if AFDHW meter report
 		{
-			TI afMtri = dvrip->dv_afMtri;    		// subscript
+			TI afMtri = dvrip->dv_afMtri > 0 ? dvrip->dv_afMtri : AfMtrR.n;   		// subscript
 			AFMTR_IVL* pIvl = &AfMtrR[afMtri].Y + (rxt.fq - 1); 	// .M is after .Y, etc
 			rxt.colDef = afMtrColdef;					 			// columns definition table for vpRxRow
 			vpRxRow(dvrip, &rxt, pIvl, shortIvlTexts[rxt.fq]);	// do DHWMTR rpt row.  Uses rxt.flags, colDef.
@@ -1487,6 +1487,8 @@ void DVRI::dv_vpAfMtrRow(RXPORTINFO *rxt, TI afMtri /*=-1*/)
 {
 	if (afMtri < 0)
 		afMtri = dv_afMtri;
+	if (afMtri == TI_SUM)
+		afMtri = AfMtrR.n;					// handle "sum"
 	AFMTR* pM = AfMtrR.GetAt(afMtri);		// record
 	AFMTR_IVL* pIvl = (&pM->Y) + (rxt->fq - 1);	// interval
 

src/CNCULT4.CPP

@@ -695,8 +695,7 @@ badZn4ty:
 // check meter reference or ALL or SUM
 
 	if (mtri > 0)						// if specific meter given (error'd above if omitted when rqd)
-	{
-		if (ckRefPt( &MtrB, mtri, isEx ? "exMeter" : "rpMeter" ) )
+	{	if (ckRefPt( &MtrB, mtri, isEx ? "exMeter" : "rpMeter" ) )
 			return RCBAD;
 	}
 	else							// no meter given, or ALL or SUM.
@@ -769,10 +768,15 @@ badDHWMtr4ty:
 	{
 		char *mtrTx /*=""*/;
 		if (ri_afMtri == TI_SUM)
-		{
-			mtrTx = "sum";
-			goto badAFMtr4ty;
-		}
+			switch (rpTy)
+			{
+			case 0:					// rpTy 0: not set, no message here
+			case C_RPTYCH_AFMTR:
+				break;   			// AFMTR (air flow meter): SUM allowed.
+			default:
+				mtrTx = "sum";
+				goto badAFMtr4ty;
+			}
 		else if (ri_afMtri == TI_ALL)
 			switch (rpTy)
 			{

src/CNGUTS.CPP

@@ -547,12 +547,13 @@ LOCAL RC FC NEAR doBegIvl()	// simulation run start-of-interval processing: init
 		EF( Top.tp_ExshBegHour());	// Penumbra external shading: sets sun position
 
 	default:  // case C_IVLCH_S:	// at start of each subhour, incl longer intervals (fall in)
+		Top.isEndHour = (Top.iSubhr + 1 >= Top.nSubSteps);	// set flag if last subHour of hour
+
 #if defined( DEBUGDUMP)
 		DbDo( dbdSTARTSTEP);		// nothing yet debug-printed for this subhour
 									//   (sets flag re on-demand heading printing
 #endif
 		EF( Top.tp_WthrBegSubhr() ); 	// set Top subhourly weather members, eg tDbOSh. Mostly interpolated. cgwthr.cpp.
-		Top.isEndHour = (Top.iSubhr + 1 >= Top.nSubSteps);	// set flag if last subHour of hour
 
 		// clear subhour values in air flow meters
 		AFMTR* pAM;
@@ -1562,10 +1563,20 @@ LOCAL void FC NEAR doIvlAccum()
 
 	AFMTR* pAMSum = AfMtrR.p + AfMtrR.n;
 	AFMTR* pAM;
+	int iM = 0;
 	RLUP(AfMtrR, pAM)						// loop AFMTRs
-	{	if (pAM->ss < AfMtrR.n)
+	{
+		if (++iM != pAM->ss)
+			printf("\nMismatch");
+		if (pAM->ss < AfMtrR.n)
+		{
 			pAMSum->S.amt_Accum(&pAM->S, pAM->ss == 1, pAM->ss == AfMtrR.n - 1);
-		pAM->amt_Accum( C_IVLCH_H, Top.isBegHour, Top.isEndHour);
+			if (iM != pAM->ss)
+				printf("\nMismatch");
+			pAM->amt_Accum(C_IVLCH_H, Top.isBegHour, Top.isEndHour);
+			if (iM != pAM->ss)
+				printf("\nMismatch");
+		}
 	}
 
 	if (Top.ivl > C_IVLCH_H)						// if subhour call, done
@@ -1724,8 +1735,8 @@ LOCAL void FC NEAR doIvlAccum()
 	RLUP(WsResR, pWSR)							// loop DHWSYS simulation results incl sum_of.
 		pWSR->M.wsr_Accum(&pWSR->D, Top.isBegMonth, Top.isEndMonth);		// accumulate month from day
 	RLUP( AhresB, ahres)							// loop air handers sim results
-		accumAhr( &ahres->D, &ahres->M, Top.isBegMonth, Top.isEndMonth);		// accumulate day ah results to month
-	mtrsAccum( C_IVLCH_M, Top.isBegMonth, Top.isEndMonth);					// accum metered energy: day to month. local,below.
+		accumAhr( &ahres->D, &ahres->M, Top.isBegMonth, Top.isEndMonth);	// accumulate day ah results to month
+	mtrsAccum( C_IVLCH_M, Top.isBegMonth, Top.isEndMonth);					// accum METERs, DHWMETERs, AFMETERS: day to month
 #ifdef BINRES
 	if (brf)									// if outputting binary results for this run
 		//if (!Top.tp_autoSizing)						// not for ausz yet 6-95: tested above, and brf is off.
@@ -2053,8 +2064,16 @@ LOCAL void FC NEAR mtrsAccum( 	// Accumulate metered results: add interval to ne
 
 	// AFMETERs
 	AFMTR* pAM;
+	int iM = 0;
 	RLUP(AfMtrR, pAM)
-		pAM->amt_Accum(ivl, firstflg, lastflg);
+	{
+		if (++iM != pAM->ss)
+			printf("\nMismatch");
+		if (pAM->ss < AfMtrR.n)
+			pAM->amt_Accum(ivl, firstflg, lastflg);
+		if (iM != pAM->ss)
+			printf("\nMismatch");
+	}
 }               // mtrsAccum
 //-----------------------------------------------------------------------------------------------------------
 LOCAL void FC NEAR mtrsFinalize( 	// Finalize meters (after post-stage calcs e.g. battery)

src/CNRECS.DEF

@@ -3403,9 +3403,9 @@ RECORD AFMTR_IVL "Airflow meter interval sub" *SUBSTRUCT  // interval substruct
 
     *prefix amt_
 	*declare "void amt_Clear() { memset( this, 0, sizeof( AFMTR_IVL));}"
-	*declare "void amt_Copy( const AFMTR_IVL* s);"
+	*declare "void amt_Copy( const AFMTR_IVL* sIvl, float mult=1.f);"
  	*declare "void amt_AccumCat( AFCAT cat, FLOAT v) { (&amt_unknown)[ cat] += v; amt_total += v; }"
-	*declare "void amt_Accum( const AFMTR_IVL* sIvl, int firstFlg, int lastFlg);"
+	*declare "void amt_Accum( const AFMTR_IVL* sIvl, int firstFlg, int lastFlg, int options=0);"
 
 	*declare "static const int NAFCATS;"
 
@@ -3430,6 +3430,8 @@ RECORD AFMTR_IVL "Airflow meter interval sub" *SUBSTRUCT  // interval substruct
 RECORD AFMTR "AFMETER" *RAT 	// Airflow meter
 
     *declare "RC amt_CkF();"
+	// *declare "void amt_Clear();"
+	*declare "bool amt_IsSumOf() const { return ss == b->n; }"
 	*declare "RC amt_BegSubhr();"
 	*declare "void amt_AccumCat( AFCAT afCat, float amf);"
 	*declare "void amt_Accum( IVLCH ivl, int firstflg, int lastFlg);"

src/VECPAK.H

@@ -336,8 +336,9 @@ template< typename T1, typename T2> void VMul1(	// vector * constant
 	T1* v,				// vector
 	int n,				// dim of v
 	T2 f)				// factor
-{	for (int i=0; i < n; i++)
-		v[ i] = T1( v[ i] * f);
+{	if (f != T2( 1))
+		for (int i=0; i < n; i++)
+			v[ i] = T1( v[ i] * f);
 }		// VMul1< T1, T2>
 //-------------------------------------------------------------------------
 template< typename T> T DotProd3(			// 3-vector dot product