[GRASS-SVN] r56586 - grass-addons/grass7/raster/r.fidimo

[svn_grass at osgeo.org]

Author: jradinger
Date: 2013-06-04 01:29:47 -0700 (Tue, 04 Jun 2013)
New Revision: 56586

Modified:
   grass-addons/grass7/raster/r.fidimo/r.fidimo.py
Log:
Problems solved with buffered distance raster, stream segments and output of r.watershed to get correct stream order.

Modified: grass-addons/grass7/raster/r.fidimo/r.fidimo.py
===================================================================
--- grass-addons/grass7/raster/r.fidimo/r.fidimo.py	2013-06-04 08:29:18 UTC (rev 56585)
+++ grass-addons/grass7/raster/r.fidimo/r.fidimo.py	2013-06-04 08:29:47 UTC (rev 56586)
@@ -194,7 +194,7 @@
 	global tmp_map_rast
 	global tmp_map_vect
 
-	tmp_map_rast = ['buffered_river_tmp_','density_final_','density_final_corrected_','density_from_point_tmp_', 'density_from_point_unmasked_tmp_', 'distance_from_point_tmp_', 'distance_raster_tmp_','distance_raster_buffered_tmp_', 'division_overlay_tmp_', 'downstream_drain_tmp_', 'drainage_tmp_', 'flow_direction_tmp_', 'lower_distance_tmp_', 'rel_upstream_shreve_tmp_', 'river_raster_cat_tmp_', 'river_raster_tmp_', 'shreve_tmp_', 'source_populations_scalar_', 'strahler_tmp_', 'stream_rwatershed_tmp_', 'upper_distance_tmp_', 'upstream_part_tmp_', 'upstream_shreve_tmp_']
+	tmp_map_rast = ['density_final_','density_final_corrected_','density_from_point_tmp_', 'density_from_point_unmasked_tmp_', 'distance_from_point_tmp_', 'distance_raster_tmp_','distance_raster_buffered_tmp_', 'distance_raster_grow_tmp_', 'division_overlay_tmp_', 'downstream_drain_tmp_', 'drainage_tmp_', 'flow_direction_tmp_', 'lower_distance_tmp_', 'rel_upstream_shreve_tmp_', 'river_raster_cat_tmp_', 'river_raster_tmp_', 'river_raster_buffer_tmp_', 'river_raster_grow_start_tmp_', 'river_raster_nearest_tmp_', 'shreve_tmp_', 'source_populations_scalar_', 'strahler_tmp_', 'stream_rwatershed_tmp_', 'upper_distance_tmp_', 'upstream_part_tmp_', 'upstream_shreve_tmp_']
 
 
 	tmp_map_vect = ['river_points_tmp_', 'river_vector_tmp_', 'river_vector_nocat_tmp_','source_points_']
@@ -416,26 +416,52 @@
 					  start_coordinates = coors)
 
 	largest_cost_value = grass.raster_info("distance_raster_tmp_%d" % os.getpid())['max']
-	n_buffer_cells = 3
+	
 
-	grass.run_command("r.buffer",
+	# buffer
+	grass.run_command("r.grow.distance",
 					overwrite=True,
 					input="distance_raster_tmp_%d" % os.getpid(),
-					output="buffered_river_tmp_%d" % os.getpid(),
-					distances=n_buffer_cells*res)
+					value="river_raster_nearest_tmp_%d" % os.getpid())
 
-	grass.mapcalc("$distance_raster_buffered_tmp = if($buffered_river_tmp==2,$largest_cost_value*2,$distance_raster_tmp)",
-					distance_raster_buffered_tmp = "distance_raster_buffered_tmp_%d" % os.getpid(),
-					buffered_river_tmp = "buffered_river_tmp_%d" % os.getpid(),
-					largest_cost_value = largest_cost_value,
-					distance_raster_tmp = "distance_raster_tmp_%d" % os.getpid())
+	#get value of nearest river cell
+	grass.run_command("r.grow",
+					overwrite=True,
+					input="distance_raster_tmp_%d" % os.getpid(),
+					output="distance_raster_grow_tmp_%d" % os.getpid(),
+					radius=2.01,
+					old=1,
+					new=largest_cost_value*2)
 
+	# remove buffer for start
+	grass.mapcalc("$river_raster_grow_start_tmp = if($river_raster_nearest_tmp==0,null(),$distance_raster_grow_tmp)",
+					river_raster_grow_start_tmp = "river_raster_grow_start_tmp_%d" % os.getpid(),
+					river_raster_nearest_tmp = "river_raster_nearest_tmp_%d" % os.getpid(),
+					distance_raster_grow_tmp = "distance_raster_grow_tmp_%d" % os.getpid())
+
+	
+	#grow by one cell to make sure taht the start point is the only cell
+	grass.run_command("r.grow",
+					overwrite=True,
+					input="river_raster_grow_start_tmp_%d" % os.getpid(),
+					output="river_raster_buffer_tmp_%d" % os.getpid(),
+					radius=1.01,
+					old=largest_cost_value*2,
+					new=largest_cost_value*2)
+
+	#patch river raster with buffer
+	grass.run_command("r.patch",
+					overwrite=True,
+					in="distance_raster_tmp_%d,river_raster_buffer_tmp_%d" % (os.getpid(),os.getpid()),
+					out="distance_raster_buffered_tmp_%d" % os.getpid())
+
+	# Getting flow direction and stream segments
 	grass.run_command("r.watershed", 
 					  flags = 'm', #depends on memory!! #
 					  elevation = "distance_raster_buffered_tmp_%d" % os.getpid(),
 					  drainage = "drainage_tmp_%d" % os.getpid(),
 					  stream = "stream_rwatershed_tmp_%d" % os.getpid(),
-					  threshold = n_buffer_cells,
+					  threshold = 3,
 					  overwrite = True)
 
 	grass.mapcalc("$flow_direction_tmp = if($stream_rwatershed_tmp,$drainage_tmp,null())",