[GRASS-SVN] r41865 - in grass/trunk/raster: r.basins.fill
r.fill.dir r.flow r.topmodel r.uslek r.watershed/front
r.watershed/ram simwe/r.sim.sediment simwe/r.sim.water
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Apr 14 14:45:09 EDT 2010
Author: martinl
Date: 2010-04-14 14:45:09 -0400 (Wed, 14 Apr 2010)
New Revision: 41865
Modified:
grass/trunk/raster/r.basins.fill/main.c
grass/trunk/raster/r.fill.dir/main.c
grass/trunk/raster/r.flow/main.c
grass/trunk/raster/r.topmodel/main.c
grass/trunk/raster/r.uslek/main.c
grass/trunk/raster/r.watershed/front/main.c
grass/trunk/raster/r.watershed/ram/Gwater.h
grass/trunk/raster/r.watershed/ram/init_vars.c
grass/trunk/raster/r.watershed/ram/usage.c
grass/trunk/raster/simwe/r.sim.sediment/main.c
grass/trunk/raster/simwe/r.sim.water/main.c
Log:
hydrology modules: some options renamed (see #1031)
Modified: grass/trunk/raster/r.basins.fill/main.c
===================================================================
--- grass/trunk/raster/r.basins.fill/main.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.basins.fill/main.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -57,11 +57,11 @@
_("Generates watershed subbasins raster map.");
drain_opt = G_define_standard_option(G_OPT_R_INPUT);
- drain_opt->key = "cmap_input";
+ drain_opt->key = "cnetwork";
drain_opt->description = _("Name of input coded stream network raster map");
ridge_opt = G_define_standard_option(G_OPT_R_INPUT);
- ridge_opt->key = "tmap_input";
+ ridge_opt->key = "tnetwork";
ridge_opt->description = _("Name of input thinned ridge network raster map");
part_opt = G_define_standard_option(G_OPT_R_OUTPUT);
Modified: grass/trunk/raster/r.fill.dir/main.c
===================================================================
--- grass/trunk/raster/r.fill.dir/main.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.fill.dir/main.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -65,7 +65,6 @@
int nrows, ncols, nbasins;
int map_id, dir_id, bas_id;
char map_name[GNAME_MAX], new_map_name[GNAME_MAX];
- const char *map_mapset;
const char *tempfile1, *tempfile2, *tempfile3;
char dir_name[GNAME_MAX];
char bas_name[GNAME_MAX];
@@ -89,15 +88,15 @@
_("Filters and generates a depressionless elevation map and a flow "
"direction map from a given elevation raster map.");
- opt1 = G_define_standard_option(G_OPT_R_INPUT);
- opt1->description = _("Name of input elevation raster map");
-
+ opt1 = G_define_standard_option(G_OPT_R_ELEV);
+
opt2 = G_define_standard_option(G_OPT_R_OUTPUT);
- opt2->description = _("Name for output elevation raster map after filling");
+ opt2->key = "depressionless";
+ opt2->description = _("Name for output depressionless elevation raster map");
opt4 = G_define_standard_option(G_OPT_R_OUTPUT);
opt4->key = "direction";
- opt4->description = _("Name for output direction raster map");
+ opt4->description = _("Name for output flow direction map for depressionless elevation raster map");
opt5 = G_define_standard_option(G_OPT_R_OUTPUT);
opt5->key = "areas";
@@ -145,7 +144,7 @@
G_verbose_message(_("Direction map is D8 resolution, i.e. 45 degrees"));
/* open the maps and get their file id */
- map_id = Rast_open_old(map_name, map_mapset);
+ map_id = Rast_open_old(map_name, "");
/* allocate cell buf for the map layer */
in_type = Rast_get_map_type(map_id);
Modified: grass/trunk/raster/r.flow/main.c
===================================================================
--- grass/trunk/raster/r.flow/main.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.flow/main.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -427,15 +427,14 @@
"map.");
pelevin = G_define_standard_option(G_OPT_R_ELEV);
- pelevin->key = "elevation_input";
paspin = G_define_standard_option(G_OPT_R_INPUT);
- paspin->key = "aspect_input";
+ paspin->key = "aspect";
paspin->required = NO;
paspin->description = _("Name of input aspect raster map");
pbarin = G_define_standard_option(G_OPT_R_INPUT);
- pbarin->key = "barrier_input";
+ pbarin->key = "barrier";
pbarin->required = NO;
pbarin->description = _("Name of input barrier raster map");
@@ -452,17 +451,17 @@
pbound->description = _("Maximum number of segments per flowline");
pflout = G_define_standard_option(G_OPT_V_OUTPUT);
- pflout->key = "flowline_output";
+ pflout->key = "flowline";
pflout->required = NO;
pflout->description = _("Name for output flowline vector map");
plgout = G_define_standard_option(G_OPT_R_OUTPUT);
- plgout->key = "flowpath_output";
+ plgout->key = "flowpath";
plgout->required = NO;
plgout->description = _("Name for output flowpath length raster map");
pdsout = G_define_standard_option(G_OPT_R_OUTPUT);
- pdsout->key = "density_output";
+ pdsout->key = "density";
pdsout->required = NO;
pdsout->description = _("Name for output flowline density raster map");
Modified: grass/trunk/raster/r.topmodel/main.c
===================================================================
--- grass/trunk/raster/r.topmodel/main.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.topmodel/main.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -66,12 +66,11 @@
/* Parameter definitions */
param.elev = G_define_standard_option(G_OPT_R_ELEV);
- param.elev->key = "elevation_input";
param.elev->required = NO;
param.elev->guisection = _("Input");
param.basin = G_define_standard_option(G_OPT_R_INPUT);
- param.basin->key = "basin_input";
+ param.basin->key = "basin";
param.basin->label =
_("Name of input basin raster map");
param.basin->description = _("Created by r.water.outlet (MASK)");
@@ -79,27 +78,27 @@
param.basin->guisection = _("Input");
param.fill = G_define_standard_option(G_OPT_R_OUTPUT);
- param.fill->key = "depression_output";
+ param.fill->key = "depressionless";
param.fill->description = _("Name for output depressionless elevation raster map");
param.fill->required = NO;
param.fill->guisection = _("Output");
param.dir = G_define_standard_option(G_OPT_R_OUTPUT);
- param.dir->key = "direction_output";
+ param.dir->key = "direction";
param.dir->description =
- _("Name for output direction map for depressionless elevation raster map");
+ _("Name for output flow direction map for depressionless elevation raster map");
param.dir->required = NO;
param.dir->guisection = _("Output");
param.belev = G_define_standard_option(G_OPT_R_OUTPUT);
- param.belev->key = "basin_output";
+ param.belev->key = "basin_elevation";
param.belev->label = _("Name for output basin elevation raster map (o/i)");
param.belev->description = _("MASK applied");
param.belev->required = NO;
param.belev->guisection = _("Output");
param.topidx = G_define_standard_option(G_OPT_R_OUTPUT);
- param.topidx->key = "topidx_output";
+ param.topidx->key = "topidx";
param.topidx->label =
_("Name for output opographic index ln(a/tanB) raster map");
param.topidx->description = _("MASK applied");
Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.uslek/main.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -58,19 +58,19 @@
/* Define the different options */
input1 = G_define_standard_option(G_OPT_R_INPUT);
- input1->key = "psand_input";
+ input1->key = "psand";
input1->description = _("Name of soil sand fraction raster map [0.0-1.0]");
input2 = G_define_standard_option(G_OPT_R_INPUT);
- input2->key = "pclay_input";
+ input2->key = "pclay";
input2->description = _("Name of soil clay fraction raster map [0.0-1.0]");
input3 = G_define_standard_option(G_OPT_R_INPUT);
- input3->key = "psilt_input";
+ input3->key = "psilt";
input3->description = _("Name of soil silt fraction raster map [0.0-1.0]");
input4 = G_define_standard_option(G_OPT_R_INPUT);
- input4->key = "pomat_input";
+ input4->key = "pomat";
input4->description = _("Name of soil organic matter raster map [0.0-1.0]");
output1 = G_define_standard_option(G_OPT_R_OUTPUT);
Modified: grass/trunk/raster/r.watershed/front/main.c
===================================================================
--- grass/trunk/raster/r.watershed/front/main.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.watershed/front/main.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -7,7 +7,7 @@
* Hamish Bowman <hamish_b yahoo.com>
* Markus Metz <markus.metz.giswork gmail.com>
* PURPOSE: Hydrological analysis
- * COPYRIGHT: (C) 1999-2010 by the GRASS Development Team
+ * COPYRIGHT: (C) 1999-2009 by the GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
@@ -72,107 +72,107 @@
module->description = _("Computes watershed basins.");
opt1 = G_define_standard_option(G_OPT_R_ELEV);
- opt1->key = "elevation_input";
+ opt1->guisection = _("Inputs");
opt2 = G_define_standard_option(G_OPT_R_INPUT);
- opt2->key = "depression_input";
+ opt2->key = "depression";
opt2->label = _("Name of input depressions raster map");
opt2->description = _("All non-NULL and non-zero cells are considered as real depressions");
opt2->required = NO;
- opt2->guisection = _("Input");
+ opt2->guisection = _("Inputs");
opt3 = G_define_standard_option(G_OPT_R_INPUT);
- opt3->key = "flow_input";
+ opt3->key = "flow";
opt3->description = _("Name of input raster representing amount of overland flow per cell");
opt3->required = NO;
- opt3->guisection = _("Input");
+ opt3->guisection = _("Inputs");
opt4 = G_define_standard_option(G_OPT_R_INPUT);
- opt4->key = "land_input";
- opt4->label =
- _("Name of input raster map percent of disturbed land");
+ opt4->key = "disturbed_land";
+ opt4->label = _("Name of input raster map percent of disturbed land");
opt4->description = _("For USLE");
opt4->required = NO;
- opt4->guisection = _("Input");
+ opt4->guisection = _("Inputs");
opt5 = G_define_standard_option(G_OPT_R_INPUT);
- opt5->key = "block_input";
+ opt5->key = "blocking";
opt5->label =
- _("Name of input raster map blocking overland surface flow");
+ _("IName of input raster map blocking overland surface flow");
opt5->description =
_("For USLE. All non-NULL and non-zero cells are considered as blocking terrain.");
opt5->required = NO;
- opt5->guisection = _("Input");
+ opt5->guisection = _("Inputs");
+ opt6 = G_define_option();
+ opt6->key = "threshold";
+ opt6->description =
+ _("Minimum size of exterior watershed basin");
+ opt6->required = NO;
+ opt6->type = TYPE_INTEGER;
+ opt6->guisection = _("Inputs");
+
+ opt7 = G_define_option();
+ opt7->key = "max_slope_length";
+ opt7->label =
+ _("Maximum length of surface flow in map units");
+ opt7->description = _("For USLE");
+ opt7->required = NO;
+ opt7->type = TYPE_DOUBLE;
+ opt7->guisection = _("Inputs");
+
opt8 = G_define_standard_option(G_OPT_R_OUTPUT);
- opt8->key = "accumulation_output";
+ opt8->key = "accumulation";
opt8->label =
_("Name for output accumulation raster map");
- opt8->description = _("Number of cells that drain through each cell");
+ opt8->description =
+ _("Number of cells that drain through each cell");
opt8->required = NO;
- opt8->guisection = _("Output");
+ opt8->guisection = _("Outputs");
opt9 = G_define_standard_option(G_OPT_R_OUTPUT);
- opt9->key = "drainage_output";
+ opt9->key = "drainage";
opt9->description = _("Name for output drainage direction raster map");
opt9->required = NO;
- opt9->guisection = _("Output");
+ opt9->guisection = _("Outputs");
opt10 = G_define_standard_option(G_OPT_R_OUTPUT);
- opt10->key = "basin_output";
- opt10->label =
+ opt10->key = "basin";
+ opt10->description =
_("Name for basins raster map");
opt10->description = _("Unique label for each watershed basin");
opt10->required = NO;
- opt10->guisection = _("Output");
+ opt10->guisection = _("Outputs");
opt11 = G_define_standard_option(G_OPT_R_OUTPUT);
- opt11->key = "stream_output";
+ opt11->key = "stream";
opt11->description = _("Name for output stream segments raster map");
opt11->required = NO;
- opt11->guisection = _("Output");
+ opt11->guisection = _("Outputs");
opt12 = G_define_standard_option(G_OPT_R_OUTPUT);
- opt12->key = "half_basin_output";
+ opt12->key = "half_basin";
opt12->label = _("Name for output half basins raster map");
opt12->description =
_("Each half-basin is given a unique value");
opt12->required = NO;
- opt12->guisection = _("Output");
+ opt12->guisection = _("Outputs");
opt13 = G_define_standard_option(G_OPT_R_OUTPUT);
- opt13->key = "slope_length_output";
+ opt13->key = "length_slope";
opt13->label = _("Name for output slope length raster map");
opt13->description =
_("Slope length and steepness (LS) factor for USLE");
opt13->required = NO;
- opt13->guisection = _("Output");
+ opt13->guisection = _("Outputs");
- opt14 = G_define_option();
- opt14->key = "slope_steep_output";
+ opt14 = G_define_standard_option(G_OPT_R_OUTPUT);
+ opt14->key = "slope_steepness";
opt14->label = _("Name for output slope steepness raster map");
opt14->description = _("Slope steepness (S) factor for USLE");
opt14->required = NO;
- opt14->guisection = _("Output");
+ opt14->guisection = _("Outputs");
- opt6 = G_define_option();
- opt6->key = "threshold";
- opt6->description =
- _("Minimum size of exterior watershed basin");
- opt6->required = NO;
- opt6->type = TYPE_INTEGER;
- opt6->guisection = _("Parameters");
-
- opt7 = G_define_option();
- opt7->key = "max_length";
- opt7->label =
- _("Maximum length of surface flow in map units");
- opt7->description = _("For USLE");
- opt7->required = NO;
- opt7->type = TYPE_DOUBLE;
- opt7->guisection = _("Parameters");
-
- opt15 = G_define_option();
+ opt15 = G_define_standard_option(G_OPT_R_OUTPUT);
opt15->key = "convergence";
opt15->type = TYPE_INTEGER;
opt15->required = NO;
@@ -180,15 +180,13 @@
opt15->label = _("Convergence factor for MFD (1-10)");
opt15->description =
_("1 = most diverging flow, 10 = most converging flow. Recommended: 5");
- opt15->guisection = _("Parameters");
- opt16 = G_define_option();
+ opt16 = G_define_standard_option(G_OPT_R_OUTPUT);
opt16->key = "memory";
opt16->type = TYPE_INTEGER;
opt16->required = NO;
opt16->answer = "300"; /* 300MB default value, please keep r.terraflow in sync */
opt16->description = _("Maximum memory to be used with -m flag (in MB)");
- opt16->guisection = _("Parameters");
flag_sfd = G_define_flag();
flag_sfd->key = 's';
@@ -204,7 +202,7 @@
flag_seg = G_define_flag();
flag_seg->key = 'm';
flag_seg->label =
- _("Enable disk swap memory option (operation is slow)");
+ _("Enable disk swap memory option: Operation is slow");
flag_seg->description =
_("Only needed if memory requirements exceed available RAM; see manual on how to calculate memory requirements");
Modified: grass/trunk/raster/r.watershed/ram/Gwater.h
===================================================================
--- grass/trunk/raster/r.watershed/ram/Gwater.h 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.watershed/ram/Gwater.h 2010-04-14 18:45:09 UTC (rev 41865)
@@ -135,7 +135,7 @@
CELL split_stream(int, int, int[], int[], int, CELL, double, CELL);
/* usage.c */
-void usage();
+void usage(char *);
#endif /* __G_WATER_H__ */
Modified: grass/trunk/raster/r.watershed/ram/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/init_vars.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.watershed/ram/init_vars.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -36,36 +36,36 @@
ele_scale = 1;
for (r = 1; r < argc; r++) {
- if (sscanf(argv[r], "elevation_input=%s", ele_name) == 1)
+ if (sscanf(argv[r], "elevation=%s", ele_name) == 1)
ele_flag++;
- else if (sscanf(argv[r], "accumulation_output=%s", wat_name) == 1)
+ else if (sscanf(argv[r], "accumulation=%s", wat_name) == 1)
wat_flag++;
- else if (sscanf(argv[r], "drainage_output=%s", asp_name) == 1)
+ else if (sscanf(argv[r], "drainage=%s", asp_name) == 1)
asp_flag++;
- else if (sscanf(argv[r], "depression_input=%s", pit_name) == 1)
+ else if (sscanf(argv[r], "depression=%s", pit_name) == 1)
pit_flag++;
else if (sscanf(argv[r], "threshold=%d", &bas_thres) == 1) ;
- else if (sscanf(argv[r], "slope_length_output=%lf", &max_length) == 1) ;
- else if (sscanf(argv[r], "basin_output=%s", bas_name) == 1)
+ else if (sscanf(argv[r], "max_slope_length=%lf", &max_length) == 1) ;
+ else if (sscanf(argv[r], "basin=%s", bas_name) == 1)
bas_flag++;
- else if (sscanf(argv[r], "stream_output=%s", seg_name) == 1)
+ else if (sscanf(argv[r], "stream=%s", seg_name) == 1)
seg_flag++;
- else if (sscanf(argv[r], "half_basin_output=%s", haf_name) == 1)
+ else if (sscanf(argv[r], "half_basin=%s", haf_name) == 1)
haf_flag++;
- else if (sscanf(argv[r], "flow_input=%s", run_name) == 1)
+ else if (sscanf(argv[r], "flow=%s", run_name) == 1)
run_flag++;
else if (sscanf(argv[r], "ar=%s", arm_name) == 1)
arm_flag++;
/* slope length
else if (sscanf(argv[r], "sl=%[^\n]", sl_name) == 1)
sl_flag++; */
- else if (sscanf(argv[r], "slope_length_output=%s", ls_name) == 1)
+ else if (sscanf(argv[r], "length_slope=%s", ls_name) == 1)
ls_flag++;
- else if (sscanf(argv[r], "slope_steep_output=%s", sg_name) == 1)
+ else if (sscanf(argv[r], "slope_steepness=%s", sg_name) == 1)
sg_flag++;
- else if (sscanf(argv[r], "block_input=%s", ob_name) == 1)
+ else if (sscanf(argv[r], "blocking=%s", ob_name) == 1)
ob_flag++;
- else if (sscanf(argv[r], "land_input=%s", ril_name) == 1) {
+ else if (sscanf(argv[r], "disturbed_land=%s", ril_name) == 1) {
if (sscanf(ril_name, "%lf", &ril_value) == 0) {
ril_value = -1.0;
ril_flag++;
@@ -75,7 +75,7 @@
else if (sscanf (argv[r], "sd=%[^\n]", dep_name) == 1) dep_flag++; */
else if (sscanf(argv[r], "-%d", &sides) == 1) {
if (sides != 4)
- usage();
+ usage(argv[0]);
}
else if (sscanf(argv[r], "convergence=%d", &c_fac) == 1) ;
else if (strcmp(argv[r], "-s") == 0)
@@ -83,7 +83,7 @@
else if (strcmp(argv[r], "-a") == 0)
abs_acc = 1;
else
- usage();
+ usage(argv[0]);
}
if (mfd == 1 && (c_fac < 1 || c_fac > 10)) {
G_fatal_error("Convergence factor must be between 1 and 10.");
@@ -97,7 +97,7 @@
((bas_flag == 1) || (seg_flag == 1) || (haf_flag == 1) ||
(sl_flag == 1) || (sg_flag == 1) || (ls_flag == 1)))
)
- usage();
+ usage(argv[0]);
tot_parts = 4;
if (ls_flag || sg_flag)
tot_parts++;
Modified: grass/trunk/raster/r.watershed/ram/usage.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/usage.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/r.watershed/ram/usage.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -4,24 +4,24 @@
#include <grass/glocale.h>
-void usage(void)
+void usage(char *me)
{
- G_fatal_error(_("USAGE for basin delineation:\n\n%s -4 elevation_input=elevation_map "
- "threshold=swale_threshold [flow_input=overland_flow_map] "
- "[drainage_output=drain_direction_map] [depression_input=depression_map] "
- "[accumulation_output=accumulation_map] [basin_output=watershed_basin_map] "
- "[stream_output=stream_segment_map]\n\n"
- "USAGE for slope length determination:\n\n%s [-4] "
- "elevation_input=elevation_map threshold=swale_threshold "
- "[drainage_output=drain_direction_map] [depression_input=depression_map] "
- "[accumulation_output=accumulation_map] [slope_length_output=max_slope_length] "
- "[block_input=overland_blocking_map] [slope_steep_output=slope_steepness_map] "
- "length_slope=length_slope_map [land_input=rill_erosion_map] "
- "[slope_deposition=slope_deposition value or map]\n\n"
- "USAGE for ARMSED FILE creation:\n\n%s [-4] elevation_input=elevation_map "
- "threshold=swale_threshold [flow_input=overland_flow_map] "
- "[drainage_output=drain_direction_map] [depression_input=depression_map] "
- "[accumulation_output=accumulation_map] [basin_output=watershed_basin_map] "
- "[stream_output=stream_segment_map] [half_basin_output=half_basin_map] "
- "ar=ARMSED_file_name\n\n"), G_program_name(), G_program_name(), G_program_name());
+ G_fatal_error(_("USAGE for basin delineation:\n%s -4 elevation=elevation_map "
+ "threshold=swale_threshold [flow=overland_flow_map] "
+ "[drainage=drain_direction_map] [depression=depression_map] "
+ "[accumulation=accumulation_map] [basin=watershed_basin_map] "
+ "[stream=stream_segment_map]\n\n"
+ "USAGE for slope length determination:\n%s [-4] "
+ "elevation=elevation_map threshold=swale_threshold "
+ "[drainage=drain_direction_map] [depression=depression_map] "
+ "[accumulation=accumulation_map] [max_slope_length=max_slope_length] "
+ "[blocking=overland_blocking_map] [slope_steepness=slope_steepness_map] "
+ "length_slope=length_slope_map [disturbed_land=rill_erosion_map] "
+ "[slope_deposition=slope_deposition value or map]"
+ "USAGE for ARMSED FILE creation:\n%s [-4] elevation=elevation_map "
+ "threshold=swale_threshold [flow=overland_flow_map] "
+ "[drainage=drain_direction_map] [depression=depression_map] "
+ "[accumulation=accumulation_map] [basin=watershed_basin_map] "
+ "[stream=stream_segment_map] [half_basin=half_basin_map] "
+ "ar=ARMSED_file_name\n\n"), me, me, me);
}
Modified: grass/trunk/raster/simwe/r.sim.sediment/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.sediment/main.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/simwe/r.sim.sediment/main.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -119,37 +119,36 @@
"using path sampling method (SIMWE).");
parm.elevin = G_define_standard_option(G_OPT_R_ELEV);
- parm.elevin->key = "elevation_input";
parm.wdepth = G_define_standard_option(G_OPT_R_INPUT);
- parm.wdepth->key = "wdepth_input";
+ parm.wdepth->key = "wdepth";
parm.wdepth->description = _("Name of water depth raster map [m]");
parm.dxin = G_define_standard_option(G_OPT_R_INPUT);
- parm.dxin->key = "dx_input";
+ parm.dxin->key = "dx";
parm.dxin->description = _("Name of x-derivatives raster map [m/m]");
parm.dyin = G_define_standard_option(G_OPT_R_INPUT);
- parm.dyin->key = "dy_input";
+ parm.dyin->key = "dy";
parm.dyin->description = _("Name of y-derivatives raster map [m/m]");
parm.detin = G_define_standard_option(G_OPT_R_INPUT);
- parm.detin->key = "det_input";
+ parm.detin->key = "det";
parm.detin->description =
_("Name of detachment capacity coefficient raster map [s/m]");
parm.tranin = G_define_standard_option(G_OPT_R_INPUT);
- parm.tranin->key = "tran_input";
+ parm.tranin->key = "tran";
parm.tranin->description =
_("Name of transport capacity coefficient raster map [s]");
parm.tauin = G_define_standard_option(G_OPT_R_INPUT);
- parm.tauin->key = "tau_input";
+ parm.tauin->key = "tau";
parm.tauin->description =
_("Name of critical shear stress raster map [Pa]");
parm.manin = G_define_standard_option(G_OPT_R_INPUT);
- parm.manin->key = "man_input";
+ parm.manin->key = "man";
parm.manin->required = NO;
parm.manin->description = _("Name of mannings n raster map");
parm.manin->guisection = _("Input");
@@ -172,33 +171,33 @@
*/
parm.tc = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.tc->key = "tc_output";
+ parm.tc->key = "tc";
parm.tc->required = NO;
parm.tc->description = _("Name for output transport capacity raster map [kg/ms]");
parm.tc->guisection = _("Output");
parm.et = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.et->key = "et_output";
+ parm.et->key = "et";
parm.et->required = NO;
parm.et->description =
_("Name for output transp.limited erosion-deposition raster map [kg/m2s]");
parm.et->guisection = _("Output");
parm.conc = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.conc->key = "conc_output";
+ parm.conc->key = "conc";
parm.conc->required = NO;
parm.conc->description =
_("Name for output sediment concentration raster map [particle/m3]");
parm.conc->guisection = _("Output");
parm.flux = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.flux->key = "flux_output";
+ parm.flux->key = "flux";
parm.flux->required = NO;
parm.flux->description = _("Name for output sediment flux raster map [kg/ms]");
parm.flux->guisection = _("Output");
parm.erdep = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.erdep->key = "erdep_output";
+ parm.erdep->key = "erdep";
parm.erdep->required = NO;
parm.erdep->description =
_("Name for output erosion-deposition raster map [kg/m2s]");
Modified: grass/trunk/raster/simwe/r.sim.water/main.c
===================================================================
--- grass/trunk/raster/simwe/r.sim.water/main.c 2010-04-14 17:15:41 UTC (rev 41864)
+++ grass/trunk/raster/simwe/r.sim.water/main.c 2010-04-14 18:45:09 UTC (rev 41865)
@@ -123,18 +123,17 @@
"path sampling method (SIMWE).");
parm.elevin = G_define_standard_option(G_OPT_R_ELEV);
- parm.elevin->key = "elevation_input";
parm.dxin = G_define_standard_option(G_OPT_R_INPUT);
- parm.dxin->key = "dx_input";
+ parm.dxin->key = "dx";
parm.dxin->description = _("Name of x-derivatives raster map [m/m]");
parm.dyin = G_define_standard_option(G_OPT_R_INPUT);
- parm.dyin->key = "dy_input";
+ parm.dyin->key = "dy";
parm.dyin->description = _("Name of y-derivatives raster map [m/m]");
parm.rain = G_define_standard_option(G_OPT_R_INPUT);
- parm.rain->key = "rain_input";
+ parm.rain->key = "rain";
parm.rain->required = NO;
parm.rain->description =
_("Name of rainfall excess rate (rain-infilt) raster map [mm/hr]");
@@ -150,7 +149,7 @@
parm.rainval->guisection = _("Input");
parm.infil = G_define_standard_option(G_OPT_R_INPUT);
- parm.infil->key = "infil_input";
+ parm.infil->key = "infil";
parm.infil->required = NO;
parm.infil->description =
_("Name of runoff infiltration rate raster map [mm/hr]");
@@ -166,7 +165,7 @@
parm.infilval->guisection = _("Input");
parm.manin = G_define_standard_option(G_OPT_R_INPUT);
- parm.manin->key = "man_input";
+ parm.manin->key = "man";
parm.manin->required = NO;
parm.manin->description = _("Name of mannings n raster map");
parm.manin->guisection = _("Input");
@@ -180,14 +179,14 @@
parm.maninval->guisection = _("Input");
parm.traps = G_define_standard_option(G_OPT_R_INPUT);
- parm.traps->key = "traps_input";
+ parm.traps->key = "traps";
parm.traps->required = NO;
parm.traps->description =
_("Name of flow controls raster map (permeability ratio 0-1)");
parm.traps->guisection = _("Input");
/*
- parm.sfile = G_define_standard_option(G_OPT_V_INPUT);
+ parm.sfile = G_define_standard_option(G_OPT_V_INPUTy);
parm.sfile->key = "vector";
parm.sfile->required = NO;
parm.sfile->description =
@@ -196,19 +195,19 @@
*/
parm.depth = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.depth->key = "depth_output";
+ parm.depth->key = "depth";
parm.depth->required = NO;
parm.depth->description = _("Name for output water depth raster map [m]");
parm.depth->guisection = _("Output");
parm.disch = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.disch->key = "disch_output";
+ parm.disch->key = "disch";
parm.disch->required = NO;
parm.disch->description = _("Name for output water discharge raster map [m3/s]");
parm.disch->guisection = _("Output");
parm.err = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.err->key = "err_output";
+ parm.err->key = "err";
parm.err->required = NO;
parm.err->description = _("Name for output simulation error raster map [m]");
parm.err->guisection = _("Output");
More information about the grass-commit
mailing list