[GRASS-SVN] r59368 - grass-addons/grass7/raster/r.stream.channel
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Mar 26 08:19:41 PDT 2014
Author: hellik
Date: 2014-03-26 08:19:40 -0700 (Wed, 26 Mar 2014)
New Revision: 59368
Modified:
grass-addons/grass7/raster/r.stream.channel/io.c
grass-addons/grass7/raster/r.stream.channel/io.h
grass-addons/grass7/raster/r.stream.channel/main.c
grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html
grass-addons/grass7/raster/r.stream.channel/stream_topology.c
Log:
cosmetics
Modified: grass-addons/grass7/raster/r.stream.channel/io.c
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/io.c 2014-03-26 15:11:32 UTC (rev 59367)
+++ grass-addons/grass7/raster/r.stream.channel/io.c 2014-03-26 15:19:40 UTC (rev 59368)
@@ -47,10 +47,10 @@
RASTER_MAP_TYPE check_data_type)
{
/*
- * Funciton read external map and put it in MAP structure (created with create_map)
- * map: map to be read can be of any data type, read map is converted to target map if neccesary.
+ * Function read external map and put it in MAP structure (created with create_map)
+ * map: map to be read can be of any data type, read map is converted to target map if necessary.
* input_map_name: name of the map to be read;
- * map pointer to map stucture (created with create_map);
+ * map pointer to map structure (created with create_map);
* check_res: [1]: check res correspondence between region and map [0 no check];
* check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
*/
@@ -329,10 +329,10 @@
{
/*
- * Funciton read external map and put it in SEG structure (created with seg_create_map)
- * map to be read can be of any data type, read map is converted if neccesary.
+ * Function read external map and put it in SEG structure (created with seg_create_map)
+ * map to be read can be of any data type, read map is converted if necessary.
* input_map_name: name of the map to be read;
- * seg: pointer to map stucture (created with create_map);
+ * seg: pointer to map structure (created with create_map);
* check_res: [1]: check res correspondence between region and map [0 no check];
* check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
*/
@@ -359,7 +359,7 @@
G_get_window(&this_window);
Rast_get_cellhd(input_map_name, mapset, &cellhd);
- /* check resolution equal anyinteger check; equal 0 no check */
+ /* check resolution equal any integer check; equal 0 no check */
if (check_res)
if (this_window.ew_res != cellhd.ew_res ||
this_window.ns_res != cellhd.ns_res)
Modified: grass-addons/grass7/raster/r.stream.channel/io.h
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/io.h 2014-03-26 15:11:32 UTC (rev 59367)
+++ grass-addons/grass7/raster/r.stream.channel/io.h 2014-03-26 15:19:40 UTC (rev 59368)
@@ -22,7 +22,7 @@
typedef struct {
void **map; /* matrix of data */
- double min, max; /* data range : may requre casting */
+ double min, max; /* data range : may require casting */
int nrows, ncols;
char *map_name; /* map name, unused */
RASTER_MAP_TYPE data_type; /* type of data */
Modified: grass-addons/grass7/raster/r.stream.channel/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/main.c 2014-03-26 15:11:32 UTC (rev 59367)
+++ grass-addons/grass7/raster/r.stream.channel/main.c 2014-03-26 15:19:40 UTC (rev 59368)
@@ -4,7 +4,7 @@
* MODULE: r.stream.channel
* AUTHOR(S): Jarek Jasiewicz jarekj amu.edu.pl
*
- * PURPOSE: Program calculate some channel properities:
+ * PURPOSE: Program calculate some channel properties:
* local elevation change, curvature along stream,
* distance to channel init/join, elevation below channel init,
* optionally distance to outlet, elevation above outlet;
@@ -55,7 +55,7 @@
/* initialize module */
module = G_define_module();
- G_add_keyword("Horton statisctics");
+ G_add_keyword("Horton statistics");
module->description =
_("Calculate local parameters for individual streams");
G_add_keyword(_("raster"));
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-26 15:11:32 UTC (rev 59367)
+++ grass-addons/grass7/raster/r.stream.channel/r.stream.channel.html 2014-03-26 15:19:40 UTC (rev 59368)
@@ -1,9 +1,9 @@
<h2>OPTIONS</h2>
<dl>
<dt><b>-l</b></dt>
-<dd>Calculate local values. See output for detials.</dd>
+<dd>Calculate local values. See output for details.</dd>
<dt><b>-c</b></dt>
-<dd>Calculate distance in cells instead of meters. See output for detials.</dd>
+<dd>Calculate distance in cells instead of meters. See output for details.</dd>
<dt><b>-d</b></dt>
<dd>Calculate downstream distance (from current cell DOWNSTREAM to outlet/join).
Default is upstream (from current cell upstream to init/join.</dd>
@@ -12,9 +12,9 @@
consumption during analysis</dd>
<dt><b>stream</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 origilan stream
+of the r.stream.order ordering system as well as unordered (with original stream
identifiers) Because streams network produced by r.watershed and
-r.stream.extract may slighty differ in detail it is required to use both stream
+r.stream.extract may slightly differ in detail it is required to use both stream
and direction map produced by the same module. Stream background shall have NULL
value or zero value. Background values of NULL are by default produced by
r.watershed and r.stream.extract. If not 0 or NULL use <a
@@ -26,7 +26,7 @@
values in places where streams occur. NULL (nodata) cells are ignored, zero and
negative values are valid direction data if they vary from -8 to 8 (CCW from
East in steps of 45 degrees). Direction map shall be of type CELL values. Region
-resolution and map resoultion must be the same.
+resolution and map resolution must be the same.
Also <em>stream</em> network map must have the same 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
@@ -42,16 +42,16 @@
<dd>Upstream distance of current cell to the init/join. Flag modifications: <br>
<b>d:</b> downstream distance of current cell to the join/outlet;<br>
<b>l:</b> local distance between current cell and next cell. In most cases cell
-resolution and sqrt2 of cell resolution. usefull when projection is LL or NS and
+resolution and sqrt2 of cell resolution. useful when projection is LL or NS and
WE resolutions differs. Flag d ignored<br>
-<b>c:</b> distance in cells. Map is written as double. Use mapcalc to convetrt
+<b>c:</b> distance in cells. Map is written as double. Use r.mapcalc to convert
to integer. Flags l and d ignored.<br>
</dd>
<dt><b>difference</b></dt>
<dd>Upstream elevation difference between current cell to the init/join. It we
need to calculate parameters different than elevation. If we need to calculate
different parameters than elevation along streams (for example precipitation or
-so) use neccesary map as elevation. Flag modifications: <br>
+so) use necessary map as elevation. Flag modifications: <br>
<b>d:</b> downstream difference of current cell to the join/outlet;<br>
<b>l:</b> local difference between current cell and next cell. With flag
calculates difference between previous cell and current cell<br>
@@ -75,15 +75,15 @@
</dd>
<dt><b>identifier</b></dt>
<dd> Integer map: In ordered stream network there are more than one segment
-(segment: a part of the network where order ramains unchanged) with the same
+(segment: a part of the network where order remains unchanged) with the same
order. To identify particular segments (for further analysis) every segment
-recive his unique identifier.</dd>
+receive his unique identifier.</dd>
</dl>
<h2>DESCRIPTION</h2>
<p>
Module r.stream.channel is prepared to calculate some local properties of the
-stream network. It is suplementary module for r.stream.order, and
+stream network. It is supplementary module for r.stream.order, and
r.stream.distance to investigate channel subsystem. For slope subsystem
parameters is r.stream.slope. It may use ordered or unordered network. It
calculate parameters for every segment between it init to outlet/join to the
@@ -99,11 +99,11 @@
stream of the catchment:
<div class="code"><pre>
-r.watershed elevation=elevation.10m treshold=1000 stream=streams drainage=dirs
+r.watershed elevation=elevation.10m threshold=1000 stream=streams drainage=dirs
r.stream.order streams=streams dirs=dirs hack=hack
r.stream.channel streams=hack dirs=dirs elevation=elevation.10m
identifier=stream_identifier gradient=stream_gradient distance=stream_distance
-#495 is a stream identifier. May be different in different situaltion
+#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())
Modified: grass-addons/grass7/raster/r.stream.channel/stream_topology.c
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/stream_topology.c 2014-03-26 15:11:32 UTC (rev 59367)
+++ grass-addons/grass7/raster/r.stream.channel/stream_topology.c 2014-03-26 15:19:40 UTC (rev 59368)
@@ -14,7 +14,7 @@
}
int ram_trib_nums(int r, int c, CELL ** streams, CELL ** dirs)
-{ /* calculate number of tributuaries */
+{ /* calculate number of tributaries */
int trib_num = 0;
int i, j;
@@ -200,7 +200,7 @@
}
int seg_trib_nums(int r, int c, SEGMENT * streams, SEGMENT * dirs)
-{ /* calculate number of tributuaries */
+{ /* calculate number of tributaries */
int trib_num = 0;
int i, j;
More information about the grass-commit
mailing list