Added tests for r.to.rast3elev, r.to.rast3 and v.random. Added seed option to v.random.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@46730 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.to.rast3/main.c

@@ -280,7 +280,7 @@ int main(int argc, char *argv[])
     map = NULL;
 
     /* Set the map type depending from the arster maps type */
-    if (globalRastMapType == CELL_TYPE)
+    if (globalRastMapType == CELL_TYPE || globalRastMapType == DCELL_TYPE)
         globalG3dMapType = DCELL_TYPE;
     else
         globalG3dMapType = FCELL_TYPE;

raster/r.to.rast3/test.r.to.rast3.sh

@@ -0,0 +1,42 @@
+# This script tests the conversion of raster maps
+# into a single voxel map with r.to.rast3
+
+# We need to set a specific region in the
+# @preprocess step of this test. We generate
+# raster data with r.mapcalc
+# The region setting should work for UTM and LL test locations
+g.region s=0 n=80 w=0 e=100 b=0 t=50 res=10 res3=10 -p3
+# We create several evlevation maps to create slices of the voxel map
+# We start from bottom and raise to the top
+r.mapcalc --o expr="elev_double = double(if(row() == 2, null(), row()))"
+r.mapcalc --o expr="elev_float = float(if(row() == 2, null(), row()))"
+r.mapcalc --o expr="elev_1 = 5"
+r.mapcalc --o expr="elev_2 = 15"
+r.mapcalc --o expr="elev_3 = 25"
+r.mapcalc --o expr="elev_4 = 35"
+r.mapcalc --o expr="elev_5 = 45"
+
+# We @test several methods to generate @raster3d maps from raster maps
+# For validation a @precision=0 should be used. We start with 5 raster maps, 
+# then 3 raster maps then using single float and double raster maps 
+# with differen tile sizes and null data
+r.to.rast3 --o input=elev_1,elev_2,elev_3,elev_4,elev_5 output=test_volume_6_raster tilesize=1
+r.to.rast3 --o input=elev_1,elev_2,elev_3               output=test_volume_3_raster tilesize=1
+r.to.rast3 --o input=elev_float                         output=test_volume_float_raster tilesize=2
+r.to.rast3 --o input=elev_double                        output=test_volume_double_raster tilesize=2
+
+# Uncomment for reference data export
+# r3.out.ascii input=test_volume_6_raster output=test_volume_6_raster.ref dp=0
+# r3.out.ascii input=test_volume_3_raster output=test_volume_3_raster.ref dp=0
+# r3.out.ascii input=test_volume_float_raster output=test_volume_float_raster.ref dp=0
+# r3.out.ascii input=test_volume_double_raster output=test_volume_double_raster.ref dp=0
+
+# We need another @preprocess step to generate a different region
+g.region s=0 n=80 w=0 e=100 b=0 t=50 res=5 res3=10 -p3
+
+# We @test the automatic resolution correction for @raster3d maps in case
+# 2d and 3d region are different
+r.to.rast3 --o input=elev_double output=test_volume_double_raster_res tilesize=2
+
+# Uncomment for reference data export
+# r3.out.ascii input=test_volume_double_raster_res output=test_volume_double_raster_res.ref dp=0

raster/r.to.rast3/test_volume_3_raster.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 

raster/r.to.rast3/test_volume_6_raster.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+15 15 15 15 15 15 15 15 15 15 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+35 35 35 35 35 35 35 35 35 35 
+35 35 35 35 35 35 35 35 35 35 
+35 35 35 35 35 35 35 35 35 35 
+35 35 35 35 35 35 35 35 35 35 
+35 35 35 35 35 35 35 35 35 35 
+35 35 35 35 35 35 35 35 35 35 
+35 35 35 35 35 35 35 35 35 35 
+35 35 35 35 35 35 35 35 35 35 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 

raster/r.to.rast3/test_volume_double_raster.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 

raster/r.to.rast3/test_volume_double_raster_res.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 

raster/r.to.rast3/test_volume_float_raster.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+3 3 3 3 3 3 3 3 3 3 
+4 4 4 4 4 4 4 4 4 4 
+5 5 5 5 5 5 5 5 5 5 
+6 6 6 6 6 6 6 6 6 6 
+7 7 7 7 7 7 7 7 7 7 
+8 8 8 8 8 8 8 8 8 8 

raster/r.to.rast3elev/test.r.to.rast3elev.sh

@@ -0,0 +1,48 @@
+# This script tests the conversion of raster maps
+# into a single voxel map with r.to.rast3elev
+
+# We need to set a specific region in the
+# @preprocess step of this test. We generate
+# raster data with r.mapcalc
+# The region setting should work for UTM and LL test locations
+g.region s=0 n=80 w=0 e=100 b=0 t=50 res=10 res3=10 -p3
+# We create several evlevation and value maps 
+r.mapcalc --o expr="elev_5_float = float(5)"
+r.mapcalc --o expr="elev_5_double = double(5)"
+r.mapcalc --o expr="elev_45_float = float(45)"
+r.mapcalc --o expr="elev_45_double = double(45)"
+r.mapcalc --o expr="elev_25_float = float(25)"
+r.mapcalc --o expr="elev_25_double = double(25)"
+r.mapcalc --o expr="elev_20_float = float(20)"
+r.mapcalc --o expr="elev_20_double = double(20)"
+r.mapcalc --o expr="raster_float = float(1)"
+r.mapcalc --o expr="raster_double = double(2)"
+
+# We @test several methods to generate @raster3d maps from elevation and value raster maps
+# For validation a @precision=0 should be used. Several methods for voxel map creation are tested
+r.to.rast3elev --o lower=0 upper=2 input=raster_float  elevation=elev_25_float  output=test_elev_volume_float_1
+r.to.rast3elev --o lower=0 upper=2 input=raster_double elevation=elev_25_double output=test_elev_volume_double_1
+r.to.rast3elev --o upper=2         input=raster_float  elevation=elev_25_float  output=test_elev_volume_float_2
+r.to.rast3elev --o upper=2         input=raster_double elevation=elev_25_double output=test_elev_volume_double_2
+r.to.rast3elev --o                 input=raster_float  elevation=elev_25_float  output=test_elev_volume_float_3
+r.to.rast3elev --o                 input=raster_double elevation=elev_25_double output=test_elev_volume_double_3
+r.to.rast3elev --o -u              input=raster_float  elevation=elev_25_float  output=test_elev_volume_float_4 
+r.to.rast3elev --o -u              input=raster_double elevation=elev_25_double output=test_elev_volume_double_4
+r.to.rast3elev --o -l              input=raster_float  elevation=elev_25_float  output=test_elev_volume_float_5
+r.to.rast3elev --o -l              input=raster_double elevation=elev_25_double output=test_elev_volume_double_5
+r.to.rast3elev --o -lu             input=raster_float  elevation=elev_25_float  output=test_elev_volume_float_5
+r.to.rast3elev --o -lu             input=raster_double elevation=elev_25_double output=test_elev_volume_double_5
+# In case the elevation map is located between two layer, booth layer are filled with data
+r.to.rast3elev --o                 input=raster_float  elevation=elev_20_float  output=test_elev_volume_float_6
+r.to.rast3elev --o                 input=raster_double elevation=elev_20_double output=test_elev_volume_double_6
+# Test with two to three elevation and value maps using different fill styles
+r.to.rast3elev --o -u  input=elev_25_float,elev_45_float   elevation=elev_25_float,elev_45_float   output=test_elev_volume_float_7 
+r.to.rast3elev --o -u  input=elev_25_double,elev_45_double elevation=elev_25_double,elev_45_double output=test_elev_volume_double_7
+r.to.rast3elev --o -l  input=elev_45_float,elev_25_float,elev_5_float    elevation=elev_45_float,elev_25_float,elev_5_float    output=test_elev_volume_float_8
+r.to.rast3elev --o -l  input=elev_45_double,elev_25_double,elev_5_double elevation=elev_45_double,elev_25_double,elev_5_double output=test_elev_volume_double_8
+# Seems to be a bug in this case, so commented out, need to be investigated
+# r.to.rast3elev --o -lu input=elev_25_float,elev_5_float   elevation=elev_25_float,elev_5_float   output=test_elev_volume_float_9
+# r.to.rast3elev --o -lu input=elev_25_double,elev_5_double elevation=elev_25_double,elev_5_double output=test_elev_volume_double_9
+
+# Export of the references
+# for i in `g.mlist type=rast3d pattern=test_elev_volume_*` ; do r3.out.ascii dp=0 input=$i output=${i}.ref; done

raster/r.to.rast3elev/test_elev_volume_double_1.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 

raster/r.to.rast3elev/test_elev_volume_double_2.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 

raster/r.to.rast3elev/test_elev_volume_double_3.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 

raster/r.to.rast3elev/test_elev_volume_double_4.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 

raster/r.to.rast3elev/test_elev_volume_double_5.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 

raster/r.to.rast3elev/test_elev_volume_double_6.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 

raster/r.to.rast3elev/test_elev_volume_double_7.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 

raster/r.to.rast3elev/test_elev_volume_double_8.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 

raster/r.to.rast3elev/test_elev_volume_float_1.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 

raster/r.to.rast3elev/test_elev_volume_float_2.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 
+2 2 2 2 2 2 2 2 2 2 

raster/r.to.rast3elev/test_elev_volume_float_3.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 

raster/r.to.rast3elev/test_elev_volume_float_4.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 

raster/r.to.rast3elev/test_elev_volume_float_5.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 

raster/r.to.rast3elev/test_elev_volume_float_6.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+1 1 1 1 1 1 1 1 1 1 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 

raster/r.to.rast3elev/test_elev_volume_float_7.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+* * * * * * * * * * 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 

raster/r.to.rast3elev/test_elev_volume_float_8.ref

@@ -0,0 +1,51 @@
+version: grass7
+order: nsbt
+north: 80.000000
+south: 0.000000
+east: 100.000000
+west: 0.000000
+top: 50.000000
+bottom: 0.000000
+rows: 8
+cols: 10
+levels: 5
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+5 5 5 5 5 5 5 5 5 5 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+25 25 25 25 25 25 25 25 25 25 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 
+45 45 45 45 45 45 45 45 45 45 

raster3d/r3.cross.rast/test.r3.cross.rast.sh

@@ -34,4 +34,4 @@ r3.cross.rast --o input=volume_null elevation=elev_NAN output=test_cross_section
 r3.cross.rast --o input=volume_null elevation=elev_cross output=test_cross_section_result
 
 # Export of the references
-for i in `g.mlist type=rast pattern=test_cross_section_*` ; do r.out.ascii input=$i output=${i}.ref; done
+# for i in `g.mlist type=rast pattern=test_cross_section_*` ; do r.out.ascii input=$i output=${i}.ref; done

vector/v.random/main.c

@@ -59,6 +59,7 @@ int main(int argc, char *argv[])
     char *output, buf[2000];
     double (*rng) ();
     double max, zmin, zmax;
+    int seed;
     int i, n, b, type, usefloat;
     struct Map_info Out;
     struct line_pnts *Points;
@@ -67,7 +68,7 @@ int main(int argc, char *argv[])
     struct GModule *module;
     struct
     {
-	struct Option *output, *nsites, *zmin, *zmax, *zcol, *ztype;
+	struct Option *output, *nsites, *zmin, *zmax, *zcol, *ztype, *seed;
     } parm;
     struct
     {
@@ -112,6 +113,13 @@ int main(int argc, char *argv[])
     parm.zmax->answer = "0.0";
     parm.zmax->guisection = _("3D output");
 
+    parm.seed = G_define_option();
+    parm.seed->key = "seed";
+    parm.seed->type = TYPE_INTEGER;
+    parm.seed->required = NO;
+    parm.seed->description =
+	_("The seed to initialize the random generator. If not set the process id is used.");
+
     parm.zcol = G_define_standard_option(G_OPT_DB_COLUMN);
     parm.zcol->label = _("Name of column for z values");
     parm.zcol->description =
@@ -147,6 +155,9 @@ int main(int argc, char *argv[])
     output = parm.output->answer;
     n = atoi(parm.nsites->answer);
     b = (flag.drand48->answer == '\0') ? 0 : 1;
+    
+    if(parm.seed->answer)
+        seed = atoi(parm.seed->answer);
 
     if (n <= 0) {
 	G_fatal_error(_("Number of points must be > 0 (%d given)"), n);
@@ -232,13 +243,21 @@ int main(int argc, char *argv[])
     if (b) {
 	rng = drand48;
 	max = 1.0;
-	srand48((long)getpid());
+    /* Init the random seed*/
+    if(parm.seed->answer)
+        srand48((long)seed);
+    else
+        srand48((long)getpid());
     }
     else {			/* default is rand() */
 
 	rng = myrand;
 	max = RAND_MAX;
-	srand(getpid());
+    /* Init the random seed*/
+    if(parm.seed->answer)
+        srand(seed);
+    else
+        srand(getpid());
     }
 
     G_get_window(&window);

vector/v.random/test.v.random.sh

@@ -0,0 +1,24 @@
+# This is a simple test for v.random
+# We create several identical pseudo random points maps :)
+# using the seed option for rand and drand48
+
+# In the @preprocess step we set up a suitable region
+g.region n=80 s=0 w=0 e=120 res=10 -p
+
+# First @test the rand function. Create a 3d vector map with attribute table
+# The validation is based on @vector map with a @precision=3
+v.random --o -z output=test_random_vect_1 n=20 zmin=0 zmax=100 seed=501
+# Now the attribute @table should be validated. Booth maps are identical
+v.random --o -z output=test_random_vect_2 n=20 zmin=0 zmax=100 column=height seed=501
+
+# Second @test the drand48 function. Create a 3d vector map with attribute table
+# The validation is based on @vector map with a @precision=3
+v.random --o -zd output=test_random_vect_3 n=20 zmin=0 zmax=100 seed=501
+# Now the attribute @table should be validated. Booth maps are identical
+v.random --o -zd output=test_random_vect_4 n=20 zmin=0 zmax=100 column=height seed=501
+
+# Export the generated data as references
+# v.out.ascii --o format=point dp=3 input=test_random_vect_1 output=test_random_vect_1.ref
+# db.select "select * from test_random_vect_2" > test_random_vect_2.ref
+# v.out.ascii --o format=point dp=3 input=test_random_vect_3 output=test_random_vect_3.ref
+# db.select "select * from test_random_vect_4" > test_random_vect_4.ref

vector/v.random/test_random_vect_1.ref

@@ -0,0 +1,20 @@
+56.432|74.504|10.513|1
+77.754|34.006|60.755|2
+78.599|22.352|2.316|3
+13.174|56.889|7.978|4
+117.364|72.243|25.994|5
+31.222|35.88|85.947|6
+86.292|43.751|20.864|7
+70.767|6.145|87.898|8
+56.7|47.99|52.967|9
+66.111|65.693|65.611|10
+44.705|28.072|58.742|11
+32.089|56.236|1.249|12
+79.183|3.837|29.19|13
+76.405|75.054|0.301|14
+66.831|76.811|90.605|15
+35.638|55.997|35.455|16
+52.501|78.468|90.144|17
+27.464|31.29|97.825|18
+41.986|73.491|57.813|19
+98.426|29.417|39.929|20

vector/v.random/test_random_vect_2.ref

@@ -0,0 +1,21 @@
+cat|height
+1|10.513031
+2|60.754897
+3|2.315542
+4|7.978077
+5|25.99442
+6|85.947325
+7|20.863804
+8|87.898246
+9|52.966879
+10|65.611376
+11|58.741693
+12|1.249162
+13|29.189654
+14|0.301011
+15|90.604677
+16|35.455006
+17|90.144005
+18|97.824914
+19|57.812769
+20|39.929343

vector/v.random/test_random_vect_3.ref

@@ -0,0 +1,20 @@
+66.866|59.978|5.76|1
+108.433|52.675|98.559|2
+13.767|65.947|4.703|3
+5.335|74.624|38.18|4
+102.018|2.912|23.083|5
+55.364|31.341|61.655|6
+85.432|69.987|73.887|7
+37.935|54.521|87.931|8
+3.354|77.629|57.185|9
+7.753|6.933|38.041|10
+102.636|45.49|46.17|11
+92.347|38.939|61.134|12
+35.131|8.54|67.251|13
+45.096|3.985|54.72|14
+84.304|70.065|88.059|15
+8.453|38.717|92.543|16
+44.445|66.069|59.899|17
+26.179|38.093|9.794|18
+17.875|20.969|92.562|19
+75.9|25.921|47.846|20

vector/v.random/test_random_vect_4.ref

@@ -0,0 +1,21 @@
+cat|height
+1|5.759849
+2|98.559369
+3|4.702532
+4|38.179579
+5|23.08331
+6|61.654781
+7|73.88729
+8|87.931084
+9|57.185002
+10|38.040844
+11|46.170111
+12|61.133558
+13|67.250528
+14|54.72017
+15|88.059149
+16|92.543305
+17|59.899267
+18|9.793562
+19|92.562099
+20|47.845702

vector/v.random/v.random.html

@@ -12,12 +12,20 @@ data type. Use <b>INTEGER</b> column type for integers and
 <b>DOUBLE PRECISION</b> for floating point numbers. Integer values are
 calculated by rounding random floating point number.
 
+<p>
+To produce repeatable results a random seed can be set using the option <em>seed</em>>.
+    
 <h2>EXAMPLES</h2>
 Generate 20 random points with binary attribute (only 0 or 1):
 <div class="code"><pre>
 v.random output=binary_random n=20 zmin=0 zmax=1 column='binary INTEGER'
 </pre></div>
 
+Generate 20 random 3d points with height attribute [0:20] and specific random seed:
+<div class="code"><pre>
+v.random seed=501 output=height_random n=20 zmin=0 zmax=1 column=height
+</pre></div>
+
 Get 20 random samples from raster map:
 <div class="code"><pre>
 v.random output=random_samples n=20

vector/v.vol.rst/user1.c

@@ -423,8 +423,7 @@ int OUTGR()
   /*** Write elevation results ***/
     if (outz != NULL) {
 
-	cf1 = G3d_openCellNew(outz, FCELL_TYPE,
-			      G3D_USE_CACHE_DEFAULT, &current_region);
+	cf1 = G3d_openNewOptTileSize(outz, G3D_USE_CACHE_DEFAULT, &current_region, FCELL_TYPE, 32); 
 	if (cf1 == NULL) {
 	    sprintf(buff, "Can't open %s for writing ", outz);
 	    clean_fatal_error(buff);
@@ -474,8 +473,7 @@ int OUTGR()
   /*** Write out the gradient results ***/
     if (gradient != NULL) {
 
-	cf2 = G3d_openCellNew(gradient, FCELL_TYPE,
-			      G3D_USE_CACHE_DEFAULT, &current_region);
+	cf2 = G3d_openNewOptTileSize(gradient, G3D_USE_CACHE_DEFAULT, &current_region, FCELL_TYPE, 32); 
 	if (cf2 == NULL) {
 	    sprintf(buff, "Can't open %s for writing ", gradient);
 	    clean_fatal_error(buff);
@@ -525,8 +523,7 @@ int OUTGR()
   /*** Write out aspect1 results ***/
     if (aspect1 != NULL) {
 
-	cf3 = G3d_openCellNew(aspect1, FCELL_TYPE,
-			      G3D_USE_CACHE_DEFAULT, &current_region);
+	cf3 = G3d_openNewOptTileSize(aspect1, G3D_USE_CACHE_DEFAULT, &current_region, FCELL_TYPE, 32); 
 	if (cf3 == NULL) {
 	    sprintf(buff, "Can't open %s for writing ", aspect1);
 	    clean_fatal_error(buff);
@@ -576,8 +573,7 @@ int OUTGR()
   /*** Write out aspect2 results ***/
     if (aspect2 != NULL) {
 
-	cf4 = G3d_openCellNew(aspect2, FCELL_TYPE,
-			      G3D_USE_CACHE_DEFAULT, &current_region);
+	cf4 = G3d_openNewOptTileSize(aspect2, G3D_USE_CACHE_DEFAULT, &current_region, FCELL_TYPE, 32); 
 	if (cf4 == NULL) {
 	    sprintf(buff, "Can't open %s for writing ", aspect2);
 	    clean_fatal_error(buff);
@@ -627,8 +623,7 @@ int OUTGR()
   /*** Write out ncurv results ***/
     if (ncurv != NULL) {
 
-	cf5 = G3d_openCellNew(ncurv, FCELL_TYPE,
-			      G3D_USE_CACHE_DEFAULT, &current_region);
+	cf5 = G3d_openNewOptTileSize(ncurv, G3D_USE_CACHE_DEFAULT, &current_region, FCELL_TYPE, 32); 
 	if (cf5 == NULL) {
 	    sprintf(buff, "Can't open %s for writing ", ncurv);
 	    clean_fatal_error(buff);
@@ -678,8 +673,7 @@ int OUTGR()
   /*** Write out gcurv results ***/
     if (gcurv != NULL) {
 
-	cf6 = G3d_openCellNew(gcurv, FCELL_TYPE,
-			      G3D_USE_CACHE_DEFAULT, &current_region);
+	cf6 = G3d_openNewOptTileSize(gcurv, G3D_USE_CACHE_DEFAULT, &current_region, FCELL_TYPE, 32); 
 	if (cf6 == NULL) {
 	    sprintf(buff, "Can't open %s for writing ", gcurv);
 	    clean_fatal_error(buff);
@@ -729,8 +723,7 @@ int OUTGR()
   /*** Write mcurv results ***/
     if (mcurv != NULL) {
 
-	cf7 = G3d_openCellNew(mcurv, FCELL_TYPE,
-			      G3D_USE_CACHE_DEFAULT, &current_region);
+	cf7 = G3d_openNewOptTileSize(mcurv, G3D_USE_CACHE_DEFAULT, &current_region, FCELL_TYPE, 32); 
 	if (cf7 == NULL) {
 	    sprintf(buff, "Can't open %s for writing ", mcurv);
 	    clean_fatal_error(buff);