Fix typo in ASHRAE clear sky model (ASHRAETauModel())

cse-sim · Apr 29, 2024 · ff97db4 · ff97db4
1 parent 49c5176
commit ff97db4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/cgwthr.cpp b/src/cgwthr.cpp
@@ -628,8 +628,8 @@ RC DESCOND::dc_CheckFixSolar(
 			else
 			{	float ebn, edh;
 				/*float egl =*/ slASHRAETauModel(sunZen, dc_tauB, dc_tauD, ebn, edh);
-				if (frDiff( ebn, dc_ebnSlrNoon) > .01f
-				  || frDiff( edh, dc_edhSlrNoon) > .01f)
+				if (frDiff( ebn, dc_ebnSlrNoon) > .001f
+				  || frDiff( edh, dc_edhSlrNoon) > .001f)
 					oWarn( "ebn/edh mismatch");
 			}
 #endif

diff --git a/src/solar.cpp b/src/solar.cpp
@@ -1039,7 +1039,7 @@ static bool slASHRAETauModelInv( // derive tauB/tauD from irradiance
   tauD = 1.5;
 
 	bool bConverge = false;
-	for (int iT = 0; iT < 20 /*&& !bConverge*/; iT++)
+	for (int iT = 0; iT < 20 && !bConverge; iT++)
 	{ // update ab & ad
 		double ab = 1.454 - 0.406 * tauB - 0.268 * tauD + 0.021 * tauB * tauD;
 		double ad = 0.507 + 0.205 * tauB - 0.080 * tauD - 0.190 * tauB * tauD;
@@ -2849,7 +2849,7 @@ float ASHRAETauModel(	// ASHRAE "tau" clear sky model
 		double ab,ad;
 		if (options & 1)
 		{	// 2013 form
-			ab = 1.454 - 0.406*tauB - 0.268*tauD - 0.021*tauB*tauD;
+			ab = 1.454 - 0.406*tauB - 0.268*tauD + 0.021*tauB*tauD;
 			ad = 0.507 + 0.205*tauB - 0.080*tauD - 0.190*tauB*tauD;
 		}
 		else