Solar calc reorg; AIRNET horiz vent bug fix

Author: chipbarnaby

src/CGCOMP.CPP

@@ -508,13 +508,10 @@ const double G0STDX = g0Std;	// CSE accel. of gravity, ft/sec2
 // class ANDAT -- airnet data
 void ANDAT::ad_ClearResults()
 {
-	ad_delP = 0.;
+	ad_delP = ad_dmdp = 0.;
 	ad_mdotP = ad_mdotB = ad_mdotX = 0.;
-	ad_dmdp = 0.;
-	ad_xDelpF = 0.;
-	ad_xMbm = 0.;
-	ad_tdFan = 0.;
-	ad_pFan = 0.;
+	// ad_xDelpF = ad_xMbm = 0.;	do not clear (values retained throughout hour)
+	ad_tdFan = ad_pFan = 0.;
 
 }	// ANDAT::ad_ClearResults
 //-----------------------------------------------------------------------------

src/CGWTHR.CPP

@@ -415,13 +415,15 @@ RC WDHR::wd_WfReader( 	// read an hour's weather data and make adjustments
 		break;
 	}
 #if defined( SOLARFIX)
+#if defined( _DEBUG)
 	float bmrad = wd_DNI;
 	float dfrad = wd_DHI;
 	if (Top.skyModel == C_SKYMODCH_ANISO)
 		slaniso(&bmrad, &dfrad,iHrST);
 	if (frDiff(bmrad, wd_bmrad) > .0001f
 	 || frDiff(dfrad, wd_dfrad) > 0.0001f)
 		printf("\nDiff");
+#endif
 #else
 	if (!rc)			// if wfRead failed, eg date not in file or type without design days
 		wd_Adjust(iHrST);

src/WFPAK.CPP

@@ -593,9 +593,7 @@ RC WDYEAR::wdy_Fill(	// read weather data for entire file; compute averages etc.
 	{	int monLen = monLens[ iMon]  + (wdy_isLeap && iMon==2);
 		for (iDay=0; iDay<monLen; iDay++)
 		{	jDay++;
-#if 1
 			slday(jDay, SLTMLST);
-#endif
 			for (int iHr=0; iHr<24; iHr++)
 			{	WDHR* pWd = &wdy_Hr(jDay, iHr);
 				rc |= pWF->wf_Read( pWd, jDay, iHr, erOp|WF_FORCEREAD);

test/CMakeLists.txt

@@ -17,6 +17,7 @@ macro(regress_test case)
 endmacro()
 
 set(files
+  wthr01
   600
   930
   960