Fix below grade surface xs_UNom / ms_UNom inconsistency

Author: chipbarnaby

src/CGWTHR.CPP

@@ -380,13 +380,13 @@ RC WDHR::wd_WfReader( 	// read an hour's weather data and make adjustments
 	}
 
 	// set up solar conditions
-#if 1
-	if (iHrST == 0)
-		slday( jDayST, SLTMLST);
-#else
+#if defined( SOLARFIX)
 	slday( jDayST, SLTMLST, 1);	// set up curr SLLOCDAT struct for today if needed
 								// sets info re declination of earth's axis, hourly sunupf[], dircos[], slazm[], etc.
 								// used by slaniso & most other slpak calls.
+#else
+	if (iHrST == 0)
+		slday( jDayST, SLTMLST);
 #endif
 
 	static float dchoriz[3] = { 0.f, 0.f, 1.f };	// dir cos of a horiz surface

src/CNCULT2.CPP

@@ -186,9 +186,9 @@ RC topReCkf()
 	return topCkfI( TRUE);
 }
 //===========================================================================
-LOCAL RC topCkfI( int re)
-
-// finish/check/set up inner function, used when RUN seen, and again (re TRUE) if main simulation follows autosize.
+LOCAL RC topCkfI(	// finish/check/set up inner function
+	int re)		// 0: when RUN seen
+				// nz: 2nd call when main simulation follows autosize
 
 /* does:
      checking that must be deferred til multiple inputs present

src/CNCULT3.CPP

@@ -692,7 +692,8 @@ x		printf( "Hit\n");
 	ms_area = sf->x.xs_area;			// net area
 	isSubhrly = SFI::sf_IsSubhrly( sf->x.xs_modelr);	// TRUE if to be simulated subhourly
 
-	ms_UNom = sf->x.xs_UNom;		// u value: construction/layers + surfaces
+	ms_UNom = sf->x.xs_UNom;		// U-factor: construction/layers + nominal surface conductance
+									// Note: ms_UNom also set in xs_SetUNom() to ensure consistency
 	ms_tc = con->hc/sf->x.uI;		// time constant, recomputed & stored here for reporting (cgresult.cpp) added 1-95
 
 	inside.bc_Setup( ss, MSBCZONE, 0);		// 0 = doing inside
@@ -1940,7 +1941,8 @@ int XSURF::xs_CanHaveExtSlr() const	// TRUE iff surface outside can receive ambi
         && xs_ty != CTPERIM && xs_ty != CTINTWALL;
 }		// XSURF::xs_CanHaveExtSlr
 //-----------------------------------------------------------------------------
-RC XSURF::xs_SetUNom()
+RC XSURF::xs_SetUNom()			// derive/set nominal U-factor
+// also sets xs_UANom, xs_rSrfNom, xs_hSrfNom, and ms_UNom
 {
 static float rSrfASHRAE[ 3][ 2] =
 //   down      up
@@ -1988,6 +1990,17 @@ static float rSrfASHRAE[ 3][ 2] =
 	for (int si=0; si<2; si++)
 		xs_hSrfNom[ si] = xs_rSrfNom[ si] > 0.f ? 1.f/xs_rSrfNom[ si] : 0.f;
 
+#if 1	// 10-28-2017
+	// set/update derived values
+	//   known case: xs_SetUNom is called a 2nd time for C_EXCNDCH_GROUND
+	//               xs_UNom value changes
+	xs_UANom = xs_area * xs_UNom;
+	if (xs_msi)
+	{	MSRAT* ms = MsR.GetAt( xs_msi);
+		ms->ms_UNom = xs_UNom;
+	}
+#endif
+
 	return RCOK;
 
 }		// XSURF::xs_SetUNom

src/CNDEFNS.H

@@ -141,6 +141,9 @@
 #define DIM_POLYGONXYZ 37		// input arrays dimension
 								//   = MAX_POLYLPVERTICIES*3 + 1
 
+#undef SOLARFIX				// define to correct timing of slday() calls
+							//    and definition of HA, 10-25-2017
+
 #endif	// ifndef _CNEDEFNS_H
 
 // cndefns.h end

src/CNGUTS.CPP

@@ -1660,8 +1660,8 @@ LOCAL void FC NEAR doIvlAccum()
 	RLUP( RSysResR, pRSR)							// loop RSYS simulation results incl sum_of.
 	{	pRSR->H.rsr_Accum( &pRSR->D, Top.isBegDay, Top.isEndDay);		// accumulate hour results to day. local
 #if 0
-		if (pRSR->ss < RSysResR.n)						// if not the sum record (last)
-			pRSR->H.rsr_Accum( &allRsysRes->H, pRSR->ss==1, pRSR->ss==RsR.n);	// also accumulate each hour to sum_of_RSYS
+0		if (pRSR->ss < RSysResR.n)						// if not the sum record (last)
+0			pRSR->H.rsr_Accum( &allRsysRes->H, pRSR->ss==1, pRSR->ss==RsR.n);	// also accumulate each hour to sum_of_RSYS
 #endif
 	}
 
@@ -1983,15 +1983,17 @@ LOCAL void FC NEAR accumAhr( 		// Accumulate air handler simulation results
 LOCAL void FC NEAR mtrsAccum( 	// Accumulate metered energy use results: add interval to next, + tot and sum.
 
 	IVLCH ivl,		// destination interval: day/month/year.  Accumulates from hour/day/month.  Not Top.ivl!
-	int firstflg ) 	// If TRUE, destination will be initialized before values are accumulated into it
-
+	int firstflg) 	// If TRUE, destination will be initialized before values are accumulated into it
 {
 	MTR* mtr;				// a meter record
 	int firstRec = 1;
-	RLUP( MtrB, mtr)					// loop (good) meter records
-	{	int bTrc = 0; // strMatch( mtr->name, "ElecMtrInitNo");
+	RLUP( MtrB, mtr)		// loop (good) meter records
+	{	
+#if defined( _DEBUG)
+		int bTrc = 0; // strMatch( mtr->name, "ElecMtrInitNo");
 		if (bTrc)
 		   printf( "\nAccum Day=%d  hr=%d  mtr='%s' ivl=%d  ff=%d", Top.jDay, Top.iHr, mtr->name, ivl, firstflg);
+#endif
 
 		MTR_IVL_SUB* mtrSub2 = &mtr->Y + (ivl - C_IVLCH_Y);	// point destination meter interval substruct for interval
 												// ASSUMES MTR interval members ordered like DTIVLCH choices
@@ -2002,37 +2004,20 @@ LOCAL void FC NEAR mtrsAccum( 	// Accumulate metered energy use results: add int
 		if (ivl==C_IVLCH_D)
 		{
 			// compute hour's total load in each record.  .allEU then propogates to D, M, Y.
-			///  sum members .clg .. usr2 to .allEU, exclude .pv and .bt
+			//  sum members .clg .. usr2 to .allEU, exclude .pv and .bt
 			mtrSub1->allEU = VSum<float,double>( &mtrSub1->clg, NENDUSES-2);  	
 
 			// compute sum of uses record (last record).  .sum record then propogates to D, M, Y.
 			if (mtr->ss < MtrB.n)   				// don't add the sum record into itself
 			{	MTR_IVL_SUB& mtrSum = MtrB.p[MtrB.n].H;
-				mtrSum.mtr_Accum1( mtrSub1, ivl, 0+(firstflg!=0));
-#if 0
-				if (firstRec)
-					memcpy( &mtrSum, mtrSub1, sizeof(MTR_IVL_SUB)); 	// copy first record
-				else								// additional records: accumulate ...
-					mtrSum.mtr_Accum1( mtrSub1, ivl);			// treatment of demand not necessarily sensible.
-#endif
+				mtrSum.mtr_Accum1( mtrSub1, ivl, 0+(firstRec!=0));
 			}
 			firstRec = 0;
 		}
 
 		// accumulate: copy on first call (in lieu of 0'ing destination).
 		// Note: doHourGains 0's MTR hour info at start hour.
-#if 1
 		mtrSub2->mtr_Accum1( mtrSub1, ivl, 0 + (firstflg!=0));
-#else
-		if (firstflg)						// if first call for destination interval
-		{	// copy selected members
-			VCopy( &mtrSub2->clg, NENDUSES-2, &mtrSub1->clg);
-			mtrSub2->pv = mtrSub1->pv;
-			mtrSub2->allEU = mtrSub1->allEU;
-		}
-		else							// additional calls in interval use accumulation subr (next)
-			mtrSub2->mtr_Accum1( mtrSub1, ivl);	// adds up uses w/o bt or tot
-#endif
 	}
 
 	// DHWMTRs
@@ -2050,9 +2035,11 @@ LOCAL void FC NEAR mtrsFinalize( 	// Finalize meters (after post-stage calcs e.g
 	int firstRec = 1;
 	RLUP( MtrB, mtr)					// loop (good) meter records
 	{
+#if defined( _DEBUG)
 		int bTrc = 0;   // strMatch( mtr->name, "ElecMtrInitNo");
 		if (bTrc)
 		   printf( "\nFinal Day=%d  hr=%d  mtr='%s' ivl=%d  ff=%d", Top.jDay, Top.iHr, mtr->name, ivl, firstflg);
+#endif
 
 		MTR_IVL_SUB* mtrSub2 = &mtr->Y + (ivl - C_IVLCH_Y);	// point destination meter interval substruct for interval
 												// ASSUMES MTR interval members ordered like DTIVLCH choices
@@ -2113,17 +2100,10 @@ LOCAL void FC NEAR mtrsFinalize( 	// Finalize meters (after post-stage calcs e.g
 
 #endif
 
-	// accumulate: copy on first call (in lieu of 0'ing destination).  Note: doHourGains 0's MTR hour info at start hour.
-#if 1
-		// accumulate to next level, handles dmd
+	// accumulate: copy on first call (in lieu of 0'ing destination).
+	//   handles dmd
+	// Note: doHourGains 0's MTR hour info at start hour.
 		mtrSub2->mtr_Accum1( mtrSub1, ivl, 2 + (firstflg!=0));
-#else
-		if (firstflg)					// if first call for destination interval
-			memcpy( mtrSub2, mtrSub1, sizeof(MTR_IVL_SUB) );	// copy whole subrecord
-		else							// additional calls in interval use accumulation subr (next)
-			mtrSub2->mtr_Accum1( mtrSub1, ivl, 2);	// finalizes totals, handles dmd
-#endif
-
 
 #if	defined( _DEBUG)
 		if (1 || bTrc)
@@ -2147,7 +2127,6 @@ void MTR_IVL_SUB::mtr_Accum1( 	// accumulate of one submeter-interval into anoth
 								//      else end-of-calc
 // accums/copies mtrSub1 into *this
 {
-#if 1
 	bool bCopy     = (options & 1) != 0;
 	bool bFinalize = (options & 2) != 0;
 
@@ -2171,17 +2150,7 @@ void MTR_IVL_SUB::mtr_Accum1( 	// accumulate of one submeter-interval into anoth
 	{	// after load management (e.g. battery)
 		// handle all mbrs w/ *p variability
 		if (bCopy)
-		{	memcpy( this, mtrSub1, sizeof( MTR_IVL_SUB));
-
-#if 0
-			tot = mtrSub1->tot;
-			bt = mtrSub1->bt;
-			cost = mtrSub1->cost;
-			dmd = mtrSub1->dmd;
-			dmdCost = mtrSub1->dmdCost;
-			dmdShoy = mtrSub1->dmdShoy;
-#endif
-		}
+			memcpy( this, mtrSub1, sizeof( MTR_IVL_SUB));
 		else
 		{	tot += mtrSub1->tot;
 			bt += mtrSub1->bt;
@@ -2191,7 +2160,6 @@ void MTR_IVL_SUB::mtr_Accum1( 	// accumulate of one submeter-interval into anoth
 				dmdCost += mtrSub1->dmdCost;
 
 			// keep peak demand, and its cost thru month level
-
 			if (mtrSub1->dmd > dmd)		// if source demand (peak use) greater
 			{	dmd  = mtrSub1->dmd;		// update largest hourly demand in destination
 				dmdShoy = mtrSub1->dmdShoy;	// update peak date & time (subhr of year)
@@ -2200,28 +2168,6 @@ void MTR_IVL_SUB::mtr_Accum1( 	// accumulate of one submeter-interval into anoth
 			}
 		}
 	}
-#else
-
-// Add up uses and cost, and demand cost if month to year
-
-	VAccum( &tot, 	// add 2nd arg float vector to 1st arg
-			NENDUSES			// vector length: # end uses
-			 + 1				//  plus .tot, assumed to precede end uses,
-			 + 1				//  plus .cost, assumed to immed follow end uses
-			 + (ivl==C_IVLCH_Y),	// plus .dmdCost if month-to-year (thru month, largest
-	                    			// dmdCost is used, not sum, by code just below).
-			&mtrSub1->tot);
-// Keep peak demand, and its cost thru month level
-
-	if (mtrSub1->dmd > dmd)		// if source demand (peak use) greater
-	{
-		dmd  = mtrSub1->dmd;		// update largest hourly demand in destination
-		dmdShoy = mtrSub1->dmdShoy;	// update peak date & time (subhr of year)
-		if (ivl != C_IVLCH_Y)			// thru month level, keep largest demand cost
-			dmdCost = mtrSub1->dmdCost;	// .. (but for month to year, dmdCost is summed, above).
-	}
-
-#endif
 }		// MTR_IVL_SUB::mtr_Accum1
 //-----------------------------------------------------------------------------------------------------------
 double MTR_IVL_SUB::mtr_NetBldgLoad() const	// building load (includes PV, excludes BT)
@@ -2362,7 +2308,7 @@ void TOPRAT::tp_DoDateDowStuff()	// do date, day of week, and holiday stuff for
 
 // allocate date string storage once. Small, error unlikely, abort ok. dmpak.cpp.
 	if (!dateStr)
-		dmal( DMPP( dateStr), max( TDDATELENMAX+1U, strlen("ddd Jan xxx cooling design day xx")), ABT); 							// small, error unlikely, let program abort.
+		dmal( DMPP( dateStr), max( TDDATELENMAX+1U, strlen("ddd Jan xxx cooling design day xx")), ABT); 	// small, error unlikely, let program abort.
 
 	if (tp_autoSizing)				// set at start setup, cncult2.cpp
 	{

src/SLPAK.CPP

@@ -379,7 +379,7 @@ void FC slday(	// set up daily data in current SLLOCDAT
 
 	sldec( dec, timetype);	// set declination-related slloccur members, below.
 
-}			/* slday */
+}			// slday
 //======================================================================
 LOCAL void FC NEAR sldaydat(
 

src/SLPAK.H

@@ -17,12 +17,12 @@
          local time to solar (and date still changes at local/daylite midnite),
 	 so range is bit more than -Pi to Pi. (mainly used when sun is up.) */
 
-#if 1
-#define HA 0.26179939
-#else
+#if defined( SOLARFIX)
 const double HA = k2Pi/24.;  	// earth rotation, rad/hr
 								// for converting hours to hour angle
 								//   then add SLLOCDAT.tmconst.
+#else
+#define HA 0.26179939
 #endif
 
 /*--------------------------------- TYPES ---------------------------------*/

src/csevrsn.h

@@ -14,14 +14,16 @@
 // version # for current build
 // change ONLY here
 #define CSEVRSN_MAJOR 0
-#define CSEVRSN_MINOR 845
+#define CSEVRSN_MINOR 847
 
 // version # as quoted text ("x.xxx")
 #define CSEVRSN_TEXT MAKE_LIT(CSEVRSN_MAJOR##.##CSEVRSN_MINOR)
 
 // ONLY comments below here
 
 /* History:
+   0.847: fix inconsistent xs_UNom
+   0.846: SOLARFIX test version, 10-25-2017
    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

test/2Zone.cse

@@ -304,6 +304,11 @@ AIRHANDLER "Infil"   //Constant Volume no energy, heating or cooling to model in
         gnMeter=GAINMETER
         gnEndUse=Lit
         gnPower=INTGAIN*.4
+
+	  GAIN IX1
+        gnMeter=GAINMETER
+        gnEndUse=DHW
+        gnPower=$DayOfYear
 
     SURFACE Roof
         sfType=Ceiling
@@ -425,6 +430,11 @@ AIRHANDLER "Infil"   //Constant Volume no energy, heating or cooling to model in
         gnMeter=GAINMETER
         gnEndUse=Lit
         gnPower=INTGAIN*.4
+
+	GAIN Ix2
+        gnMeter=GAINMETER
+        gnEndUse=Htg
+        gnPower=$DayOfYear*.9
 
     SURFACE Roof
         sfType=Ceiling
@@ -573,11 +583,15 @@ TERMINAL  "infil"  //Constant vol, no heat or cool to model infil
 
  //--------- REPORTS ------------
 
- REPORT rpType=ZDD     rpZone=Z1
  REPORT rpType=AH     rpAH="MainAH"          rpFreq=Month
 
- REPORT     rpType=MTR     rpMeter=HEATMETER    rpFreq=Month
- REPORT "Heating Energy"
+ REPORT     rpType=MTR     rpMeter=ALL    rpFreq=Month
+
+ REPORT     rpType=MTR     rpMeter=All    rpFreq=Day  rpDayBeg=May 14  rpDayEnd=May 24
+
+ REPORT     rpType=MTR     rpMeter=All    rpFreq=Hour  rpDayBeg=May 15  rpDayEnd=May 15
+ 
+  REPORT "Heating Energy"
         rpType=UDT 
         rpFreq=YEAR
         reportcol colVal=@meter[HEATMETER].Y.dmd/3413             ColHead="Pk kW"
@@ -586,9 +600,7 @@ TERMINAL  "infil"  //Constant vol, no heat or cool to model infil
         reportcol [email protected]                             ColHead="Pk Hr"
         reportcol colval=@meter[HEATMETER].y.tot* 0.000000292997   ColHead="Yr mWh"
 
-
- REPORT     rpType=MTR     rpMeter=COOLMETER    rpFreq=Month
- REPORT "Cooling Energy"
+  REPORT "Cooling Energy"
         rpType=UDT 
         rpFreq=YEAR
  reportcol colVal=@meter[CoolMETER].Y.dmd/3413 ColHead="Pk kW"
@@ -597,8 +609,6 @@ TERMINAL  "infil"  //Constant vol, no heat or cool to model infil
         reportcol [email protected]          ColHead="Pk Hr"
         reportcol colval=@meter[CoolMETER].y.tot* 0.000000292997   ColHead="Yr mWh"
 
- REPORT     rpType=MTR     rpMeter=GAINMETER    rpFreq=Month
- 
  REPORT  rpType=ZEB rpZone=Z1 rpDayBeg=Jan 4 rpDayEnd=Jan 4 rpFreq=Hour
  REPORT  rpType=AH  rpAH="MainAH"   rpDayBeg=Jan 4 rpDayEnd=Jan 4 rpFreq=HOUR
  REPORT  rpType=ZEB rpZone=Z1 rpDayBeg=Jul 26 rpDayEnd=Jul 26 rpFreq=Hour
@@ -609,6 +619,7 @@ TERMINAL  "infil"  //Constant vol, no heat or cool to model infil
 // REPORT  rpType=AH  rpAH="Infil"  rpDayBeg=Jul 26 rpDayEnd=Jul 26 rpFreq=HOUR
 // REPORT  rpType=AH  rpAH="Infil"  rpDayBeg= Oct 16 rpDayEnd= Oct 16 rpFreq=HOUR
 
+ REPORT rpType=ZDD     rpZone=Z1
 
 
 #if 0