[GRASS-SVN] r63072 - grass/branches/releasebranch_7_0/raster3d/r3.gwflow

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 07:24:08 -0800 (Wed, 26 Nov 2014)
New Revision: 63072

Modified:
   grass/branches/releasebranch_7_0/raster3d/r3.gwflow/main.c
Log:
r3.gwflow: use standardized options (#2409) - (merge r63070 from trunk)

Modified: grass/branches/releasebranch_7_0/raster3d/r3.gwflow/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.gwflow/main.c	2014-11-26 15:23:51 UTC (rev 63071)
+++ grass/branches/releasebranch_7_0/raster3d/r3.gwflow/main.c	2014-11-26 15:24:08 UTC (rev 63072)
@@ -75,16 +75,16 @@
 	_("Input 3D raster map with the z-part of the hydraulic conductivity tensor in [m/s]");
 
     param.q = G_define_standard_option(G_OPT_R3_INPUT);
-    param.q->key = "q";
+    param.q->key = "sink";
     param.q->required = NO;
     param.q->description = _("Input 3D raster map with sources and sinks in [m^3/s]");
 
     param.s = G_define_standard_option(G_OPT_R3_INPUT);
-    param.s->key = "s";
+    param.s->key = "yield";
     param.s->description = _("Specific yield [1/m] input 3D raster map");
 
     param.r = G_define_standard_option(G_OPT_R3_INPUT);
-    param.r->key = "r";
+    param.r->key = "recharge";
     param.r->required = NO;
     param.r->description = _("Recharge input 3D raster map in m^3/s");
 
@@ -93,19 +93,19 @@
     param.output->description = _("Output 3D raster map storing the piezometric head result of the numerical calculation");
 
     param.vector_x = G_define_standard_option(G_OPT_R3_OUTPUT);
-    param.vector_x->key = "vx";
+    param.vector_x->key = "velocity_x";
     param.vector_x->required = NO;
     param.vector_x->description =
 	_("Output 3D raster map storing the groundwater filter velocity vector part in x direction [m/s]");
 
     param.vector_y = G_define_standard_option(G_OPT_R3_OUTPUT);
-    param.vector_y->key = "vy";
+    param.vector_y->key = "velocity_y";
     param.vector_y->required = NO;
     param.vector_y->description =
 	_("Output 3D raster map storing the groundwater filter velocity vector part in y direction [m/s]");
 
     param.vector_z = G_define_standard_option(G_OPT_R3_OUTPUT);
-    param.vector_z->key = "vz";
+    param.vector_z->key = "velocity_z";
     param.vector_z->required = NO;
     param.vector_z->description =
 	_("Output 3D raster map storing the groundwater filter velocity vector part in z direction [m/s]");