[GRASS-SVN] r46740 - grass/trunk/raster3d/r3.out.ascii
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Jun 18 15:52:04 EDT 2011
Author: huhabla
Date: 2011-06-18 12:52:04 -0700 (Sat, 18 Jun 2011)
New Revision: 46740
Modified:
grass/trunk/raster3d/r3.out.ascii/test.r3.out.ascii.sh
Log:
Typo fixes
Modified: grass/trunk/raster3d/r3.out.ascii/test.r3.out.ascii.sh
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/test.r3.out.ascii.sh 2011-06-18 19:09:54 UTC (rev 46739)
+++ grass/trunk/raster3d/r3.out.ascii/test.r3.out.ascii.sh 2011-06-18 19:52:04 UTC (rev 46740)
@@ -8,16 +8,17 @@
# voxel data with r3.mapcalc. 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
-# Now create several (float, double, null value) voxel map
+# We create several (float, double, null value) voxel map
# with value = col + row + depth.
r3.mapcalc --o expr="volume_float = float(col() + row() + depth())"
r3.mapcalc --o expr="volume_double = double(col() + row() + depth())"
-# Add null value information
+# Add null value information to test correct null value handling
r3.mapcalc --o expr="volume_float_null = if(row() == 1 || row() == 5, null(), volume_float)"
r3.mapcalc --o expr="volume_double_null = if(row() == 1 || row() == 5, null(), volume_double)"
-# We export float data in the first @test using different order and precision
-# as text @files for valdiation of correct ordering and null data handling
+# We export float data in the first @test using different order and precision.
+# The created text @files are validated of correct ordering and null data handling.
+# All reference files are located in the r3.out.ascii directory.
r3.out.ascii --o input=volume_float_null output=test_float_nsbt_null.txt dp=0 null=*
r3.out.ascii --o -r input=volume_float_null output=test_float_snbt_null.txt dp=0 null=*
r3.out.ascii --o -d input=volume_float_null output=test_float_nstb_null.txt dp=0 null=*
@@ -29,13 +30,13 @@
r3.out.ascii --o -h input=volume_float_null output=test_float_nsbt_null_no_header.txt dp=3 null=*
r3.out.ascii --o -c input=volume_float_null output=test_float_nsbt_null_grass6_comp_1.txt dp=3 null=*
# Any row or depth order should be ignored in case grass6 compatibility is enabled
-# The rsult of comp_1, _2 and _3 must be identical
+# The result of comp_1, _2 and _3 must be identical
r3.out.ascii --o -cr input=volume_float_null output=test_float_nsbt_null_grass6_comp_2.txt dp=3 null=*
r3.out.ascii --o -crd input=volume_float_null output=test_float_nsbt_null_grass6_comp_3.txt dp=3 null=*
-# We export double data in the second @test using different order and precision
-# as text @files for valdiation of correct ordering and null data handling. Its hte same
-# procedure as with float data
+# We export float data in the first @test using different order and precision.
+# The created text @files are validated of correct ordering and null data handling.
+# All reference files are located in the r3.out.ascii directory.
r3.out.ascii --o input=volume_double_null output=test_double_nsbt_null.txt dp=0 null=*
r3.out.ascii --o -r input=volume_double_null output=test_double_snbt_null.txt dp=0 null=*
r3.out.ascii --o -d input=volume_double_null output=test_double_nstb_null.txt dp=0 null=*
@@ -51,10 +52,10 @@
r3.out.ascii --o -cr input=volume_double_null output=test_double_nsbt_null_grass6_comp_2.txt dp=3 null=*
r3.out.ascii --o -crd input=volume_double_null output=test_double_nsbt_null_grass6_comp_3.txt dp=3 null=*
-# In the third @test we import all the generated data using r3.in.ascii
-# The created @raster maps should be identical to the map "volume_double_null"
-# The export of the created g3d map should use as @precision=0 for data validation
-# The same raster name is used for all the imported data and so for the validation reference file
+# In the third @test we import all the generated data using r3.in.ascii.
+# The created @raster maps should be identical to the map "volume_double_null".
+# The export of the created g3d map should use as @precision=0 for data validation.
+# The same raster name is used for all the imported data and so for the validation reference file.
r3.in.ascii --o output=test_double_nsbt_null input=test_double_nsbt_null.txt nv=*
r3.in.ascii --o output=test_double_nsbt_null input=test_double_snbt_null.txt nv=*
r3.in.ascii --o output=test_double_nsbt_null input=test_double_nstb_null.txt nv=*
@@ -62,11 +63,11 @@
# Different precision and null values than default
r3.in.ascii --o output=test_double_nsbt_null input=test_double_nsbt_null_prec5.txt nv=-1000
r3.in.ascii --o output=test_double_nsbt_null input=test_double_sntb_null_prec8.txt nv=-2000
-# Any row or depth order should be ignored in case grass6 compatibility is enabled
+# AImport grass6 legacy data
r3.in.ascii --o output=test_double_nsbt_null input=test_double_nsbt_null_grass6_comp_1.txt
# In this @preprocess step for the last test we create a large region and
-# generate large input data to test the handling of large files
+# generate large input data to test the handling of large files.
g.region s=0 n=800 w=0 e=1200 b=0 t=50 res=10 res3=1.5 -p3
r3.mapcalc --o expr="volume_double_large = double(col() + row() + depth())"
# Add null value information
More information about the grass-commit
mailing list