Replace #include <math.h> with #include <cmath>

src/cgcomp.cpp

@@ -19,13 +19,6 @@
 #include "irats.h"	// input RATs
 #include "cnguts.h"	// decls for this file, IzxR
 
-#if 0
-// Now #included below near point of use
-// When here, code generation associated with pow() is altered.
-// Cause not known.
-#include <Eigen\Dense>
-#endif
-
 /*----------------------- LOCAL FUNCTION DECLARATIONS ---------------------*/
 LOCAL float FC cgnveffa( float a1, float a2);
 
@@ -2283,8 +2276,6 @@ void TOPRAT::tp_AirNetDestroy()
 //   finds zone pressures that achieve balanced mass flows
 ///////////////////////////////////////////////////////////////////////////////
 #if defined( AIRNET_EIGEN)
-// Eigen #include located here because placement of top of file altered
-//   code generation associated with pow() (4-12-2023).  Cause not known.
 #include <Eigen\Dense>
 using Eigen::MatrixXd;
 using Eigen::VectorXd;

src/cnah1.cpp

@@ -630,6 +630,10 @@ RC AH::endSubhr() 		// airHandler stuff done at end subhr
 				//   using co_plrAv forces barely large enuf coil (makes frFanOn approach 1),
 				//   and is necessary to save correct info for AHSIZE report,
 				//   but has had a history of convergence problems (re heat), 6-97.
+#if 0
+x				if (!Top.isWarmup)
+x					printf("\nAH peak: %s  %0.4f", Top.dateStr.CStr(), ahcc.co_plrAv);
+#endif
 				ccAs.plrPk = ahcc.co_plrAv;		//   part load ratio peak value (curr total load / cap'y @ current conditions)
 				ccAs.xPk = ahcc.captRat;		//   record capacity plr relates to in AUSZ member, 6-97
 				ccAs.ldPk = ahcc.q;		//   total load at time of peak plr (negative)

src/cnglob.h

@@ -84,7 +84,7 @@ struct CULT;
 #include <ctype.h>
 #include <assert.h>
 #include <time.h>
-#include <math.h>
+#include <cmath>
 #include <float.h>
 
 #if defined( USE_STDLIB)

src/envpak.cpp

@@ -21,8 +21,6 @@
 
 #include "envpak.h"	// declares functions in this file
 
-#include <cmath> // isfinite
-
 #if CSE_OS==CSE_OS_MACOS
 #include <mach-o/dyld.h> // _NSGetExecutablePath
 #endif
@@ -273,10 +271,9 @@ int enkichk()			// Check whether a keyboard interrupt has been received
 /*-------------------------- FUNCTION DECLARATIONS ------------------------*/
 // PUBLIC functions called only from msc lib or interrupt code; no prototype
 //   in envpak.h so inadvertent external calls are flagged.  8-31-91
-/* INT  matherr( struct exception *);	 private math runtime error fcn;
-					 actual decl in math.h */
-void CDEC fpeErr( INT, INT);		// intercepts floating point errors, and integer errors under Borland
-void CDEC iDiv0Err( SI);			// intercepts integer x/0 errors under MSC
+// INT  matherr( struct exception *);	 private math runtime error fcn;
+//										 actual decl in CRT (formerly math.h), now (12/23) not known
+// void CDEC fpeErr( INT, INT);		// intercepts floating point errors, and integer errors under Borland
 #if 0								// Defined but not declated, 5-22
 void __cdecl fpeErr( INT, INT);		// intercepts floating point errors, and integer errors under Borland
 #endif
@@ -368,7 +365,7 @@ UINT doControlFP()
 #if CSE_COMPILER==CSE_COMPILER_MSVC // TODO (MP) Add table for other compilers
 INT CDEC matherr(	// Handle errors detected in Microsoft/Borland math library
 
-	struct _exception *x )	// Exception info structure provided by Microsoft; see math.h
+	struct _exception *x )	// Exception info structure provided by MSVC library
 
 // Calls rmkerr fcns to report error (as a warning), then returns a 1 to prevent error reporting out of library.
 {

src/envpak.h

@@ -31,9 +31,8 @@ void FC byebye( int exitCode);  	// exit fcn
 
 void FC cknull();						// check for memory clobbers
 /* also public but called ONLY from msc lib or interrupt
- * SI   matherr( struct exception *);	* private math runtime error fcn *
- * void fpeErr( SI, SI);		* intercepts floating point errors *
- * void iDiv0Err( SI);			* intercepts int x/0 errors *
+ * INT matherr( struct exception *);	* private math runtime error fcn *
+ * void fpeErr( INT, INT);				* intercepts floating point errors *
 */
 
 // end of envpak.h

src/hvac.cpp

@@ -9,7 +9,6 @@
 #include "ancrec.h"
 #include "rccn.h"
 
-#include <cmath>
 #include <btwxt.h>
 #include "hvac.h"
 

test/ref/2ZONE.REP

@@ -822,7 +822,7 @@ IzXfer                  Zn1: Z1  Zn2: Z2  UAconst: 5.000  NVctrl: TwoWay
 
 ! Log for Run 001:
 
-! CSE 0.906.0+ah-report-heat-recovery.24a27189.6.dirty for Win32 console
+! CSE 0.920.0+main.99c64c5b.17 for Win32 console
 
 
 
@@ -1633,18 +1633,18 @@ Input for Run 001:
 
 
 
-! CSE 0.906.0+ah-report-heat-recovery.24a27189.6.dirty for Win32 console run(s) done: Fri 20-May-22  11:17:12 am
+! CSE 0.920.0+main.99c64c5b.17 for Win32 console run(s) done: Mon 18-Dec-23   4:17:54 pm
 
 ! Executable:   d:\cse\msvc\cse.exe
-!               20-May-22  11:08 am   (VS 14.29    3001856 bytes)  (HPWH 1.18.1)
-! Command line: -x!  -t1 2zone
-! Input file:   D:\cse\test\2zone.cse
-! Report file:  D:\cse\test\2zone.rep
+!               18-Dec-23   4:07 pm   (VS 14.29    2796544 bytes)  (HPWH 1.22.0+HEAD.f9b8f77.122)
+! Command line: -x!  -b -t1 2Zone
+! Input file:   D:\cse\test\2Zone.cse
+! Report file:  D:\CSE\TEST\2ZONE.REP
 
 ! Timing info --
 
-!                Input:  Time = 0.01     Calls = 1      T/C = 0.0090
-!           AutoSizing:  Time = 0.00     Calls = 0      T/C = 0.0000
-!           Simulation:  Time = 0.32     Calls = 1      T/C = 0.3230
-!              Reports:  Time = 0.00     Calls = 1      T/C = 0.0010
-!                Total:  Time = 0.34     Calls = 1      T/C = 0.3350
+!                Input:  Time = 0.01     Calls = 1         T/C = 0.0130
+!           AutoSizing:  Time = 0.00     Calls = 0         T/C = 0.0000
+!           Simulation:  Time = 0.52     Calls = 1         T/C = 0.5200
+!              Reports:  Time = 0.00     Calls = 1         T/C = 0.0010
+!                Total:  Time = 0.54     Calls = 1         T/C = 0.5350