various minor changes in hydrologic modules

parameters keys sychronized


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@41705 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.basins.fill/main.c

@@ -8,7 +8,7 @@
  *
  * PURPOSE:      Generates a raster map layer showing watershed subbasins.
  *
- * COPYRIGHT:    (C) 2005 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2005, 2010 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
@@ -52,36 +52,25 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
     module->description =
-	_("Generates a raster map layer showing " "watershed subbasins.");
+	_("Generates watershed subbasins raster map.");
 
+    drain_opt = G_define_standard_option(G_OPT_R_INPUT);
+    drain_opt->key = "cmap_input";
+    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->description = _("Name of input thinned ridge network raster map");
+
+    part_opt = G_define_standard_option(G_OPT_R_OUTPUT);
+    
     num_opt = G_define_option();
     num_opt->key = "number";
     num_opt->type = TYPE_INTEGER;
     num_opt->required = YES;
     num_opt->description = _("Number of passes through the dataset");
-    num_opt->gisprompt = "old,cell,raster";
-
-    drain_opt = G_define_option();
-    drain_opt->key = "c_map";
-    drain_opt->type = TYPE_STRING;
-    drain_opt->required = YES;
-    drain_opt->description = _("Coded stream network file name");
-    drain_opt->gisprompt = "old,cell,raster";
-
-    ridge_opt = G_define_option();
-    ridge_opt->key = "t_map";
-    ridge_opt->type = TYPE_STRING;
-    ridge_opt->required = YES;
-    ridge_opt->description = _("Thinned ridge network file name");
-    ridge_opt->gisprompt = "old,cell,raster";
-
-    part_opt = G_define_option();
-    part_opt->key = "result";
-    part_opt->type = TYPE_STRING;
-    part_opt->required = YES;
-    part_opt->description = _("Name for the resultant watershed partition file");
-    part_opt->gisprompt = "new,cell,raster";
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

raster/r.carve/main.c

@@ -9,7 +9,7 @@
  * PURPOSE:      Takes vector stream data, converts it to 3D raster and
  *               subtracts a specified depth
  *
- * COPYRIGHT:    (C) 2006 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2006, 2010 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,6 +72,8 @@ int main(int argc, char **argv)
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
+    module->label = _("Generates stream channels");
     module->description = _("Takes vector stream data, transforms it "
 			    "to raster and subtracts depth from the output DEM.");
 
@@ -81,8 +83,8 @@ int main(int argc, char **argv)
 
     parm.invect = G_define_standard_option(G_OPT_V_INPUT);
     parm.invect->key = "vect";
-    parm.invect->description =
-	_("Name of vector input map containing stream(s)");
+    parm.invect->label =
+	_("Name of input vector map containing stream(s)");
 
     parm.outrast = G_define_standard_option(G_OPT_R_OUTPUT);
 
@@ -95,8 +97,8 @@ int main(int argc, char **argv)
     width = G_define_option();
     width->key = "width";
     width->type = TYPE_DOUBLE;
-    width->description = _("Stream width (in meters). "
-			   "Default is raster cell width");
+    width->label = _("Stream width (in meters)");
+    width->description = _("Default is raster cell width");
 
     depth = G_define_option();
     depth->key = "depth";

raster/r.fill.dir/main.c

@@ -26,7 +26,7 @@
  *               program can be run repeatedly, using the output elevations from
  *               one run as input to the next run until all problems are 
  *               resolved.
- * COPYRIGHT:    (C) 2001 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2001, 2010 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
@@ -84,60 +84,45 @@ int main(int argc, char **argv)
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
     module->description =
 	_("Filters and generates a depressionless elevation map and a flow "
-	  "direction map from a given elevation layer.");
+	  "direction map from a given elevation raster map.");
 
     opt1 = G_define_standard_option(G_OPT_R_INPUT);
-    opt1->description =
-	_("Name of existing raster map containing elevation surface");
+    opt1->description = _("Name of input elevation raster map");
 
-    opt2 = G_define_option();
-    opt2->key = "elevation";
-    opt2->type = TYPE_STRING;
-    opt2->required = YES;
-    opt2->gisprompt = "new,cell,raster";
-    opt2->description = _("Output elevation raster map after filling");
-
-    opt4 = G_define_option();
+    opt2 = G_define_standard_option(G_OPT_R_OUTPUT);
+    opt2->description = _("Name for output elevation raster map after filling");
+    
+    opt4 = G_define_standard_option(G_OPT_R_OUTPUT);
     opt4->key = "direction";
-    opt4->type = TYPE_STRING;
-    opt4->required = YES;
-    opt4->gisprompt = "new,cell,raster";
-    opt4->description = _("Output direction raster map");
+    opt4->description = _("Name for output direction raster map");
 
-    opt5 = G_define_option();
+    opt5 = G_define_standard_option(G_OPT_R_OUTPUT);
     opt5->key = "areas";
-    opt5->type = TYPE_STRING;
     opt5->required = NO;
-    opt5->gisprompt = "new,cell,raster";
-    opt5->description = _("Output raster map of problem areas");
+    opt5->description = _("Name for output raster map of problem areas");
 
     opt3 = G_define_option();
     opt3->key = "type";
     opt3->type = TYPE_STRING;
     opt3->required = NO;
     opt3->description =
-	_("Output aspect direction format (agnps, answers, or grass)");
+	_("Aspect direction format");
+    opt3->options = "agnps,answers,grass";
     opt3->answer = "grass";
-    /* TODO after feature freeze
-       opt3->options    = "agnps,answers,grass";
-     */
-
+    
     flag1 = G_define_flag();
     flag1->key = 'f';
     flag1->description = _("Find unresolved areas only");
-    flag1->answer = '0';
-
-
+    
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (flag1->answer != '0' && opt5->answer == NULL) {
-	fprintf(stdout,
-		"\nThe \"f\" flag requires that you name a file for the output area map\n");
-	fprintf(stdout, "\tEnter the file name, or <Enter> to quit:  ");
-	scanf("%s", opt5->answer);
+    if (flag1->answer && opt5->answer == NULL) {
+	G_fatal_error(_("The '%c' flag requires '%s'to be specified"),
+		      flag1->key, opt5->key);
     }
 
     type = 0;
@@ -149,30 +134,16 @@ int main(int argc, char **argv)
 
     if (strcmp(opt3->answer, "agnps") == 0)
 	type = 1;
-    else if (strcmp(opt3->answer, "AGNPS") == 0)
-	type = 1;
     else if (strcmp(opt3->answer, "answers") == 0)
 	type = 2;
-    else if (strcmp(opt3->answer, "ANSWERS") == 0)
-	type = 2;
     else if (strcmp(opt3->answer, "grass") == 0)
 	type = 3;
-    else if (strcmp(opt3->answer, "GRASS") == 0)
-	type = 3;
-
+    
     G_debug(1, "output type (1=AGNPS, 2=ANSWERS, 3=GRASS): %d", type);
 
-    if (type == 0)
-	G_fatal_error
-	    ("direction format must be either agnps, answers, or grass.");
     if (type == 3)
-	G_warning("Direction map is D8 resolution, i.e. 45 degrees.");
-
-    /* get the name of the elevation map layer for filling */
-    map_mapset = G_find_raster(map_name, "");
-    if (!map_mapset)
-	G_fatal_error(_("Raster map <%s> not found"), map_name);
-
+	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);
 
@@ -211,11 +182,13 @@ int main(int argc, char **argv)
     fd = open(tempfile2, O_RDWR | O_CREAT, 0666);	/* dirn */
     fm = open(tempfile3, O_RDWR | O_CREAT, 0666);	/* problems */
 
-    G_message(_("Reading map..."));
+    G_message(_("Reading elevation map..."));
     for (i = 0; i < nrows; i++) {
+	G_percent(i, nrows, 2);
 	get_row(map_id, in_buf, i);
 	write(fe, in_buf, bnd.sz);
     }
+    G_percent(1, 1, 1);
     Rast_close(map_id);
 
     /* fill single-cell holes and take a first stab at flow directions */

raster/r.flow/main.c

@@ -419,31 +419,24 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
+    module->label = _("Constructs flow lines.");
     module->description =
 	_("Construction of slope curves (flowlines), flowpath lengths, "
-	  "and flowline densities (upslope areas) from a raster "
-	  "digital elevation model (DEM)");
-
-    pelevin = G_define_option();
-    pelevin->key = "elevin";
-    pelevin->type = TYPE_STRING;
-    pelevin->required = YES;
-    pelevin->gisprompt = "old,cell,raster";
-    pelevin->description = _("Input elevation raster map");
-
-    paspin = G_define_option();
-    paspin->key = "aspin";
-    paspin->type = TYPE_STRING;
+	  "and flowline densities (upslope areas) from a elevation raster "
+	  "map.");
+
+    pelevin = G_define_standard_option(G_OPT_R_ELEV);
+    
+    paspin = G_define_standard_option(G_OPT_R_INPUT);
+    paspin->key = "aspect_input";
     paspin->required = NO;
-    paspin->gisprompt = "old,cell,raster";
-    paspin->description = _("Input aspect raster map");
+    paspin->description = _("Name of input aspect raster map");
 
-    pbarin = G_define_option();
-    pbarin->key = "barin";
-    pbarin->type = TYPE_STRING;
+    pbarin = G_define_standard_option(G_OPT_R_INPUT);
+    pbarin->key = "barrier_input";
     pbarin->required = NO;
-    pbarin->gisprompt = "old,cell,raster";
-    pbarin->description = _("Input barrier raster map");
+    pbarin->description = _("Name of input barrier raster map");
 
     pskip = G_define_option();
     pskip->key = "skip";
@@ -457,26 +450,20 @@ int main(int argc, char *argv[])
     pbound->required = NO;
     pbound->description = _("Maximum number of segments per flowline");
 
-    pflout = G_define_option();
-    pflout->key = "flout";
-    pflout->type = TYPE_STRING;
+    pflout = G_define_standard_option(G_OPT_V_OUTPUT);
+    pflout->key = "flowline_output";
     pflout->required = NO;
-    pflout->gisprompt = "any,dig,vector";
-    pflout->description = _("Output flowline vector map");
+    pflout->description = _("Name for output flowline vector map");
 
-    plgout = G_define_option();
-    plgout->key = "lgout";
-    plgout->type = TYPE_STRING;
+    plgout = G_define_standard_option(G_OPT_R_OUTPUT);
+    plgout->key = "flowpath_output";
     plgout->required = NO;
-    plgout->gisprompt = "any,cell,raster";
-    plgout->description = _("Output flowpath length raster map");
+    plgout->description = _("Name for output flowpath length raster map");
 
-    pdsout = G_define_option();
-    pdsout->key = "dsout";
-    pdsout->type = TYPE_STRING;
+    pdsout = G_define_standard_option(G_OPT_R_OUTPUT);
+    pdsout->key = "density_output";
     pdsout->required = NO;
-    pdsout->gisprompt = "any,cell,raster";
-    pdsout->description = _("Output flowline density raster map");
+    pdsout->description = _("Name for output flowline density raster map");
 
     fup = G_define_flag();
     fup->key = 'u';
@@ -485,7 +472,7 @@ int main(int argc, char *argv[])
 
     flg = G_define_flag();
     flg->key = '3';
-    flg->description = _("3-D lengths instead of 2-D");
+    flg->description = _("3D lengths instead of 2D");
 
     fmem = G_define_flag();
     fmem->key = 'm';

raster/r.lake/main.c

@@ -10,7 +10,7 @@
  *               As seed You can use already existing map or
  *               X,Y coordinates.
  *
- * COPYRIGHT:    (C) 2005-2008 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2005-2008, 2010 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
@@ -148,6 +148,7 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
     module->description = _("Fills lake from seed at given level.");
 
     tmap_opt = G_define_standard_option(G_OPT_R_ELEV);
@@ -160,7 +161,6 @@ int main(int argc, char *argv[])
 
     lake_opt = G_define_standard_option(G_OPT_R_OUTPUT);
     lake_opt->key = "lake";
-    lake_opt->description = _("Name for output raster map with lake");
     lake_opt->required = NO;
 
     sdxy_opt = G_define_option();

raster/r.terraflow/main.cc

@@ -2,7 +2,7 @@
  * 
  *  MODULE:	r.terraflow
  *
- *  COPYRIGHT (C) 2007 Laura Toma
+ *  COPYRIGHT (C) 2007, 2010 Laura Toma
  *   
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -70,32 +70,32 @@ parse_args(int argc, char *argv[]) {
   struct Option *output_elev;
   output_elev = G_define_standard_option(G_OPT_R_OUTPUT);
   output_elev->key        = "filled";
-  output_elev->description= _("Output filled (flooded) elevation raster map");
+  output_elev->description= _("Name for output filled (flooded) elevation raster map");
   
  /* output direction  grid */
   struct Option *output_dir;
   output_dir = G_define_standard_option(G_OPT_R_OUTPUT);
   output_dir->key        = "direction";
-  output_dir->description= _("Output flow direction raster map");
+  output_dir->description= _("Name for output flow direction raster map");
 
   /* output sinkwatershed  grid */
   struct Option *output_watershed;
   output_watershed = G_define_standard_option(G_OPT_R_OUTPUT);
   output_watershed->key        = "swatershed";
-  output_watershed->description= _("Output sink-watershed raster map");
+  output_watershed->description= _("Name for output sink-watershed raster map");
 
   /* output flow accumulation grid */
   struct Option *output_accu;
   output_accu = G_define_standard_option(G_OPT_R_OUTPUT);
   output_accu->key        = "accumulation";
-  output_accu->description= _("Output flow accumulation raster map");
+  output_accu->description= _("Name for output flow accumulation raster map");
 
 #ifdef OUTPUT_TCI
   struct Option *output_tci;
   output_tci = G_define_standard_option(G_OPT_R_OUTPUT);
   output_tci->key        = "tci";
   output_tci->description=
-    _("Output topographic convergence index (tci) raster map");
+    _("Name for output topographic convergence index (tci) raster map");
 #endif
 
   /* MFD/SFD flag */
@@ -103,7 +103,6 @@ parse_args(int argc, char *argv[]) {
   sfd_flag = G_define_flag() ;
   sfd_flag->key        = 's';
   sfd_flag->description= _("SFD (D8) flow (default is MFD)");
-  /* sfd_flag->answer     = 'n'; */
 
   /* D8CUT value*/
   struct Option *d8cut;
@@ -112,9 +111,10 @@ parse_args(int argc, char *argv[]) {
   d8cut->type = TYPE_DOUBLE;
   d8cut->required = NO;
   d8cut->answer = G_store("infinity"); /* default value */
-  d8cut->description =
+  d8cut->label = _("Routing using SFD (D8) direction");
+  d8cut->description = 
     _("If flow accumulation is larger than this value it is routed using "
-      "SFD (D8) direction \n \t\t (meaningfull only  for MFD flow)");
+      "SFD (D8) direction (meaningfull only  for MFD flow)");
   
   /* main memory */
   struct Option *mem;
@@ -446,12 +446,13 @@ main(int argc, char *argv[]) {
  
   module = G_define_module();
 #ifdef ELEV_SHORT
-  module->description = _("Flow computation for massive grids (Integer version).");
+  module->description = _("Flow computation for massive grids (integer version).");
 #endif
 #ifdef ELEV_FLOAT
-  module->description = _("Flow computation for massive grids (Float version).");
+  module->description = _("Flow computation for massive grids (float version).");
 #endif
   G_add_keyword(_("raster"));
+  G_add_keyword(_("hydrology"));
 
   /* read user options; fill in global <opt> */  
   opt = (userOptions*)malloc(sizeof(userOptions));

raster/r.topidx/main.c

@@ -10,7 +10,7 @@
  * PURPOSE:      Creates topographic index map from elevation map.
  *               Based on GRIDATB.FOR.
  *
- * COPYRIGHT:    (C) 2000-2009 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2000-2010 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
@@ -37,16 +37,14 @@ int main(int argc, char **argv)
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
     module->description =
-	_("Creates topographic index [ln(a/tan(beta))] map from elevation map.");
+	_("Creates topographic index map from elevation raster map.");
 
     params.input = G_define_standard_option(G_OPT_R_INPUT);
-    params.input->description = _("Input elevation map");
 
     params.output = G_define_standard_option(G_OPT_R_OUTPUT);
-    params.output->key = "output";
-    params.output->description = _("Output topographic index map");
-
+    
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

raster/r.topmodel/main.c

@@ -4,7 +4,7 @@
  * TMOD9502.FOR Author: Keith Beven <k.beven@lancaster.ac.uk>
  *                      http://www.es.lancs.ac.uk/hfdg/topmodel.html
  *
- *      Copyright (C) 2000 by the GRASS Development Team
+ *      Copyright (C) 2000, 2010 by the GRASS Development Team
  *      Author: Huidae Cho <grass4u@gmail.com>
  *              Hydro Laboratory, Kyungpook National University
  *              South Korea
@@ -60,109 +60,97 @@ int main(int argc, char **argv)
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
     module->description =
 	_("Simulates TOPMODEL which is a physically based hydrologic model.");
 
     /* Parameter definitions */
-    param.basin = G_define_option();
-    param.basin->key = "basin";
-    param.basin->description =
-	_("(i)   Basin map created by r.water.outlet (MASK)");
-    param.basin->type = TYPE_STRING;
+    param.basin = G_define_standard_option(G_OPT_R_INPUT);
+    param.basin->key = "basin_input";
+    param.basin->label =
+	_("Name of input basin raster map");
+    param.basin->description = _("Created by r.water.outlet (MASK)");
     param.basin->required = NO;
-    param.basin->gisprompt = "old,cell,raster";
+    param.basin->guisection = _("Input");
 
-    param.elev = G_define_option();
-    param.elev->key = "elevation";
-    param.elev->description = _("(i)   Elevation map");
-    param.elev->type = TYPE_STRING;
+    param.elev = G_define_standard_option(G_OPT_R_ELEV);
     param.elev->required = NO;
-    param.elev->gisprompt = "old,cell,raster";
+    param.elev->guisection = _("Input");
 
-    param.fill = G_define_option();
-    param.fill->key = "depressionless";
-    param.fill->description = _("(o)   Depressionless elevation map");
-    param.fill->type = TYPE_STRING;
+    param.fill = G_define_standard_option(G_OPT_R_OUTPUT);
+    param.fill->key = "dep_output";
+    param.fill->description = _("Name for output depressionless elevation raster map");
     param.fill->required = NO;
-    param.fill->gisprompt = "new,cell,raster";
+    param.fill->guisection = _("Output");
 
-    param.dir = G_define_option();
-    param.dir->key = "direction";
+    param.dir = G_define_standard_option(G_OPT_R_OUTPUT);
+    param.dir->key = "direction_output";
     param.dir->description =
-	_("(o)   Direction map for depressionless elevation map");
-    param.dir->type = TYPE_STRING;
+	_("Name for output direction map for depressionless elevation raster map");
     param.dir->required = NO;
-    param.dir->gisprompt = "new,cell,raster";
+    param.dir->guisection = _("Output");
 
-    param.belev = G_define_option();
-    param.belev->key = "belevation";
-    param.belev->description = _("(o/i) Basin elevation map (MASK applied)");
-    param.belev->type = TYPE_STRING;
+    param.belev = G_define_standard_option(G_OPT_R_OUTPUT);
+    param.belev->key = "belevation_output";
+    param.belev->label = _("Name for output basin elevation raster map (o/i)");
+    param.belev->description = _("MASK applied");
     param.belev->required = NO;
-    param.belev->gisprompt = "new,cell,raster";
+    param.belev->guisection = _("Output");
 
-    param.topidx = G_define_option();
-    param.topidx->key = "topidx";
-    param.topidx->description =
-	_("(o)   Topographic index ln(a/tanB) map (MASK applied)");
-    param.topidx->type = TYPE_STRING;
+    param.topidx = G_define_standard_option(G_OPT_R_OUTPUT);
+    param.topidx->key = "topidx_output";
+    param.topidx->label =
+	_("Name for output opographic index ln(a/tanB) raster map");
+    param.topidx->description = _("MASK applied");
     param.topidx->required = NO;
-    param.topidx->gisprompt = "new,cell,raster";
+    param.topidx->guisection = _("Output");
 
     param.nidxclass = G_define_option();
     param.nidxclass->key = "nidxclass";
     param.nidxclass->description =
-	_("(i)   Number of topographic index classes");
+	_("Number of topographic index classes");
     param.nidxclass->type = TYPE_INTEGER;
     param.nidxclass->required = NO;
     param.nidxclass->answer = "30";
-
-    param.idxstats = G_define_option();
+    param.nidxclass->guisection = _("Parameters");
+    
+    param.idxstats = G_define_standard_option(G_OPT_F_INPUT);
     param.idxstats->key = "idxstats";
     param.idxstats->description =
-	_("(o/i) Topographic index statistics file");
-    param.idxstats->type = TYPE_STRING;
-    param.idxstats->required = YES;
-
-    param.params = G_define_option();
+	_("Name of topographic index statistics file (o/i)");
+    
+    param.params = G_define_standard_option(G_OPT_F_INPUT);
     param.params->key = "parameters";
-    param.params->description = _("(i)   TOPMODEL Parameters file");
-    param.params->type = TYPE_STRING;
-    param.params->required = YES;
-
-    param.input = G_define_option();
-    param.input->key = "input";
+    param.params->description = _("Name of TOPMODEL parameters file");
+    
+    param.input = G_define_standard_option(G_OPT_F_INPUT);
     param.input->description =
-	_("(i)   Rainfall and potential evapotranspiration data file");
-    param.input->type = TYPE_STRING;
-    param.input->required = YES;
+	_("Name of rainfall and potential evapotranspiration data file");
 
-    param.output = G_define_option();
-    param.output->key = "output";
-    param.output->description = _("(o)   Output file");
-    param.output->type = TYPE_STRING;
-    param.output->required = YES;
+    param.output = G_define_standard_option(G_OPT_F_OUTPUT);
+    param.output->description = _("Name for output file");
 
-    param.Qobs = G_define_option();
+    param.Qobs = G_define_standard_option(G_OPT_F_OUTPUT);
     param.Qobs->key = "qobs";
-    param.Qobs->description = _("(i)   OPTIONAL Observed flow file");
-    param.Qobs->type = TYPE_STRING;
+    param.Qobs->description = _("Name for observed flow file");
     param.Qobs->required = NO;
-
+    param.Qobs->guisection = _("Output");
+    
     param.timestep = G_define_option();
     param.timestep->key = "timestep";
     param.timestep->description =
-	_("(i)   OPTIONAL Output for given time step");
+	_("Time step");
     param.timestep->type = TYPE_INTEGER;
     param.timestep->required = NO;
-
+    param.timestep->guisection = _("Parameters");
+    
     param.idxclass = G_define_option();
     param.idxclass->key = "idxclass";
     param.idxclass->description =
-	_("(i)   OPTIONAL Output for given topographic index class");
+	_("Topographic index class");
     param.idxclass->type = TYPE_INTEGER;
     param.idxclass->required = NO;
-
+    param.idxclass->guisection = _("Parameters");
 
     /* Flag definitions */
     flag.input = G_define_flag();

raster/r.uslek/main.c

@@ -7,7 +7,7 @@
  *               into USDA 1951 (p209) soil texture classes and then
  *               into USLE soil erodibility factor (K) as an output
  *
- * COPYRIGHT:    (C) 2002-2008 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2002-2008, 2010 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
@@ -51,31 +51,30 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
     G_add_keyword(_("soil"));
     G_add_keyword(_("erosion"));
-    G_add_keyword(_("USLE"));
-    module->description = _("USLE Soil Erodibility Factor (K)");
+    module->description = _("Computes USLE Soil Erodibility Factor (K).");
     
     /* Define the different options */ 
     input1 = G_define_standard_option(G_OPT_R_INPUT);
-    input1->key = "psand";
-    input1->description = _("Name of the Soil sand fraction map [0.0-1.0]");
+    input1->key = "psand_input";
+    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";
-    input2->description = _("Name of the Soil clay fraction map [0.0-1.0]");
+    input2->key = "pclay_input";
+    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";
-    input3->description = _("Name of the Soil silt fraction map [0.0-1.0]");
+    input3->key = "psilt_input";
+    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";
-    input4->description = _("Name of the Soil Organic Matter map [0.0-1.0]");
+    input4->key = "pomat_input";
+    input4->description = _("Name of soil organic matter raster map [0.0-1.0]");
 
     output1 = G_define_standard_option(G_OPT_R_OUTPUT);
-    output1->key = "usle_k";
-    output1->description = _("Name of the output USLE K factor map [t.ha.hr/ha.MJ.mm]");
+    output1->description = _("Name for output USLE K factor raster map [t.ha.hr/ha.MJ.mm]");
 
     /********************/ 
     if (G_parser(argc, argv))

raster/r.usler/main.c

@@ -6,7 +6,7 @@
  * PURPOSE:      Calculates USLE R factor 
  * 		 Rainfall Erosion index according to four methods 
  *
- * COPYRIGHT:    (C) 2002-2008 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2002-2008, 2010 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
@@ -49,16 +49,16 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
     G_add_keyword(_("rainfall"));
     G_add_keyword(_("erosion"));
-    G_add_keyword(_("USLE"));
     module->description = _("Computes USLE R factor, Rainfall erosivity index.");
     
     input2 = G_define_standard_option(G_OPT_R_INPUT);
-    input2->description = _("Name of the annual precipitation map [mm/year]");
+    input2->description = _("Name of annual precipitation raster map [mm/year]");
 
     output = G_define_standard_option(G_OPT_R_OUTPUT);
-    output->description = _("Name of the USLE R map [MJ.mm/ha.hr.year]");
+    output->description = _("Name for output USLE R raster map [MJ.mm/ha.hr.year]");
 
     /* Define the different options */ 
     input1 = G_define_option();

raster/r.water.outlet/main.c

@@ -13,7 +13,7 @@
  * PURPOSE:      this program makes a watershed basin raster map using the 
  *               drainage pointer map, from an outlet point defined by an 
  *               easting and a northing.
- * COPYRIGHT:    (C) 1999-2006 by the GRASS Development Team
+ * COPYRIGHT:    (C) 1999-2006, 2010 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
@@ -61,30 +61,21 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
 
     module = G_define_module();
-    module->description = _("Watershed basin creation program.");
+    module->description = _("Creates watershed basins.");
     G_add_keyword(_("raster"));
-    
-    opt1 = G_define_option();
-    opt1->key = "drainage";
-    opt1->type = TYPE_STRING;
-    opt1->required = YES;
-    opt1->gisprompt = "old,cell,raster";
-    opt1->description = _("Name of input raster map");
-
-    opt2 = G_define_option();
-    opt2->key = "basin";
-    opt2->type = TYPE_STRING;
-    opt2->required = YES;
-    opt2->gisprompt = "new,cell,raster";
-    opt2->description = _("Name of raster map to contain results");
+    G_add_keyword(_("hydrology"));
+	
+    opt1 = G_define_standard_option(G_OPT_R_INPUT);
 
+    opt2 = G_define_standard_option(G_OPT_R_OUTPUT);
+    
     opt3 = G_define_option();
     opt3->key = "easting";
     opt3->type = TYPE_STRING;
     opt3->key_desc = "x";
     opt3->multiple = NO;
     opt3->required = YES;
-    opt3->description = _("The map E grid coordinates");
+    opt3->description = _("Easting grid coordinates");
 
     opt4 = G_define_option();
     opt4->key = "northing";
@@ -92,7 +83,7 @@ int main(int argc, char *argv[])
     opt4->key_desc = "y";
     opt4->multiple = NO;
     opt4->required = YES;
-    opt4->description = _("The map N grid coordinates");
+    opt4->description = _("Northing grid coordinates");
 
     /*   Parse command line */
     if (G_parser(argc, argv))

raster/r.watershed/front/main.c

@@ -7,7 +7,7 @@
  *               Hamish Bowman <hamish_b yahoo.com>
  *               Markus Metz <markus.metz.giswork gmail.com>
  * PURPOSE:      Hydrological analysis
- * COPYRIGHT:    (C) 1999-2009 by the GRASS Development Team
+ * COPYRIGHT:    (C) 1999-2010 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
@@ -68,126 +68,108 @@ int main(int argc, char *argv[])
     /* Set description */
     module = G_define_module();
     G_add_keyword(_("raster"));
-    module->description = _("Watershed basin analysis program.");
+    G_add_keyword(_("hydrology"));
+    module->description = _("Computes watershed basins.");
 
-    opt1 = G_define_standard_option(G_OPT_R_INPUT);
-    opt1->key = "elevation";
-    opt1->description =
-	_("Input map: elevation on which entire analysis is based");
-    opt1->guisection = _("Input_options");
+    opt1 = G_define_standard_option(G_OPT_R_ELEV);
 
-    opt2 = G_define_option();
-    opt2->key = "depression";
-    opt2->label = _("Input map: locations of real depressions");
+    opt2 = G_define_standard_option(G_OPT_R_INPUT);
+    opt2->key = "depression_input";
+    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->type = TYPE_STRING;
-    opt2->gisprompt = "old,cell,raster";
-    opt2->guisection = _("Input_options");
+    opt2->guisection = _("Input");
 
-    opt3 = G_define_option();
-    opt3->key = "flow";
-    opt3->description = _("Input map: amount of overland flow per cell");
+    opt3 = G_define_standard_option(G_OPT_R_INPUT);
+    opt3->key = "flow_input";
+    opt3->description = _("Name of input raster representing amount of overland flow per cell");
     opt3->required = NO;
-    opt3->type = TYPE_STRING;
-    opt3->gisprompt = "old,cell,raster";
-    opt3->guisection = _("Input_options");
-
-    opt4 = G_define_option();
-    opt4->key = "disturbed_land";
-    opt4->description =
-	_("Input map or value: percent of disturbed land, for USLE");
+    opt3->guisection = _("Input");
+
+    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->description = _("For USLE");
     opt4->required = NO;
-    opt4->type = TYPE_STRING;
-    opt4->gisprompt = "old,cell,raster";
-    opt4->guisection = _("Input_options");
+    opt4->guisection = _("Input");
 
-    opt5 = G_define_option();
-    opt5->key = "blocking";
+    opt5 = G_define_standard_option(G_OPT_R_INPUT);
+    opt5->key = "block_input";
     opt5->label =
-	_("Input map: terrain blocking overland surface flow, for USLE");
+	_("Name of input raster map blocking overland surface flow");
     opt5->description =
-	_("All non-NULL and non-zero cells are considered as blocking terrain");
+	_("For USLE. All non-NULL and non-zero cells are considered as blocking terrain.");
     opt5->required = NO;
-    opt5->type = TYPE_STRING;
-    opt5->gisprompt = "old,cell,raster";
-    opt5->guisection = _("Input_options");
-
-    opt6 = G_define_option();
-    opt6->key = "threshold";
-    opt6->description =
-	_("Input value: minimum size of exterior watershed basin");
-    opt6->required = NO;
-    opt6->type = TYPE_INTEGER;
-    opt6->guisection = _("Input_options");
-
-    opt7 = G_define_option();
-    opt7->key = "max_slope_length";
-    opt7->description =
-	_("Input value: maximum length of surface flow in map units, for USLE");
-    opt7->required = NO;
-    opt7->type = TYPE_DOUBLE;
-    opt7->guisection = _("Input_options");
+    opt5->guisection = _("Input");
 
-    opt8 = G_define_option();
-    opt8->key = "accumulation";
-    opt8->description =
-	_("Output map: number of cells that drain through each cell");
+    opt8 = G_define_standard_option(G_OPT_R_OUTPUT);
+    opt8->key = "accumulation_output";
+    opt8->label =
+	_("Name for output accumulation raster map");
+    opt8->description = _("Number of cells that drain through each cell");
     opt8->required = NO;
-    opt8->type = TYPE_STRING;
-    opt8->gisprompt = "new,cell,raster";
-    opt8->guisection = _("Output_options");
+    opt8->guisection = _("Output");
 
-    opt9 = G_define_option();
-    opt9->key = "drainage";
-    opt9->description = _("Output map: drainage direction");
+    opt9 = G_define_standard_option(G_OPT_R_OUTPUT);
+    opt9->key = "drainage_output";
+    opt9->description = _("Name for output drainage direction raster map");
     opt9->required = NO;
-    opt9->type = TYPE_STRING;
-    opt9->gisprompt = "new,cell,raster";
-    opt9->guisection = _("Output_options");
-
-    opt10 = G_define_option();
-    opt10->key = "basin";
-    opt10->description =
-	_("Output map: unique label for each watershed basin");
+    opt9->guisection = _("Output");
+
+    opt10 = G_define_standard_option(G_OPT_R_OUTPUT);
+    opt10->key = "basin_output";
+    opt10->label =
+	_("Name for basins raster map");
+    opt10->description = _("Unique label for each watershed basin");
     opt10->required = NO;
-    opt10->type = TYPE_STRING;
-    opt10->gisprompt = "new,cell,raster";
-    opt10->guisection = _("Output_options");
+    opt10->guisection = _("Output");
 
-    opt11 = G_define_option();
-    opt11->key = "stream";
-    opt11->description = _("Output map: stream segments");
+    opt11 = G_define_standard_option(G_OPT_R_OUTPUT);
+    opt11->key = "stream_output";
+    opt11->description = _("Name for output stream segments raster map");
     opt11->required = NO;
-    opt11->type = TYPE_STRING;
-    opt11->gisprompt = "new,cell,raster";
-    opt11->guisection = _("Output_options");
+    opt11->guisection = _("Output");
 
-    opt12 = G_define_option();
-    opt12->key = "half_basin";
+    opt12 = G_define_standard_option(G_OPT_R_OUTPUT);
+    opt12->key = "half_basin_output";
+    opt12->label = _("Name for output half basins raster map");
     opt12->description =
-	_("Output map: each half-basin is given a unique value");
+	_("Each half-basin is given a unique value");
     opt12->required = NO;
-    opt12->type = TYPE_STRING;
-    opt12->gisprompt = "new,cell,raster";
-    opt12->guisection = _("Output_options");
+    opt12->guisection = _("Output");
 
-    opt13 = G_define_option();
-    opt13->key = "length_slope";
+    opt13 = G_define_standard_option(G_OPT_R_OUTPUT);
+    opt13->key = "slope_length_output";
+    opt13->label = _("Name for output slope length raster map");
     opt13->description =
-	_("Output map: slope length and steepness (LS) factor for USLE");
+	_("Slope length and steepness (LS) factor for USLE");
     opt13->required = NO;
-    opt13->type = TYPE_STRING;
-    opt13->gisprompt = "new,cell,raster";
-    opt13->guisection = _("Output_options");
+    opt13->guisection = _("Output");
 
     opt14 = G_define_option();
-    opt14->key = "slope_steepness";
-    opt14->description = _("Output map: slope steepness (S) factor for USLE");
+    opt14->key = "slope_steep_output";
+    opt14->label = _("Name for output slope steepness raster map");
+    opt14->description = _("Slope steepness (S) factor for USLE");
     opt14->required = NO;
-    opt14->type = TYPE_STRING;
-    opt14->gisprompt = "new,cell,raster";
-    opt14->guisection = _("Output_options");
+    opt14->guisection = _("Output");
+
+    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->key = "convergence";
@@ -197,6 +179,7 @@ int main(int argc, char *argv[])
     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->key = "memory";
@@ -204,6 +187,7 @@ int main(int argc, char *argv[])
     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';
@@ -219,7 +203,7 @@ int main(int argc, char *argv[])
     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");
 

raster/simwe/r.sim.sediment/main.c

@@ -7,7 +7,7 @@
  * AUTHOR(S):    L. Mitas,  H. Mitasova, J. Hofierka
  * PURPOSE:      Sediment transport simulation (SIMWE)
  *
- * COPYRIGHT:    (C) 2002 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2002, 2010 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
@@ -100,7 +100,7 @@ char msg[1024];
 /****************************************/
 int main(int argc, char *argv[])
 {
-    int i, ii, j, l;
+    int ii;
     int ret_val;
     double x_orig, y_orig;
     static int rand1 = 12345;
@@ -110,64 +110,56 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("hydrology"));
     G_add_keyword(_("sediment flow"));
     G_add_keyword(_("erosion"));
     G_add_keyword(_("deposition"));
     module->description =
 	_("Sediment transport and erosion/deposition simulation "
-	  "using path sampling method (SIMWE)");
+	  "using path sampling method (SIMWE).");
 
-    parm.elevin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.elevin->key = "elevin";
-    parm.elevin->description = _("Name of the elevation raster map [m]");
-    parm.elevin->guisection = _("Input_options");
+    parm.elevin = G_define_standard_option(G_OPT_R_ELEV);
 
     parm.wdepth = G_define_standard_option(G_OPT_R_INPUT);
-    parm.wdepth->key = "wdepth";
-    parm.wdepth->description = _("Name of the water depth raster map [m]");
-    parm.wdepth->guisection = _("Input_options");
+    parm.wdepth->key = "wdepth_input";
+    parm.wdepth->description = _("Name of water depth raster map [m]");
 
     parm.dxin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.dxin->key = "dxin";
-    parm.dxin->description = _("Name of the x-derivatives raster map [m/m]");
-    parm.dxin->guisection = _("Input_options");
+    parm.dxin->key = "dx_input";
+    parm.dxin->description = _("Name of x-derivatives raster map [m/m]");
 
     parm.dyin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.dyin->key = "dyin";
-    parm.dyin->description = _("Name of the y-derivatives raster map [m/m]");
-    parm.dyin->guisection = _("Input_options");
-
+    parm.dyin->key = "dy_input";
+    parm.dyin->description = _("Name of y-derivatives raster map [m/m]");
+    
     parm.detin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.detin->key = "detin";
+    parm.detin->key = "det_input";
     parm.detin->description =
-	_("Name of the detachment capacity coefficient raster map [s/m]");
-    parm.detin->guisection = _("Input_options");
+	_("Name of detachment capacity coefficient raster map [s/m]");
 
     parm.tranin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.tranin->key = "tranin";
+    parm.tranin->key = "tran_input";
     parm.tranin->description =
-	_("Name of the transport capacity coefficient raster map [s]");
-    parm.tranin->guisection = _("Input_options");
-
+	_("Name of transport capacity coefficient raster map [s]");
+    
     parm.tauin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.tauin->key = "tauin";
+    parm.tauin->key = "tau_input";
     parm.tauin->description =
-	_("Name of the critical shear stress raster map [Pa]");
-    parm.tauin->guisection = _("Input_options");
+	_("Name of critical shear stress raster map [Pa]");
 
     parm.manin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.manin->key = "manin";
+    parm.manin->key = "man_input";
     parm.manin->required = NO;
-    parm.manin->description = _("Name of the Mannings n raster map");
-    parm.manin->guisection = _("Input_options");
+    parm.manin->description = _("Name of mannings n raster map");
+    parm.manin->guisection = _("Input");
 
     parm.maninval = G_define_option();
     parm.maninval->key = "maninval";
     parm.maninval->type = TYPE_DOUBLE;
     parm.maninval->answer = MANINVAL;
     parm.maninval->required = NO;
-    parm.maninval->description = _("Name of the Mannings n value");
-    parm.maninval->guisection = _("Input_options");
+    parm.maninval->description = _("Name of mannings n value");
+    parm.maninval->guisection = _("Input");
 
     /* needs to be updated to GRASS 6 vector format !! 
     parm.sfile = G_define_standard_option(G_OPT_V_INPUT);
@@ -179,37 +171,37 @@ int main(int argc, char *argv[])
 */
 
     parm.tc = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.tc->key = "tc";
+    parm.tc->key = "tc_output";
     parm.tc->required = NO;
-    parm.tc->description = _("Output transport capacity raster map [kg/ms]");
-    parm.tc->guisection = _("Output_options");
+    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";
+    parm.et->key = "et_output";
     parm.et->required = NO;
     parm.et->description =
-	_("Output transp.limited erosion-deposition raster map [kg/m2s]");
-    parm.et->guisection = _("Output_options");
+	_("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";
+    parm.conc->key = "conc_output";
     parm.conc->required = NO;
     parm.conc->description =
-	_("Output sediment concentration raster map [particle/m3]");
-    parm.conc->guisection = _("Output_options");
+	_("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";
+    parm.flux->key = "flux_output";
     parm.flux->required = NO;
-    parm.flux->description = _("Output sediment flux raster map [kg/ms]");
-    parm.flux->guisection = _("Output_options");
+    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";
+    parm.erdep->key = "erdep_output";
     parm.erdep->required = NO;
     parm.erdep->description =
-	_("Output erosion-deposition raster map [kg/m2s]");
-    parm.erdep->guisection = _("Output_options");
+	_("Name for output erosion-deposition raster map [kg/m2s]");
+    parm.erdep->guisection = _("Output");
 
     parm.nwalk = G_define_option();
     parm.nwalk->key = "nwalk";

raster/simwe/r.sim.water/main.c

@@ -7,7 +7,7 @@
  * AUTHOR(S):    L. Mitas,  H. Mitasova, J. Hofierka
  * PURPOSE:      Hydrologic and sediment transport simulation (SIMWE)
  *
- * COPYRIGHT:    (C) 2002 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2002, 2010 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
@@ -107,7 +107,7 @@ char msg[1024];
 /****************************************/
 int main(int argc, char *argv[])
 {
-    int i, ii, j, l;
+    int ii;
     int ret_val;
     double x_orig, y_orig;
     static int rand1 = 12345;
@@ -117,34 +117,28 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster"));
-    G_add_keyword(_("flow"));
     G_add_keyword(_("hydrology"));
     module->description =
 	_("Overland flow hydrologic simulation using "
-	  "path sampling method (SIMWE)");
+	  "path sampling method (SIMWE).");
 
-    parm.elevin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.elevin->key = "elevin";
-    parm.elevin->description = _("Name of the elevation raster map [m]");
-    parm.elevin->guisection = _("Input_options");
+    parm.elevin = G_define_standard_option(G_OPT_R_ELEV);
 
     parm.dxin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.dxin->key = "dxin";
-    parm.dxin->description = _("Name of the x-derivatives raster map [m/m]");
-    parm.dxin->guisection = _("Input_options");
+    parm.dxin->key = "dx_input";
+    parm.dxin->description = _("Name of x-derivatives raster map [m/m]");
 
     parm.dyin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.dyin->key = "dyin";
-    parm.dyin->description = _("Name of the y-derivatives raster map [m/m]");
-    parm.dyin->guisection = _("Input_options");
+    parm.dyin->key = "dy_input";
+    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";
+    parm.rain->key = "rain_input";
     parm.rain->required = NO;
     parm.rain->description =
-	_("Name of the rainfall excess rate (rain-infilt) raster map [mm/hr]");
-    parm.rain->guisection = _("Input_options");
-
+	_("Name of rainfall excess rate (rain-infilt) raster map [mm/hr]");
+    parm.rain->guisection = _("Input");
+    
     parm.rainval = G_define_option();
     parm.rainval->key = "rain_val";
     parm.rainval->type = TYPE_DOUBLE;
@@ -152,14 +146,14 @@ int main(int argc, char *argv[])
     parm.rainval->required = NO;
     parm.rainval->description =
 	_("Rainfall excess rate unique value [mm/hr]");
-    parm.rainval->guisection = _("Input_options");
+    parm.rainval->guisection = _("Input");
 
     parm.infil = G_define_standard_option(G_OPT_R_INPUT);
-    parm.infil->key = "infil";
+    parm.infil->key = "infil_input";
     parm.infil->required = NO;
     parm.infil->description =
-	_("Name of the runoff infiltration rate raster map [mm/hr]");
-    parm.infil->guisection = _("Input_options");
+	_("Name of runoff infiltration rate raster map [mm/hr]");
+    parm.infil->guisection = _("Input");
 
     parm.infilval = G_define_option();
     parm.infilval->key = "infil_val";
@@ -168,28 +162,28 @@ int main(int argc, char *argv[])
     parm.infilval->required = NO;
     parm.infilval->description =
 	_("Runoff infiltration rate unique value [mm/hr]");
-    parm.infilval->guisection = _("Input_options");
+    parm.infilval->guisection = _("Input");
 
     parm.manin = G_define_standard_option(G_OPT_R_INPUT);
-    parm.manin->key = "manin";
+    parm.manin->key = "man_input";
     parm.manin->required = NO;
-    parm.manin->description = _("Name of the Mannings n raster map");
-    parm.manin->guisection = _("Input_options");
+    parm.manin->description = _("Name of mannings n raster map");
+    parm.manin->guisection = _("Input");
 
     parm.maninval = G_define_option();
-    parm.maninval->key = "manin_val";
+    parm.maninval->key = "man_val";
     parm.maninval->type = TYPE_DOUBLE;
     parm.maninval->answer = MANINVAL;
     parm.maninval->required = NO;
     parm.maninval->description = _("Mannings n unique value");
-    parm.maninval->guisection = _("Input_options");
+    parm.maninval->guisection = _("Input");
 
     parm.traps = G_define_standard_option(G_OPT_R_INPUT);
-    parm.traps->key = "traps";
+    parm.traps->key = "traps_input";
     parm.traps->required = NO;
     parm.traps->description =
-	_("Name of the flow controls raster map (permeability ratio 0-1)");
-    parm.traps->guisection = _("Input_options");
+	_("Name of flow controls raster map (permeability ratio 0-1)");
+    parm.traps->guisection = _("Input");
 
 /*
     parm.sfile = G_define_standard_option(G_OPT_V_INPUT);
@@ -201,22 +195,22 @@ int main(int argc, char *argv[])
 */
 
     parm.depth = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.depth->key = "depth";
+    parm.depth->key = "depth_output";
     parm.depth->required = NO;
-    parm.depth->description = _("Output water depth raster map [m]");
-    parm.depth->guisection = _("Output_options");
+    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";
+    parm.disch->key = "disch_output";
     parm.disch->required = NO;
-    parm.disch->description = _("Output water discharge raster map [m3/s]");
-    parm.disch->guisection = _("Output_options");
+    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";
+    parm.err->key = "err_output";
     parm.err->required = NO;
-    parm.err->description = _("Output simulation error raster map [m]");
-    parm.err->guisection = _("Output_options");
+    parm.err->description = _("Name for output simulation error raster map [m]");
+    parm.err->guisection = _("Output");
 
 /*
     parm.outwalk = G_define_standard_option(G_OPT_V_OUTPUT);
@@ -275,8 +269,9 @@ int main(int argc, char *argv[])
     parm.hmax->type = TYPE_DOUBLE;
     parm.hmax->answer = HMAX;
     parm.hmax->required = NO;
-    parm.hmax->description =
-	_("Threshold water depth [m] (diffusion increases after this water depth is reached)");
+    parm.hmax->label =
+	_("Threshold water depth [m]");
+    parm.hmax->description = _("Diffusion increases after this water depth is reached");
     parm.hmax->guisection = _("Parameters");
 
     parm.halpha = G_define_option();
@@ -300,7 +295,6 @@ int main(int argc, char *argv[])
     flag.tserie->key = 't';
     flag.tserie->description = _("Time-series output");
 
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);