[GRASS-SVN] r59438 - grass-addons/grass7/raster/r.stream.order

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-03-27 08:55:53 -0700 (Thu, 27 Mar 2014)
New Revision: 59438

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

Modified: grass-addons/grass7/raster/r.stream.order/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.order/main.c	2014-03-27 15:48:56 UTC (rev 59437)
+++ grass-addons/grass7/raster/r.stream.order/main.c	2014-03-27 15:55:53 UTC (rev 59438)
@@ -29,10 +29,10 @@
 {
 
     IO input[] = {
-        {"streams", YES, _("Name of input streams mask raster map")},
-	{"dirs", YES, _("Name of input flow direction raster map")},
+        {"stream_rast", YES, _("Name of input streams mask raster map")},
+	{"direction", YES, _("Name of input flow direction raster map")},
 	{"elevation", NO, _("Name of input elevation raster map")},
-	{"accum", NO, _("Name of input accumulation raster map")}
+	{"accumulation", NO, _("Name of input accumulation raster map")}
     };
 
     /* add new basic rdering here and in local_vars.h declaration 

Modified: grass-addons/grass7/raster/r.stream.order/r.stream.order.html
===================================================================
--- grass-addons/grass7/raster/r.stream.order/r.stream.order.html	2014-03-27 15:48:56 UTC (rev 59437)
+++ grass-addons/grass7/raster/r.stream.order/r.stream.order.html	2014-03-27 15:55:53 UTC (rev 59438)
@@ -8,11 +8,11 @@
 zero-filled background instead of null (default).</dd>
 <dt><b>-a</b></dt>
 <dd>Uses accumulation map instead of cumulated stream length to determine main
-branch at bifuraction. Works well only with SFD networks</dd>
+branch at bifurcation. Works well only with SFD networks</dd>
 <dt><b>-m</b></dt>
 <dd>Only for very large data sets. Use segment library to optimise memory
 consumption during analysis</dd>
-<dt><b>stream network map</b></dt>
+<dt><b>stream_rast</b></dt>
 <dd>Name of input stream map on which ordering will be performed produced by
 r.watershed or r.stream.extract. Because streams network produced by r.watershed
 and r.stream.extract may slightly differ in detail it is required to 
@@ -22,7 +22,7 @@
 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>flow direction map</b></dt>
+<dt><b>direction</b></dt>
 <dd>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 negative values are
@@ -33,7 +33,7 @@
 resolution. It is checked by default. If resolutions differ the module informs
 about it and stops. Region boundary
 and maps boundary may be differ but it may lead to unexpected results.</dd>
-<dt><b>accumulation map</b></dt>
+<dt><b>accumulation</b></dt>
 <dd>Flow accumulation (optional, not recommended): name of flow accumulation
 file produced by r.watershed or used in r.stream.extract. This map is an option
 only if Horton's or Hack's ordering is performed. Normally both Horton and Hack
@@ -41,7 +41,7 @@
 internally. Flow accumulation can be used if user want to calculate main stream
 as most accumulated stream. Flow accumulation map shall be of DCELL type, as is
 by default produced by r.watershed or converted do DCELL with r.mapcalc.</dd>
-<dt><b>elevation map</b></dt>
+<dt><b>elevation</b></dt>
 <dd>Used to calculate geometrical properties of the network stored in the
 table.</dd>
 </dl>
@@ -254,11 +254,12 @@
 
 <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 strahler=riverorder_strahler horton=riverorder_horton shreve=riverorder_shreve hack=riverorder_hack topo=river_topodim
+r.watershed elevation=elevation threshold=10000 drainage=direction stream=streams
+r.stream.order stream_rast=streams direction=direction strahler=riverorder_strahler \
+horton=riverorder_horton shreve=riverorder_shreve hack=riverorder_hack topo=river_topodim
 # vector river network
 r.watershed elevation=elevation threshold=10000 accumulation=accum
-r.stream.order streams=streams dirs=dirs elevation=elevation accum=accum stream_vect=river_vector
+r.stream.order stream_rast=streams direction=direction elevation=elevation accumulation=accum stream_vect=river_vector
 </pre></div>
 
 <h2>SEE ALSO</h2>