DEBUG to G_debug, fix broken % literal (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33374 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/wildfire/r.spread/collect_ori.c

@@ -80,7 +80,7 @@ void collect_ori(int start_fd)
 		    DATA(map_x_out, row, col) = col;
 		if (y_out)
 		    DATA(map_y_out, row, col) = row;
-		/*DEBUG printf("\norigin: row=%d col=%d\n", row, col); */
+		G_debug(4, "origin: row=%d col=%d", row, col);
 #if 0
 		if (display)
 		    draw_a_burning_cell(row, col);

raster/wildfire/r.spread/main.c

@@ -39,8 +39,6 @@
 
 #define DATA(map, r, c)		(map)[(r) * ncols + (c)]
 
-/*#define DEBUG */
-
 CELL range_min, range_max;
 CELL *cell;
 CELL *x_cell;
@@ -505,23 +503,15 @@ int main(int argc, char *argv[])
     heap_len = 0;
 
     G_message(_("Reading %s..."), start_layer);
-#ifdef DEBUG
-    printf("Collecting origins...");
-#endif
+    G_debug(1, "Collecting origins...");
     collect_ori(start_fd);
-#ifdef DEBUG
-    printf("Done\n");
-#endif
+    G_debug(1, "Done");
 
 
     /* Major computation of spread time */
-#ifdef DEBUG
-    printf("Spreading...");
-#endif
+    G_debug(1, "Spreading...");
     spread();
-#ifdef DEBUG
-    printf("Done\n");
-#endif
+    G_debug(1, "Done");
 
 
     /*  Open cumulative cost layer (and x, y direction layers) for writing */

raster/wildfire/r.spread/select_linksB.c

@@ -118,70 +118,52 @@ void select_linksB(struct costHa *pres_cell, int least, float comp_dens)
 	    continue;
 
 	for (col = pres_cell->col - w; col <= pres_cell->col + e; col++) {
-#ifdef DEBUG
-	    printf
-		("(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d base=%d BARRIER=%d\n",
+
+	    G_debug(4,
+		"(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d base=%d BARRIER=%d",
 		 row, col, ros_max, ros_base, dir, least, n, s, e, w,
 		 DATA(map_base, row, col), BARRIER);
-#endif
 
 	    if (col < 0 || col >= ncols)	/*outside e,w */
 		continue;
-#ifdef DEBUG
-	    printf
-		("(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d base=%d BARRIER=%d\n",
+
+	    G_debug(4,
+		"(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d base=%d BARRIER=%d",
 		 row, col, ros_max, ros_base, dir, least, n, s, e, w,
 		 DATA(map_base, row, col), BARRIER);
-#endif
 
 	    if (row == pres_cell->row && col == pres_cell->col)
 		continue;	/*spread cell */
-#ifdef DEBUG
-	    printf
-		("(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d base=%d BARRIER=%d\n",
+
+	    G_debug(4,
+		"(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d base=%d BARRIER=%d",
 		 row, col, ros_max, ros_base, dir, least, n, s, e, w,
 		 DATA(map_base, row, col), BARRIER);
-#endif
 
 	    if (DATA(map_visit, row, col))	/*visited? */
 		continue;
-#ifdef DEBUG
-	    printf
-		("(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d base=%d BARRIER=%d\n",
+
+	    G_debug(4,
+		"(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d base=%d BARRIER=%d",
 		 row, col, ros_max, ros_base, dir, least, n, s, e, w,
 		 DATA(map_base, row, col), BARRIER);
-#endif
 
 	    if (DATA(map_base, row, col) == BARRIER)	/*barriers */
 		continue;
 
-#ifdef DEBUG
-	    printf
-		("(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d\n",
+	     G_debug(4,
+		"(%d, %d) max=%d base=%d dir=%d least=%d n=%d s=%d e=%d w=%d",
 		 row, col, ros_max, ros_base, dir, least, n, s, e, w);
-#endif
 	    angle =
 		atan2((double)(col - pres_cell->col),
 		      (double)(pres_cell->row - row));
 
 	    /*the polar (square) distance of enlarged ellipse */
 	    polar_len =
-		(1 /
-		 (1 -
-		  (1 - ros_base / (float)ros_max) * cos(angle -
-							dir_angle))) * (1 /
-									(1 -
-									 (1 -
-									  ros_base
-									  /
-									  (float)
-									  ros_max)
-									 *
-									 cos
-									 (angle
-									  -
-									  dir_angle)))
-		+ 2 * least * least;
+		(1 / (1 - (1 - ros_base / (float)ros_max)
+			* cos(angle - dir_angle))) *
+			(1 / (1 - (1 - ros_base / (float)ros_max) *
+			cos(angle - dir_angle))) + 2 * least * least;
 
 	    /*the (square) distance to this cell */
 	    distance =

raster/wildfire/r.spread/spot.c

@@ -54,7 +54,6 @@
 #endif
 
 #define DATA(map, r, c)		(map)[(r) * ncols + (c)]
-/*#define DEBUG */
 
 void spot(struct costHa *pres_cell, int dir /* direction of forward ROS */ )
 {
@@ -77,10 +76,10 @@ void spot(struct costHa *pres_cell, int dir /* direction of forward ROS */ )
     /* Find the (cell) location spotting might reach */
 
     land_dist = pick_dist(DATA(map_spotdist, pres_cell->row, pres_cell->col));
-#ifdef DEBUG
-    printf("pres_cell(%d, %d): land_dist=%d\n", pres_cell->row,
+
+    G_debug(1, "pres_cell(%d, %d): land_dist=%d", pres_cell->row,
 	   pres_cell->col, land_dist);
-#endif
+
     land_distc = land_dist / (window.ns_res / 100);	/* 100 fac due to cm */
 
     if (land_distc < 2)		/* no need for adjacent cells */
@@ -98,17 +97,17 @@ void spot(struct costHa *pres_cell, int dir /* direction of forward ROS */ )
 
     if (DATA(map_mois, row, col) > 17)	/* too wet */
 	return;
-#ifdef DEBUG
-    printf
-	("	pre pick_ignite(): land_distc(%d, %d)=%d dir=%d PI=%.2f (dir\%360)*PI/180=%.2f\n",
-	 row, col, land_distc, dir, PI, (dir % 360) * PI / 180);
-#endif
+
+    G_debug(1,
+      "	pre pick_ignite(): land_distc(%d, %d)=%d dir=%d PI=%.2f (dir%%360)*PI/180=%.2f",
+	  row, col, land_distc, dir, PI, (dir % 360) * PI / 180);
+
     if (pick_ignite(DATA(map_mois, row, col)) == 0)	/* not success */
 	return;
-#ifdef DEBUG
-    printf("	post pick_ignite(): land_distc(%d, %d)=%d \n", row, col,
-	   land_distc);
-#endif
+
+    G_debug(1, "	post pick_ignite(): land_distc(%d, %d)=%d ",
+	   row, col, land_distc);
+
     /* travel time by spotting */
 
     U = 0.305 * DATA(map_velocity, pres_cell->row, pres_cell->col);
@@ -124,10 +123,8 @@ void spot(struct costHa *pres_cell, int dir /* direction of forward ROS */ )
     min_cost = pres_cell->min_cost + spot_cost + Te;
 
     /* update it to the to_cell */
-#ifdef DEBUG
-    printf("		min_cost=%.2f: pres=%.2f spot=%.2f Te=%.2f\n",
+    G_debug(1, "		min_cost=%.2f: pres=%.2f spot=%.2f Te=%.2f",
 	   min_cost, pres_cell->min_cost, spot_cost, Te);
-#endif
 
     update(pres_cell, row, col, (double)dir, min_cost);
 }