[GRASS-SVN] r53269 - in grass/trunk/raster3d: r3.cross.rast r3.retile r3.to.rast

[svn_grass at osgeo.org]

Author: huhabla
Date: 2012-09-22 17:42:25 -0700 (Sat, 22 Sep 2012)
New Revision: 53269

Modified:
   grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh
   grass/trunk/raster3d/r3.retile/test.r3.retile.sh
   grass/trunk/raster3d/r3.retile/test_retile_map_10_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_1_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_2_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_3_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_4_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_5_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_6_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_7_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_8_info.ref
   grass/trunk/raster3d/r3.retile/test_retile_map_9_info.ref
   grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh
Log:
Tests updated to generate text files for reference file comparison.


Modified: grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh	2012-09-23 00:42:25 UTC (rev 53269)
@@ -34,4 +34,4 @@
 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}.txt; done

Modified: grass/trunk/raster3d/r3.retile/test.r3.retile.sh
===================================================================
--- grass/trunk/raster3d/r3.retile/test.r3.retile.sh	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test.r3.retile.sh	2012-09-23 00:42:25 UTC (rev 53269)
@@ -14,28 +14,28 @@
 # We @test the retiling with different tile sizes, with and without tile caching.
 # The validation is based on @raster3d maps and r3.info generated @files. 
 # We use @precision=0 for data export
-r3.retile input=volume_null output=test_retile_map_1  tiledim=1x1x1
-r3.info -i map=test_retile_map_1 > test_retile_map_1_info.txt
-r3.retile input=volume_null output=test_retile_map_2  tiledim=1x1x1 -c
-r3.info -i map=test_retile_map_2 > test_retile_map_2_info.txt
-r3.retile input=volume_null output=test_retile_map_3  tiledim=8x8x4 
-r3.info -i map=test_retile_map_3 > test_retile_map_3_info.txt
-r3.retile input=volume_null output=test_retile_map_4  tiledim=8x8x4 -c
-r3.info -i map=test_retile_map_4 > test_retile_map_4_info.txt
-r3.retile input=volume_null output=test_retile_map_5  tiledim=16x16x16 
-r3.info -i map=test_retile_map_5 > test_retile_map_5_info.txt
-r3.retile input=volume_null output=test_retile_map_6  tiledim=16x16x16 -c
-r3.info -i map=test_retile_map_6 > test_retile_map_6_info.txt
-r3.retile input=volume_null output=test_retile_map_7  tiledim=35x47x23 
-r3.info -i map=test_retile_map_7 > test_retile_map_7_info.txt
-r3.retile input=volume_null output=test_retile_map_8  tiledim=35x47x23 -c
-r3.info -i map=test_retile_map_8 > test_retile_map_8_info.txt
-r3.retile input=volume_null output=test_retile_map_9  tiledim=34x46x22 
-r3.info -i map=test_retile_map_9 > test_retile_map_9_info.txt
-r3.retile input=volume_null output=test_retile_map_10 tiledim=34x46x22 -c
-r3.info -i map=test_retile_map_10 > test_retile_map_10_info.txt
+r3.retile --o input=volume_null output=test_retile_map_1  tiledim=1x1x1
+r3.info -g map=test_retile_map_1 > test_retile_map_1_info.txt
+r3.retile --o input=volume_null output=test_retile_map_2  tiledim=1x1x1 -c
+r3.info -g map=test_retile_map_2 > test_retile_map_2_info.txt
+r3.retile --o input=volume_null output=test_retile_map_3  tiledim=8x8x4 
+r3.info -g map=test_retile_map_3 > test_retile_map_3_info.txt
+r3.retile --o input=volume_null output=test_retile_map_4  tiledim=8x8x4 -c
+r3.info -g map=test_retile_map_4 > test_retile_map_4_info.txt
+r3.retile --o input=volume_null output=test_retile_map_5  tiledim=16x16x16 
+r3.info -g map=test_retile_map_5 > test_retile_map_5_info.txt
+r3.retile --o input=volume_null output=test_retile_map_6  tiledim=16x16x16 -c
+r3.info -g map=test_retile_map_6 > test_retile_map_6_info.txt
+r3.retile --o input=volume_null output=test_retile_map_7  tiledim=35x47x23 
+r3.info -g map=test_retile_map_7 > test_retile_map_7_info.txt
+r3.retile --o input=volume_null output=test_retile_map_8  tiledim=35x47x23 -c
+r3.info -g map=test_retile_map_8 > test_retile_map_8_info.txt
+r3.retile --o input=volume_null output=test_retile_map_9  tiledim=34x46x22 
+r3.info -g map=test_retile_map_9 > test_retile_map_9_info.txt
+r3.retile --o input=volume_null output=test_retile_map_10 tiledim=34x46x22 -c
+r3.info -g map=test_retile_map_10 > test_retile_map_10_info.txt
 
 # Create the validation files
-# for map in `g.mlist type=rast3d pattern=test_retile_map_*` ; do
-#  r3.out.ascii input=${map} output=${map}.ref dp=0
-# done
\ No newline at end of file
+for map in `g.mlist type=rast3d pattern=test_retile_map_*` ; do
+  r3.out.ascii input=${map} output=${map}.txt dp=0
+done

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_10_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_10_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_10_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=2
 tilenumy=2
 tilenumz=2

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_1_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_1_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_1_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=35
 tilenumy=47
 tilenumz=23

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_2_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_2_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_2_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=35
 tilenumy=47
 tilenumz=23

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_3_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_3_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_3_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=5
 tilenumy=6
 tilenumz=6

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_4_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_4_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_4_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=5
 tilenumy=6
 tilenumz=6

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_5_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_5_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_5_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=3
 tilenumy=3
 tilenumz=2

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_6_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_6_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_6_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=3
 tilenumy=3
 tilenumz=2

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_7_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_7_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_7_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=1
 tilenumy=1
 tilenumz=1

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_8_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_8_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_8_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=1
 tilenumy=1
 tilenumz=1

Modified: grass/trunk/raster3d/r3.retile/test_retile_map_9_info.ref
===================================================================
--- grass/trunk/raster3d/r3.retile/test_retile_map_9_info.ref	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.retile/test_retile_map_9_info.ref	2012-09-23 00:42:25 UTC (rev 53269)
@@ -1,3 +1,16 @@
+north=47
+south=0
+east=35
+west=0
+bottom=0
+top=23
+nsres=1
+ewres=1
+tbres=1
+datatype="DCELL"
+timestamp="none"
+units="none"
+vertical_units="units"
 tilenumx=2
 tilenumy=2
 tilenumz=2

Modified: grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh
===================================================================
--- grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh	2012-09-23 00:40:56 UTC (rev 53268)
+++ grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh	2012-09-23 00:42:25 UTC (rev 53269)
@@ -22,7 +22,7 @@
 
 # Export of the references
 # for i in `g.mlist type=rast pattern=test_raster_slice_1*` ; do r.out.ascii input=$i output=${i}.ref; done
-for i in `g.mlist type=rast pattern=test_raster_slice_float*` ; do r.out.ascii input=$i output=${i}.ref; done
+for i in `g.mlist type=rast pattern=test_raster_slice_float*` ; do r.out.ascii input=$i output=${i}.txt; done
 
 # The next @preprocess step adjusts the raster region to increase the resolution by 2
 g.region res=7.5 -p3
@@ -32,7 +32,7 @@
 r3.to.rast --o input=volume_null output=test_raster_slice_2
 
 # Export of the references
-# for i in `g.mlist type=rast pattern=test_raster_slice_2*` ; do r.out.ascii input=$i output=${i}.ref; done
+for i in `g.mlist type=rast pattern=test_raster_slice_2*` ; do r.out.ascii input=$i output=${i}.txt; done
 
 # The next @preprocess step adjusts the raster region to increase the resolution by 2 again
 g.region res=5 -p3
@@ -42,4 +42,4 @@
 r3.to.rast --o input=volume_null output=test_raster_slice_3
 
 # Export of the references
-# for i in `g.mlist type=rast pattern=test_raster_slice_3*` ; do r.out.ascii input=$i output=${i}.ref; done
+for i in `g.mlist type=rast pattern=test_raster_slice_3*` ; do r.out.ascii input=$i output=${i}.txt; done