More clang cleanups

Author: chipbarnaby

src/cnah1.cpp

@@ -985,10 +985,6 @@ RC AH::ahEstimate()	// set ahMode and supply temp for terminal computations b4 i
 	return RCOK;
 }				// AH::ahEstimate
 //-----------------------------------------------------------------------------------------------------------------------------
-//--- constants, also hard-coded in cncult2.cpp for Top.absTol; also in cnah2.cpp:
-//const float RELoverABS = .01f;		use commented out 5-95	// relative to absolute tol ratio: +-1 corrsponds to +- 1%.
-//const float ABSoverREL = 1.f/RELoverABS;	no uses 5-95		// reciprocal thereof
-//---------------------------------------------------------------------------------------------------------------------------
 RC AH::ahCompute()			// airHandler full computation ("refine"), after terminals have been estimated
 
 // (old) preceding call sequence: tuEstimate, ahEstimate, ztuCompute.

src/cnah2.cpp

@@ -86,8 +86,8 @@ const int UULIM = 250;		// 200-->250 to match default ahTsMx, after PSYCHROMAXT
 // AH::iter4Fs (next function) is called by ahCompute, which is in cnah1.cpp.
 //-----------------------------------------------------------------------------------------------------------------------------
 //--- constants, also hard-coded in cncult2.cpp for Top.absTol; also in cnah1.cpp:
-const float RELoverABS = .01f;			// relative to absolute tolerance ratio: +-1 corrsponds to +- 1%.
-//const float ABSoverREL = 1.f/RELoverABS;	no uses 5-95	// reciprocal thereof
+static constexpr float RELoverABS = .01f;			// relative to absolute tolerance ratio: +-1 corrsponds to +- 1%.
+// static constexpr float ABSoverREL = 1.f/RELoverABS;	no uses 5-95	// reciprocal thereof
 //-----------------------------------------------------------------------------------------------------------------------------
 //---- ahCompute callees (iter4Fs - antRatTs - etc) local variables
 LOCAL DBL tsmLLim, tsmULim;	// antRatTs narrows these to next temp up and down from ts where zone mode changes

src/cncult3.cpp

@@ -1265,9 +1265,12 @@ void ZNR::zn_SetAirRadXArea()		// set mbrs re zone air radiant pseudo surface
 #endif
 }	// ZNR::zn_SetAirRadXArea
 //-----------------------------------------------------------------------------
+#if 0
 // FFactors() convergence failure seen in optimized release builds
 //   Disabling optimization seems to fix, did not fully analyze, 2-8-12
+//   Renabled optimization 10-9-2025, passes all tests
 #pragma optimize( "", off)
+#endif
 static int FFactors(			// derive spherical geometry factors
 	int nS,				// # of surfaces
 	const double areaS[],	// areas of surfaces
@@ -1322,7 +1325,9 @@ x				printf( "Mismatch\n");
 
 	return errTxt[ 0] ? RCBAD : RCOK;
 }	// FFactors
+#if 0
 #pragma optimize( "", on)
+#endif
 //-----------------------------------------------------------------------------
 // #undef CZM_COMPARE		// #define in cndefns.h to use exact CZM values re result comparison
 //-----------------------------------------------------------------------------
@@ -2275,7 +2280,9 @@ void XSURF::xs_Init(			// initialize
 //-----------------------------------------------------------------------------
 XSURF& XSURF::Copy( const XSURF* pXS, [[maybe_unused]] int options /*=0*/)
 {	record* pParent = xs_pParent;		// save parent ptr (set by c'tor)
-	memcpy( reinterpret_cast< void *>(this), pXS, sizeof( XSURF));	// bitwise copy
+	memcpy( reinterpret_cast< void *>(this), 
+		    reinterpret_cast< const void *>(pXS),
+		    sizeof( XSURF));	// bitwise copy
 	xs_pParent = pParent;				// restore parent ptr
 	xs_Init( xs_pParent);	// fix sub-objects
 							// (deletes FENAWs, xs_SetRunConstants remakes)

src/cnloads.cpp

@@ -2660,9 +2660,8 @@ RC RSYS::rs_FazInit(		// init before autosize (once) and main sim
 	return rc;
 }		// RSYS::rs_FazInit
 //-----------------------------------------------------------------------------
-RC RSYS::rs_RddInit( int isAusz)	// init before each autosize design day and main sim
+RC RSYS::rs_RddInit( int /*isAusz*/)	// init before each autosize design day and main sim
 {
-	isAusz;
 	return RCOK;
 }		// RSYS::rs_RddInit
 //-----------------------------------------------------------------------------
@@ -4554,7 +4553,7 @@ float RSYS::rs_PerfASHP2(		// ASHP performance
 							//   multiplies final COP result
 // returns gross (compressor-only) full-speed COP (as adjusted by COPAdjF)
 {
-	RC rc = RCOK;
+	[[maybe_unused]] RC rc = RCOK;
 	capDfHt = 0.f;
 	bool bDoDefrostAux = (ashpModel & 0x100) == 0
 		           && rs_defrostModel == C_RSYSDEFROSTMODELCH_REVCYCLEAUX;
@@ -6145,6 +6144,7 @@ double RSYS::rs_FxCapForSpeedF(		// call-back fcn for regula method
 	double& speedF)		// trial speedF (may be returned modified)
 // returns required rs_fxCap[ 0] (= rs_amf / amfReq), >1 = excess capacity
 {
+	[[maybe_unused]] RC rc = RCOK;
 #if defined( _DEBUG)
 	double speedFWas = speedF;
 	float rsSpeedFWas = rs_speedF;
@@ -6163,7 +6163,7 @@ double RSYS::rs_FxCapForSpeedF(		// call-back fcn for regula method
 	//   (when far from solution errors are common and not meaningful
 	int arOptions = abs(rs_fxCap[0] - 1.f) < .01f;
 
-	RC rc = rs_TotalAirRequestForSpeedF(float(speedF), arOptions);
+	rc |= rs_TotalAirRequestForSpeedF(float(speedF), arOptions);
 
 	// if rc != RCOK, rs_fxCap[0] is 0
 

src/cntp.cpp

@@ -383,16 +383,20 @@ RC TOWERPLANT::varSpeedF( 	// determine f needed for one tower to output power q
 // initial trial f: when possible, interpolate from prior f and q for fast repeated calls in same subhr
 // CAUTION: old q will not corres to old f if weather, setpoint, etc changed, so never save initial point.
 	if (_q > qMax1 || _q < qMin1)					// /0 and major change protection
-		if (_q <= qWant) _f  =  _f * (qWant - qMin1)/(_q - qMin1);	// if prior q too big (negative), linear inter tween qMin1 and q
-		else   	        _f += (1. - _f)*(qWant - _q)/(qMax1 - _q);	// else prior q too small (neg), interp tween q and qMax1
+	{
+		if (_q <= qWant)
+			_f = _f * (qWant - qMin1)/(_q - qMin1);	// if prior q too big (negative), linear inter tween qMin1 and q
+		else
+			_f += (1. - _f)*(qWant - _q)/(qMax1 - _q);	// else prior q too small (neg), interp tween q and qMax1
+	}
 	// else: fall thru with old f as 1st trial. f < 0 and f > 1 fixed below.
 
 #if 1	// believe this is faster than next, provided towModel is stable enuf to assure convergence. 9-92.
 
 // search loop. secant method: inter/extrapolate from most recent two points
 
 	DBL f1=0., q1=qMin1;				// init prior point to one precomputed end of interval
-	for (SI niter = 0; ; )
+	for (int niter = 0; ; )
 	{
 		if   (_f <= 0.)
 		{

src/cnztu.cpp

@@ -59,10 +59,6 @@ WHAT if we modify the smart terminal to shut off flow if supply temp is on wrong
   ****** UNTIL details thought thru, don't bother to try to implement smart terminals. *******   */
 
 //-----------------------------------------------------------------------------------------------------------------------------
-//--- constants, also hard-coded in cncult2.cpp for Top.absTol; also in cnah.cpp:
-const float RELoverABS = .01f;			// relative to absolute tolerance ratio: +-1 corrsponds to +- 1%.
-const float ABSoverREL = 1.f/RELoverABS;	// reciprocal thereof
-//---------------------------------------------------------------------------------------------------------------------------
 RC FC hvacIterSubhr()
 
 // Iterative (estimate-refine) part of hvac subhour computations for all zones/terminals/airHandlers
@@ -531,25 +527,38 @@ RC TU::tu_Setup()			// check and set up terminal record: call for each terminal
 		SI vbl = FALSE;					// TRUE if any variable exprs given: don't default
 		float def = 0.f;					// use only > 0 values
 		if (sstat[TU_TUVFMN] & FsSET)     			// if minimum flow given
+		{
 			if (sstat[TU_TUVFMN] & FsAS)			// if being autoSized 7-95, its not constant nor variable
 				ausz++;						// set flag
 			else if (sstat[TU_TUVFMN] & FsVAL)			// else if set now (thus constant)
 				def = tuVfMn;					// use it as default (if > 0)
-			else  vbl++;					// not set, not autoSized --> must be variable, can't default
+			else
+				vbl++;					// not set, not autoSized --> must be variable, can't default
+		}
 		if (cmAr & cmStH)					// heat max only pertinent with tstat ctrl'd heat
+		{
 			if (sstat[TU_TUVFMXH] & FsSET)   			// if heat max flow given
+			{
 				if (sstat[TU_TUVFMXH] & FsAS)			// if being autoSized 7-95, its not constant nor variable
 					ausz++;					// set flag
 				else if (sstat[TU_TUVFMXH] & FsVAL)		// if set now (thus constant)
 					setToMax(def, tuVfMxH);  			// use it as default if larger
-				else  vbl++;					// not set --> must be variable, can't default
+				else
+					vbl++;					// not set --> must be variable, can't default
+			}
+		}
 		if (cmAr & cmStC)					// cool max only pertinent with tstat ctrl'd cool
+		{
 			if (sstat[TU_TUVFMXC] & FsSET)   			// if cool max flow given
+			{
 				if (sstat[TU_TUVFMXC] & FsAS)			// if being autoSized 7-95, its not constant nor variable
 					ausz++;					// set flag
 				else if (sstat[TU_TUVFMXC] & FsVAL)		// if set now (thus constant)
 					setToMax(def, tuVfMxC);  			// use it as default if larger
-				else  vbl++;					// not set --> must be variable, can't default
+				else
+					vbl++;					// not set --> must be variable, can't default
+			}
+		}
 		/* if any exprs given, don't use the constants or autoSizes -- require input.
 		   if only constants or autoSizes given, use max for main sim.
 		   if both constants & autoSizes given, don't store the constants b4 ausz phase: leave 0 for dynamic default.
@@ -2498,6 +2507,9 @@ RC ZNR::ztuMode()		// ztuCompute inner fcn: determine zone mode, zone temp, term
 				   Turnoff happens: AH::setTsSp1 (some 0-flow cases), TU::tuEstimate (next subhour),
 				   and now in ZNR::ztuAbs at most once per subhour. 4-95. */
 
+			default:
+				break;
+
 			} // end switch zhxTy
 
 			// sums for humidity, for setpoint modes: add active-terminal contribution if any to sums from ztuAbs
@@ -2773,7 +2785,7 @@ RC ZNR::ztuAbs( 			// compute stuff for zn's terminals in given zone mode
 					&&  ah->isZNorZN2   					// if ah supply temp is under ZN or ZN2 control this hour
 					// don't turn on ah if no flow possible: just turns itself off again --> ah-tu nonconvergence, 10-96.
 					&&  (max( tu->tuVfMn, tu->tuVfMxH) > 0 || Top.tp_sizing && tu->vhAs.az_active)	// tuVfMxH==0 is allowed input.
-					&&  (ah->sfan.vfDs > 0 || Top.tp_sizing && ah->fanAs.az_active) )		// vfDs==0 could result from autoSizing.
+					&&  (ah->sfan.vfDs > 0 || (Top.tp_sizing && ah->fanAs.az_active)) )		// vfDs==0 could result from autoSizing.
 			{
 				TU *ctu = TuB.p + ah->ahCtu;			// point ZN/ZN2 control terminal for this air handler
 				ctu->wantMd = ahHEATING;			// have terminal tell ah that it wants heat
@@ -2808,7 +2820,7 @@ RC ZNR::ztuAbs( 			// compute stuff for zn's terminals in given zone mode
 					&&  ah->isZNorZN2   				// if ah supply temp is under ZN or ZN2 control this hour
 					// don't turn on ah if no flow possible: just turns itself off again --> ah-tu nonconvergence, 10-96.
 					&&  (max( tu->tuVfMn, tu->tuVfMxC) > 0 || Top.tp_sizing && tu->vcAs.az_active)	// tuVfMxC==0 is allowed input.
-					&&  (ah->sfan.vfDs > 0 || Top.tp_sizing && ah->fanAs.az_active) )		// vfDs==0 could result from autoSizing.
+					&&  (ah->sfan.vfDs > 0 || (Top.tp_sizing && ah->fanAs.az_active)) )		// vfDs==0 could result from autoSizing.
 			{
 				TU *ctu = TuB.p + ah->ahCtu;		// point ZN/ZN2 control terminal for this air handler
 				ctu->wantMd = ahCOOLING;			// have terminal tell ah that it wants coolth
@@ -2862,6 +2874,8 @@ haveFlow: ;					// other air handler cases join here with flow cz set
 			wc1 += cz * (ah->ah_wSupLs + ah->ah_wSup)/2.;		// accumulate average supply hum rat * flow, for wcO1
 			wc += cz * ah->ah_wSup;					// accumulate latest supply hum rat * flow
 			break;
+		default:
+			break;
 		}
 	}
 
@@ -3098,6 +3112,8 @@ tzOhum: ;		// common exit for air cases. cz contains tu->cz.
 				}
 			break;
 #undef TOLF
+		default:
+			break;
 		}
 	}
 }				// ZNR::ztuMdSets

src/cueval.cpp

@@ -411,6 +411,7 @@ LOCAL RC FC cuEvalI(
 	static_assert( sizeof(SI)==sizeof(PSOP));		// assumed in (SI *) cast used in PSPKONN case
 
 	static bool bCoverageInited = false;
+	if (!bCoverageInited)
 	{	/* rc = */ CoverageInit();
 		bCoverageInited = true;
 	}