Merge pull request #245 from DrylandEcology/revert-242-Bugfix_231_Div…

…ision_By_Zero

Revert "Divide by zero bug fix, issue #231"

SW_SoilWater.c

@@ -984,13 +984,12 @@ RealD SW_SWCbulk2SWPmatric(RealD fractionGravel, RealD swcBulk, LyrIndex n) {
 			theta1 = 0.0;
 		else
 			theta1 = (swcBulk / lyr->width) * 100. / (1. - fractionGravel);
-    if (GT(BARCONV, 0.0))
-      swp = lyr->psisMatric / powe(theta1/lyr->thetasMatric, lyr->bMatric) / BARCONV;
-    else
-      LogError(logfp, LOGFATAL, "Attempt to divide by 0, SWP value may not be accurate.");
-	} else
+		swp = lyr->psisMatric / powe(theta1/lyr->thetasMatric, lyr->bMatric) / BARCONV;
+	} else {
 		LogError(logfp, LOGFATAL, "Invalid SWC value (%.4f) in SW_SWC_swc2potential.\n"
 				"    Year = %d, DOY=%d, Layer = %d\n", swcBulk, SW_Model.year, SW_Model.doy, n);
+	}
+
 	return swp;
 }