[GRASS-SVN] r63620 - in grass/branches/releasebranch_7_0: raster/r.sim/r.sim.water raster/r.to.rast3elev raster3d/r3.in.bin/test_suite raster3d/r3.retile scripts/v.unpack/test_suite temporal/t.rast.aggregate.ds/testsuite temporal/t.rast.to.rast3 temporal/t.rast3d.extract/testsuite temporal/t.rast3d.list/testsuite temporal/t.rast3d.mapcalc temporal/t.rast3d.univar/testsuite temporal/t.register temporal/t.sample/testsuite temporal/t.select temporal/t.vect.algebra/testsuite temporal/t.vect.univar
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 19 11:21:34 PST 2014
Author: neteler
Date: 2014-12-19 11:21:34 -0800 (Fri, 19 Dec 2014)
New Revision: 63620
Modified:
grass/branches/releasebranch_7_0/raster/r.sim/r.sim.water/spearfish.sh
grass/branches/releasebranch_7_0/raster/r.to.rast3elev/test.r.to.rast3elev.sh
grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
grass/branches/releasebranch_7_0/raster3d/r3.retile/test.r3.retile.sh
grass/branches/releasebranch_7_0/scripts/v.unpack/test_suite/test.v.unpack.sh
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster3d.sh
grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.vector.file.layer.sh
grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.vector.sh
grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh
grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh
grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test.t.vect.algebra.sh
grass/branches/releasebranch_7_0/temporal/t.vect.univar/test.t.vect.univar.sh
Log:
update shell scripts to use new element names (#2409)
Modified: grass/branches/releasebranch_7_0/raster/r.sim/r.sim.water/spearfish.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.sim/r.sim.water/spearfish.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/raster/r.sim/r.sim.water/spearfish.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -57,5 +57,5 @@
echo "Step throu the time steps and adjust the color tables"
# cleanup
-g.remove --q -f type=rast name=${output}_dx,${output}_dy,${output}_rain,${output}_manin,${output}_infil,${output}_null
-g.remove --q -f type=vect name=observation_points
+g.remove --q -f type=raster name=${output}_dx,${output}_dy,${output}_rain,${output}_manin,${output}_infil,${output}_null
+g.remove --q -f type=vector name=observation_points
Modified: grass/branches/releasebranch_7_0/raster/r.to.rast3elev/test.r.to.rast3elev.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.to.rast3elev/test.r.to.rast3elev.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/raster/r.to.rast3elev/test.r.to.rast3elev.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -45,4 +45,4 @@
# 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.list type=rast3d pattern=test_elev_volume_*` ; do r3.out.ascii dp=0 input=$i output=${i}.ref; done
+# for i in `g.list type=raster3d pattern=test_elev_volume_*` ; do r3.out.ascii dp=0 input=$i output=${i}.ref; done
Modified: grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -124,7 +124,7 @@
bottom=0 top=100 west=0 east=180 south=0 north=90 \
cols=18 rows=9 depths=10
-for map in `g.list type=rast3d pattern=test_in_bin_float*` ; do
+for map in `g.list type=raster3d pattern=test_in_bin_float*` ; do
r3.out.ascii input=${map} output=${map}.txt dp=0
done
@@ -132,7 +132,7 @@
diff $i test_out_bin_float.ref
done
-g.remove -f type=rast3d pattern=test_in*
-g.remove -f type=rast3d pattern=test_out*
+g.remove -f type=raster3d pattern=test_in*
+g.remove -f type=raster3d pattern=test_out*
rm test_in_*.txt
rm test_out_*.bin
Modified: grass/branches/releasebranch_7_0/raster3d/r3.retile/test.r3.retile.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.retile/test.r3.retile.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/raster3d/r3.retile/test.r3.retile.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -36,7 +36,7 @@
r3.info -g map=test_retile_map_10 > test_retile_map_10_info.txt
# Create the validation files
-for map in `g.list type=rast3d pattern=test_retile_map_*` ; do
+for map in `g.list type=raster3d pattern=test_retile_map_*` ; do
r3.out.ascii input=${map} output=${map}.txt dp=0
done
Modified: grass/branches/releasebranch_7_0/scripts/v.unpack/test_suite/test.v.unpack.sh
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -19,7 +19,7 @@
db.copy from_table=probe_orig to_table=probe_3_3
# Removing un-needed vectors and tables
-g.remove -f type=vect name=probe_orig
+g.remove -f type=vector name=probe_orig
v.db.droptable -f map=probe_3 table=probe_3 layer=1
# Adding tables to layer
@@ -37,7 +37,7 @@
v.pack --o -c input=probe_3 output=probe_3_uncompressed.pack
# We need to clean before import
-g.remove -f type=vect name=probe_1,probe_2,probe_3
+g.remove -f type=vector name=probe_1,probe_2,probe_3
# Test the import with v.unpack
v.unpack --o input=probe_1.pack
@@ -55,5 +55,5 @@
v.unpack --o input=probe_3.pack output=probe_3_uncompressed
v.category input=probe_3_uncompressed option=report
-g.remove -f type=vect name=probe_1_uncompressed,probe_2_uncompressed,probe_3_uncompressed
+g.remove -f type=vector name=probe_1_uncompressed,probe_2_uncompressed,probe_3_uncompressed
rm *.pack
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -28,10 +28,10 @@
EOF
t.create type=stvds temporaltype=absolute output=soil_abs1 title="A test" descr="A test"
-t.register type=vect input=soil_abs1 file="${n1}"
+t.register type=vector input=soil_abs1 file="${n1}"
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i type=rast input=precip_abs1 \
+t.register -i type=raster input=precip_abs1 \
maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
start="2001-03-01 00:00:00" increment="1 months"
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -26,61 +26,61 @@
t.create --o type=strds temporaltype=absolute output=precip_abs 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 --v -i type=rast input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="3 years"
+t.register --o --v -i type=raster input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="3 years"
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=raster3d input=precipitation
r3.info precipitation
-t.register --o --v -i type=rast input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="2 months"
+t.register --o --v -i type=raster input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="2 months"
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=raster3d input=precipitation
r3.info precipitation
-t.register --o --v -i type=rast input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="8 days"
+t.register --o --v -i type=raster input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="8 days"
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=raster3d input=precipitation
r3.info precipitation
-t.register --o --v -i type=rast input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="6 hours"
+t.register --o --v -i type=raster input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="6 hours"
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=raster3d input=precipitation
r3.info precipitation
-t.register --o --v -i type=rast input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="30 minutes"
+t.register --o --v -i type=raster input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="30 minutes"
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=raster3d input=precipitation
r3.info precipitation
-t.register --o --v -i type=rast input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="1 seconds"
+t.register --o --v -i type=raster input=precip_abs maps=prec_1,prec_2,prec_3 start="2001-01-01" increment="1 seconds"
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=raster3d input=precipitation
r3.info precipitation
-t.register --o --v -i type=rast input=precip_abs file=${n1}
+t.register --o --v -i type=raster input=precip_abs file=${n1}
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=raster3d input=precipitation
r3.info precipitation
-t.register --o --v -i type=rast input=precip_rel maps=prec_4,prec_5,prec_6 start=1000 increment=100 unit=years
+t.register --o --v -i type=raster input=precip_rel maps=prec_4,prec_5,prec_6 start=1000 increment=100 unit=years
t.info type=strds input=precip_rel
t.rast.to.rast3 --o input=precip_rel output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=raster3d input=precipitation
r3.info precipitation
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs,precip_rel
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -15,12 +15,12 @@
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.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=raster3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
# The @test
t.rast3d.extract --o input=precip_abs1 output=precip_abs2 where="start_time > '2001-06-01'" expression=" if(precip_abs1 > 400, precip_abs1, null())" base=new_prec
t.info type=str3ds input=precip_abs2
-t.unregister type=rast3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=str3ds input=precip_abs1,precip_abs2
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -74,36 +74,36 @@
t.create type=str3ds temporaltype=absolute output=volume_abs5 title="A test with input files" descr="A test with input files"
# The first @test
-t.register type=rast3d input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=raster3d input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
t.rast3d.list separator=" | " method=comma input=volume_abs1
t.rast3d.list input=volume_abs1
t.rast3d.list separator=" | " method=cols input=volume_abs1
t.rast3d.list separator=" | " method=delta input=volume_abs1
t.rast3d.list separator=" | " method=deltagaps input=volume_abs1
-t.register -i type=rast3d input=volume_abs2 file="${n2}"
+t.register -i type=raster3d input=volume_abs2 file="${n2}"
t.rast3d.list separator=" | " method=comma input=volume_abs2
t.rast3d.list input=volume_abs2
t.rast3d.list separator=" | " method=cols input=volume_abs2
t.rast3d.list separator=" | " method=delta input=volume_abs2
t.rast3d.list separator=" | " method=deltagaps input=volume_abs2
-t.register -i type=rast3d input=volume_abs3 file="${n3}"
+t.register -i type=raster3d input=volume_abs3 file="${n3}"
t.rast3d.list separator=" | " method=comma input=volume_abs3
t.rast3d.list separator=" | " method=delta input=volume_abs3
t.rast3d.list separator=" | " method=deltagaps input=volume_abs3
-t.register -i type=rast3d input=volume_abs4 file="${n4}"
+t.register -i type=raster3d input=volume_abs4 file="${n4}"
t.rast3d.list separator=" | " method=comma input=volume_abs4
t.rast3d.list separator=" | " method=delta input=volume_abs4
t.rast3d.list separator=" | " method=deltagaps input=volume_abs4
-t.register -i type=rast3d input=volume_abs5 file="${n5}"
+t.register -i type=raster3d input=volume_abs5 file="${n5}"
t.rast3d.list separator=" | " method=comma input=volume_abs5
t.rast3d.list input=volume_abs5
t.rast3d.list separator=" | " method=cols input=volume_abs5
t.rast3d.list separator=" | " method=delta input=volume_abs5
t.rast3d.list separator=" | " method=deltagaps input=volume_abs5
-t.unregister type=rast3d maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
+t.unregister type=raster3d maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
t.remove type=str3ds input=volume_abs1,volume_abs2,volume_abs3,volume_abs4,volume_abs5
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -16,8 +16,8 @@
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.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 --o type=rast3d input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.register -i type=raster3d 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 --o type=raster3d input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.info type=str3ds input=precip_abs1
t.info type=str3ds input=precip_abs2
@@ -33,6 +33,6 @@
method=equal nprocs=6
t.info type=str3ds input=precip_abs4
-t.unregister type=rast3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.unregister type=rast3d maps=new_prec_1,new_prec_2,new_prec_3,new_prec_4,new_prec_5,new_prec_6
+t.unregister type=raster3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster3d maps=new_prec_1,new_prec_2,new_prec_3,new_prec_4,new_prec_5,new_prec_6
t.remove type=str3ds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -17,7 +17,7 @@
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.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=raster3d --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.info type=str3ds input=precip_abs1
# The first @test
Modified: grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster3d.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster3d.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster3d.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -30,12 +30,12 @@
t.create --v --o type=str3ds temporaltype=absolute output=volume_abs6 title="A test" descr="A test"
t.create --v --o type=str3ds temporaltype=absolute output=volume_abs7 title="A test" descr="A test"
-t.register type=rast3d --o --v -i input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="1 seconds"
+t.register type=raster3d --o --v -i input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="1 seconds"
t.info type=str3ds input=volume_abs1
-t.unregister --v type=rast3d input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=raster3d input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.info type=str3ds input=volume_abs1
-t.register type=rast3d --o --v -i input=volume_abs2 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 seconds, 5 minutes"
+t.register type=raster3d --o --v -i input=volume_abs2 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 seconds, 5 minutes"
t.info type=str3ds input=volume_abs2
r3.info volume_1
r3.info volume_2
@@ -44,28 +44,28 @@
r3.info volume_5
r3.info volume_6
-t.register type=rast3d --o --v -i input=volume_abs3 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="8 hours"
+t.register type=raster3d --o --v -i input=volume_abs3 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="8 hours"
t.info type=str3ds input=volume_abs3
-t.unregister --v type=rast3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=raster3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.info type=str3ds input=volume_abs3
-t.register type=rast3d --o input=volume_abs4 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="3 days"
+t.register type=raster3d --o input=volume_abs4 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="3 days"
t.info type=str3ds input=volume_abs4
-t.register type=rast3d --o input=volume_abs5 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="4 weeks"
+t.register type=raster3d --o input=volume_abs5 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="4 weeks"
t.info type=str3ds input=volume_abs5
-t.register type=rast3d --o input=volume_abs6 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-08-01" increment="2 months"
+t.register type=raster3d --o input=volume_abs6 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-08-01" increment="2 months"
t.info type=str3ds input=volume_abs6
-t.register type=rast3d --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
+t.register type=raster3d --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
t.info type=str3ds input=volume_abs7
# Register with different valid time again
-t.register type=rast3d --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=raster3d --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=str3ds input=volume_abs7
# Register with different valid time again creating intervals
-t.register type=rast3d -i --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=raster3d -i --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=str3ds input=volume_abs7
-t.unregister --v type=rast3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=raster3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.remove --v type=str3ds input=volume_abs1,volume_abs2,volume_abs3,volume_abs4,volume_abs5,volume_abs6,volume_abs7
Modified: grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.vector.file.layer.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.vector.file.layer.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.vector.file.layer.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -54,21 +54,21 @@
# The first @test
# Test with input files
# File 1
-t.register --o --v type=vect input=lidar_abs_ds1 file="${n1}" start="2001-01-01" increment="1 months"
-t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
+t.register --o --v type=vector input=lidar_abs_ds1 file="${n1}" start="2001-01-01" increment="1 months"
+t.list type=vector columns=id,name,start_time,end_time where="name='lidar_abs_1'"
# File 1
-t.register --o --v type=vect input=lidar_abs_ds1 file="${n1}" start="2001-01-01"
-t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
+t.register --o --v type=vector input=lidar_abs_ds1 file="${n1}" start="2001-01-01"
+t.list type=vector columns=id,name,start_time,end_time where="name='lidar_abs_1'"
# File 2
-t.register --o --v type=vect input=lidar_abs_ds1 file="${n2}"
-t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
+t.register --o --v type=vector input=lidar_abs_ds1 file="${n2}"
+t.list type=vector columns=id,name,start_time,end_time where="name='lidar_abs_1'"
# File 2
-t.register --o --v type=vect input=lidar_abs_ds1 -i file="${n2}" start=file increment="1 months"
-t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
+t.register --o --v type=vector input=lidar_abs_ds1 -i file="${n2}" start=file increment="1 months"
+t.list type=vector columns=id,name,start_time,end_time where="name='lidar_abs_1'"
# File 3
-t.register --o --v type=vect input=lidar_abs_ds1 file="${n3}" start=file
-t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
+t.register --o --v type=vector input=lidar_abs_ds1 file="${n3}" start=file
+t.list type=vector columns=id,name,start_time,end_time where="name='lidar_abs_1'"
-t.unregister --v type=vect maps=lidar_abs_1:1,lidar_abs_1:2,lidar_abs_1:3,lidar_abs_1:4,lidar_abs_1:5,lidar_abs_1:6
+t.unregister --v type=vector maps=lidar_abs_1:1,lidar_abs_1:2,lidar_abs_1:3,lidar_abs_1:4,lidar_abs_1:5,lidar_abs_1:6
t.remove type=stvds input=lidar_abs_ds1
-g.remove -f type=vect name=lidar_abs_1,lidar_abs_orig
+g.remove -f type=vector name=lidar_abs_1,lidar_abs_orig
Modified: grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.vector.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.vector.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.vector.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -27,42 +27,42 @@
t.create --v --o type=stvds temporaltype=absolute output=lidar_abs_ds6 title="A test" descr="A test"
t.create --v --o type=stvds temporaltype=absolute output=lidar_abs_ds7 title="A test" descr="A test"
-t.register type=vect --o --v -i input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="1 seconds"
+t.register type=vector --o --v -i input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="1 seconds"
t.info type=stvds input=lidar_abs_ds1
-t.unregister --v type=vect input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
+t.unregister --v type=vector input=lidar_abs_ds1 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
t.info type=stvds input=lidar_abs_ds1
-t.register type=vect --o --v -i input=lidar_abs_ds2 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="20 seconds, 5 minutes"
+t.register type=vector --o --v -i input=lidar_abs_ds2 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="20 seconds, 5 minutes"
t.info type=stvds input=lidar_abs_ds2
-t.register type=vect --o --v -i input=lidar_abs_ds3 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="8 hours"
+t.register type=vector --o --v -i input=lidar_abs_ds3 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="8 hours"
t.info type=stvds input=lidar_abs_ds3
-t.unregister --v type=vect maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
+t.unregister --v type=vector maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
t.info type=stvds input=lidar_abs_ds3
-t.register type=vect --o input=lidar_abs_ds4 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="3 days"
+t.register type=vector --o input=lidar_abs_ds4 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="3 days"
t.info type=stvds input=lidar_abs_ds4
-t.register type=vect --o input=lidar_abs_ds5 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="4 weeks"
+t.register type=vector --o input=lidar_abs_ds5 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="4 weeks"
t.info type=stvds input=lidar_abs_ds5
-t.register type=vect --o input=lidar_abs_ds6 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-08-01" increment="2 months"
+t.register type=vector --o input=lidar_abs_ds6 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-08-01" increment="2 months"
t.info type=stvds input=lidar_abs_ds6
-t.register type=vect --o input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
+t.register type=vector --o input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
t.info type=stvds input=lidar_abs_ds7
# Register with different valid time again
-t.register type=vect --o input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=vector --o input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=stvds input=lidar_abs_ds7
# Register with different valid time again creating an interval
-t.register type=vect --o -i input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=vector --o -i input=lidar_abs_ds7 maps=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=stvds input=lidar_abs_ds7
-t.unregister --v type=vect maps=lidar_abs_1,lidar_abs_2,lidar_abs_3
+t.unregister --v type=vector maps=lidar_abs_1,lidar_abs_2,lidar_abs_3
# Test warning
-t.unregister --v type=vect maps=lidar_abs_1,lidar_abs_2,lidar_abs_3
+t.unregister --v type=vector maps=lidar_abs_1,lidar_abs_2,lidar_abs_3
t.remove --v type=stvds input=lidar_abs_ds1,lidar_abs_ds2,lidar_abs_ds3,lidar_abs_ds4,lidar_abs_ds5,lidar_abs_ds6,lidar_abs_ds7
-t.unregister --v type=vect maps=lidar_abs_4,lidar_abs_5,lidar_abs_6
-g.remove -f type=vect name=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
+t.unregister --v type=vector maps=lidar_abs_4,lidar_abs_5,lidar_abs_6
+g.remove -f type=vector name=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
Modified: grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.sample/testsuite/test.t.sample.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -61,11 +61,11 @@
t.create type=stvds temporaltype=absolute output=pnts_abs1 \
title="A test with vector input files" descr="A test with vector input files"
-t.register type=rast -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=raster -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
t.rast.list precip_abs0
-t.register type=vect input=pnts_abs0 file="${n2}"
+t.register type=vector input=pnts_abs0 file="${n2}"
t.vect.list pnts_abs0
-t.register type=vect input=pnts_abs1 file="${n3}"
+t.register type=vector input=pnts_abs1 file="${n3}"
t.vect.list pnts_abs1
# The @test
@@ -81,7 +81,7 @@
# Test with temporal point data
-t.register type=rast input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=raster input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
t.rast.list precip_abs0
t.sample input=precip_abs0 samtype=stvds sample=pnts_abs0 -cs
t.sample input=precip_abs0 samtype=stvds sample=pnts_abs1 -cs
Modified: grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.select/test.t.select.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -32,10 +32,10 @@
t.create output=test4 type=stvds title="test dataset" descr="test dataset"
-t.register -i type=vect input=test1 file=${n1} increment="1 days" start="2013-01-01"
-t.register -i type=vect input=test2 file=${n2} increment="1 days" start="2013-01-10"
-t.register -i type=vect input=test3 file=${n3} increment="3 days" start="2013-01-01"
-t.register -i type=vect input=test4 file=${n4} increment="3 days" start="2013-01-10"
+t.register -i type=vector input=test1 file=${n1} increment="1 days" start="2013-01-01"
+t.register -i type=vector input=test2 file=${n2} increment="1 days" start="2013-01-10"
+t.register -i type=vector input=test3 file=${n3} increment="3 days" start="2013-01-01"
+t.register -i type=vector input=test4 file=${n4} increment="3 days" start="2013-01-10"
t.info type=stvds input=test1
t.info type=stvds input=test2
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test.t.vect.algebra.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test.t.vect.algebra.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.algebra/testsuite/test.t.vect.algebra.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -68,14 +68,14 @@
t.create output=P3 type=stvds title="Point test dataset" descr="Point test dataset"
t.create output=P4 type=stvds title="Point test dataset" descr="Point test dataset"
-t.register -i type=vect input=A1 file=vinput1_area_test.txt increment="1 days" start="2013-01-01"
-t.register -i type=vect input=A2 file=vinput2_area_test.txt increment="1 days" start="2013-01-10"
-t.register -i type=vect input=A3 file=vinput3_area_test.txt increment="3 days" start="2013-01-01"
-t.register -i type=vect input=A4 file=vinput4_area_test.txt increment="3 days" start="2013-01-10"
-t.register -i type=vect input=P1 file=vinput1_point_test.txt increment="1 days" start="2013-01-01"
-t.register -i type=vect input=P2 file=vinput2_point_test.txt increment="1 days" start="2013-01-10"
-t.register -i type=vect input=P3 file=vinput3_point_test.txt increment="3 days" start="2013-01-01"
-t.register -i type=vect input=P4 file=vinput4_point_test.txt increment="3 days" start="2013-01-10"
+t.register -i type=vector input=A1 file=vinput1_area_test.txt increment="1 days" start="2013-01-01"
+t.register -i type=vector input=A2 file=vinput2_area_test.txt increment="1 days" start="2013-01-10"
+t.register -i type=vector input=A3 file=vinput3_area_test.txt increment="3 days" start="2013-01-01"
+t.register -i type=vector input=A4 file=vinput4_area_test.txt increment="3 days" start="2013-01-10"
+t.register -i type=vector input=P1 file=vinput1_point_test.txt increment="1 days" start="2013-01-01"
+t.register -i type=vector input=P2 file=vinput2_point_test.txt increment="1 days" start="2013-01-10"
+t.register -i type=vector input=P3 file=vinput3_point_test.txt increment="3 days" start="2013-01-01"
+t.register -i type=vector input=P4 file=vinput4_point_test.txt increment="3 days" start="2013-01-10"
# Test different options.
t.vect.algebra expression='B1 = A1 & A2' basename="bmap1"
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.univar/test.t.vect.univar.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.univar/test.t.vect.univar.sh 2014-12-19 19:20:07 UTC (rev 63619)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.univar/test.t.vect.univar.sh 2014-12-19 19:21:34 UTC (rev 63620)
@@ -15,7 +15,7 @@
v.voronoi input=rpoints2 output=rvoronoi2
t.create type=stvds temporaltype=absolute output=random_data title="A test" descr="A test"
-t.register type=vect --v -i input=random_data maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2 start="2001-01-15 12:05:45" increment="14 days"
+t.register type=vector --v -i input=random_data maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2 start="2001-01-15 12:05:45" increment="14 days"
# The first @test
t.vect.univar input=random_data column=height where='height > 50' twhere="start_time > '2000-01-01'" layer=1
@@ -25,7 +25,7 @@
t.vect.univar type=line input=random_data column=height where='height > 20' twhere="start_time > '2000-01-01'" layer=1
# @postprocess
-t.unregister type=vect maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2
+t.unregister type=vector maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2
t.remove type=stvds input=random_data
-g.remove -f type=vect name=rpoints1,rpoints2,rvoronoi1,rvoronoi2
+g.remove -f type=vector name=rpoints1,rpoints2,rvoronoi1,rvoronoi2
More information about the grass-commit
mailing list