[GRASS-SVN] r59455 - in grass-addons/grass7/raster: r.stream.channel r.stream.order r.stream.segment r.stream.slope r.stream.snap r.stream.stats

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Mar 27 11:18:09 PDT 2014


Author: neteler
Date: 2014-03-27 11:18:08 -0700 (Thu, 27 Mar 2014)
New Revision: 59455

Modified:
   grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html
   grass-addons/grass7/raster/r.stream.order/r.stream.order.html
   grass-addons/grass7/raster/r.stream.segment/r.stream.segment.html
   grass-addons/grass7/raster/r.stream.slope/r.stream.slope.html
   grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html
   grass-addons/grass7/raster/r.stream.stats/r.stream.stats.html
Log:
r.stream.* manuals: example fixes

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 18:10:22 UTC (rev 59454)
+++ grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html	2014-03-27 18:18:08 UTC (rev 59455)
@@ -97,8 +97,8 @@
   identifier=stream_identifier distance=stream_distance gradient=stream_gradient
 
 # Eg., 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())
+r.mapcalc "stgrad = if(stream_identifier==495,float(stream_gradient),null())"
+r.mapcalc "stdist = if(stream_identifier==495,float(stream_distance),null())"
 
 # Use R for plotting
 R

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 18:10:22 UTC (rev 59454)
+++ grass-addons/grass7/raster/r.stream.order/r.stream.order.html	2014-03-27 18:18:08 UTC (rev 59455)
@@ -1,8 +1,8 @@
 <h2>DESCRIPTION</h2>
 
-The <em>r.stream.order</em> calculates Strahler's and more streams
-hierarchy. It's a basic module for topological analysis of drainage
-network.
+The <em>r.stream.order</em> calculates Strahler's and other stream
+hierarchy methods. It is a basic module for topological analysis of
+drainage networks.
 
 <h2>OPTIONS</h2>
 <dl>
@@ -208,7 +208,7 @@
 multiplied by 2:
 
 <div class="code"><pre>
-r.mapcalc scheidegger=shreve*2
+r.mapcalc "scheidegger = shreve * 2.0"
 </pre></div>
 
 <h4>Drwal's stream hierarchy (old style)</h4>
@@ -227,7 +227,7 @@
 formula: <tt>floor(log(shreve,2))+1</tt>
 
 <div class="code"><pre>
-r.mapcalc drwal=int(log(shreve,2))+1
+r.mapcalc "drwal = int(log(shreve,2.0)) + 1.0"
 </pre></div>
 
 <h4>Advantages and disadvantages of Drwal's hierarhy</h4> 
@@ -309,13 +309,16 @@
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-g.region -p -a rast=elevation align=elevation
+g.region -p -a rast=elevation
 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
+  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 stream_rast=streams direction=direction elevation=elevation accumulation=accum stream_vect=river_vector
+r.stream.order stream_rast=streams direction=direction elevation=elevation \
+  accumulation=accum stream_vect=river_vector
 </pre></div>
 
 <h2>REFERENCES</h2>

Modified: grass-addons/grass7/raster/r.stream.segment/r.stream.segment.html
===================================================================
--- grass-addons/grass7/raster/r.stream.segment/r.stream.segment.html	2014-03-27 18:10:22 UTC (rev 59454)
+++ grass-addons/grass7/raster/r.stream.segment/r.stream.segment.html	2014-03-27 18:18:08 UTC (rev 59455)
@@ -176,10 +176,11 @@
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-g.region -p -a rast=elevation align=elevation
+g.region -p -a rast=elevation
 r.watershed elevation=elevation threshold=10000 drainage=direction stream=streams
 r.stream.order stream_vect=streams direction=direction strahler=riverorder_strahler
-r.stream.segment stream_rast=riverorder_strahler direction=direction elevation=elevation segments=river_segment sectors=river_sector
+r.stream.segment stream_rast=riverorder_strahler direction=direction \
+  elevation=elevation segments=river_segment sectors=river_sector
 </pre></div>
 
 <h2>SEE ALSO</h2>

Modified: grass-addons/grass7/raster/r.stream.slope/r.stream.slope.html
===================================================================
--- grass-addons/grass7/raster/r.stream.slope/r.stream.slope.html	2014-03-27 18:10:22 UTC (rev 59454)
+++ grass-addons/grass7/raster/r.stream.slope/r.stream.slope.html	2014-03-27 18:18:08 UTC (rev 59455)
@@ -48,7 +48,7 @@
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-g.region -p -a rast=elevation align=elevation
+g.region -p -a rast=elevation
 r.watershed elevation=elevation threshold=10000 drainage=dirs stream=streams
 r.stream.slope dir=dirs elevation=elevation difference=downstream_elev_difference \
   gradient=downstream_gradient maxcurv=downstream_maxcurv mincurv=downstream_mincurv

Modified: grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html
===================================================================
--- grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html	2014-03-27 18:10:22 UTC (rev 59454)
+++ grass-addons/grass7/raster/r.stream.snap/r.stream.snap.html	2014-03-27 18:18:08 UTC (rev 59455)
@@ -90,7 +90,7 @@
 <h2>EXAMPLE</h2>
 
 <div class="code"><pre>
-g.region -p -a rast=elevation align=elevation
+g.region -p -a rast=elevation
 r.watershed elevation=elevation threshold=10000 drainage=dirs stream=streams accumulation=accum
 # snap a point sampled in the riverine landscape to the calculated river network
 r.stream.snap input=mysampleoutlet output=mysampleoutlet_snapped stream_rast=streams accumulation=accum

Modified: grass-addons/grass7/raster/r.stream.stats/r.stream.stats.html
===================================================================
--- grass-addons/grass7/raster/r.stream.stats/r.stream.stats.html	2014-03-27 18:10:22 UTC (rev 59454)
+++ grass-addons/grass7/raster/r.stream.stats/r.stream.stats.html	2014-03-27 18:18:08 UTC (rev 59455)
@@ -164,7 +164,7 @@
 external program (like R) to be visualised:
 
 <div class="code"><pre>
-g.region -p -a rast=elevation align=elevation
+g.region -p -a rast=elevation
 r.watershed elevation=elevation threshold=10000 drainage=direction stream=streams
 r.stream.stats stream_rast=horton direction=direction elevation=elevation
 # export for processing in R



More information about the grass-commit mailing list