[GRASS-SVN] r69659 - grass/branches/releasebranch_7_2/raster/r.stream.extract

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-10-03 14:11:31 -0700 (Mon, 03 Oct 2016)
New Revision: 69659

Added:
   grass/branches/releasebranch_7_2/raster/r.stream.extract/r_stream_extract_accum_orig_zoom.png
   grass/branches/releasebranch_7_2/raster/r.stream.extract/r_stream_extract_accum_weighted_zoom.png
   grass/branches/releasebranch_7_2/raster/r.stream.extract/r_stream_extract_streams_noweight.png
   grass/branches/releasebranch_7_2/raster/r.stream.extract/r_stream_extract_weights_zoom.png
Modified:
   grass/branches/releasebranch_7_2/raster/r.stream.extract/r.stream.extract.html
Log:
r.stream.extract manual: screenshots added (trunk, r69658)

Modified: grass/branches/releasebranch_7_2/raster/r.stream.extract/r.stream.extract.html
===================================================================
--- grass/branches/releasebranch_7_2/raster/r.stream.extract/r.stream.extract.html	2016-10-03 21:09:59 UTC (rev 69658)
+++ grass/branches/releasebranch_7_2/raster/r.stream.extract/r.stream.extract.html	2016-10-03 21:11:31 UTC (rev 69659)
@@ -110,7 +110,7 @@
 <p>
 Another possibility is to restrict channel initiation to valleys
 determined from terrain morphology. Valleys can be determined with
-<em><a href="r.param.scale.html">r.param.scale</a></em> <tt>param=crosc</tt>
+<em><a href="r.param.scale.html">r.param.scale</a></em> <tt>method=crosc</tt>
 (cross-sectional or tangential curvature). Curvature values < 0
 indicate concave features, i.e. valleys. The size of the processing
 window determines whether narrow or broad valleys will be identified
@@ -166,18 +166,18 @@
 r.watershed ele=elev_ned_30m at PERMANENT acc=elevation.10m.acc
 
 # curvature to get narrow valleys
-r.param.scale input=elev_ned_30m at PERMANENT output=tangential_curv_5 size=5 param=crosc
+r.param.scale input=elev_ned_30m at PERMANENT output=tangential_curv_5 size=5 method=crosc
 
 # curvature to get a bit broader valleys
-r.param.scale input=elev_ned_30m at PERMANENT output=tangential_curv_7 size=7 param=crosc
+r.param.scale input=elev_ned_30m at PERMANENT output=tangential_curv_7 size=7 method=crosc
 
 # curvature to get broad valleys
-r.param.scale input=elev_ned_30m at PERMANENT output=tangential_curv_11 size=11 param=crosc
+r.param.scale input=elev_ned_30m at PERMANENT output=tangential_curv_11 size=11 method=crosc
 
 # create weight map
-r.mapcalc "weight = if(tangential_curv_5 < 0, -100 * tangential_curv_5, \
-                    if(tangential_curv_7 < 0, -100 * tangential_curv_7, \
-		    if(tangential_curv_11 < 0, -100 * tangential_curv_11, 0.000001)))"
+r.mapcalc "weight = if(tangential_curv_5 < 0, -100 * tangential_curv_5, \
+                    if(tangential_curv_7 < 0, -100 * tangential_curv_7, \
+		    if(tangential_curv_11 < 0, -100 * tangential_curv_11, 0.000001)))"
 
 # weigh accumulation map
 r.mapcalc expr="elev_ned_30m.acc.weighed = elev_ned_30m.acc * weight"
@@ -186,11 +186,27 @@
 r.colors map=elev_ned_30m.acc.weighed raster=elev_ned_30m.acc
 </pre></div>
 
+<p>
+<a href="r_stream_extract_weights_zoom.png">
+<img src="r_stream_extract_weights_zoom.png" width="400"></a><br>
+Weight map (spatial subset with lake in the southern half)
+
+<p>
+<a href="r_stream_extract_accum_orig_zoom.png">
+<img src="r_stream_extract_accum_orig_zoom.png" width="400"></a><br>
+Original flow accumulation map (spatial subset with lake in the southern half)
+
+<p>
+<a href="r_stream_extract_accum_weighted_zoom.png">
+<img src="r_stream_extract_accum_weighted_zoom.png" width="400"></a><br>
+Weighed flow accumulation map (spatial subset with lake in the southern half)
+<p>
+
 Display both the original and the weighed accumulation map.
 Compare them and proceed if the weighed accumulation map makes sense.
 
 <div class="code"><pre>
-# extract streams
+# extract streams from weighed map
 r.stream.extract elevation=elev_ned_30m at PERMANENT \
                  accumulation=elev_ned_30m.acc.weighed \
 		 threshold=1000 \
@@ -203,8 +219,24 @@
 		 stream_rast=elev_ned_30m.streams.noweight
 </pre></div>
 
+<p>
 Now display both stream maps and decide which one is more realistic.
+<!-- 
+d.shade color=elev_ned_30m_streams_noweight shade=elevation_shade brighten=20
+-->
+<p>
+<a href="r_stream_extract_streams_noweight.png">
+<img src="r_stream_extract_streams_noweight.png" width="400"></a><br>
+Extracted streams from original flow accumulation map
 
+<!-- 
+TODO: ERROR: Accumulation raster map is NULL but elevation map is not NULL
+<p>
+<a href="r_stream_extract_streams_weight.png">
+<img src="r_stream_extract_streams_weight.png" width="400"></a><br>
+Extracted streams from weighed flow accumulation map
+-->
+
 <h2>REFERENCES</h2>
 
 <ul>

Copied: grass/branches/releasebranch_7_2/raster/r.stream.extract/r_stream_extract_accum_orig_zoom.png (from rev 69658, grass/trunk/raster/r.stream.extract/r_stream_extract_accum_orig_zoom.png)
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_7_2/raster/r.stream.extract/r_stream_extract_accum_weighted_zoom.png (from rev 69658, grass/trunk/raster/r.stream.extract/r_stream_extract_accum_weighted_zoom.png)
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_7_2/raster/r.stream.extract/r_stream_extract_streams_noweight.png (from rev 69658, grass/trunk/raster/r.stream.extract/r_stream_extract_streams_noweight.png)
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_7_2/raster/r.stream.extract/r_stream_extract_weights_zoom.png (from rev 69658, grass/trunk/raster/r.stream.extract/r_stream_extract_weights_zoom.png)
===================================================================
(Binary files differ)