[GRASS-SVN] r61703 - in grass/branches/releasebranch_7_0/temporal: t.merge t.rast.mapcalc2 t.support

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-08-19 13:41:16 -0700 (Tue, 19 Aug 2014)
New Revision: 61703

Modified:
   grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.html
   grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh
   grass/branches/releasebranch_7_0/temporal/t.support/test.t.support.sh
Log:
temporal: add seeding in r.mapcalc calls (completes r61475)

Modified: grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.html	2014-08-19 20:39:38 UTC (rev 61702)
+++ grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.html	2014-08-19 20:41:16 UTC (rev 61703)
@@ -80,8 +80,8 @@
  | 
  +----------------------------------------------------------------------------+
 
-r.mapcalc expr="map3 = rand(20, 30)" 
-r.mapcalc expr="map4 = rand(30, 40)" 
+r.mapcalc expr="map3 = rand(20, 30)" -s
+r.mapcalc expr="map4 = rand(30, 40)" -s
 
 t.create type=strds temporaltype=absolute \
          output=precipitation_daily_2 \

Modified: grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh	2014-08-19 20:39:38 UTC (rev 61702)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh	2014-08-19 20:41:16 UTC (rev 61703)
@@ -11,7 +11,7 @@
 
 # Generate data
 r.mapcalc expr="a1 = rand(0, 550)" -s
-r.mapcalc expr="a2 = if(col() == 2, null(), rand(0, 450))"
+r.mapcalc expr="a2 = if(col() == 2, null(), rand(0, 450))" -s
 r.mapcalc expr="a3 = rand(0, 320)" -s
 r.mapcalc expr="a4 = rand(0, 510)" -s
 r.mapcalc expr="a5 = rand(0, 300)" -s

Modified: grass/branches/releasebranch_7_0/temporal/t.support/test.t.support.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.support/test.t.support.sh	2014-08-19 20:39:38 UTC (rev 61702)
+++ grass/branches/releasebranch_7_0/temporal/t.support/test.t.support.sh	2014-08-19 20:41:16 UTC (rev 61703)
@@ -38,12 +38,13 @@
 
 # @test the map update function
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=20 res3=20
-r.mapcalc --o expr="prec_1 = rand(0, 55)"
-r.mapcalc --o expr="prec_2 = rand(0, 45)"
-r.mapcalc --o expr="prec_3 = rand(0, 32)"
-r.mapcalc --o expr="prec_4 = rand(0, 51)"
-r.mapcalc --o expr="prec_5 = rand(0, 30)"
-r.mapcalc --o expr="prec_6 = rand(0, 65)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 55)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 45)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 32)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 51)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 30)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 65)" -s
 
 # The map dependent metadata should have been updated
 t.support --v -m type=strds input=precip_abs1