[GRASS-SVN] r41511 - in grass/trunk: lib/gpde raster/r.gwflow
raster/r.solute.transport
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Mar 21 12:52:45 EDT 2010
Author: huhabla
Date: 2010-03-21 12:52:44 -0400 (Sun, 21 Mar 2010)
New Revision: 41511
Modified:
grass/trunk/lib/gpde/N_parse_options.c
grass/trunk/raster/r.gwflow/main.c
grass/trunk/raster/r.gwflow/r.gwflow.html
grass/trunk/raster/r.gwflow/valid_calc_7x7.py
grass/trunk/raster/r.gwflow/valid_calc_excavation.py
grass/trunk/raster/r.solute.transport/example.py
grass/trunk/raster/r.solute.transport/main.c
grass/trunk/raster/r.solute.transport/r.solute.transport.html
grass/trunk/raster/r.solute.transport/seguin_verify.py
grass/trunk/raster/r.solute.transport/seguin_verify_well.py
Log:
Typo fixes
Using G_define_standard_option()
Renamed recharge and retardation options
Removed translation form options and default answers
Modified: grass/trunk/lib/gpde/N_parse_options.c
===================================================================
--- grass/trunk/lib/gpde/N_parse_options.c 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/lib/gpde/N_parse_options.c 2010-03-21 16:52:44 UTC (rev 41511)
@@ -54,7 +54,7 @@
Opt->key_desc = "name";
Opt->answer = "cg";
Opt->options = "gauss,lu,cholesky,jacobi,sor,cg,bicgstab,pcg";
- Opt->guisection = _("solver");
+ Opt->guisection = "Solver";
Opt->description =
("The type of solver which should solve the symmetric linear equation system");
break;
@@ -66,7 +66,7 @@
Opt->key_desc = "name";
Opt->answer = "bicgstab";
Opt->options = "gauss,lu,jacobi,sor,bicgstab";
- Opt->guisection = _("solver");
+ Opt->guisection = "Solver";
Opt->description =
("The type of solver which should solve the linear equation system");
break;
@@ -75,7 +75,7 @@
Opt->type = TYPE_INTEGER;
Opt->required = NO;
Opt->answer = "100000";
- Opt->guisection = _("solver");
+ Opt->guisection = "Solver";
Opt->description =
("Maximum number of iteration used to solver the linear equation system");
break;
@@ -84,7 +84,7 @@
Opt->type = TYPE_DOUBLE;
Opt->required = NO;
Opt->answer = "0.0000000001";
- Opt->guisection = _("solver");
+ Opt->guisection = "Solver";
Opt->description =
("Error break criteria for iterative solvers (jacobi, sor, cg or bicgstab)");
break;
@@ -93,7 +93,7 @@
Opt->type = TYPE_DOUBLE;
Opt->required = NO;
Opt->answer = "1";
- Opt->guisection = _("solver");
+ Opt->guisection = "Solver";
Opt->description =
("The relaxation parameter used by the jacobi and sor solver for speedup or stabilizing");
break;
@@ -102,7 +102,7 @@
Opt->type = TYPE_DOUBLE;
Opt->required = YES;
Opt->answer = "86400";
- Opt->guisection = _("solver");
+ Opt->guisection = "Solver";
Opt->description = _("The calculation time in seconds");
break;
}
Modified: grass/trunk/raster/r.gwflow/main.c
===================================================================
--- grass/trunk/raster/r.gwflow/main.c 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.gwflow/main.c 2010-03-21 16:52:44 UTC (rev 41511)
@@ -52,101 +52,67 @@
/* ************************************************************************* */
void set_params(void)
{
- param.phead = G_define_option();
+ param.phead = G_define_standard_option(G_OPT_R_INPUT);
param.phead->key = "phead";
- param.phead->type = TYPE_STRING;
- param.phead->required = YES;
- param.phead->gisprompt = "old,raster,raster";
param.phead->description = _("The initial piezometric head in [m]");
- param.status = G_define_option();
+ param.status = G_define_standard_option(G_OPT_R_INPUT);
param.status->key = "status";
- param.status->type = TYPE_STRING;
- param.status->required = YES;
- param.status->gisprompt = "old,raster,raster";
param.status->description =
_("Boundary condition status, 0-inactive, 1-active, 2-dirichlet");
- param.hc_x = G_define_option();
+ param.hc_x =G_define_standard_option(G_OPT_R_INPUT);
param.hc_x->key = "hc_x";
- param.hc_x->type = TYPE_STRING;
- param.hc_x->required = YES;
- param.hc_x->gisprompt = "old,raster,raster";
param.hc_x->description =
_("X-part of the hydraulic conductivity tensor in [m/s]");
- param.hc_y = G_define_option();
+ param.hc_y = G_define_standard_option(G_OPT_R_INPUT);
param.hc_y->key = "hc_y";
- param.hc_y->type = TYPE_STRING;
- param.hc_y->required = YES;
- param.hc_y->gisprompt = "old,raster,raster";
param.hc_y->description =
_("Y-part of the hydraulic conductivity tensor in [m/s]");
- param.q = G_define_option();
+ param.q = G_define_standard_option(G_OPT_R_INPUT);
param.q->key = "q";
- param.q->type = TYPE_STRING;
- param.q->required = NO;
- param.q->gisprompt = "old,raster,raster";
- param.q->description = _("Raster amp water sources and sinks in [m^3/s]");
+ param.q->description = _("Raster map water sources and sinks in [m^3/s]");
- param.s = G_define_option();
+ param.s = G_define_standard_option(G_OPT_R_INPUT);
param.s->key = "s";
- param.s->type = TYPE_STRING;
- param.s->required = YES;
- param.s->gisprompt = "old,raster,raster";
param.s->description = _("Specific yield in [1/m]");
- param.r = G_define_option();
- param.r->key = "r";
- param.r->type = TYPE_STRING;
+ param.r = G_define_standard_option(G_OPT_R_INPUT);
+ param.r->key = "recharge";
param.r->required = NO;
- param.r->gisprompt = "old,raster,raster";
+ param.r->guisection = _("Recharge");
param.r->description =
_("Recharge map e.g: 6*10^-9 per cell in [m^3/s*m^2]");
- param.top = G_define_option();
+ param.top = G_define_standard_option(G_OPT_R_INPUT);
param.top->key = "top";
- param.top->type = TYPE_STRING;
- param.top->required = YES;
- param.top->gisprompt = "old,raster,raster";
param.top->description = _("Top surface of the aquifer in [m]");
- param.bottom = G_define_option();
+ param.bottom = G_define_standard_option(G_OPT_R_INPUT);
param.bottom->key = "bottom";
- param.bottom->type = TYPE_STRING;
- param.bottom->required = YES;
- param.bottom->gisprompt = "old,raster,raster";
param.bottom->description = _("Bottom surface of the aquifer in [m]");
- param.output = G_define_option();
+ param.output = G_define_standard_option(G_OPT_R_OUTPUT);
param.output->key = "output";
- param.output->type = TYPE_STRING;
- param.output->required = YES;
- param.output->gisprompt = "new,raster,raster";
param.output->description = _("The map storing the numerical result [m]");
- param.vector_x = G_define_option();
+ param.vector_x = G_define_standard_option(G_OPT_R_OUTPUT);
param.vector_x->key = "vx";
- param.vector_x->type = TYPE_STRING;
param.vector_x->required = NO;
- param.vector_x->gisprompt = "new,raster,raster";
param.vector_x->description =
_("Calculate and store the groundwater filter velocity vector part in x direction [m/s]\n");
- param.vector_y = G_define_option();
+ param.vector_y = G_define_standard_option(G_OPT_R_OUTPUT);
param.vector_y->key = "vy";
- param.vector_y->type = TYPE_STRING;
param.vector_y->required = NO;
- param.vector_y->gisprompt = "new,raster,raster";
param.vector_y->description =
_("Calculate and store the groundwater filter velocity vector part in y direction [m/s]\n");
- param.budget = G_define_option();
+ param.budget = G_define_standard_option(G_OPT_R_OUTPUT);
param.budget->key = "budget";
- param.budget->type = TYPE_STRING;
param.budget->required = NO;
- param.budget->gisprompt = "new,raster,raster";
param.budget->description =
_("Store the groundwater budget for each cell [m^3/s]\n");
@@ -154,51 +120,43 @@
param.type->key = "type";
param.type->type = TYPE_STRING;
param.type->required = YES;
- param.type->answer = _("confined");
- param.type->options = _("confined,unconfined");
+ param.type->answer = "confined";
+ param.type->options = "confined,unconfined";
param.type->description = _("The type of groundwater flow");
/*Variants of the cauchy boundary condition */
- param.river_bed = G_define_option();
+ param.river_bed = G_define_standard_option(G_OPT_R_INPUT);
param.river_bed->key = "river_bed";
- param.river_bed->type = TYPE_STRING;
param.river_bed->required = NO;
- param.river_bed->gisprompt = "old,raster,raster";
param.river_bed->description = _("The height of the river bed in [m]");
- param.river_bed->guisection = _("river");
+ param.river_bed->guisection = "River";
- param.river_head = G_define_option();
+ param.river_head = G_define_standard_option(G_OPT_R_INPUT);
param.river_head->key = "river_head";
- param.river_head->type = TYPE_STRING;
param.river_head->required = NO;
- param.river_head->gisprompt = "old,raster,raster";
- param.river_head->guisection = _("river");
+ param.river_head->guisection = "River";
param.river_head->description =
_("Water level (head) of the river with leakage connection in [m]");
- param.river_leak = G_define_option();
+ param.river_leak = G_define_standard_option(G_OPT_R_INPUT);
param.river_leak->key = "river_leak";
- param.river_leak->type = TYPE_STRING;
param.river_leak->required = NO;
- param.river_leak->gisprompt = "old,raster,raster";
- param.river_leak->guisection = _("river");
+ param.river_leak->guisection = "River";
param.river_leak->description =
_("The leakage coefficient of the river bed in [1/s].");
- param.drain_bed = G_define_option();
+ param.drain_bed = G_define_standard_option(G_OPT_R_INPUT);
param.drain_bed->key = "drain_bed";
param.drain_bed->type = TYPE_STRING;
param.drain_bed->required = NO;
param.drain_bed->gisprompt = "old,raster,raster";
- param.drain_bed->guisection = _("drainage");
+ param.drain_bed->guisection = "Drainage";
param.drain_bed->description = _("The height of the drainage bed in [m]");
- param.drain_leak = G_define_option();
+ param.drain_leak = G_define_standard_option(G_OPT_R_INPUT);
param.drain_leak->key = "drain_leak";
- param.drain_leak->type = TYPE_STRING;
param.drain_leak->required = NO;
- param.drain_leak->gisprompt = "old,raster,raster";
- param.drain_leak->guisection = _("drainage");
+ param.drain_leak->guisection = "Drainage";
param.drain_leak->description =
_("The leakage coefficient of the drainage bed in [1/s]");
@@ -210,7 +168,7 @@
param.full_les = G_define_flag();
param.full_les->key = 'f';
- param.full_les->guisection = _("solver");
+ param.full_les->guisection = "Solver";
param.full_les->description = _("Allocate a full quadratic linear equation system,"
" default is a sparse linear equation system.");
Modified: grass/trunk/raster/r.gwflow/r.gwflow.html
===================================================================
--- grass/trunk/raster/r.gwflow/r.gwflow.html 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.gwflow/r.gwflow.html 2010-03-21 16:52:44 UTC (rev 41511)
@@ -119,12 +119,12 @@
#confined groundwater flow with cg solver and sparse matrix, river and drain
#do not work with this confined aquifer (top == 20m)
r.gwflow --o solver=cg top=top_conf bottom=bottom phead=phead status=status \
-hc_x=hydcond hc_y=hydcond q=well s=syield r=recharge output=gwresult_conf \
+hc_x=hydcond hc_y=hydcond q=well s=syield recharge=recharge output=gwresult_conf \
dt=8640000 type=confined vx=gwresult_conf_velocity_x vy=gwresult_conf_velocity_y budget=budget_conf
#unconfined groundwater flow with cg solver and sparse matrix, river and drain are enabled
r.gwflow --o solver=cg top=top_unconf bottom=bottom phead=phead \
-status=status hc_x=hydcond hc_y=hydcond q=well s=poros r=recharge \
+status=status hc_x=hydcond hc_y=hydcond q=well s=poros recharge=recharge \
river_bed=river_bed river_head=river_head river_leak=river_leak \
drain_bed=drain_bed drain_leak=drain_leak \
output=gwresult_unconf dt=8640000 type=unconfined vx=gwresult_unconf_velocity_x \
Modified: grass/trunk/raster/r.gwflow/valid_calc_7x7.py
===================================================================
--- grass/trunk/raster/r.gwflow/valid_calc_7x7.py 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.gwflow/valid_calc_7x7.py 2010-03-21 16:52:44 UTC (rev 41511)
@@ -31,13 +31,13 @@
#First compute the initial groundwater flow
grass.run_command("r.gwflow", "f", solver="cholesky", top="top_conf", bottom="bottom", phead="phead",\
status="status", hc_x="hydcond", hc_y="hydcond", q="well", s="syield",\
- r="recharge", output="gwresult_conf", dt=500, type="confined", budget="water_budget")
+ recharge="recharge", output="gwresult_conf", dt=500, type="confined", budget="water_budget")
count=500
# loop over the timesteps
for i in range(20):
grass.run_command("r.gwflow", "f", solver="cholesky", top="top_conf", bottom="bottom", phead="gwresult_conf",\
status="status", hc_x="hydcond", hc_y="hydcond", q="well", s="syield",\
- r="recharge", output="gwresult_conf", dt=500, type="confined", budget="water_budget")
+ recharge="recharge", output="gwresult_conf", dt=500, type="confined", budget="water_budget")
count += 500
Modified: grass/trunk/raster/r.gwflow/valid_calc_excavation.py
===================================================================
--- grass/trunk/raster/r.gwflow/valid_calc_excavation.py 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.gwflow/valid_calc_excavation.py 2010-03-21 16:52:44 UTC (rev 41511)
@@ -36,4 +36,4 @@
#compute a steady state groundwater flow
grass.run_command("r.gwflow", "f", solver="cholesky", top="top", bottom="bottom", phead="phead", \
status="status", hc_x="hydcond", hc_y="hydcond", q="well", s="syield", \
- r="recharge", output="gwresult", dt=864000000000, type="unconfined", budget="water_budget")
+ recharge="recharge", output="gwresult", dt=864000000000, type="unconfined", budget="water_budget")
Modified: grass/trunk/raster/r.solute.transport/example.py
===================================================================
--- grass/trunk/raster/r.solute.transport/example.py 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.solute.transport/example.py 2010-03-21 16:52:44 UTC (rev 41511)
@@ -28,7 +28,7 @@
grass.run_command("r.gwflow", solver="cg", top="top_conf", bottom="bottom", phead="phead",\
status="status", hc_x="hydcond", hc_y="hydcond", q="well", s="syield",\
- r="recharge", output="gwresult_conf", dt=8640000000000, type="confined")
+ recharge="recharge", output="gwresult_conf", dt=8640000000000, type="confined")
grass.message(_("generate the transport data"))
grass.run_command("r.mapcalc", expression="c=if(col() == 15 && row() == 75 , 500.0, 0.0)")
@@ -40,13 +40,13 @@
# Compute the initial state
grass.run_command("r.solute.transport", solver="bicgstab", top="top_conf",\
bottom="bottom", phead="gwresult_conf", status="tstatus", hc_x="hydcond", hc_y="hydcond",\
- r="R", cs="cs", q="well", nf="poros", output="stresult_conf_0", dt=3600, diff_x="diff",\
+ rd="R", cs="cs", q="well", nf="poros", output="stresult_conf_0", dt=3600, diff_x="diff",\
diff_y="diff", c="c", al=0.1, at=0.01)
# Compute the solute transport for 300 days in 10 day steps
for dt in range(30):
grass.run_command("r.solute.transport", solver="bicgstab", top="top_conf",\
bottom="bottom", phead="gwresult_conf", status="tstatus", hc_x="hydcond", hc_y="hydcond",\
- r="R", cs="cs", q="well", nf="poros", output="stresult_conf_" + str(dt + 1), dt=864000, diff_x="diff",\
+ rd="R", cs="cs", q="well", nf="poros", output="stresult_conf_" + str(dt + 1), dt=864000, diff_x="diff",\
diff_y="diff", c="stresult_conf_" + str(dt), al=0.1, at=0.01, vx="vx", vy="vy")
Modified: grass/trunk/raster/r.solute.transport/main.c
===================================================================
--- grass/trunk/raster/r.solute.transport/main.c 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.solute.transport/main.c 2010-03-21 16:52:44 UTC (rev 41511)
@@ -91,7 +91,7 @@
param.q = G_define_standard_option(G_OPT_R_INPUT);
param.q->key = "q";
- param.q->guisection = _("water flow");
+ param.q->guisection = _("Water flow");
param.q->required = NO;
param.q->description = _("Groundwater sources and sinks in [m^3/s]");
@@ -99,7 +99,7 @@
param.cin->key = "cin";
param.cin->required = NO;
param.cin->gisprompt = "old,raster,raster";
- param.cin->guisection = _("water flow");
+ param.cin->guisection = "Water flow";
param.cin->description = _("Concentration sources and sinks bounded to a "
"water source or sink in [kg/s]");
@@ -113,7 +113,7 @@
"(i.e. a chemical reaction)");
param.r = G_define_standard_option(G_OPT_R_INPUT);
- param.r->key = "r";
+ param.r->key = "rd";
param.r->description = _("Retardation factor [-]");
param.nf = G_define_standard_option(G_OPT_R_INPUT);
@@ -137,7 +137,7 @@
param.vector_x->type = TYPE_STRING;
param.vector_x->required = NO;
param.vector_x->gisprompt = "new,raster,raster";
- param.vector_x->guisection = _("water flow");
+ param.vector_x->guisection = "Water flow";
param.vector_x->description =
_("Calculate and store the groundwater filter velocity vector part in x direction [m/s]\n");
@@ -146,7 +146,7 @@
param.vector_y->type = TYPE_STRING;
param.vector_y->required = NO;
param.vector_y->gisprompt = "new,raster,raster";
- param.vector_y->guisection = _("water flow");
+ param.vector_y->guisection = "Water flow";
param.vector_y->description =
_("Calculate and store the groundwater filter velocity vector part in y direction [m/s]\n");
@@ -186,19 +186,19 @@
param.stab->required = NO;
param.stab->answer = "full";
param.stab->options = "full,exp";
- param.stab->guisection = _("stabelization");
+ param.stab->guisection = "Stabelization";
param.stab->description =
_("Set the flow stabilizing scheme (full or exponential upwinding).");
param.full_les = G_define_flag();
param.full_les->key = 'f';
- param.full_les->guisection = _("solver");
+ param.full_les->guisection = "Solver";
param.full_les->description = _("Use a full filled quadratic linear equation system,"
" default is a sparse linear equation system.");
param.cfl = G_define_flag();
param.cfl->key = 'c';
- param.cfl->guisection = _("stabelization");
+ param.cfl->guisection = "Stabelization";
param.cfl->description =
_("Use the Courant-Friedrichs-Lewy criteria for time step calculation");
}
Modified: grass/trunk/raster/r.solute.transport/r.solute.transport.html
===================================================================
--- grass/trunk/raster/r.solute.transport/r.solute.transport.html 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.solute.transport/r.solute.transport.html 2010-03-21 16:52:44 UTC (rev 41511)
@@ -120,7 +120,7 @@
grass.run_command("r.gwflow", solver="cg", top="top_conf", bottom="bottom", phead="phead",\
status="status", hc_x="hydcond", hc_y="hydcond", q="well", s="syield",\
- r="recharge", output="gwresult_conf", dt=8640000000000, type="confined")
+ recharge="recharge", output="gwresult_conf", dt=8640000000000, type="confined")
grass.message(_("generate the transport data"))
grass.run_command("r.mapcalc", expression="c=if(col() == 15 && row() == 75 , 500.0, 0.0)")
@@ -132,14 +132,14 @@
# Compute the initial state
grass.run_command("r.solute.transport", solver="bicgstab", top="top_conf",\
bottom="bottom", phead="gwresult_conf", status="tstatus", hc_x="hydcond", hc_y="hydcond",\
- r="R", cs="cs", q="well", nf="poros", output="stresult_conf_0", dt=3600, diff_x="diff",\
+ rd="R", cs="cs", q="well", nf="poros", output="stresult_conf_0", dt=3600, diff_x="diff",\
diff_y="diff", c="c", al=0.1, at=0.01)
# Compute the solute transport for 300 days in 10 day steps
for dt in range(30):
grass.run_command("r.solute.transport", solver="bicgstab", top="top_conf",\
bottom="bottom", phead="gwresult_conf", status="tstatus", hc_x="hydcond", hc_y="hydcond",\
- r="R", cs="cs", q="well", nf="poros", output="stresult_conf_" + str(dt + 1), dt=864000, diff_x="diff",\
+ rd="R", cs="cs", q="well", nf="poros", output="stresult_conf_" + str(dt + 1), dt=864000, diff_x="diff",\
diff_y="diff", c="stresult_conf_" + str(dt), al=0.1, at=0.01)
Modified: grass/trunk/raster/r.solute.transport/seguin_verify.py
===================================================================
--- grass/trunk/raster/r.solute.transport/seguin_verify.py 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.solute.transport/seguin_verify.py 2010-03-21 16:52:44 UTC (rev 41511)
@@ -48,7 +48,7 @@
# Compute the steady state groundwater flow
grass.run_command("r.gwflow", solver="cg", top="top_conf_1", bottom="bottom_1", phead="phead_1",\
status="status_1", hc_x="hydcond_1", hc_y="hydcond_1", \
- q="well_1", s="syield_1", r="recharge_1", output="gwresult_conf_1",\
+ q="well_1", s="syield_1", recharge="recharge_1", output="gwresult_conf_1",\
dt=8640000000000, type="confined")
grass.message(_("generate the transport data"))
@@ -73,7 +73,7 @@
# Compute the solute transport using the above defined dispersivity coefficients for a timestep of 1000d
grass.run_command("r.solute.transport", "c", error=0.000000000000001, maxit=1000, solver="bicgstab",\
top="top_conf_1", bottom="bottom_1", phead="gwresult_conf_1", status="tstatus_1", hc_x="hydcond_1",\
- hc_y="hydcond_1", r="R_1", cs="cs_1", q="well_1", nf="poros_1", output="stresult_conf_1", dt=86400000,\
+ hc_y="hydcond_1", rd="R_1", cs="cs_1", q="well_1", nf="poros_1", output="stresult_conf_1", dt=86400000,\
diff_x="diff_1", diff_y="diff_1", cin="cin_1", c="c_1", al=AL, at=AT, vx="stresult_conf_vel_1_x", vy="stresult_conf_vel_1_y")
# The second computation uses different porosity for higher groundwater velocity
@@ -84,5 +84,5 @@
# Compute the solute transport using the above defined dispersivity coefficients for a timestep of 1000d
grass.run_command("r.solute.transport", "c", error=0.000000000000001, maxit=1000, solver="bicgstab",\
top="top_conf_1", bottom="bottom_1", phead="gwresult_conf_1", status="tstatus_1", hc_x="hydcond_1",\
- hc_y="hydcond_1", r="R_1", cs="cs_1", q="well_1", nf="poros_2", output="stresult_conf_2", dt=86400000,\
+ hc_y="hydcond_1", rd="R_1", cs="cs_1", q="well_1", nf="poros_2", output="stresult_conf_2", dt=86400000,\
diff_x="diff_1", diff_y="diff_1", cin="cin_1", c="c_1", al=AL, at=AT, vx="stresult_conf_vel_2_x", vy="stresult_conf_vel_2_y")
Modified: grass/trunk/raster/r.solute.transport/seguin_verify_well.py
===================================================================
--- grass/trunk/raster/r.solute.transport/seguin_verify_well.py 2010-03-21 15:42:22 UTC (rev 41510)
+++ grass/trunk/raster/r.solute.transport/seguin_verify_well.py 2010-03-21 16:52:44 UTC (rev 41511)
@@ -49,7 +49,7 @@
# Compute the steady state groundwater flow
grass.run_command("r.gwflow", solver="cg", top="top_conf_1", bottom="bottom_1", phead="phead_1",\
status="status_1", hc_x="hydcond_1", hc_y="hydcond_1", \
- q="well_1", s="syield_1", r="recharge_1", output="gwresult_conf_1",\
+ q="well_1", s="syield_1", recharge="recharge_1", output="gwresult_conf_1",\
dt=8640000000000, type="confined")
grass.message(_("generate the transport data"))
@@ -74,7 +74,7 @@
# Compute the solute transport using the above defined dispersivity coefficients for a timestep of 250d
grass.run_command("r.solute.transport", "c", error=0.000000000000001, maxit=1000, solver="bicgstab",\
top="top_conf_1", bottom="bottom_1", phead="gwresult_conf_1", status="tstatus_1", hc_x="hydcond_1",\
- hc_y="hydcond_1", r="R_1", cs="cs_1", q="well_1", nf="poros_1", output="stresult_conf_1", dt=21600000,\
+ hc_y="hydcond_1", rd="R_1", cs="cs_1", q="well_1", nf="poros_1", output="stresult_conf_1", dt=21600000,\
diff_x="diff_1", diff_y="diff_1", cin="cin_1", c="c_1", al=AL, at=AT)
# The second computation uses different dispersivities
@@ -85,6 +85,6 @@
# Compute the solute transport using the above defined dispersivity coefficients for a timestep of 250d
grass.run_command("r.solute.transport", "c", error=0.000000000000001, maxit=1000, solver="bicgstab",\
top="top_conf_1", bottom="bottom_1", phead="gwresult_conf_1", status="tstatus_1", hc_x="hydcond_1",\
- hc_y="hydcond_1", r="R_1", cs="cs_1", q="well_1", nf="poros_1", output="stresult_conf_2", dt=21600000,\
+ hc_y="hydcond_1", rd="R_1", cs="cs_1", q="well_1", nf="poros_1", output="stresult_conf_2", dt=21600000,\
diff_x="diff_1", diff_y="diff_1", cin="cin_1", c="c_1", al=AL, at=AT)
More information about the grass-commit
mailing list