[GRASS-SVN] r55784 - grass/trunk/raster/r.gwflow

[svn_grass at osgeo.org]

Author: neteler
Date: 2013-04-14 02:35:18 -0700 (Sun, 14 Apr 2013)
New Revision: 55784

Modified:
   grass/trunk/raster/r.gwflow/r.gwflow.html
Log:
r.gwflow: r.mapcalc white space fixes; HTML cosmetics

Modified: grass/trunk/raster/r.gwflow/r.gwflow.html
===================================================================
--- grass/trunk/raster/r.gwflow/r.gwflow.html	2013-04-14 09:28:25 UTC (rev 55783)
+++ grass/trunk/raster/r.gwflow/r.gwflow.html	2013-04-14 09:35:18 UTC (rev 55784)
@@ -88,59 +88,63 @@
 
 <div class="code"><pre>
 # set the region accordingly
-g.region res=25 res3=25 t=100 b=0 n=1000 s=0 w=0 e=1000
+g.region res=25 res3=25 t=100 b=0 n=1000 s=0 w=0 e=1000 -p3
 
 #now create the input raster maps for confined and unconfined aquifers
-r.mapcalc --o expression="phead=if(row() == 1 , 50, 40)"
-r.mapcalc --o expression="status=if(row() == 1 , 2, 1)"
-r.mapcalc --o expression="well=if(row() == 20 && col() == 20 , -0.01, 0)"
-r.mapcalc --o expression="hydcond=0.00025"
-r.mapcalc --o expression="recharge=0"
-r.mapcalc --o expression="top_conf=20.0"
-r.mapcalc --o expression="top_unconf=70.0"
-r.mapcalc --o expression="bottom=0.0"
-r.mapcalc --o expression="null=0.0"
-r.mapcalc --o expression="poros=0.15"
-r.mapcalc --o expression="s=0.0001"
+r.mapcalc expression="phead = if(row() == 1 , 50, 40)"
+r.mapcalc expression="status = if(row() == 1 , 2, 1)"
+r.mapcalc expression="well = if(row() == 20 && col() == 20 , -0.01, 0)"
+r.mapcalc expression="hydcond = 0.00025"
+r.mapcalc expression="recharge = 0"
+r.mapcalc expression="top_conf = 20.0"
+r.mapcalc expression="top_unconf = 70.0"
+r.mapcalc expression="bottom = 0.0"
+r.mapcalc expression="null = 0.0"
+r.mapcalc expression="poros = 0.15"
+r.mapcalc expression="s = 0.0001"
 
 # The maps of the river
-r.mapcalc --o expression="river_bed=if(col() == 35 , 48, null())"
-r.mapcalc --o expression="river_head=if(col() == 35 , 49, null())"
-r.mapcalc --o expression="river_leak=if(col() == 35 , 0.0001, null())"
+r.mapcalc expression="river_bed = if(col() == 35 , 48, null())"
+r.mapcalc expression="river_head = if(col() == 35 , 49, null())"
+r.mapcalc expression="river_leak = if(col() == 35 , 0.0001, null())"
 
 # The maps of the drainage
-r.mapcalc --o expression="drain_bed=if(col() == 5 , 48, null())"
-r.mapcalc --o expression="drain_leak=if(col() == 5 , 0.01, null())"
+r.mapcalc expression="drain_bed = if(col() == 5 , 48, null())"
+r.mapcalc expression="drain_leak = if(col() == 5 , 0.01, null())"
 
 #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=s recharge=recharge output=gwresult_conf \
-dt=8640000 type=confined vx=gwresult_conf_velocity_x vy=gwresult_conf_velocity_y budget=budget_conf
+r.gwflow solver=cg top=top_conf bottom=bottom phead=phead status=status \
+  hc_x=hydcond hc_y=hydcond q=well s=s 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
 # We use the effective porosity as storativity parameter
-r.gwflow --o solver=cg top=top_unconf bottom=bottom phead=phead \
-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 \
-budget=budget_unconf vy=gwresult_unconf_velocity_y
+r.gwflow solver=cg top=top_unconf bottom=bottom phead=phead \
+  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 \
+  budget=budget_unconf vy=gwresult_unconf_velocity_y
 
 # The data can be visulaized with paraview when exported with r.out.vtk
-r.out.vtk -p in=gwresult_conf,status vector=gwresult_conf_velocity_x,gwresult_conf_velocity_y,null out=/tmp/gwdata_conf2d.vtk
-r.out.vtk -p elevation=gwresult_unconf in=gwresult_unconf,status vector=gwresult_unconf_velocity_x,gwresult_unconf_velocity_y,null out=/tmp/gwdata_unconf2d.vtk
+r.out.vtk -p in=gwresult_conf,status vector=gwresult_conf_velocity_x,gwresult_conf_velocity_y,null \
+  out=/tmp/gwdata_conf2d.vtk
+r.out.vtk -p elevation=gwresult_unconf in=gwresult_unconf,status vector=gwresult_unconf_velocity_x,gwresult_unconf_velocity_y,null \
+  out=/tmp/gwdata_unconf2d.vtk
 
 #now load the data into paraview
-paraview --data=/tmp/gwdata_conf2d.vtk &
-paraview --data=/tmp/gwdata_unconf2d.vtk &
+paraview --data=/tmp/gwdata_conf2d.vtk &
+paraview --data=/tmp/gwdata_unconf2d.vtk &
 </pre></div>
 
 <h2>SEE ALSO</h2>
 
-<em><a href="r.solute.transport.html">r.solute.transport</a></em><br>
-<em><a href="r3.gwflow.html">r3.gwflow</a></em><br>
-<em><a href="r.out.vtk.html">r.out.vtk</a></em><br>
+<em>
+<a href="r.solute.transport.html">r.solute.transport</a>,
+<a href="r3.gwflow.html">r3.gwflow</a>,
+<a href="r.out.vtk.html">r.out.vtk</a>
+</em>
 
 <h2>AUTHOR</h2>
 Sören Gebbert