Merge fix

Author: chipbarnaby

src/CMakeLists.txt

@@ -238,9 +238,6 @@ target_include_directories(CSE PRIVATE
   "${CSE_BINARY_DIR}/src"
   "${CSE_SOURCE_DIR}/src"
   "${penumbra_SOURCE_DIR}/include"
-  "${HPWHsim_SOURCE_DIR}/src"
-  "${HPWHsim_BINARY_DIR}/src"
-  "${btwxt_SOURCE_DIR}/src"
 )
 
 target_compile_features(CSE PUBLIC cxx_std_17)

src/CNRECS.DEF

@@ -4539,7 +4539,7 @@ RECORD HPWHLINK "HPWHLink" *SUBSTRUCT	// Ecotope's HPWH tank and heater
                                     //   calc'd at substep end only
 
 *h *e INT hw_bWriteCSV;				// write HPWH debugging CSV iff nz
-*declare "FILE* hw_pFCSV;"			// file for debugging CSV (opened on 1st use)
+*declare "std::ofstream* hw_pFCSV;"	// file for debugging CSV (opened on 1st use)
 
 *s *e DBl hw_qBal;                  // current step HPWH heat balance, kWh (s/b 0)
 *s *e INT hw_balErrCount;			// annual count of energy balance errors
@@ -4733,10 +4733,6 @@ RECORD DHWHEATER "DHWHeater" *RAT	// input / runtime DHW heater
 									//   DHW+DHWLOOP+CHDHW; does not include wh_qXBU
   *s *e INT wh_nzDrawCount;			// current substep # of draws > 0
 
-  *h *e INT wh_bWriteCSV;			// write HPWH debugging CSV iff nz
-  *declare "FILE* wh_pFCSV;"		// file for debugging CSV (opened on 1st use)
-
-  
 
   *h *e DBL wh_totHARL;		// cumulative (year to date) recovery load at heater, Btu
 							//   = SUM( HARL) (includes losses, solar etc)

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)
@@ -93,6 +93,7 @@ struct CULT;
 #include <vector>
 #include <string>
 #include <map>
+#include <fstream>
 #define WVect std::vector
 typedef std::map< int, std::string> WMapIntStr;
 typedef std::string WStr;

src/cnloads.cpp

@@ -24,8 +24,8 @@
 #include "mspak.h"
 #include "nummeth.h"
 
-#include "array"
-#include "btwxt.h"
+#include <array>
+#include <btwxt/btwxt.h>
 
 #ifdef COMFORT_MODEL
 #include "comfort/comfort.h"
@@ -4987,12 +4987,12 @@ RC RSYS::rs_SetupBtwxt(	// init/populate btwxt for heating runtime interpolation
 	}
 
 	// single grid variable = dry-bulb temp (allow linear extrapolation)
-	Btwxt::GridAxis dbtRange(gridODB, Btwxt::Method::LINEAR);
+	Btwxt::GridAxis dbtRange(gridODB, "Dry-bulb temp", Btwxt::InterpolationMethod::linear, Btwxt::ExtrapolationMethod::linear);
 	std::vector<Btwxt::GridAxis> dbt{ dbtRange };
 
-	Btwxt::GriddedData perfMapHtg(dbt, values);
+	// Btwxt::GriddedData perfMapHtg(dbt, values);
 
-	pRgi = new Btwxt::RegularGridInterpolator( perfMapHtg);
+	pRgi = new Btwxt::RegularGridInterpolator( dbt, values);
 
 #if 0
 	// test code

src/dhwcalc.cpp

@@ -2891,13 +2891,13 @@ void HPWHLINK::hw_Cleanup()
 // duplicate calls OK
 {
 	delete hw_pHPWH;
-	hw_pHPWH = NULL;
+	hw_pHPWH = nullptr;
+
 	delete[] hw_HSMap;
-	hw_HSMap = NULL;
-	if (hw_pFCSV)
-	{	fclose( hw_pFCSV);
-		hw_pFCSV = nullptr;
-	}
+	hw_HSMap = nullptr;
+
+	delete hw_pFCSV;		// closes file if open
+	hw_pFCSV = nullptr;
 
 	hw_pNodePowerExtra_W.clear();
 
@@ -3618,9 +3618,8 @@ RC HPWHLINK::hw_DoSubhrStart(	// HPWH subhour start
 
 #define HPWH_DUMP		// define to include debug CSV file
 #if defined( HPWH_DUMP)
-	// #define HPWH_DUMPSMALL	// #define to use abbreviated version
-		// use debug dump mechanism w/o headings to log file
-		//   (dump goes to external CSV file)
+	// use debug dump mechanism w/o headings to log file
+	//   (dump goes to external CSV file)
 	hw_bWriteCSV = DbDo(dbdHPWH, dbdoptNOHDGS);
 #endif
 
@@ -3730,9 +3729,10 @@ RC HPWHLINK::hw_DoSubhrTick(		// calcs for 1 tick
 	{
 		double qTXkWh = tk.wtk_qTX / BtuperkWh;
 		hw_qTX += qTXkWh;		// subhour total (kWh)
-		double qTXPwr			// tick power per node, W
-			= qTXkWh * 1000. / (hw_nQTXNodes * Top.tp_tickDurHr);
-		hw_pNodePowerExtra_W.assign(hw_nQTXNodes, qTXPwr);
+		double qTXPwr			// tick power (W)
+			= qTXkWh * 1000. / (Top.tp_tickDurHr);
+		hw_pNodePowerExtra_W = {qTXPwr, 0., 0., 0.}; // bottom 1/4 of tank
+
 		pNPX = &hw_pNodePowerExtra_W;
 	}
 
@@ -3876,43 +3876,37 @@ RC HPWHLINK::hw_DoSubhrTick(		// calcs for 1 tick
 
 		CSVGen csvGen(CI);
 
-		if (!hw_pFCSV)
+		if (hw_pFCSV == nullptr)
+		{
+			hw_pFCSV = new std::ofstream;
+		}
+		if (!hw_pFCSV->is_open()) 
 		{
 			// dump file name = <cseFile>_<DHWHEATER name>_hpwh.csv
 			//   Overwrite pre-existing file
 			//   >>> thus file contains info from only last RUN in multi-RUN sessions
 			const char* nameNoWS = strDeWS(strtmp(hw_pOwner->Name()));
-			const char* fName =
-				strsave(strffix2(strtprintf("%s_%s_hpwh", InputFilePathNoExt, nameNoWS), ".csv", 1));
-			hw_pFCSV = fopen(fName, "wt");
-			if (!hw_pFCSV)
+			const char* fName = strffix2(strtprintf("%s_%s_hpwh", InputFilePathNoExt, nameNoWS), ".csv", 1);
+			hw_pFCSV->open(fName, std::ifstream::out);	// implies truncation
+			if (!hw_pFCSV->is_open())
 				err(PWRN, "HPWH report failure for '%s'", fName);
 			else
 			{	// headings
-				fprintf(hw_pFCSV, "%s,%s,%s\n",
+				*hw_pFCSV << strtprintf("%s,%s,%s\n",
 					hw_pOwner->GetDescription(), Top.repHdrL.CStr(), Top.runDateTime.CStr());
-				fprintf(hw_pFCSV, "%s%s %s %s HPWH %s\n",
+				*hw_pFCSV << strtprintf( "%s%s %s %s HPWH %s\n",
 					Top.tp_RepTestPfx(), ProgName, ProgVersion, ProgVariant,
 					Top.tp_HPWHVersion.CStr());
-#if defined( HPWH_DUMPSMALL)
-				fprintf(wh_pFCSV, "minYear,draw( L)\n");
-#else
 				WStr s("mon,day,hr,");
 				s += csvGen.cg_Hdgs(dumpUx);
-				hw_pHPWH->WriteCSVHeading(hw_pFCSV, s.c_str(), nTCouples, hpwhOptions);
-#endif
+				hw_pHPWH->WriteCSVHeading(*hw_pFCSV, s.c_str(), nTCouples, hpwhOptions);
 			}
 		}
-		if (hw_pFCSV)
-		{
-#if defined( HPWH_DUMPSMALL)
-			fprintf(wh_pFCSV, "%0.2f,%0.3f\n", minYear, GAL_TO_L(drawForTick));
-#else
-			WStr s = strtprintf("%d,%d,%d,",
+		if (hw_pFCSV->is_open())
+		{	WStr s = strtprintf("%d,%d,%d,",
 				Top.tp_date.month, Top.tp_date.mday, Top.iHr + 1);
 			s += csvGen.cg_Values(dumpUx);
-			hw_pHPWH->WriteCSVRow(hw_pFCSV, s.c_str(), nTCouples, hpwhOptions);
-#endif
+			hw_pHPWH->WriteCSVRow(*hw_pFCSV, s.c_str(), nTCouples, hpwhOptions);
 		}
 	}
 #endif	// HPWH_DUMP
@@ -4310,7 +4304,6 @@ RC DHWHEATER::wh_Init()		// init for run
 	RC rc = RCOK;
 
 	DHWSYS* pWS = wh_GetDHWSYS();
-	wh_pFCSV = NULL;
 
 	// one-time inits
 	wh_balErrCount = 0;

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

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