[GRASS-SVN] r59416 - grass-addons/grass7/raster/r.stream.channel

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-03-27 07:08:26 -0700 (Thu, 27 Mar 2014)
New Revision: 59416

Modified:
   grass-addons/grass7/raster/r.stream.channel/main.c
   grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html
Log:
r.stream.channel - unify keywords, otions

Modified: grass-addons/grass7/raster/r.stream.channel/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/main.c	2014-03-27 13:56:22 UTC (rev 59415)
+++ grass-addons/grass7/raster/r.stream.channel/main.c	2014-03-27 14:08:26 UTC (rev 59416)
@@ -56,17 +56,16 @@
     G_add_keyword(_("raster"));
     G_add_keyword(_("hydrology"));
     G_add_keyword(_("stream network"));
-    G_add_keyword(_("Horton statistics"));
     module->description =
 	_("Calculates local parameters for individual streams.");
 
     in_stm_opt = G_define_standard_option(G_OPT_R_INPUT);
-    in_stm_opt->key = "streams";
+    in_stm_opt->key = "stream_rast";
     in_stm_opt->description = _("Name of input streams mask raster map");
 
     in_dir_opt = G_define_standard_option(G_OPT_R_INPUT);
-    in_dir_opt->key = "dirs";
-    in_dir_opt->description = _("Name of input flow direction raster map");
+    in_dir_opt->key = "direction";
+    in_dir_opt->description = _("Name for input raster map with flow direction");
 
     in_elev_opt = G_define_standard_option(G_OPT_R_ELEV);
 

Modified: grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html	2014-03-27 13:56:22 UTC (rev 59415)
+++ grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html	2014-03-27 14:08:26 UTC (rev 59416)
@@ -10,7 +10,7 @@
 <dt><b>-m</b></dt>
 <dd>Only for very large data sets. Use segment library to optimize memory
 consumption during analysis</dd>
-<dt><b>stream</b></dt>
+<dt><b>stream_rast</b></dt>
 <dd>Stream network: name of input stream map. Map may be ordered according one
 of the r.stream.order ordering system as well as unordered (with original stream
 identifiers)  Because streams network produced by r.watershed and
@@ -20,7 +20,7 @@
 r.watershed and r.stream.extract. If not 0 or NULL use <a
 href="r.mapcalc.html">r.mapcalc</a> to set background values to null.  
 </dd>
-<dt><b>dir</b></dt>
+<dt><b>direction</b></dt>
 <dd>Flow direction: name of input direction map produced by r.watershed or
 r.stream.extract. If r.stream.extract output map is used, it only has non-NULL
 values in places where streams occur. NULL (nodata) cells are ignored, zero and
@@ -34,7 +34,7 @@
 <dt><b>elevation</b></dt>
 <dd>Elevation: name of input elevation map. Map can be of type CELL, FCELL or
 DCELL. It is not restricted to resolution of region settings as streams and
-dirs.</dd>
+direction.</dd>
 </dl>
 <h2>OUTPUTS</h2>
 <dl>
@@ -101,8 +101,8 @@
 <div class="code"><pre>
 g.region -p -a rast=elevation align=elevation
 r.watershed elevation=elevation threshold=10000 drainage=dirs stream=streams
-r.stream.order streams=streams dirs=dirs hack=hack
-r.stream.channel streams=hack dirs=dirs elevation=elevation identifier=stream_identifier distance=stream_distance gradient=stream_gradient
+r.stream.order streams=streams direction=dirs hack=hack
+r.stream.channel streams=hack direction=dirs elevation=elevation identifier=stream_identifier distance=stream_distance gradient=stream_gradient
 #495 is a stream identifier. May be different in different situation
 r.mapcalc stgrad=if(stream_identifier==495,float(stream_gradient),null())
 r.mapcalc stdist=if(stream_identifier==495,float(stream_distance),null())