Merge 0.836b branch into master.

Author: nealkruis

src/ANCREC.CPP

@@ -253,16 +253,16 @@ const char* record::whatIn() const 	// return basAnc record owner text
 					1 );				// say show [file(file)] in 1st object if unnamed
 }	// record::whatIn
 //-----------------------------------------------------------------------------
-int record::IsSetAny(
+int record::IsSetCount(			// count # of set fns in list
 	int fn, ...) const	// 0 terminated fn list (don't forget the 0!)
-// return 1 iff at least one of fields IsSet()
+// returns # of IsSet() fields
 {	va_list ap;
 	va_start( ap, fn);
+	int nSet = 0;
 	while (1)
 	{	if (fn == 0)
-			return 0;
-		if (IsSet( fn))
-			return 1;
+			return nSet;
+		nSet += IsSet( fn);
 		fn = va_arg( ap, int);
 	}
 }		// record::IsSetAny

src/ANCREC.H

@@ -187,7 +187,7 @@ class record		// base class for records
 	{ return ((UCH *)this + b->sOff)[fn]; }
 	inline int IsSet( int fn) const
 	{ return (fStat( fn)&FsSET) != 0; }
-	int IsSetAny( int fn, ...) const;
+	int IsSetCount( int fn, ...) const;
 	inline void ClrSet( int fn)
 	{ fStat( fn) &= ~FsSET; }
 	inline int IsVal( int fn) const

src/BATTERY.cpp

@@ -3,26 +3,27 @@
 // that can be found in the LICENSE file.
 
 #include "cnglob.h"
+
 #include "ancrec.h"
 #include "rccn.h"
 
 #include "cnguts.h"
-#include <cmath>
 
+//----------------------------------------------------------------------------
 RC BATTERY::bt_CkF()
 {
 	RC rc = RCOK;
 	return rc;
 }	// BATTERY::bt_CkF
-
+//----------------------------------------------------------------------------
 RC BATTERY::RunDup(		// copy input to run record; check and initialize
 	const record* pSrc,		// input record
 	int options/*=0*/)
 {
-	RC rc = record::RunDup(pSrc, options);
+	RC rc = record::RunDup( pSrc, options);
 	return rc;
 }	// BATTERY::RunDup
-
+//----------------------------------------------------------------------------
 RC BATTERY::bt_Init()
 {
 	RC rc = RCOK;
@@ -33,76 +34,94 @@ RC BATTERY::bt_Init()
 	bt_loadSeen = 0.0;
 	return rc;
 }	// BATTERY::bt_Init
-
-// MTR -> float
-// Given a meter (MTR) object, calculate all loads and return as power in kW
-float BATTERY::bt_CalcAdjLoad(MTR m)
+//-----------------------------------------------------------------------------
+float BATTERY::bt_CalcAdjLoad(		// default load
+	const MTR& m) const	// source meter
+// returns sum of all end uses, kW
 {
-	float btuh_to_kW(1.0/3412.142);
-	return (m.H.clg
-		+ m.H.htg
-		+ m.H.hp
-		+ m.H.dhw
-		+ m.H.dhwBU
-		+ m.H.fanC
-		+ m.H.fanH
-		+ m.H.fanV
-		+ m.H.fan
-		+ m.H.aux
-		+ m.H.proc
-		+ m.H.lit
-		+ m.H.rcp
-		+ m.H.ext
-		+ m.H.refr
-		+ m.H.dish
-		+ m.H.dry
-		+ m.H.wash
-		+ m.H.cook
-		+ m.H.usr1
-		+ m.H.usr2
-		+ m.H.pv) * btuh_to_kW;
-}
-
-RC BATTERY::bt_DoHour()
+	return float( m.H.mtr_NetBldgLoad() / 3412.142);
+}		// bt_CalcAdjLoad
+//-----------------------------------------------------------------------------
+RC BATTERY::bt_DoHour(
+	int stage)		// 0: pre-calc
+					// 1: calcs
+					// 2: after reports
 {
+	static const float kW_to_btuh = 3412.142f;
+	static const float dt = 1.f;	// timestep duration, hr
+
 	RC rc = RCOK;
-	float P_load_adj(0.0); // building + PV load, power [kW]
-	float P_bt_req(0.0); // battery requested discharge power [kW]
-	float P_bt_max_cap(0.0); // battery maximum (charge) power based on capacity [kW]
-	float P_bt_min_cap(0.0); // battery minimum (discharge) power based on capacity [kW]
-	float P_bt(0.0); // battery discharge power [kW]
-	float dE_bt_app(0.0); // battery apparent power change [kWh]
-	float dE_bt(0.0); // actual battery discharged energy [kWh]
-	float eff(1.0); // efficiency of the battery [fraction]
-	float dt(1.0); // hours in this timestep [hr]
-	float dsoe(0.0); // change in SOE
-	float kW_to_btuh(3412.142);
-	float tolerance(bt_maxCap * 1e-6); // tolerance for capacity calculations [kW] -- used to prevent underflow issues
-	bt_loadSeen = 0.0;
-	if (bt_meter) {
-		P_load_adj = bt_CalcAdjLoad(MtrB.p[bt_meter]);
-		bt_loadSeen = P_load_adj;
+
+	if (stage == 0)
+	{	// stage 0: after meter accum, before EVENDIVL expression eval
+		//          bt_loadSeen is thus available at EVENDIVL
+		if (Top.tp_isBegMainSim && IsSet( BATTERY_INITSOE))
+		// Ensure battery is reinitialized
+		// after warmup and/or autosizing
+		// ONLY IF bt_initSOE was set by user
+			rc = bt_Init();
+
+		// building + PV net from meter if available
+		bt_loadSeen	= bt_meter ?  bt_CalcAdjLoad( MtrB.p[bt_meter]) : 0.f;
+	}
+	else if (stage == 1)
+	{	// stage 1: after EVENDIVL expression eval
+		//          results have *p (EVPSTIVL) stage (available in reports)
+
+		float tolerance(bt_maxCap * 1e-6);	// tolerance for capacity calculations [kW]
+											//  used to prevent underflow issues
+
+		// battery requested discharge power[ kW]
+		float P_bt_req 	= bt_useUsrChg == C_NOYESCH_YES
+				? bt_chgReq			// user-specified discharge request
+				: -bt_loadSeen;		// default control strategy
+
+		// battery maximum (charge) power based on capacity [kW]
+		float P_bt_max_cap = (bt_maxCap * (1.f - bt_soe)) / (dt * bt_chgEff);
+		if (P_bt_max_cap < tolerance)
+			P_bt_max_cap = 0.f;
+
+		// battery minimum (discharge) power based on capacity [kW]
+		float P_bt_min_cap = -1.0 * (bt_maxCap * bt_soe * bt_dschgEff) / dt;
+		if (P_bt_min_cap > (-tolerance))
+			P_bt_min_cap = 0.f;
+
+		// battery discharge power [kW]
+		float P_bt = bracket<float>( max( P_bt_min_cap, -bt_maxDschgPwr), P_bt_req, min( P_bt_max_cap, bt_maxChgPwr));
+
+		// battery apparent power change [kWh]
+		float dE_bt_app = P_bt * dt;
+
+		// efficiency of battery
+		float eff = dE_bt_app >= 0.f ? bt_chgEff : (1.f / bt_dschgEff);
+
+		// actual battery discharged energy [kWh]
+		// update energy
+		float dE_bt = dE_bt_app * eff;
+		float energyPrior = bt_energy;
+		bt_energy = bracket(0.f, bt_energy + dE_bt, bt_maxCap);
+		dE_bt = bt_energy - energyPrior;	// force consistency in case bracket() changed bt_energy
+
+		// state of energy
+		bt_soe = bt_energy / bt_maxCap;
+
+		// soeBegIvl is used to provide probe access to SOE for the beginning of the next interval
+		// during expression evaluation
+		bt_soeBegIvl = bt_soe;
+
+		// we divide by 2 because one full discharge and one full charge = one cycle
+		bt_cycles += fabs( dE_bt / bt_maxCap) / 2.f;
+		if (bt_meter)
+			MtrB.p[bt_meter].H.mtr_Accum(bt_endUse, P_bt * kW_to_btuh);
+	}
+	else
+	{	// stage == 2 (after reports): copy current hour results to xxxlh
+		//    re availability for probing in e.g. next hour control expressions
+		bt_soelh = bt_soe;
+		bt_energylh = bt_energy;
+		bt_cycleslh = bt_cycles;
 	}
-	P_bt_req = (bt_useUsrChg == C_NOYESCH_NO) ? -1.0 * P_load_adj : bt_chgReq;
-	P_bt_max_cap = (bt_maxCap * (1.0 - bt_soe)) / (dt * bt_chgEff);
-	if (P_bt_max_cap < tolerance)
-		P_bt_max_cap = 0.0;
-	P_bt_min_cap = -1.0 * (bt_maxCap * bt_soe * bt_dschgEff) / dt;
-	if (P_bt_min_cap > (-1.0 * tolerance))
-		P_bt_min_cap = 0.0;
-	P_bt = bracket<float>(max(P_bt_min_cap, -1.0 * bt_maxDschgPwr), P_bt_req, min(P_bt_max_cap, bt_maxChgPwr));
-	dE_bt_app = P_bt * dt;
-	eff = (dE_bt_app >= 0.0) ? bt_chgEff : (1.0 / bt_dschgEff);
-	dE_bt = dE_bt_app * eff;
-	bt_energy = bt_energy + dE_bt;
-	dsoe = dE_bt / bt_maxCap;
-	bt_soe = bt_soe + dsoe;
-	// soeBegIvl is used to provide probe access to SOE for the beginning of the next interval
-	// during expression evaluation
-	bt_soeBegIvl = bt_soe;
-	// we devide by two because one full discharge and one full charge = one cycle
-	bt_cycles = bt_cycles + (std::abs(dsoe) / 2.0);
-	if (bt_meter)
-		MtrB.p[bt_meter].H.mtr_Accum(bt_endUse, P_bt * kW_to_btuh);
 	return rc;
-}	// BATTERY::bt_DoHour()
+}	// BATTERY::bt_DoHour
+
+// battery.cpp end

src/CGCOMP.CPP

@@ -1871,7 +1871,7 @@ AIRSTATE DUCTSEG::ds_CalcFL(		// current performance at full load
 		//   0: leaving air db = surround temp
 		//   1: leaving air = entering air
 		ds_beta = mCp > .1f
-						? exp( max( -100., -ds_uaTot/mCp))
+						? exp( max( -80., -ds_uaTot/mCp))
 						: 0.f;		// very small air flow
 		ds_air[ 3].as_Set(
 				ds_beta*ds_air[ 1].as_tdb + (1.f-ds_beta)*ds_sbcO.sb_txe,