Missing TDV file -> UNSET data -> error if probed

Warning re derived weather values when autosizing using ET1 header data

Author: chipbarnaby

src/ANCREC.CPP

@@ -410,10 +410,10 @@ basAnc::basAnc()		// default c'tor (for derived copy c'tor
 	memset( (char *)this+SZVFTP, 0, sizeof(*this)-SZVFTP); // SZVFTP: virtFcnTblPtr: cnglob.h.
 }			// basAnc::basAnc
 //---------------------------------------------------------------------------------------------------------------------------
-basAnc::basAnc( USI _flags, SFIR * _fir, USI _nFlds, char * _what, USI _eSz, RCT _rt, USI _sOff, SI dontRegister/*=0*/ )
+basAnc::basAnc( int flags, SFIR * _fir, USI _nFlds, char * _what, USI _eSz, RCT _rt, USI _sOff, int dontRegister/*=0*/ )
 {
 	memset( (char *)this+SZVFTP, 0, sizeof(basAnc)-SZVFTP);		// zero all basAnc members but virtFcnTblPtr at front
-	flags = _flags;
+	ba_flags = flags;
 	fir = _fir;
 	nFlds =_nFlds;
 	what = _what;  	// store non-0 member values
@@ -422,12 +422,13 @@ basAnc::basAnc( USI _flags, SFIR * _fir, USI _nFlds, char * _what, USI _eSz, RCT
 	sOff = _sOff;				// ..
 	mn = 1;						// min record subscript 1 (overwritten with 0 if static)
 	// ptr() = 0;				is done in derived class constructor (deriv vf not avail here; ptr is pure!)
-	if (!dontRegister)  regis();					// conditionally include anchor for nextAnc() iteration
+	if (!dontRegister)
+		regis();					// conditionally include anchor for nextAnc() iteration
 }					// basAnc::basAnc
 //--------------------------------------------------------------------------------------------------------------
 /*virtual*/ basAnc::~basAnc()		// d'tor
 {
-	if (flags & RFTYS)
+	if (ba_flags & RFTYS)
 		dmfree( DMPP( what));
 }		// basAnc::~basAnc
 //---------------------------------------------------------------------------------------------------------------------------
@@ -530,7 +531,7 @@ x					(char /*far!*/ *)what );					// returns RCBAD
 	{
 		nAl = _nAl;   				// save max alloc'd subscript+1.
 		mn = 1;  					// insurance: mn is already 1.
-		flags |= RFHEAP;					// say block is in heap, should be free'd
+		ba_flags |= RFHEAP;			// say block is in heap, should be free'd
 		// the n record spaces are subscripted 1 to n.  The spaces are not "records" till constructed by add().
 		// allocated but unused space[0] "grounds" unset references and allows using 0 subscript as "unset" indicator.
 		// set front members in block's space[0] now, as req'd by validate's check when ptr nz.
@@ -539,12 +540,12 @@ x					(char /*far!*/ *)what );					// returns RCBAD
 			ptr()->rt = rt;  			//   ... (rec(0) is not add'd, and anyway validate error would foil add.)
 			ptr()->b = (BP)this;			// .ss is already 0.  .gud is left 0.
 		}
-#if 1	// 9-10
+
 		// loop all pre-reAl gud records
 		for (int i=mn; i<=n ; i++)
 			if (rec( i).gud)
 				rec( i).FixUp();		// virtual, allow record to fix e.g. link ptrs
-#endif
+
 	}
 	return rc;
 } 		// basAnc::reAl
@@ -554,9 +555,9 @@ RC FC basAnc::free()				// free (non-static) record memory block for anchor
 	desRecs();  			// destroy any records: calls record-derived class virtual d'tor
 	n = nAl = 0;
 	mn = 1;					// minimum subscript 1 to be > n; also 1 expected by reAl/add.
-	if (flags & RFHEAP)		// do not free non-heap (static) block
+	if (ba_flags & RFHEAP)	// do not free non-heap (static) block
 		dmfree( pptr());	//   free memory block and set ptr() null
-	flags &= ~RFHEAP;		// clear all flags but non-heap flag
+	ba_flags &= ~RFHEAP;	// clear all flags but non-heap flag
 	return RCOK;
 }					// basAnc::free
 //---------------------------------------------------------------------------------------------------------------------------
@@ -634,11 +635,11 @@ void basAnc::statSetup( 		// init anchor with given non-expandable static record
 	// initialize run-time anc members.  eSz and rt are init by constructor.
 	setPtr( &r);
 	if (inHeap)
-		flags |= RFHEAP;
+		ba_flags |= RFHEAP;
 	else
-		flags &= ~RFHEAP;	// inHeap arg to flags bit
-	flags |= RFSTAT;		// disable realloc and var data
-	mn = 0;  				// minimum subscript is 0 for static (to save space: 1 large record is typical)
+		ba_flags &= ~RFHEAP;	// inHeap arg to flags bit
+	ba_flags |= RFSTAT;			// disable realloc and var data
+	mn = 0;  					// minimum subscript is 0 for static (to save space: 1 large record is typical)
 	nAl = _n;
 	n = _n - 1;
 	for (TI i = mn; i <= n; i++)
@@ -701,7 +702,7 @@ RC basAnc::validate(	// validate an anchor: check self-consistency of anchor and
 	||  !(rt & RTBRAT) )				//   or base rt not a RAT rt
 		return err( erOp, (char *)MH_X0055, fcnName);	// errMsg "%s() argument not a valid anchor" & abort or return per erOp. rmkerr.cpp.
 
-	if (noStat && (flags & RFSTAT) )			// check staticness
+	if (noStat && (ba_flags & RFSTAT) )			// check staticness
 		return err( erOp, (char *)MH_X0056, fcnName);  	// "%s(): illegal use of static-storage anchor"
 
 	return RCOK;							// if here, all OK

src/ANCREC.H

@@ -54,8 +54,8 @@ typedef basAnc* BP;	// basAnc pointer -- formerly used to localize NEARness
 //--- bits for basAnc.flags
 #define RFSTAT  0x4000	// "static" record basAnc: not reallocable, min subscr 0 not 1. set ancrec.cpp, tested ancrec,cul,cuprobe.cpp.
 #define RFTYS   0x1000	// is in TYPES sub-basAnc (pted to by a basAnc.tys)
-#define RFNOEX  0x0800	// don't register exprs in records in this basAnc: appl (e.g. ul\cul.cpp) to ul\exman.cpp:exWalkRecs()
-#define RFINP   0x0400	// is an input (not run) records basAnc: ul\cul.cpp to ul\cuparse.cpp:probe.  12-91.
+#define RFNOEX  0x0800	// don't register exprs in records in this basAnc: appl (e.g. cul.cpp) to exman.cpp:exWalkRecs()
+#define RFINP   0x0400	// is an input (not run) records basAnc: cul.cpp to cuparse.cpp:probe.  12-91.
 #define RFPROBED 0x0200	// set if basAnc has been 'probed': do not free (input) basAnc b4 run. cuparse.cpp:probe to cul.cpp:finalClear.
 #define RFLOCAL 0x0100	// flag for private local uses 1-92. used in: cuprobe.cpp:showProbeNames, .
 #define RFHEAP  0x0080	// set if block is in heap, else don't dmfree. 5-92.
@@ -80,32 +80,32 @@ class basAnc    	// base class for record anchors: basAnc<recordName>
     TI mn, n;				// minimum (0 or 1) and max NOT+1 used record subscript (spaces unused if .gud==0)
 	inline int GetSSRange() const { return n-mn+1; }	// count INCLUDING UNUSED
 	inline int GetSS0() const { return mn; }			// subscript of 0th entry
-    USI flags;				// bits, RFxxxx defines above -- also set by user
+    int ba_flags;			// bits, RFxxxx defines above -- also set by user
   // members setable by application user language (cul.cpp)
     BP tyB;				// 0 or ptr to user language TYPES anchor in heap (destructor deletes)
     BP ownB;			// 0 or ptr to anchor whose objects own this anchor's objects (record.ownTi)
 	const CULT* an_pCULT;	// NULL or associated CULT input table for records of this type
 							//   simplifies back translation of input names
 
     basAnc();
-    basAnc( USI flags, SFIR * fir, USI nFlds, char * what, USI eSz, RCT rt, USI sOff, SI dontRegister=0 );
+    basAnc( int flags, SFIR * fir, USI nFlds, char * what, USI eSz, RCT rt, USI sOff, int dontRegister=0 );
     void FC regis();
     virtual ~basAnc();  								// destroyed in deriv classes, to use vf
     virtual record* ptr() = 0;							// access block ptr (in drv class: typed)
 	virtual void** pptr() = 0;
 	virtual void setPtr( record* r) = 0;
     virtual record& rec(TI i) = 0;   // { return (record)((char *)ptr() + i*eSz); }	// access record i
-	virtual record* GetAtSafe( int i) const	= 0;			// typed pointer to ith record or NULL
-    virtual void* recMbr(TI i, USI off) = 0;				// point record i member by offset
-    void * FC recFld(TI i, SI fn);							// point record i member by FIELD # 3-92
-    RC FC al( TI n, int erOp=ABT, BP _ownB=NULL);		// allocate records block. destroys old recs.
-    RC FC reAl( TI n, int erOp=ABT);						// (re)allocate records block. keeps old recs <= n.
-    RC FC free();										// free block
-    RC add( record **r, int erOp, TI i=0);			// add record to block
-    RC FC del( TI i, int erOp=ABT);						// delete record i
-    void statSetup( record &r, TI n=1, SI noZ=0, SI inHeap=0);   		// set up with static record(s)
-    SI FC isNamed() const { return flags & RFNAMED; }		// records have .name[]: always on, coding out 7-92
-    static BP FC anc4n( USI an, int erOp=ABT);   					// access anchor by anchor #
+	virtual record* GetAtSafe( int i) const	= 0;				// typed pointer to ith record or NULL
+    virtual void* recMbr(TI i, USI off) = 0;					// point record i member by offset
+    void * FC recFld(TI i, SI fn);								// point record i member by FIELD # 3-92
+    RC FC al( TI n, int erOp=ABT, BP _ownB=NULL);				// allocate records block. destroys old recs.
+    RC FC reAl( TI n, int erOp=ABT);							// (re)allocate records block. keeps old recs <= n.
+    RC FC free();												// free block
+    RC add( record **r, int erOp, TI i=0);						// add record to block
+    RC FC del( TI i, int erOp=ABT);								// delete record i
+    void statSetup( record &r, TI n=1, SI noZ=0, SI inHeap=0);  // set up with static record(s)
+    int isNamed() const { return ba_flags & RFNAMED; }		// records have .name[]: always on, coding out 7-92
+    static BP FC anc4n( USI an, int erOp=ABT);   				// access anchor by anchor #
     static RC FC findAnchorByNm( char *what, BP *b);
     static SI FC ancNext( USI &an, BP *_b);						// iterate anchors
     RC validate( char *fcnName, int erOp=ABT, SI noStat=0);				// check for valid anchor
@@ -261,11 +261,11 @@ class record		// base class for records
 
 template <class T>  class anc : public basAnc
 { public:
-    anc( char *what, SFIR *sFir, USI nFlds, RCT rt) 				// cpp'tor used for static instances
+    anc( char *what, SFIR *sFir, USI nFlds, RCT rt) 		// cpp'tor used for static instances
         : basAnc( RFNAMED|RFOWNED, sFir, nFlds, what, sizeof(T), rt, offsetof( T, sstat) )
         { p = 0; }								// soon code out obsolete flags RFNAMED, RFOWNED.
-    anc( const BP src, USI _flags, char  *_what,  				// like-another constructor,
-         BP _ownB, SI dontRegister=0 );    					//  code included only ifdef NEEDLIKECTOR.
+    anc( const BP src, int flags, char  *_what,  			// like-another constructor,
+         BP _ownB, int dontRegister=0 );    				//  code included only ifdef NEEDLIKECTOR.
     virtual ~anc();							// destroys records, and types anchor & its recs.
 
     T* p;									// typed pointer to record array storage block
@@ -326,7 +326,7 @@ template <class T>  class anc : public basAnc
 //=============================================================================
 #ifdef NEEDLIKECTOR		// define where this constructor is USED: avoids generating for classes where not used.
 
-template <class T> anc<T>::anc( const BP src, USI _flags, char *_what, BP _ownB, SI dontRegister/*=0*/)
+template <class T> anc<T>::anc( const BP src, int flags, char *_what, BP _ownB, int dontRegister/*=0*/)
 
 	// like-another-with-records-deleted constructor.
 
@@ -337,10 +337,11 @@ template <class T> anc<T>::anc( const BP src, USI _flags, char *_what, BP _ownB,
     memcpy( this, src, sizeof(anc<T>) );  		// bitwise copy ALL, to incude virt fcn table ptr.
     ancN= nAl= n= 0; p= 0; tyB= 0; 			// clear what don't want: anchor #, records, ul stuff.
     mn = 1;						// mn = 1 when no records allocated even if will be static
-    flags = _flags;  what = _what;  ownB = _ownB; 	// store members given by caller
-    if (!dontRegister)  regis();			// conditionally include in nextAnc iteration.
-							/* CAUTION: don't regis() tyB's or any dm anc<T>'s without
-							   adding unregister logic to destructor, 10-93. */
+    ba_flags = flags;  what = _what;  ownB = _ownB; 	// store members given by caller
+    if (!dontRegister)
+		regis();			// conditionally include in nextAnc iteration.
+							// CAUTION: don't regis() tyB's or any dm anc<T>'s without
+							// adding unregister logic to destructor, 10-93.
 }				// anc<T>::anc
 #endif	// NEEDLIKECTOR
 //-------------------------------------------------------------------------------------------------------------------------

src/CNAH2.CPP

@@ -2228,7 +2228,7 @@ RC AH::setMode()		// set ahMode per ts sp control method and supply fan schedule
 	return RCOK;
 }			// AH::setMode
 //-----------------------------------------------------------------------------------------------------------------------------
-/* Notes re AH ZN and ZN2 supply temp control methods, Rob 5-95. Also at start of ul\cncult5.cpp and app\cnah1.cpp.
+/* Notes re AH ZN and ZN2 supply temp control methods, Rob 5-95. Also at start of cncult5.cpp and app\cnah1.cpp.
  *
  * 1. ZN and ZN2 are needed to simulate single zone constant volume systems.
  *    VAV is still allowed but could be removed (says Bruce in fax 5-95) if hard-to-fix problems

src/CNCP.CPP

@@ -4,7 +4,7 @@
 
 // cncp.cpp -- COOLPLANTs and CHILLERs runtime code for CSE.  Created 10-92.
 
-// related code: code used only at setup time: ul\cncult6.cpp
+// related code: code used only at setup time: cncult6.cpp
 //               CHW coil model: cncoil.cpp.
 //               class declarations: rccn.h, automatically generated from cnrecs.def.
 

src/CNCULT.CPP

@@ -11,8 +11,8 @@
 
 // TYREF's are supposed to be VEOI/VFAZLY, right? A lot were 0, changed to VEOI 10-9-92. cul.cpp doesn't check evf for TYREF.
 
-/* used in: cnr.exe (derived from \dev\ul\hscult.cpp 8-91)
-            formerly also \dev\ul\hstul.exe (preliminary test for above, not maintained as of 8-91. */
+/* used in: cnr.exe (derived from \dev\hscult.cpp 8-91)
+            formerly also \dev\hstul.exe (preliminary test for above, not maintained as of 8-91. */
 
 /* there are 3 include files for cncult,2,3,4,5,6.cpp (2-92), cuz various inclusions are required first, etc:
 cncult.h: use classes, globally used functions
@@ -187,6 +187,13 @@ void FC cnPreInit()		// preliminary cncult.cpp initialization [needed before sho
 						   Topi can then be accessed as static structure,
 						   or via gen'l routines that work thru TopiR.  lib\ancrec.cpp fcn. */
 
+// say WFDATA records have no members set by via expressions
+// prevents exWalkRecs() from msging deliberately UNSET values
+// (TDV values are left UNSET if no TDV file is provided and
+//  and are detected if used in expressions.)
+	WthrR.ba_flags |= RFNOEX;
+	WthrNxHrR.ba_flags |= RFNOEX;
+
 // note rats are now 'registered' in cse.cpp so input and run rats can be intermixed.
 
 }			// cnPreInit

src/CNCULT2.CPP

@@ -221,19 +221,19 @@ LOCAL RC topCkfI( int re)
 	   bad reference or other internal error that might cause many spurious messages in later fcns
 	   out of memory (continuation proliferates errors) */
 
+
 #ifdef AUTOSIZE
 	// 're' is TRUE on recall for run after autosize. Pass to called fcns as need found, 6-95.
 
 //--- flag (run) basAncs whose records will persist from autoSizing to main sim if both are performed.
 	// flag use: exman.cpp: retain expr use info between phases for records in these basAncs 10-95, .
 	// list of basAncs must match: those not re-setup here if re;
 	//                             those not cleared by cnguts:runFazDataFree() (use RFPERSIS there?)
-	DvriB.flags |= RFPERSIS;
-	RcolB.flags |= RFPERSIS;
-	XcolB.flags |= RFPERSIS;
+	DvriB.ba_flags |= RFPERSIS;
+	RcolB.ba_flags |= RFPERSIS;
+	XcolB.ba_flags |= RFPERSIS;
 
 //--- first determine whether autosizing or main simulation will occur next, set $autosize, evaluate FAZLY expressions.
-
 	// default or check/fix chAutoSize (input "doAutoSize = YES | NO" or as changed)
 	if (!re)							// on initial call only
 	{
@@ -246,7 +246,7 @@ LOCAL RC topCkfI( int re)
 		{
 			Topi.chAutoSize = C_NOYESCH_NO;   			// change it to no -- no autosizing will be done
 			pWarn( "'DOAUTOSIZE = YES' will be disregarded because \n"
-					   "    no 'AUTOSIZE <x>' commands found in input." );  	// NUMS
+				   "    no 'AUTOSIZE <x>' commands found in input." );  	// NUMS
 		}
 		if (Topi.IsSet( TOPRAT_COOLDSDAY))
 			// can't specify both coolDsDay and coolDsMo
@@ -541,7 +541,9 @@ RC TOPRAT::tp_Wfile(		// find/check weather file / init top members with data fr
 			if (badAuszWthr)
 				rc |= per( "'coolDsDay' (not 'coolDsMo') is required"
 							" when autosizing and weather file is not ET1");
-
+			else if (tp_AuszWthrSource()==1)
+				warn( "Derived weather values (e.g. tGrnd and tMains) are missing when autosizing\n"
+					"   conditions are specified via 'coolDsMo' (as opposed to 'coolDsDay').");
 		}
 	}
 

src/CNGLOB.H

@@ -278,11 +278,11 @@ template< typename T> T& IvlData( T* ivlData, int ivl)
 
 /*---------------------------- dept of NANs: unset, nandles, nchoices ---------------------------*/
 
-/* a NANDLE is a 32-bit quantity that is not a valid IEEE float number nor an expected string pointer value,
-   used to indicate unset data and to specify the "expression number" of runtime expression entered for the variable
-     or whose value is to be stored in the variable later.  More discussion in exman.h, exman.cpp.
-   A NANDLE contains 0xFF80 in the hi word and 0 for unset or ffff for autosizing or expression number 1-16383 in the low word.
-   CAUTION: highly system dependent.  CAUTION: keep distinct from NCHOICEs (below) */
+// a NANDLE is a 32-bit quantity that is not a valid IEEE float number nor an expected string pointer value,
+// used to indicate unset data and to specify the "expression number" of runtime expression entered for the variable
+//    or whose value is to be stored in the variable later.  More discussion in exman.h, exman.cpp.
+// A NANDLE contains 0xFF80 in the hi word and 0 for unset or ffff for autosizing or expression number 1-16383 in the low word.
+// CAUTION: highly system dependent.  CAUTION: keep distinct from NCHOICEs (below)
 
 // type to hold a NANDLE or a datum (ptr if string)
 typedef void * NANDAT;		// CAUTION: for fcn args use ptr (NANDAT *) to be sure C does not alter arg bit pattern.
@@ -295,13 +295,13 @@ typedef void * NANDAT;		// CAUTION: for fcn args use ptr (NANDAT *) to be sure C
 #define ASING ((NANDAT)NANDLE(0xffff))				// may be stored in values to be determined by autosizing 6-95
 #define NANDLE(h) ((NANDAT)(0xff800000L + h))		// "expr n" ref for float/ptr/LI (or SI in 4 bytes). h = 1..16383.
 
-/* NCHOICEs are values which can represent one of several choices and which can
-      be stored in a float and distinguished from all numeric values. 2-92.
-   NCHOICEs are used in CHOICN data types, definable thru rcdef.exe per input file cndtypes.def.
-   NCHOICES are stored as IEEE NAN's (not-a-number's) in the form 0x7f80 plus the choice number 1-7f in the hi word.
-   NCHOICES must be kept distinct from UNSET and NANDLES (hi word ff8x) (above/exman.h).
-   CAUTION: to test a float's bit pattern, cast to a pointer then to ULI.
-      Casting directly to ULI causes its numeric value to be converted, altering the bit pattern. */
+//  NCHOICEs are values which can represent one of several choices and which can
+//       be stored in a float and distinguished from all numeric values. 2-92.
+//  NCHOICEs are used in CHOICN data types, definable thru rcdef.exe per input file cndtypes.def.
+//  NCHOICES are stored as IEEE NAN's (not-a-number's) in the form 0x7f80 plus the choice number 1-7f in the hi word.
+//  NCHOICES must be kept distinct from UNSET and NANDLES (hi word ff8x) (above/exman.h).
+//    CAUTION: to test a float's bit pattern, cast to a pointer then to ULI.
+//    Casting directly to ULI causes its numeric value to be converted, altering the bit pattern
 
 #define NCNAN 0x7f80			// bits that make nchoice a nan; is combined with choice index 1-7f to form stored value
 
@@ -609,7 +609,7 @@ inline float  AVFtoAMF( float avf)  { return avf * 60.f*.075f; }
 const int PTENSIZE = 21;			// # of pwrs of 10 in Pten array
 const double Pten[PTENSIZE] = {1.,10.,1e2,1e3,1e4,1e5,1e6,1e7,1e8,1e9,1e10,1e11,1e12,1e13,1e14,1e15,1e16,1e17,1e18,1e19,1e20};
 const int NPTENSIZE = 21;			// # of negative pwrs of 10 in NPten array
-const double NPten[NPTENSIZE] = {1.,.1,.01,1e-3,1e-4,1e-5,1e-6,1e-7,1e-8,1e-9,1e-10,1e-11,1e-12,1e-13,1e-14,1e-15,1e-16,1e-17,1e-18,1e-19,1e-20 };	// rob 6-92
+const double NPten[NPTENSIZE] = {1.,.1,.01,1e-3,1e-4,1e-5,1e-6,1e-7,1e-8,1e-9,1e-10,1e-11,1e-12,1e-13,1e-14,1e-15,1e-16,1e-17,1e-18,1e-19,1e-20 };
 
 const float FHuge = float(1.E38);	// Handy large (not strictly largest) value used for x/0,
 									// search initializations, etc.  Single defn for portability and code clarity.