Просмотр исходного кода

temporal: add seeding in r.mapcalc calls (completes https://trac.osgeo.org/grass/changeset/61475)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@61701 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 11 лет назад
Родитель
Сommit
f58a269bfc
46 измененных файлов с 284 добавлено и 249 удалено
  1. 1 1
      temporal/t.create/t.create.html
  2. 1 1
      temporal/t.info/t.info.html
  3. 4 4
      temporal/t.info/test.t.info.sh
  4. 4 3
      temporal/t.list/t.list.html
  5. 2 2
      temporal/t.merge/t.merge.html
  6. 7 6
      temporal/t.merge/test.t.merge.sh
  7. 6 6
      temporal/t.rast.accumulate/test_suite/test.t.rast.accumulate.sh
  8. 8 7
      temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh
  9. 7 6
      temporal/t.rast.aggregate/test.t.rast.aggregate.sh
  10. 7 6
      temporal/t.rast.export/test.t.rast.export.sh
  11. 7 6
      temporal/t.rast.extract/test.t.rast.extract.sh
  12. 7 6
      temporal/t.rast.import/test.t.rast.import.relative.sh
  13. 7 6
      temporal/t.rast.import/test.t.rast.import.sh
  14. 7 6
      temporal/t.rast.import/test.t.rast.import_locations.sh
  15. 7 6
      temporal/t.rast.list/t.rast.list.html
  16. 7 6
      temporal/t.rast.list/test.t.rast.list.sh
  17. 7 6
      temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
  18. 7 6
      temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
  19. 6 5
      temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh
  20. 6 5
      temporal/t.rast.neighbors/test.t.rast.neighbors.sh
  21. 7 6
      temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh
  22. 1 1
      temporal/t.rast.univar/t.rast.univar.html
  23. 7 7
      temporal/t.rast.univar/test.t.rast.univar.sh
  24. 7 6
      temporal/t.rast3d.extract/test.t.rast3d.extract.sh
  25. 7 6
      temporal/t.rast3d.list/test.t.rast3d.list.sh
  26. 7 6
      temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
  27. 7 6
      temporal/t.rast3d.mapcalc2/test.t.rast3d.mapcalc2.sh
  28. 7 7
      temporal/t.rast3d.univar/test.t.rast3d.univar.sh
  29. 7 6
      temporal/t.register/test.t.register.raster.file.reltime.sh
  30. 7 6
      temporal/t.register/test.t.register.raster.file.sh
  31. 7 6
      temporal/t.register/test.t.register.raster.file.timezone.sh
  32. 7 6
      temporal/t.register/test.t.register.raster.sh
  33. 5 4
      temporal/t.register/test.t.register.raster.timestamp.sh
  34. 7 6
      temporal/t.register/test.t.register.raster3d.sh
  35. 7 6
      temporal/t.remove/test.t.remove.sh
  36. 3 2
      temporal/t.rename/test.t.rename.sh
  37. 7 6
      temporal/t.sample/test.t.sample.sh
  38. 6 7
      temporal/t.shift/t.shift.html
  39. 7 6
      temporal/t.shift/test.t.shift.absolue.sh
  40. 7 6
      temporal/t.shift/test.t.shift.relative.sh
  41. 7 7
      temporal/t.snap/t.snap.html
  42. 7 6
      temporal/t.snap/test.t.snap.absolute.sh
  43. 7 6
      temporal/t.snap/test.t.snap.relative.sh
  44. 7 6
      temporal/t.support/test.t.support.sh
  45. 7 6
      temporal/t.topology/test.t.topology.abstime.sh
  46. 7 6
      temporal/t.topology/test.t.topology.reltime.sh

+ 1 - 1
temporal/t.create/t.create.html

@@ -32,7 +32,7 @@ space time raster dataset to stdout using <em>t.info</em>.
 MAPS="map_1 map_2 map_3 map_4 map_5 map_6 map_7"
 MAPS="map_1 map_2 map_3 map_4 map_5 map_6 map_7"
 
 
 for map in ${MAPS} ; do
 for map in ${MAPS} ; do
-    r.mapcalc --o expr="${map} = rand(0, 10)" 
+    r.mapcalc --o expr="${map} = rand(0, 10)" -s
     echo ${map} >> map_list.txt 
     echo ${map} >> map_list.txt 
 done
 done
 
 

+ 1 - 1
temporal/t.info/t.info.html

@@ -33,7 +33,7 @@ t.info -s
  | SQL template path:.......... /home/soeren/src/grass7.0/grass_trunk/dist.x86_64-unknown-linux-gnu/etc/sql
  | SQL template path:.......... /home/soeren/src/grass7.0/grass_trunk/dist.x86_64-unknown-linux-gnu/etc/sql
  +----------------------------------------------------------------------------+
  +----------------------------------------------------------------------------+
 
 
-r.mapcalc expr="map1 = rand(0, 10)" 
+r.mapcalc expr="map1 = rand(0, 10)" -s
 
 
 t.create type=strds temporaltype=absolute \
 t.create type=strds temporaltype=absolute \
          output=precipitation_daily \
          output=precipitation_daily \

+ 4 - 4
temporal/t.info/test.t.info.sh

@@ -5,11 +5,11 @@
 # @preprocess step of this test. 
 # @preprocess step of this test. 
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
 
 
-r3.mapcalc --o expr="prec_1 = rand(0, 120)"
-r3.mapcalc --o expr="prec_2 = rand(0, 320)"
+r3.mapcalc --o expr="prec_1 = rand(0, 120)" -s
+r3.mapcalc --o expr="prec_2 = rand(0, 320)" -s
 
 
 v.random --o -z output=lidar_abs_1 n=20 zmin=0 zmax=100 column=height
 v.random --o -z output=lidar_abs_1 n=20 zmin=0 zmax=100 column=height
 v.random --o -z output=lidar_abs_2 n=20 zmin=0 zmax=100 column=height
 v.random --o -z output=lidar_abs_2 n=20 zmin=0 zmax=100 column=height

+ 4 - 3
temporal/t.list/t.list.html

@@ -17,9 +17,10 @@ temporal database an then in the newly created space time raster dataset.
 We use t.list to show what maps are already in the 
 We use t.list to show what maps are already in the 
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-r.mapcalc expr="map1 = rand(0, 10)" 
-r.mapcalc expr="map2 = rand(10, 20)" 
-r.mapcalc expr="map3 = rand(20, 30)" 
+# Generate data
+r.mapcalc expr="map1 = rand(0,  10)" -s
+r.mapcalc expr="map2 = rand(10, 20)" -s
+r.mapcalc expr="map3 = rand(20, 30)" -s
 
 
 t.register type=rast maps=map1 start=2012-08-20 end=2012-08-21
 t.register type=rast maps=map1 start=2012-08-20 end=2012-08-21
 t.register type=rast maps=map2 start=2012-08-21 end=2012-08-22
 t.register type=rast maps=map2 start=2012-08-21 end=2012-08-22

+ 2 - 2
temporal/t.merge/t.merge.html

@@ -17,8 +17,8 @@ two unique maps in each of it. Then we merge the two space time raster
 datasets together.
 datasets together.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-r.mapcalc expr="map1 = rand(0, 10)" 
-r.mapcalc expr="map2 = rand(10, 20)" 
+r.mapcalc expr="map1 = rand(0, 10)"  -s
+r.mapcalc expr="map2 = rand(10, 20)" -s
 
 
 t.create type=strds temporaltype=absolute \
 t.create type=strds temporaltype=absolute \
          output=precipitation_daily_1 \
          output=precipitation_daily_1 \

+ 7 - 6
temporal/t.merge/test.t.merge.sh

@@ -6,12 +6,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(10, 150)"
-r.mapcalc --o expr="prec_2 = rand(20, 250)"
-r.mapcalc --o expr="prec_3 = rand(30, 350)"
-r.mapcalc --o expr="prec_4 = rand(40, 450)"
-r.mapcalc --o expr="prec_5 = rand(50, 550)"
-r.mapcalc --o expr="prec_6 = rand(60, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(10, 150)" -s
+r.mapcalc --o expr="prec_2 = rand(20, 250)" -s
+r.mapcalc --o expr="prec_3 = rand(30, 350)" -s
+r.mapcalc --o expr="prec_4 = rand(40, 450)" -s
+r.mapcalc --o expr="prec_5 = rand(50, 550)" -s
+r.mapcalc --o expr="prec_6 = rand(60, 650)" -s
 
 
 # Register maps in temporal database
 # Register maps in temporal database
 t.register -i --o maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
 t.register -i --o maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \

+ 6 - 6
temporal/t.rast.accumulate/test_suite/test.t.rast.accumulate.sh

@@ -8,12 +8,12 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 -p
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
 
 
 # Generate data
 # Generate data
-r.mapcalc expr="prec_1 = rand(0, 25)"
-r.mapcalc expr="prec_2 = rand(0, 24)"
-r.mapcalc expr="prec_3 = rand(0, 23)"
-r.mapcalc expr="prec_4 = rand(0, 25)"
-r.mapcalc expr="prec_5 = rand(0, 23)"
-r.mapcalc expr="prec_6 = rand(0, 26)"
+r.mapcalc expr="prec_1 = rand(0, 25)" -s
+r.mapcalc expr="prec_2 = rand(0, 24)" -s
+r.mapcalc expr="prec_3 = rand(0, 23)" -s
+r.mapcalc expr="prec_4 = rand(0, 25)" -s
+r.mapcalc expr="prec_5 = rand(0, 23)" -s
+r.mapcalc expr="prec_6 = rand(0, 26)" -s
 
 
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \

+ 8 - 7
temporal/t.rast.aggregate/test.t.rast.aggregate.relative_time.sh

@@ -5,13 +5,14 @@
 # @preprocess step of this test. 
 # @preprocess step of this test. 
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
-# Data generation
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=strds temporaltype=relative output=precip_abs1 title="A test" descr="A test"
 t.create --o type=strds temporaltype=relative output=precip_abs1 title="A test" descr="A test"
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 unit=days increment=3
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start=0 unit=days increment=3

+ 7 - 6
temporal/t.rast.aggregate/test.t.rast.aggregate.sh

@@ -7,13 +7,14 @@ export GRASS_OVERWRITE=1
 
 
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
+
 # Generate data
 # Generate data
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \

+ 7 - 6
temporal/t.rast.export/test.t.rast.export.sh

@@ -6,12 +6,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550.0)"
-r.mapcalc --o expr="prec_2 = rand(0, 80000)"
-r.mapcalc --o expr="prec_3 = rand(-120, 120)"
-r.mapcalc --o expr="prec_4 = rand(0, 255)"
-r.mapcalc --o expr="prec_5 = rand(-1, 60000)"
-r.mapcalc --o expr="prec_6 = rand(0, 256)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550.0)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 80000)" -s
+r.mapcalc --o expr="prec_3 = rand(-120, 120)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 255)" -s
+r.mapcalc --o expr="prec_5 = rand(-1, 60000)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 256)" -s
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 
 
 

+ 7 - 6
temporal/t.rast.extract/test.t.rast.extract.sh

@@ -7,12 +7,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
 t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"

+ 7 - 6
temporal/t.rast.import/test.t.rast.import.relative.sh

@@ -11,12 +11,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
 mkdir test
 mkdir test
 
 
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 
 
 

+ 7 - 6
temporal/t.rast.import/test.t.rast.import.sh

@@ -11,12 +11,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
 mkdir test
 mkdir test
 
 
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 
 
 

+ 7 - 6
temporal/t.rast.import/test.t.rast.import_locations.sh

@@ -9,12 +9,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
 mkdir test
 mkdir test
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 
 
 

+ 7 - 6
temporal/t.rast.list/t.rast.list.html

@@ -23,12 +23,13 @@ This example shows several options that are available for map layers listing.
 <div class="code"><pre>
 <div class="code"><pre>
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc expr="map_1 = rand(0, 550)"
-r.mapcalc expr="map_2 = rand(0, 450)"
-r.mapcalc expr="map_3 = rand(0, 320)"
-r.mapcalc expr="map_4 = rand(0, 510)"
-r.mapcalc expr="map_5 = rand(0, 300)"
-r.mapcalc expr="map_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="map_1 = rand(0, 550)" -s
+r.mapcalc expr="map_2 = rand(0, 450)" -s
+r.mapcalc expr="map_3 = rand(0, 320)" -s
+r.mapcalc expr="map_4 = rand(0, 510)" -s
+r.mapcalc expr="map_5 = rand(0, 300)" -s
+r.mapcalc expr="map_6 = rand(0, 650)" -s
 
 
 cat > map_list.txt << EOF
 cat > map_list.txt << EOF
 map_1|2001-01-01|2001-04-01
 map_1|2001-01-01|2001-04-01

+ 7 - 6
temporal/t.rast.list/test.t.rast.list.sh

@@ -9,12 +9,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
 
 
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 
 n2=`g.tempfile pid=2 -d`
 n2=`g.tempfile pid=2 -d`

+ 7 - 6
temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh

@@ -7,12 +7,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"

+ 7 - 6
temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh

@@ -9,12 +9,13 @@ export GRASS_OVERWRITE=1
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"

+ 6 - 5
temporal/t.rast.mapcalc2/test.t.rast.mapcalc2.sh

@@ -9,12 +9,13 @@ export GRASS_OVERWRITE=1
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc expr="a1 = rand(0, 550)"
+# 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))"
-r.mapcalc expr="a3 = rand(0, 320)"
-r.mapcalc expr="a4 = rand(0, 510)"
-r.mapcalc expr="a5 = rand(0, 300)"
-r.mapcalc expr="a6 = rand(0, 650)"
+r.mapcalc expr="a3 = rand(0, 320)" -s
+r.mapcalc expr="a4 = rand(0, 510)" -s
+r.mapcalc expr="a5 = rand(0, 300)" -s
+r.mapcalc expr="a6 = rand(0, 650)" -s
 
 
 t.create type=strds temporaltype=absolute output=A1 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=A1 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=A2 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=A2 title="A test" descr="A test"

+ 6 - 5
temporal/t.rast.neighbors/test.t.rast.neighbors.sh

@@ -4,13 +4,14 @@
 # @preprocess step of this test. 
 # @preprocess step of this test. 
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 -p
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 -p
+
 # Generate data
 # Generate data
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
 r.mapcalc --o expr="prec_5 = null()"
 r.mapcalc --o expr="prec_5 = null()"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.register -i --o type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
 t.register -i --o type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"

+ 7 - 6
temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh

@@ -7,12 +7,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 res=0.5 -p
 g.region s=0 n=80 w=0 e=120 res=0.5 -p
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 r.mapcalc --o expr="elevation = sin(row() + col()) * 10"
 r.mapcalc --o expr="elevation = sin(row() + col()) * 10"
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 

+ 1 - 1
temporal/t.rast.univar/t.rast.univar.html

@@ -16,7 +16,7 @@ MAPS="map_1 map_2 map_3 map_4 map_5 map_6 map_7"
 maxn=10
 maxn=10
 
 
 for map in ${MAPS} ; do
 for map in ${MAPS} ; do
-    r.mapcalc --o expr="${map} = rand(0,$maxn)" 
+    r.mapcalc --o expr="${map} = rand(0,$maxn)" -s
     echo ${map} >> map_list.txt 
     echo ${map} >> map_list.txt 
     maxn=`expr $maxn + 10`
     maxn=`expr $maxn + 10`
 done
 done

+ 7 - 7
temporal/t.rast.univar/test.t.rast.univar.sh

@@ -8,13 +8,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
 
 
-# Data generation
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.register type=rast --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
 t.register type=rast --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"

+ 7 - 6
temporal/t.rast3d.extract/test.t.rast3d.extract.sh

@@ -6,12 +6,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r3.mapcalc --o expr="prec_1 = rand(0, 550)"
-r3.mapcalc --o expr="prec_2 = rand(0, 450)"
-r3.mapcalc --o expr="prec_3 = rand(0, 320)"
-r3.mapcalc --o expr="prec_4 = rand(0, 510)"
-r3.mapcalc --o expr="prec_5 = rand(0, 300)"
-r3.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r3.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r3.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r3.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r3.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r3.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r3.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.register -i type=rast3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
 t.register -i type=rast3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"

+ 7 - 6
temporal/t.rast3d.list/test.t.rast3d.list.sh

@@ -8,12 +8,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
 
 
-r3.mapcalc expr="vol_1 = rand(0, 550)"
-r3.mapcalc expr="vol_2 = rand(0, 450)"
-r3.mapcalc expr="vol_3 = rand(0, 320)"
-r3.mapcalc expr="vol_4 = rand(0, 510)"
-r3.mapcalc expr="vol_5 = rand(0, 300)"
-r3.mapcalc expr="vol_6 = rand(0, 650)"
+# Generate data
+r3.mapcalc expr="vol_1 = rand(0, 550)" -s
+r3.mapcalc expr="vol_2 = rand(0, 450)" -s
+r3.mapcalc expr="vol_3 = rand(0, 320)" -s
+r3.mapcalc expr="vol_4 = rand(0, 510)" -s
+r3.mapcalc expr="vol_5 = rand(0, 300)" -s
+r3.mapcalc expr="vol_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 
 n2=`g.tempfile pid=2 -d`
 n2=`g.tempfile pid=2 -d`

+ 7 - 6
temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh

@@ -6,12 +6,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r3.mapcalc --o expr="prec_1 = rand(0, 550)"
-r3.mapcalc --o expr="prec_2 = rand(0, 450)"
-r3.mapcalc --o expr="prec_3 = rand(0, 320)"
-r3.mapcalc --o expr="prec_4 = rand(0, 510)"
-r3.mapcalc --o expr="prec_5 = rand(0, 300)"
-r3.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r3.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r3.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r3.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r3.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r3.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r3.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=str3ds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
 t.create --o type=str3ds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"

+ 7 - 6
temporal/t.rast3d.mapcalc2/test.t.rast3d.mapcalc2.sh

@@ -9,12 +9,13 @@ export GRASS_OVERWRITE=1
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r3.mapcalc expr="a1 = rand(0, 550)"
-r3.mapcalc expr="a2 = rand(0, 450)"
-r3.mapcalc expr="a3 = rand(0, 320)"
-r3.mapcalc expr="a4 = rand(0, 510)"
-r3.mapcalc expr="a5 = rand(0, 300)"
-r3.mapcalc expr="a6 = rand(0, 650)"
+# Generate data
+r3.mapcalc expr="a1 = rand(0, 550)" -s
+r3.mapcalc expr="a2 = rand(0, 450)" -s
+r3.mapcalc expr="a3 = rand(0, 320)" -s
+r3.mapcalc expr="a4 = rand(0, 510)" -s
+r3.mapcalc expr="a5 = rand(0, 300)" -s
+r3.mapcalc expr="a6 = rand(0, 650)" -s
 
 
 t.create type=str3ds temporaltype=absolute output=A1 title="A test" descr="A test"
 t.create type=str3ds temporaltype=absolute output=A1 title="A test" descr="A test"
 t.create type=str3ds temporaltype=absolute output=A2 title="A test" descr="A test"
 t.create type=str3ds temporaltype=absolute output=A2 title="A test" descr="A test"

+ 7 - 7
temporal/t.rast3d.univar/test.t.rast3d.univar.sh

@@ -8,13 +8,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
 
 
-# Data generation
-r3.mapcalc expr="prec_1 = rand(0, 550)"
-r3.mapcalc expr="prec_2 = rand(0, 450)"
-r3.mapcalc expr="prec_3 = rand(0, 320)"
-r3.mapcalc expr="prec_4 = rand(0, 510)"
-r3.mapcalc expr="prec_5 = rand(0, 300)"
-r3.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r3.mapcalc expr="prec_1 = rand(0, 550)" -s
+r3.mapcalc expr="prec_2 = rand(0, 450)" -s
+r3.mapcalc expr="prec_3 = rand(0, 320)" -s
+r3.mapcalc expr="prec_4 = rand(0, 510)" -s
+r3.mapcalc expr="prec_5 = rand(0, 300)" -s
+r3.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 t.create type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.register type=rast3d --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
 t.register type=rast3d --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"

+ 7 - 6
temporal/t.register/test.t.register.raster.file.reltime.sh

@@ -11,12 +11,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` # Only map names
 n1=`g.tempfile pid=1 -d` # Only map names
 n2=`g.tempfile pid=2 -d` # Map names and start time
 n2=`g.tempfile pid=2 -d` # Map names and start time

+ 7 - 6
temporal/t.register/test.t.register.raster.file.sh

@@ -11,12 +11,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` # Only map names
 n1=`g.tempfile pid=1 -d` # Only map names
 n2=`g.tempfile pid=2 -d` # Map names and start time
 n2=`g.tempfile pid=2 -d` # Map names and start time

+ 7 - 6
temporal/t.register/test.t.register.raster.file.timezone.sh

@@ -12,12 +12,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 n2=`g.tempfile pid=2 -d` # Map names and start time
 n2=`g.tempfile pid=2 -d` # Map names and start time
 n3=`g.tempfile pid=3 -d` # Map names start time and increment
 n3=`g.tempfile pid=3 -d` # Map names start time and increment

+ 7 - 6
temporal/t.register/test.t.register.raster.sh

@@ -13,12 +13,13 @@ export GRASS_OVERWRITE=1
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc  expr="prec_1 = rand(0, 550)"
-r.mapcalc  expr="prec_2 = rand(0, 450)"
-r.mapcalc  expr="prec_3 = rand(0, 320)"
-r.mapcalc  expr="prec_4 = rand(0, 510)"
-r.mapcalc  expr="prec_5 = rand(0, 300)"
-r.mapcalc  expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc  expr="prec_1 = rand(0, 550)" -s
+r.mapcalc  expr="prec_2 = rand(0, 450)" -s
+r.mapcalc  expr="prec_3 = rand(0, 320)" -s
+r.mapcalc  expr="prec_4 = rand(0, 510)" -s
+r.mapcalc  expr="prec_5 = rand(0, 300)" -s
+r.mapcalc  expr="prec_6 = rand(0, 650)" -s
 
 
 # The first @test
 # The first @test
 # We create the space time raster inputs and register the raster maps with absolute time interval
 # We create the space time raster inputs and register the raster maps with absolute time interval

+ 5 - 4
temporal/t.register/test.t.register.raster.timestamp.sh

@@ -11,10 +11,11 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
 
 
 r.timestamp map=prec_1 date="1 jan 1995 / 23 sep 1995"
 r.timestamp map=prec_1 date="1 jan 1995 / 23 sep 1995"
 r.timestamp map=prec_2 date="14 jul 1996 / 15 jul 1996"
 r.timestamp map=prec_2 date="14 jul 1996 / 15 jul 1996"

+ 7 - 6
temporal/t.register/test.t.register.raster3d.sh

@@ -11,12 +11,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r3.mapcalc --o expr="volume_1 = rand(0, 550)"
-r3.mapcalc --o expr="volume_2 = rand(0, 450)"
-r3.mapcalc --o expr="volume_3 = rand(0, 320)"
-r3.mapcalc --o expr="volume_4 = rand(0, 510)"
-r3.mapcalc --o expr="volume_5 = rand(0, 300)"
-r3.mapcalc --o expr="volume_6 = rand(0, 650)"
+# Generate data
+r3.mapcalc --o expr="volume_1 = rand(0, 550)" -s
+r3.mapcalc --o expr="volume_2 = rand(0, 450)" -s
+r3.mapcalc --o expr="volume_3 = rand(0, 320)" -s
+r3.mapcalc --o expr="volume_4 = rand(0, 510)" -s
+r3.mapcalc --o expr="volume_5 = rand(0, 300)" -s
+r3.mapcalc --o expr="volume_6 = rand(0, 650)" -s
 
 
 # The first @test
 # The first @test
 # We create the space time raster3d dataset and register the raster3d maps with absolute time interval
 # We create the space time raster3d dataset and register the raster3d maps with absolute time interval

+ 7 - 6
temporal/t.remove/test.t.remove.sh

@@ -6,12 +6,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 # The first @test
 # The first @test
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"

+ 3 - 2
temporal/t.rename/test.t.rename.sh

@@ -6,8 +6,9 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
 
 
 # We need to create three space time dataset
 # We need to create three space time dataset
 t.create --v --o type=strds temporaltype=absolute output=precip_abs1 \
 t.create --v --o type=strds temporaltype=absolute output=precip_abs1 \

+ 7 - 6
temporal/t.sample/test.t.sample.sh

@@ -8,12 +8,13 @@ g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
 export GRASS_OVERWRITE=1
 export GRASS_OVERWRITE=1
 
 
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 v.random -z output=pnts1 n=20 zmin=0 zmax=100 column=height
 v.random -z output=pnts1 n=20 zmin=0 zmax=100 column=height
 v.random -z output=pnts2 n=20 zmin=0 zmax=100 column=height
 v.random -z output=pnts2 n=20 zmin=0 zmax=100 column=height

+ 6 - 7
temporal/t.shift/t.shift.html

@@ -26,13 +26,12 @@ We create 6 raster maps and register them in a space time raster dataset using a
 Then we shift the time intervals with a granularity of 12 hours.
 Then we shift the time intervals with a granularity of 12 hours.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 t.create type=strds temporaltype=absolute \
 t.create type=strds temporaltype=absolute \
          output=precipitation_daily \
          output=precipitation_daily \

+ 7 - 6
temporal/t.shift/test.t.shift.absolue.sh

@@ -4,13 +4,14 @@
 # @preprocess step of this test. 
 # @preprocess step of this test. 
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
+
 # Generate data
 # Generate data
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
 t.create --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
 t.register -i --o type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
 t.register -i --o type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \

+ 7 - 6
temporal/t.shift/test.t.shift.relative.sh

@@ -4,13 +4,14 @@
 # @preprocess step of this test. 
 # @preprocess step of this test. 
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
+
 # Generate data
 # Generate data
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=strds temporaltype=relative output=precip_rel title="A test" descr="A test"
 t.create --o type=strds temporaltype=relative output=precip_rel title="A test" descr="A test"
 t.register -i --o type=rast unit=days input=precip_rel maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
 t.register -i --o type=rast unit=days input=precip_rel maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \

+ 7 - 7
temporal/t.snap/t.snap.html

@@ -17,13 +17,13 @@ in a space time raster dataset using an increment of one month.
 Then we snap the created time instances resulting in time intervals.
 Then we snap the created time instances resulting in time intervals.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-
-r.mapcalc expr="prec_1 = rand(0, 550)"
-r.mapcalc expr="prec_2 = rand(0, 450)"
-r.mapcalc expr="prec_3 = rand(0, 320)"
-r.mapcalc expr="prec_4 = rand(0, 510)"
-r.mapcalc expr="prec_5 = rand(0, 300)"
-r.mapcalc expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc expr="prec_1 = rand(0, 550)" -s
+r.mapcalc expr="prec_2 = rand(0, 450)" -s
+r.mapcalc expr="prec_3 = rand(0, 320)" -s
+r.mapcalc expr="prec_4 = rand(0, 510)" -s
+r.mapcalc expr="prec_5 = rand(0, 300)" -s
+r.mapcalc expr="prec_6 = rand(0, 650)" -s
 
 
 t.create type=strds temporaltype=absolute \
 t.create type=strds temporaltype=absolute \
          output=precipitation_daily \
          output=precipitation_daily \

+ 7 - 6
temporal/t.snap/test.t.snap.absolute.sh

@@ -4,13 +4,14 @@
 # @preprocess step of this test. 
 # @preprocess step of this test. 
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
+
 # Generate data
 # Generate data
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 
 
 

+ 7 - 6
temporal/t.snap/test.t.snap.relative.sh

@@ -4,13 +4,14 @@
 # @preprocess step of this test. 
 # @preprocess step of this test. 
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
+
 # Generate data
 # Generate data
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 t.create --o type=strds temporaltype=relative output=precip_rel title="A test" descr="A test"
 t.create --o type=strds temporaltype=relative output=precip_rel title="A test" descr="A test"
 t.register --o type=rast input=precip_rel unit="days" \
 t.register --o type=rast input=precip_rel unit="days" \

+ 7 - 6
temporal/t.support/test.t.support.sh

@@ -6,12 +6,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 # We create several space time raster datasets
 # We create several space time raster datasets
 
 
 # @test Register the maps in two space time datasets
 # @test Register the maps in two space time datasets

+ 7 - 6
temporal/t.topology/test.t.topology.abstime.sh

@@ -6,12 +6,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 # Different spatial extents
 # Different spatial extents
 r.mapcalc --o expr="A = 1"
 r.mapcalc --o expr="A = 1"

+ 7 - 6
temporal/t.topology/test.t.topology.reltime.sh

@@ -6,12 +6,13 @@
 # The region setting should work for UTM and LL test locations
 # The region setting should work for UTM and LL test locations
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
 
 
-r.mapcalc --o expr="prec_1 = rand(0, 550)"
-r.mapcalc --o expr="prec_2 = rand(0, 450)"
-r.mapcalc --o expr="prec_3 = rand(0, 320)"
-r.mapcalc --o expr="prec_4 = rand(0, 510)"
-r.mapcalc --o expr="prec_5 = rand(0, 300)"
-r.mapcalc --o expr="prec_6 = rand(0, 650)"
+# Generate data
+r.mapcalc --o expr="prec_1 = rand(0, 550)" -s
+r.mapcalc --o expr="prec_2 = rand(0, 450)" -s
+r.mapcalc --o expr="prec_3 = rand(0, 320)" -s
+r.mapcalc --o expr="prec_4 = rand(0, 510)" -s
+r.mapcalc --o expr="prec_5 = rand(0, 300)" -s
+r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
 
 
 n1=`g.tempfile pid=1 -d` 
 n1=`g.tempfile pid=1 -d` 
 n2=`g.tempfile pid=2 -d`
 n2=`g.tempfile pid=2 -d`