[GRASS-SVN] r33575 - in grass/trunk/raster: r.topmodel
r.watershed/front
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Sep 27 19:36:15 EDT 2008
Author: glynn
Date: 2008-09-27 19:36:15 -0400 (Sat, 27 Sep 2008)
New Revision: 33575
Modified:
grass/trunk/raster/r.topmodel/main.c
grass/trunk/raster/r.topmodel/r.topmodel.html
grass/trunk/raster/r.watershed/front/main.c
grass/trunk/raster/r.watershed/front/r.watershed.html
Log:
Restrict option names to (lower-case) a-z, 0-9 and underscore
r.topmodel: Qobs= -> qobs=
r.watershed: dot -> underscore
Modified: grass/trunk/raster/r.topmodel/main.c
===================================================================
--- grass/trunk/raster/r.topmodel/main.c 2008-09-27 23:18:20 UTC (rev 33574)
+++ grass/trunk/raster/r.topmodel/main.c 2008-09-27 23:36:15 UTC (rev 33575)
@@ -144,7 +144,7 @@
param.output->required = YES;
param.Qobs = G_define_option();
- param.Qobs->key = "Qobs";
+ param.Qobs->key = "qobs";
param.Qobs->description = _("(i) OPTIONAL Observed flow file");
param.Qobs->type = TYPE_STRING;
param.Qobs->required = NO;
Modified: grass/trunk/raster/r.topmodel/r.topmodel.html
===================================================================
--- grass/trunk/raster/r.topmodel/r.topmodel.html 2008-09-27 23:18:20 UTC (rev 33574)
+++ grass/trunk/raster/r.topmodel/r.topmodel.html 2008-09-27 23:36:15 UTC (rev 33575)
@@ -33,7 +33,7 @@
r.topidx input=elevation output=topidx
</pre></div></dd>
-<dt><b>Qobs</b></dt>
+<dt><b>qobs</b></dt>
<dd>Compare simulated flows with observed flows and calculate model
efficiency.
</dd>
Modified: grass/trunk/raster/r.watershed/front/main.c
===================================================================
--- grass/trunk/raster/r.watershed/front/main.c 2008-09-27 23:18:20 UTC (rev 33574)
+++ grass/trunk/raster/r.watershed/front/main.c 2008-09-27 23:36:15 UTC (rev 33575)
@@ -72,7 +72,7 @@
opt3->guisection = _("Input_options");
opt4 = G_define_option();
- opt4->key = "disturbed.land";
+ opt4->key = "disturbed_land";
opt4->description =
_("Input map or value: percent of disturbed land, for USLE");
opt4->required = NO;
@@ -99,7 +99,7 @@
opt6->guisection = _("Input_options");
opt7 = G_define_option();
- opt7->key = "max.slope.length";
+ opt7->key = "max_slope_length";
opt7->description =
_("Input value: maximum length of surface flow, for USLE");
opt7->required = NO;
@@ -142,7 +142,7 @@
opt11->guisection = _("Output_options");
opt12 = G_define_option();
- opt12->key = "half.basin";
+ opt12->key = "half_basin";
opt12->description =
_("Output map: each half-basin is given a unique value");
opt12->required = NO;
@@ -160,7 +160,7 @@
opt13->guisection = _("Output_options");
opt14 = G_define_option();
- opt14->key = "length.slope";
+ opt14->key = "length_slope";
opt14->description =
_("Output map: slope length and steepness (LS) factor for USLE");
opt14->required = NO;
@@ -169,7 +169,7 @@
opt14->guisection = _("Output_options");
opt15 = G_define_option();
- opt15->key = "slope.steepness";
+ opt15->key = "slope_steepness";
opt15->description = _("Output map: slope steepness (S) factor for USLE");
opt15->required = NO;
opt15->type = TYPE_STRING;
Modified: grass/trunk/raster/r.watershed/front/r.watershed.html
===================================================================
--- grass/trunk/raster/r.watershed/front/r.watershed.html 2008-09-27 23:18:20 UTC (rev 33574)
+++ grass/trunk/raster/r.watershed/front/r.watershed.html 2008-09-27 23:36:15 UTC (rev 33575)
@@ -68,7 +68,7 @@
overland flow each cell contributes to surface flow. If omitted, a
value of one (1) is assumed. The algorithm is D8 flow accumulation.
-<dt><em>disturbed.land</em>
+<dt><em>disturbed_land</em>
<dd>Raster map input layer or value containing the percent of disturbed
land (i.e., croplands, and construction sites) where the raster or input
@@ -86,11 +86,11 @@
<dd>The minimum size of an exterior watershed basin in cells, if no flow
map is input, or overland flow units when a flow map is given.
Warning: low threshold values will dramactically increase run time and
-generate difficult too read basin and half.basin results.
+generate difficult too read basin and half_basin results.
This parameter also controls the level of detail in the <em>stream</em>
segments map.
-<dt><em>max.slope.length</em>
+<dt><em>max_slope_length</em>
<dd>Input value indicating the maximum length of overland surface flow
in meters. If overland flow travels greater than the maximum length,
@@ -134,7 +134,7 @@
<dd>Output map: stream segments. Values correspond to the watershed
basin values.
-<dt><em>half.basin</em>
+<dt><em>half_basin</em>
<dd>Output map: each half-basin is given a unique value. Watershed
basins are divided into left and right sides. The right-hand side
@@ -151,7 +151,7 @@
are changed to zero. All positive values above the basin threshold
are given the value of the <em>threshold</em> parameter.
-<dt><em>length.slope</em>
+<dt><em>length_slope</em>
<dd>Output map: slope length and steepness (LS) factor. Contains the LS
factor for the Revised Universal Soil Loss Equation. Equations taken
@@ -160,7 +160,7 @@
Since the LS factor is a small number, it is multiplied by 100 for the
GRASS output map.
-<dt><em>slope.steepness</em>
+<dt><em>slope_steepness</em>
<dd>Output map: slope steepness (S) factor for RUSLE.
Contains the revised S factor for the Universal Soil
@@ -185,7 +185,7 @@
valleys while <em>r.watershed</em> performed much better. Thus, if forest
canopy exists in valleys, SRTM, IFSAR, and similar data products will cause
major errors in <em>r.terraflow</em> stream output. Under similar conditions,
-<em>r.watershed</em> will generate better <b>stream</b> and <b>half.basin</b>
+<em>r.watershed</em> will generate better <b>stream</b> and <b>half_basin</b>
results. If watershed divides contain flat to low slope, <em>r.watershed</em>
will generate better basin results than <em>r.terraflow</em>.
(<em>r.terraflow</em> uses the same type of algorithm as ESRI's ArcGIS
More information about the grass-commit
mailing list