dhwcalc hpwh debug dump enhancement

Experiments re reducing windows dependency

Author: chipbarnaby

src/CNGLOB.H

@@ -87,6 +87,19 @@ typedef long long LLI;		// signed 64 bit integer
 typedef unsigned long long ULLI;
 //typedef int BOOL;	if needed: // 16 or 32 bit Boolean, matches windows.h.
 
+#undef ELIMINATE_WINDOWS		// #define to eliminate Windows dependencies
+								//   work in progress, 10-2017
+#if defined( ELIMINATE_WINDOWS)
+// typedefs based on windows.h
+typedef unsigned long DWORD;
+typedef unsigned int UINT;
+typedef unsigned int BOOL;
+typedef unsigned short WORD;
+typedef char TCHAR;
+typedef unsigned char BYTE;
+#define _T(s) s
+#endif
+
 #define LOCAL   static	// for file-local functions: a clearer word than "static"
 #define STATIC  static	// for local data; static un-doable for (former) debugging
 #define REFDATA static	// For readonly, pak-specific data which could be overlayed
@@ -141,7 +154,9 @@ struct CULT;
 
 #else
 
+#if !defined( ELIMINATE_WINDOWS)
 #include <windows.h>
+#endif
 
 #include <string.h>
 #include <stddef.h>

src/DHWCalc.cpp

@@ -1607,21 +1607,28 @@ RC DHWHEATER::wh_HPWHDoSubhr(		// HPWH subhour
 		static FILE* pF = NULL;		// file
 		if (bWriteCSV)
 		{	if (!pF)
-			{	const char* fName = strtprintf( "HPWH_%s.csv", name);
+			{
+#if 1
+				// dump file name = <cseFile>_hpwh.csv
+				const char* fName =
+					strsave( strffix2( strtprintf( "%s_hpwh", InputFilePathNoExt), ".csv", 1));
+#else
+x				const char* fName = strtprintf( "HPWH_%s.csv", name);
+#endif
 				pF = fopen( fName, "wt");
 				if (!pF)
 					err( PWRN, "HPWH report failure for '%s'", fName);
 				else
 				{	// headings
-					fprintf( pF, "%s\n",wh_desc, Top.runDateTime);
-					fprintf( pF, "%s%s %s %s HPWH %s   %s\n",
+					fprintf( pF, "%s,%s,%s\n",wh_desc, Top.repHdrL,Top.runDateTime);
+					fprintf( pF, "%s%s %s %s HPWH %s\n",
 						Top.tp_RepTestPfx(), ProgName, ProgVersion, ProgVariant,
-						Top.tp_HPWHVersion, Top.runDateTime);
+						Top.tp_HPWHVersion);
 #if defined( HPWH_DUMPSMALL)
 					fprintf( pF, "minYear,draw( L)\n");
 #else
 					wh_pHPWH->WriteCSVHeading( pF, "month,day,hr,min,minDay,"
-									"tEnv (C),tSrcAir (C),"
+						            "tOut (C),tEnv (C),tSrcAir (C),"
 						            "tInlet (C),tSetpoint (C),draw (gal),draw (L),");
 #endif
 				}
@@ -1634,9 +1641,9 @@ RC DHWHEATER::wh_HPWHDoSubhr(		// HPWH subhour
 				fprintf( pF, "%0.2f,%0.3f\n", minYear, GAL_TO_L( drawForTick));
 #else
 				wh_pHPWH->WriteCSVRow( pF, strtprintf(
-						"%d,%d,%d,%0.2f,%0.2f,%0.2f,%0.2f,%0.2f,%0.2f,%0.3f,%0.3f,",
+						"%d,%d,%d,%0.2f,%0.2f,%0.2f,%0.2f,%0.2f,%0.2f,%0.2f, %0.3f,%0.3f,",
 						Top.tp_date.month, Top.tp_date.mday, Top.iHr+1, minHr, minDay,
-						DegFtoC( wh_tEx), DegFtoC( wh_ashpTSrc),
+						DegFtoC( Top.tDbOSh),DegFtoC( wh_tEx),DegFtoC( wh_ashpTSrc),
 						DegFtoC( pWS->ws_tInlet), DegFtoC( pWS->ws_tSetpoint),
 						drawForTick, GAL_TO_L( drawForTick)));
 #endif

src/csevrsn.h

@@ -14,14 +14,15 @@
 // version # for current build
 // change ONLY here
 #define CSEVRSN_MAJOR 0
-#define CSEVRSN_MINOR 843
+#define CSEVRSN_MINOR 844
 
 // version # as quoted text ("x.xxx")
 #define CSEVRSN_TEXT MAKE_LIT(CSEVRSN_MAJOR##.##CSEVRSN_MINOR)
 
 // ONLY comments below here
 
 /* History:
+   0.844: ...
    0.843: BATTERY last hour values; DESCOND prelim version; 10-10-17
    0.842: btChgReq eval stage bug fix (cncult.cpp), 9-12-2017
    0.841: release version with post-ivl evaluation, autosize refinements, 9-12-2017