[GRASS-SVN] r73303 - grass/branches/releasebranch_7_6/imagery/i.eb.hsebal01

[svn_grass at osgeo.org]

Author: neteler
Date: 2018-09-09 02:23:25 -0700 (Sun, 09 Sep 2018)
New Revision: 73303

Modified:
   grass/branches/releasebranch_7_6/imagery/i.eb.hsebal01/main.c
Log:
i.eb.hsebal01: updated code for eact and z0m nullval in auto mode (trunk, r73288)

Modified: grass/branches/releasebranch_7_6/imagery/i.eb.hsebal01/main.c
===================================================================
--- grass/branches/releasebranch_7_6/imagery/i.eb.hsebal01/main.c	2018-09-09 08:24:56 UTC (rev 73302)
+++ grass/branches/releasebranch_7_6/imagery/i.eb.hsebal01/main.c	2018-09-09 09:23:25 UTC (rev 73303)
@@ -295,17 +295,25 @@
 	/*********************/
 	for (row = 0; row < nrows; row++) {
 	    DCELL d_t0dem;
+	    DCELL d_z0m;
+	    DCELL d_eact;
 
 	    G_percent(row, nrows, 2);
 	    Rast_get_d_row(infd_t0dem, inrast_t0dem, row);
+	    Rast_get_d_row(infd_z0m, inrast_z0m, row);
+	    Rast_get_d_row(infd_eact, inrast_eact, row);
 	    Rast_get_d_row(infd_Rn, inrast_Rn, row);
 	    Rast_get_d_row(infd_g0, inrast_g0, row);
 	    /*process the data */
 	    for (col = 0; col < ncols; col++) {
 		d_t0dem = ((DCELL *) inrast_t0dem)[col];
+		d_z0m = ((DCELL *) inrast_z0m)[col];
+		d_eact = ((DCELL *) inrast_eact)[col];
 		d_Rn = ((DCELL *) inrast_Rn)[col];
 		d_g0 = ((DCELL *) inrast_g0)[col];
 		if (Rast_is_d_null_value(&d_t0dem) ||
+		    Rast_is_d_null_value(&d_eact) ||
+		    Rast_is_d_null_value(&d_z0m) ||
 		    Rast_is_d_null_value(&d_Rn) ||
 		    Rast_is_d_null_value(&d_g0)) {
 		    /* do nothing */
@@ -423,6 +431,11 @@
 		/* do nothing */
 		d_Roh[row][col] = -999.9;
 		d_Rah[row][col] = -999.9;
+		if (row == rowDry && col == colDry) {	/*collect dry pix info */
+		    d_rah_dry = d_rah1;
+		    d_roh_dry = d_roh1;
+		    G_message("d_rah_dry=%f d_roh_dry=%f",d_rah_dry,d_roh_dry);
+		}
 	    }
 	    else {
 		d_u5 = (ustar / 0.41) * log(5 / d_z0m);