[GRASS-SVN] r63945 - in grass/trunk: lib/gis raster/r.sim/r.sim.sediment

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-01-03 12:26:09 -0800 (Sat, 03 Jan 2015)
New Revision: 63945

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/raster/r.sim/r.sim.sediment/main.c
   grass/trunk/raster/r.sim/r.sim.sediment/r.sim.sediment.html
Log:
r.sim.sediment: rename parameters

Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2015-01-03 19:36:01 UTC (rev 63944)
+++ grass/trunk/lib/gis/renamed_options	2015-01-03 20:26:09 UTC (rev 63945)
@@ -260,11 +260,12 @@
 r.sim.sediment|tranin:transport_coeff
 r.sim.sediment|tauin:shear_stress
 r.sim.sediment|manin:man
+r.sim.sediment|flux:sediment_flux
 r.sim.sediment|maninval:man_value
 r.sim.sediment|outwalk:walkers_output
-r.sim.sediment|tc:sedflow_capacity
+r.sim.sediment|tc:transport_capacity
 r.sim.sediment|et:tlimit_erosion_deposition
-r.sim.sediment|conc:concentration
+r.sim.sediment|conc:sediment_concentration
 r.sim.sediment|erdep:erosion_deposition
 r.sim.sediment|nwalk:nwalkers
 r.sim.sediment|niter:niterations

Modified: grass/trunk/raster/r.sim/r.sim.sediment/main.c
===================================================================
--- grass/trunk/raster/r.sim/r.sim.sediment/main.c	2015-01-03 19:36:01 UTC (rev 63944)
+++ grass/trunk/raster/r.sim/r.sim.sediment/main.c	2015-01-03 20:26:09 UTC (rev 63945)
@@ -167,7 +167,7 @@
     parm.observation->guisection = _("Input");
 
     parm.tc = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.tc->key = "sedflow_capacity";
+    parm.tc->key = "transport_capacity";
     parm.tc->required = NO;
     parm.tc->description = _("Name for output transport capacity raster map [kg/ms]");
     parm.tc->guisection = _("Output");
@@ -180,14 +180,14 @@
     parm.et->guisection = _("Output");
 
     parm.conc = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.conc->key = "concentration";
+    parm.conc->key = "sediment_concentration";
     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";
+    parm.flux->key = "sediment_flux";
     parm.flux->required = NO;
     parm.flux->description = _("Name for output sediment flux raster map [kg/ms]");
     parm.flux->guisection = _("Output");

Modified: grass/trunk/raster/r.sim/r.sim.sediment/r.sim.sediment.html
===================================================================
--- grass/trunk/raster/r.sim/r.sim.sediment/r.sim.sediment.html	2015-01-03 19:36:01 UTC (rev 63944)
+++ grass/trunk/raster/r.sim/r.sim.sediment/r.sim.sediment.html	2015-01-03 20:26:09 UTC (rev 63945)
@@ -24,11 +24,11 @@
 reference literature (see suggested values in Notes and References). <br>
 
 <p>
-Output includes transport capacity raster map <i>sedflow_capacity</i>  in [kg/ms],
+Output includes transport capacity raster map <i>transport_capacity</i>  in [kg/ms],
 transport capacity limited erosion/deposition raster map
 <i>tlimit_erosion_deposition</i> [kg/m<sup>2</sup>s]i that are output almost immediately and
 can be viewed while the simulation continues. Sediment flow rate raster map 
-<i>flux</i> [kg/ms], and net erosion/deposition raster map [kg/m<sup>2</sup>s]
+<i>sediment_flux</i> [kg/ms], and net erosion/deposition raster map [kg/m<sup>2</sup>s]
 can take longer time depending on time step and simulation time. 
 Simulation time is controled by <i>niterations</i> [minutes] parameter. 
 <!-- Output files can be saved during simulation using <i>outiter</i> parameter