[GRASS-SVN] r63619 - in grass/trunk: raster/r.mapcalc/testsuite raster/r.series.accumulate/test_suite raster/r.sim/r.sim.water raster/r.to.rast3elev raster3d/r3.cross.rast raster3d/r3.in.bin/test_suite raster3d/r3.retile raster3d/r3.to.rast scripts/r.unpack/test_suite scripts/v.unpack/test_suite temporal/t.merge/testsuite temporal/t.rast.accdetect/testsuite temporal/t.rast.accumulate/testsuite temporal/t.rast.aggregate.ds/testsuite temporal/t.rast.colors temporal/t.rast.export temporal/t.rast.gapfill temporal/t.rast.import temporal/t.rast.list temporal/t.rast.mapcalc temporal/t.rast.neighbors temporal/t.rast.out.vtk temporal/t.rast.series temporal/t.rast.to.rast3 temporal/t.rast.univar/testsuite temporal/t.register temporal/t.rename temporal/t.sample/testsuite temporal/t.select temporal/t.shift temporal/t.snap temporal/t.support temporal/t.topology temporal/t.vect.db.select testsuite/raster
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 19 11:20:07 PST 2014
Author: neteler
Date: 2014-12-19 11:20:07 -0800 (Fri, 19 Dec 2014)
New Revision: 63619
Modified:
grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh
grass/trunk/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh
grass/trunk/raster/r.sim/r.sim.water/spearfish.sh
grass/trunk/raster/r.to.rast3elev/test.r.to.rast3elev.sh
grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh
grass/trunk/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
grass/trunk/raster3d/r3.retile/test.r3.retile.sh
grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh
grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh
grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh
grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh
grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
grass/trunk/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh
grass/trunk/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh
grass/trunk/temporal/t.rast.colors/test.t.rast.colors.sh
grass/trunk/temporal/t.rast.export/test.t.rast.export.sh
grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh
grass/trunk/temporal/t.rast.list/test.t.rast.list.sh
grass/trunk/temporal/t.rast.mapcalc/example.sh
grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
grass/trunk/temporal/t.rast.neighbors/test.t.rast.neighbors.sh
grass/trunk/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh
grass/trunk/temporal/t.rast.series/test.t.rast.series.sh
grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
grass/trunk/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh
grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh
grass/trunk/temporal/t.register/test.t.register.raster.file.sh
grass/trunk/temporal/t.register/test.t.register.raster.sh
grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh
grass/trunk/temporal/t.register/test.t.register.vector.sh
grass/trunk/temporal/t.rename/test.t.rename.sh
grass/trunk/temporal/t.sample/testsuite/test.t.sample.sh
grass/trunk/temporal/t.select/test.t.select.sh
grass/trunk/temporal/t.shift/test.t.shift.absolue.sh
grass/trunk/temporal/t.shift/test.t.shift.relative.sh
grass/trunk/temporal/t.snap/test.t.snap.absolute.sh
grass/trunk/temporal/t.snap/test.t.snap.relative.sh
grass/trunk/temporal/t.support/test.t.support.sh
grass/trunk/temporal/t.topology/test.t.topology.abstime.sh
grass/trunk/temporal/t.topology/test.t.topology.reltime.sh
grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh
grass/trunk/testsuite/raster/raster_md5test.sh
grass/trunk/testsuite/raster/rhemisphere.sh
Log:
update shell scripts to use new element names (#2409)
Modified: grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh
===================================================================
--- grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -43,7 +43,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove -f type=rast name=$TMPNAME > /dev/null
+ g.remove -f type=raster name=$TMPNAME > /dev/null
}
# check if a MASK is already present:
@@ -63,7 +63,7 @@
#restore user mask if present:
if test -f $LOCATION/cell/$USERMASK ; then
echo "Restoring user MASK"
- g.remove -f type=rast name=MASK > /dev/null
+ g.remove -f type=raster name=MASK > /dev/null
g.rename $USERMASK,MASK > /dev/null
fi
}
Modified: grass/trunk/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh
===================================================================
--- grass/trunk/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -51,7 +51,7 @@
output=test_accu_9 range=6,9 method=mean --verbose
# Test for correct results
-for map in `g.list type=rast pattern=test_accu_*` ; do
+for map in `g.list type=raster pattern=test_accu_*` ; do
r.out.ascii input=${map} output=${map}.ref dp=2
done
Modified: grass/trunk/raster/r.sim/r.sim.water/spearfish.sh
===================================================================
--- grass/trunk/raster/r.sim/r.sim.water/spearfish.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/raster/r.sim/r.sim.water/spearfish.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/raster/r.to.rast3elev/test.r.to.rast3elev.sh
===================================================================
--- grass/trunk/raster/r.to.rast3elev/test.r.to.rast3elev.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/raster/r.to.rast3elev/test.r.to.rast3elev.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -34,7 +34,7 @@
r3.cross.rast --o input=volume_null elevation=elev_cross output=test_cross_section_result
# Export of the text files
-for i in `g.list type=rast pattern=test_cross_section_*` ; do
+for i in `g.list type=raster pattern=test_cross_section_*` ; do
r.out.ascii input=$i output=${i}.txt;
done
Modified: grass/trunk/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
===================================================================
--- grass/trunk/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/raster3d/r3.retile/test.r3.retile.sh
===================================================================
--- grass/trunk/raster3d/r3.retile/test.r3.retile.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/raster3d/r3.retile/test.r3.retile.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh
===================================================================
--- grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -21,8 +21,8 @@
r3.to.rast --o input=volume_null_float output=test_raster_slice_float
# Export of the references
-for i in `g.list type=rast pattern=test_raster_slice_1*` ; do r.out.ascii input=$i output=${i}.txt; done
-for i in `g.list type=rast pattern=test_raster_slice_float*` ; do r.out.ascii input=$i output=${i}.txt; done
+for i in `g.list type=raster pattern=test_raster_slice_1*` ; do r.out.ascii input=$i output=${i}.txt; done
+for i in `g.list type=raster 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.list type=rast pattern=test_raster_slice_2*` ; do r.out.ascii input=$i output=${i}.txt; done
+for i in `g.list type=raster 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,7 +42,7 @@
r3.to.rast --o input=volume_null output=test_raster_slice_3
# Export of the references
-for i in `g.list type=rast pattern=test_raster_slice_3*` ; do r.out.ascii input=$i output=${i}.txt; done
+for i in `g.list type=raster pattern=test_raster_slice_3*` ; do r.out.ascii input=$i output=${i}.txt; done
# Comparison of references and text files
for i in `ls *.ref` ; do
Modified: grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh
===================================================================
--- grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -21,7 +21,7 @@
r.pack --o --v -c input=test_double output=test_double_uncompressed.pack
# Remove generated maps and re-import
-g.remove -f type=rast name=test_int,test_float,test_double
+g.remove -f type=raster name=test_int,test_float,test_double
# Second we check the import with r.unpack
r.unpack --o --v input=test_int.pack
@@ -42,5 +42,5 @@
#r.out.ascii --o input=test_float_uncompressed output=test_float_uncompressed.ref dp=1
#r.out.ascii --o input=test_double_uncompressed output=test_double_uncompressed.ref dp=1
-g.remove -f type=rast name=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
+g.remove -f type=raster name=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
rm *.pack
Modified: grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh
===================================================================
--- grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/temporal/t.merge/testsuite/test.t.merge.sh
===================================================================
--- grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -38,7 +38,7 @@
t.info precip_abs4
t.rast.list precip_abs4
-t.unregister type=rast maps=prec_1,prec_2,prec_3 input=precip_abs4
+t.unregister type=raster maps=prec_1,prec_2,prec_3 input=precip_abs4
t.merge --o inputs=precip_abs1,precip_abs2,precip_abs3 output=precip_abs4
t.info precip_abs4
t.rast.list precip_abs4
@@ -48,5 +48,5 @@
t.rast.list precip_abs4
t.remove type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove -f type=rast name=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
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -16,7 +16,7 @@
r.mapcalc expr="temp_1 = 30"
t.create type=strds temporaltype=absolute output=temp_abs1 title="A test" descr="A test"
-t.register -i type=rast input=temp_abs1 maps=temp_1,temp_2,temp_3,temp_4,temp_5,temp_6 \
+t.register -i type=raster input=temp_abs1 maps=temp_1,temp_2,temp_3,temp_4,temp_5,temp_6 \
start="2001-01-01" increment="2 months"
# The first @test
Modified: grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -16,7 +16,7 @@
r.mapcalc expr="temp_6 = 30"
t.create type=strds temporaltype=absolute output=temp_abs1 title="A test" descr="A test"
-t.register -i type=rast input=temp_abs1 maps=temp_1,temp_2,temp_3,temp_4,temp_5,temp_6 \
+t.register -i type=raster input=temp_abs1 maps=temp_1,temp_2,temp_3,temp_4,temp_5,temp_6 \
start="2001-01-01" increment="2 months"
# The first @test
@@ -38,10 +38,10 @@
# We use different
t.create type=strds temporaltype=absolute output=minimum title="minimum limit" descr="minimum limit"
-t.register -i type=rast input=minimum maps=minimum start="2001-01-01" increment="8 months"
+t.register -i type=raster input=minimum maps=minimum start="2001-01-01" increment="8 months"
t.create type=strds temporaltype=absolute output=maximum title="maximum limit" descr="maximum limit"
-t.register -i type=rast input=maximum maps=maximum start="2001-01-01" increment="10 months"
+t.register -i type=raster input=maximum maps=maximum start="2001-01-01" increment="10 months"
t.rast.accdetect input=temp_accumulation occurrence=temp_occ base=temp_occ \
range=20,80 start="2001-01-01" cycle="12 months" min=minimum \
Modified: grass/trunk/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -16,7 +16,7 @@
r.mapcalc expr="prec_6 = rand(0, 26)" -s
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
+t.register -i type=raster input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
start="2001-01-01" increment="2 months"
# The first @test
@@ -53,10 +53,10 @@
r.mapcalc expr="upper = 35"
t.create type=strds temporaltype=absolute output=lower title="lower limit" descr="lower limit"
-t.register -i type=rast input=lower maps=lower start="2001-01-01" increment="8 months"
+t.register -i type=raster input=lower maps=lower start="2001-01-01" increment="8 months"
t.create type=strds temporaltype=absolute output=upper title="upper limit" descr="upper limit"
-t.register -i type=rast input=upper maps=upper start="2001-01-01" increment="10 months"
+t.register -i type=raster input=upper maps=upper start="2001-01-01" increment="10 months"
t.rast.accumulate input=precip_abs1 output=precip_abs2 base=prec_acc \
limits=8,33 lower=lower upper=upper start="2001-01-01" stop="2002-01-01" gran="1 months" \
Modified: grass/trunk/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/temporal/t.rast.colors/test.t.rast.colors.sh
===================================================================
--- grass/trunk/temporal/t.rast.colors/test.t.rast.colors.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.colors/test.t.rast.colors.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -15,7 +15,7 @@
# @test
t.create --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
-t.register --o type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="1 months"
+t.register --o type=raster input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="1 months"
t.rast.colors input=precip_abs color=random
r.colors.out map=prec_1
@@ -25,5 +25,5 @@
r.colors.out map=prec_3
-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
Modified: grass/trunk/temporal/t.rast.export/test.t.rast.export.sh
===================================================================
--- grass/trunk/temporal/t.rast.export/test.t.rast.export.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.export/test.t.rast.export.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -28,7 +28,7 @@
t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test with input files" descr="A test with input files"
# The first @test
-t.register -i type=rast input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.register -i type=raster input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.bz2 compression=bzip2 workdir=/tmp
t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.gz compression=gzip workdir=/tmp
t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar compression=no workdir=/tmp
@@ -37,7 +37,7 @@
t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip workdir=/tmp
t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar compression=no workdir=/tmp
-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_abs1
rm strds_export_gtiff.tar.bz2
rm strds_export_gtiff.tar.gz
Modified: grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh
===================================================================
--- grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -18,17 +18,17 @@
EOF
t.create --v --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
-t.register --v type=rast input=precip_abs file="${n1}"
+t.register --v type=raster input=precip_abs file="${n1}"
# @test
t.rast.gapfill input=precip_abs base="prec" nprocs=2
t.info precip_abs
-t.info type=rast input=prec_6
-t.info type=rast input=prec_7
+t.info type=raster input=prec_6
+t.info type=raster input=prec_7
# @postprocess
-t.unregister --v type=rast maps=prec_1,prec_2,prec_3,prec_6,prec_7
+t.unregister --v type=raster maps=prec_1,prec_2,prec_3,prec_6,prec_7
t.remove --v type=strds input=precip_abs
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_6,prec_7
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_6,prec_7
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -36,7 +36,7 @@
title="A test with input files" descr="A test with input files"
# The first @test
-t.register type=rast input=precip_rel file="${n1}" unit="years"
+t.register type=raster input=precip_rel file="${n1}" unit="years"
t.rast.export input=precip_rel output=strds_export.tar.bz2 compression=bzip2 format=GTiff workdir=test
t.rast.export input=precip_rel output=strds_export.tar.gz compression=gzip format=GTiff workdir=test
@@ -73,9 +73,9 @@
r.info prec_1
# Cleaning up
-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_rel
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export.tar.gz
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -35,7 +35,7 @@
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test with input files" descr="A test with input files"
# The first @test
-t.register -i type=rast input=precip_abs1 file="${n1}"
+t.register -i type=raster input=precip_abs1 file="${n1}"
t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=AAIGrid workdir=test
t.rast.export input=precip_abs1 output=strds_export.tar.gz compression=gzip format=GTiff workdir=test
@@ -72,9 +72,9 @@
r.info prec_1
# Cleaning up
-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_abs1
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export.tar.gz
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -33,7 +33,7 @@
t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test with input files" descr="A test with input files"
# The first @test
-t.register -i type=rast input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.register -i type=raster input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
t.rast.export input=precip_abs1 output=strds_export.tar.bz2 compression=bzip2 format=GTiff workdir=test
t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack workdir=test
@@ -57,9 +57,9 @@
title="A test" description="Description of a test"
ls -la $GISDBASE/new_test_4/PERMANENT
-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_abs1
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export_pack.tar.gz
Modified: grass/trunk/temporal/t.rast.list/test.t.rast.list.sh
===================================================================
--- grass/trunk/temporal/t.rast.list/test.t.rast.list.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.list/test.t.rast.list.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -71,7 +71,7 @@
t.create type=strds temporaltype=absolute output=precip_abs0 title="A test with input files" descr="A test with input files"
# The @test
-t.register type=rast -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 month"
+t.register type=raster -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 month"
t.rast.list separator=" | " method=comma input=precip_abs0
t.rast.list input=precip_abs0
t.rast.list separator=" | " method=cols input=precip_abs0
@@ -81,7 +81,7 @@
t.rast.list separator=" | " method=gran input=precip_abs0 gran="2 months"
t.rast.list separator=" | " method=gran input=precip_abs0 gran="1 day"
-t.register type=rast input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 month"
+t.register type=raster input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 month"
t.rast.list separator=" | " method=comma input=precip_abs0
t.rast.list input=precip_abs0
t.rast.list separator=" | " method=cols input=precip_abs0
@@ -91,7 +91,7 @@
t.rast.list separator=" | " method=gran input=precip_abs0 gran="2 months"
t.rast.list separator=" | " method=gran input=precip_abs0 gran="6 days"
-t.register type=rast -i input=precip_abs0 file="${n2}"
+t.register type=raster -i input=precip_abs0 file="${n2}"
t.rast.list separator=" | " method=comma input=precip_abs0
t.rast.list input=precip_abs0
t.rast.list separator=" | " method=cols input=precip_abs0
@@ -101,7 +101,7 @@
t.rast.list separator=" | " method=gran input=precip_abs0 gran="2 months"
t.rast.list separator=" | " method=gran input=precip_abs0 gran="6 days"
-t.register type=rast -i input=precip_abs0 file="${n3}"
+t.register type=raster -i input=precip_abs0 file="${n3}"
t.rast.list separator=" | " method=comma input=precip_abs0
t.rast.list separator=" | " method=delta input=precip_abs0
t.rast.list separator=" | " method=deltagaps input=precip_abs0
@@ -109,7 +109,7 @@
t.rast.list separator=" | " method=gran input=precip_abs0 gran="2 months"
t.rast.list separator=" | " method=gran input=precip_abs0 gran="6 days"
-t.register type=rast -i input=precip_abs0 file="${n4}"
+t.register type=raster -i input=precip_abs0 file="${n4}"
t.rast.list separator=" | " method=comma input=precip_abs0
t.rast.list separator=" | " method=delta input=precip_abs0
t.rast.list separator=" | " method=deltagaps input=precip_abs0
@@ -117,7 +117,7 @@
t.rast.list separator=" | " method=gran input=precip_abs0 gran="2 months"
t.rast.list separator=" | " method=gran input=precip_abs0 gran="6 days"
-t.register type=rast -i input=precip_abs0 file="${n5}"
+t.register type=raster -i input=precip_abs0 file="${n5}"
t.rast.list separator=" | " method=comma input=precip_abs0
t.rast.list input=precip_abs0
t.rast.list separator=" | " method=cols input=precip_abs0
@@ -127,5 +127,5 @@
t.rast.list separator=" | " method=gran input=precip_abs0 gran="8 months"
t.rast.list separator=" | " method=gran input=precip_abs0 gran="13 days"
-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_abs0
Modified: grass/trunk/temporal/t.rast.mapcalc/example.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/example.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.mapcalc/example.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -25,9 +25,9 @@
output=A title="Dataset A" descr="Dataset A"
t.create --o type=strds temporaltype=absolute \
output=B title="Dataset B" descr="Dataset B"
-t.register --o -i type=rast input=A maps=a3,a4,a5,a6,a7,a8 \
+t.register --o -i type=raster input=A maps=a3,a4,a5,a6,a7,a8 \
start="2001-03-01" increment="1 months"
-t.register --o -i type=rast input=B maps=b1,b2,b3,b4,b5,b6,b7,b8,b9,b10,b11,b12 \
+t.register --o -i type=raster input=B maps=b1,b2,b3,b4,b5,b6,b7,b8,b9,b10,b11,b12 \
start="2001-01-01" increment="1 months"
t.rast.mapcalc --o --v input=A,B output=C base=c method=equal \
Modified: grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -16,8 +16,8 @@
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
t.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
-t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
-t.register type=rast input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.register -i type=raster 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 type=raster input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.info precip_abs1
t.info precip_abs2
Modified: grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -19,8 +19,8 @@
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
t.create type=strds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
-t.register -i type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
-t.register type=rast input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.register -i type=raster 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 type=raster input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.info precip_abs1
t.info precip_abs2
@@ -47,7 +47,7 @@
t.info type=strds input=precip_abs4
# Let the test fail
-g.remove -f type=rast name=prec_1
+g.remove -f type=raster name=prec_1
t.rast.mapcalc -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
expression=" (precip_abs1 + precip_abs2) * null()" base=new_prec \
method=equal nprocs=5
Modified: grass/trunk/temporal/t.rast.neighbors/test.t.rast.neighbors.sh
===================================================================
--- grass/trunk/temporal/t.rast.neighbors/test.t.rast.neighbors.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.neighbors/test.t.rast.neighbors.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -14,7 +14,7 @@
r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i --o type=rast input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
+t.register -i --o type=raster 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"
# The first @test
Modified: grass/trunk/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh
===================================================================
--- grass/trunk/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -33,17 +33,17 @@
# The first @test
mkdir /tmp/test1
-t.register -i --o type=rast input=precip_abs1 file="${n1}"
+t.register -i --o type=raster input=precip_abs1 file="${n1}"
t.rast.out.vtk input=precip_abs1 expdir=/tmp/test1
ls -al /tmp/test1
mkdir /tmp/test2
-t.register -i --o type=rast input=precip_abs2 file="${n1}"
+t.register -i --o type=raster input=precip_abs2 file="${n1}"
t.rast.out.vtk input=precip_abs2 expdir=/tmp/test2 elevation=elevation
ls -al /tmp/test2
mkdir /tmp/test3
-t.register -i --o type=rast input=precip_abs3 file="${n1}"
+t.register -i --o type=raster input=precip_abs3 file="${n1}"
t.rast.out.vtk -g input=precip_abs3 expdir=/tmp/test3 elevation=elevation
ls -al /tmp/test3
@@ -51,5 +51,5 @@
rm -rf /tmp/test2
rm -rf /tmp/test3
-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_abs1,precip_abs2,precip_abs3
Modified: grass/trunk/temporal/t.rast.series/test.t.rast.series.sh
===================================================================
--- grass/trunk/temporal/t.rast.series/test.t.rast.series.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.series/test.t.rast.series.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -15,7 +15,7 @@
# @test
t.create --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
-t.register type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="1 months"
+t.register type=raster input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="1 months"
t.rast.list precip_abs
t.rast.series --o -t input=precip_abs method=average output=prec_average where="start_time > '2001-03-01'"
@@ -29,7 +29,7 @@
r.info prec_max
r.info prec_sum
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6,prec_sum,prec_max
+t.unregister type=raster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6,prec_sum,prec_max
t.remove type=strds input=precip_abs
-g.remove -f type=rast name=prec_sum,prec_max,prec_average
+g.remove -f type=raster name=prec_sum,prec_max,prec_average
Modified: grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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=3draster 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=3draster 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=3draster 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=3draster 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=3draster 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=3draster 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=3draster 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=3draster 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/trunk/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh
===================================================================
--- grass/trunk/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -17,7 +17,7 @@
r.mapcalc expr="prec_6 = rand(0, 650)" -s
t.create type=strds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register type=rast --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
+t.register type=raster --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"
# The first @test
t.rast.univar -e input=precip_abs1
Modified: grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.register/test.t.register.raster.file.reltime.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -60,43 +60,43 @@
# Test with input files
# File 1, and 3 without a space time raster dataset
t.register --o -i file="${n1}" start=0 increment=7 unit=days
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
t.register --o file="${n2}" unit=minutes
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
t.register --o -i file="${n3}" unit=seconds
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
# File 1
t.register --o -i input=precip_abs8 file="${n1}" start=0 increment=7 unit=days
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 1
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
t.register --o input=precip_abs8 file="${n1}" start=20 unit=years
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 2
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
t.register --o input=precip_abs8 file="${n2}" unit=minutes
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 2 ERROR ERROR -- Increment computation needs to be fixed
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
t.register --o input=precip_abs8 file="${n2}" increment=14 unit=days
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 2 ERROR ERROR -- Increment computation needs to be fixed
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
t.register --o -i input=precip_abs8 file="${n2}" increment=14 unit=days
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
# File 3
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
t.register --o -i input=precip_abs8 file="${n3}" unit=seconds
t.info type=strds input=precip_abs8
t.rast.list input=precip_abs8
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
# @test of correct @failure handling
t.register --o -i input=precip_abs8 maps=preac_1,prec_2 file="${n3}" # Maps and file set
Modified: grass/trunk/temporal/t.register/test.t.register.raster.file.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.file.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.register/test.t.register.raster.file.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -80,4 +80,4 @@
t.rast.list input=precip_abs8
t.remove --v type=strds input=precip_abs8
-t.unregister --v type=rast file="${n1}"
+t.unregister --v type=raster file="${n1}"
Modified: grass/trunk/temporal/t.register/test.t.register.raster.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.register/test.t.register.raster.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -99,9 +99,9 @@
t.register -i input=precip_abs7 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="months"
-t.unregister type=rast maps=prec_1,prec_2,prec_3
+t.unregister type=raster maps=prec_1,prec_2,prec_3
# Test the warning message
-t.unregister type=rast maps=prec_1,prec_2,prec_3
+t.unregister type=raster maps=prec_1,prec_2,prec_3
t.remove type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4,precip_abs5,precip_abs6,precip_abs7
-t.unregister type=rast maps=prec_4,prec_5,prec_6
+t.unregister type=raster maps=prec_4,prec_5,prec_6
r.info map=prec_1
Modified: grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/temporal/t.register/test.t.register.vector.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.vector.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.register/test.t.register.vector.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/temporal/t.rename/test.t.rename.sh
===================================================================
--- grass/trunk/temporal/t.rename/test.t.rename.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.rename/test.t.rename.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -33,14 +33,14 @@
t.rename --o type=strds input=precip_abs1 output=precip_abs2
t.info precip_abs2
-t.info type=rast input=prec_1
-t.info type=rast input=prec_2
+t.info type=raster input=prec_1
+t.info type=raster input=prec_2
t.rename --o type=strds input=precip_abs2 output=precip_abs4
t.info precip_abs4
-t.info type=rast input=prec_1
-t.info type=rast input=prec_2
+t.info type=raster input=prec_1
+t.info type=raster input=prec_2
# Error checking, new dataset has the wrong mapset
t.rename type=strds input=precip_abs4 output=precip_abs3 at BLABLA
@@ -48,5 +48,5 @@
t.rename type=strds input=precip_abs4 output=precip_abs3
t.remove --v type=strds input=precip_abs3,precip_abs4
-t.unregister type=rast maps=prec_1,prec_2
-g.remove -f type=rast name=prec_1,prec_2
+t.unregister type=raster maps=prec_1,prec_2
+g.remove -f type=raster name=prec_1,prec_2
Modified: grass/trunk/temporal/t.sample/testsuite/test.t.sample.sh
===================================================================
--- grass/trunk/temporal/t.sample/testsuite/test.t.sample.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.sample/testsuite/test.t.sample.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/temporal/t.select/test.t.select.sh
===================================================================
--- grass/trunk/temporal/t.select/test.t.select.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.select/test.t.select.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -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/trunk/temporal/t.shift/test.t.shift.absolue.sh
===================================================================
--- grass/trunk/temporal/t.shift/test.t.shift.absolue.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.shift/test.t.shift.absolue.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -14,7 +14,7 @@
r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
t.create --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
-t.register -i --o type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
+t.register -i --o type=raster input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
start="2001-01-01 12:00:00" increment="14 days"
t.rast.list input=precip_abs
@@ -42,5 +42,5 @@
# that will result in wrong number of days in the next month
t.shift --o input=precip_abs granularity="1 month"
-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
Modified: grass/trunk/temporal/t.shift/test.t.shift.relative.sh
===================================================================
--- grass/trunk/temporal/t.shift/test.t.shift.relative.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.shift/test.t.shift.relative.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -14,7 +14,7 @@
r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
t.create --o type=strds temporaltype=relative output=precip_rel title="A test" descr="A test"
-t.register -i --o type=rast unit=days input=precip_rel maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
+t.register -i --o type=raster unit=days input=precip_rel maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
start=0 increment=1
t.info type=strds input=precip_rel
@@ -28,5 +28,5 @@
t.info type=strds input=precip_rel
t.rast.list input=precip_rel
-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_rel
Modified: grass/trunk/temporal/t.snap/test.t.snap.absolute.sh
===================================================================
--- grass/trunk/temporal/t.snap/test.t.snap.absolute.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.snap/test.t.snap.absolute.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -25,7 +25,7 @@
EOF
t.create --o type=strds temporaltype=absolute output=precip_abs title="A test" descr="A test"
-t.register --o type=rast input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
+t.register --o type=raster input=precip_abs maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
start="2001-01-01 12:00:00" increment="14 days"
# The first @test
@@ -39,7 +39,7 @@
# The second @test
# Creating a valid topology
-t.register --o type=rast input=precip_abs file=${n1}
+t.register --o type=raster input=precip_abs file=${n1}
t.rast.list input=precip_abs
t.topology input=precip_abs
@@ -49,5 +49,5 @@
t.rast.list input=precip_abs
t.topology input=precip_abs
-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
Modified: grass/trunk/temporal/t.snap/test.t.snap.relative.sh
===================================================================
--- grass/trunk/temporal/t.snap/test.t.snap.relative.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.snap/test.t.snap.relative.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -14,7 +14,7 @@
r.mapcalc --o expr="prec_6 = rand(0, 650)" -s
t.create --o type=strds temporaltype=relative output=precip_rel title="A test" descr="A test"
-t.register --o type=rast input=precip_rel unit="days" \
+t.register --o type=raster input=precip_rel unit="days" \
maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
start=0 increment=14
@@ -26,5 +26,5 @@
t.info type=strds input=precip_rel
t.rast.list input=precip_rel
-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_rel
Modified: grass/trunk/temporal/t.support/test.t.support.sh
===================================================================
--- grass/trunk/temporal/t.support/test.t.support.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.support/test.t.support.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -54,7 +54,7 @@
t.info type=strds input=precip_abs2
# Remove three maps
-g.remove -f type=rast name=prec_1,prec_2,prec_3
+g.remove -f type=raster name=prec_1,prec_2,prec_3
# Booth space time datasets should be updated and 3 maps must have been unregistered
t.support --v -m type=strds input=precip_abs1
@@ -62,5 +62,5 @@
t.info type=strds input=precip_abs2
t.remove --v type=strds input=precip_abs1,precip_rel1
-t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove -f type=rast name=prec_4,prec_5,prec_6
+t.unregister type=raster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=raster name=prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.topology/test.t.topology.abstime.sh
===================================================================
--- grass/trunk/temporal/t.topology/test.t.topology.abstime.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.topology/test.t.topology.abstime.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -89,36 +89,36 @@
t.create --o type=strds temporaltype=absolute output=precip_abs title="A test with input files" descr="A test with input files"
t.create --o type=strds temporaltype=absolute output=maps title="A test with maps in input files" descr="A test with maps in input files"
-t.register --o type=rast -i input=precip_abs file="${n1}" start="2001-01-01" increment="1 months"
+t.register --o type=raster -i input=precip_abs file="${n1}" start="2001-01-01" increment="1 months"
cat "${n1}"
t.topology input=precip_abs
t.topology -m input=precip_abs
-t.register --o type=rast -i input=precip_abs file="${n2}"
+t.register --o type=raster -i input=precip_abs file="${n2}"
cat "${n2}"
t.topology input=precip_abs
t.topology -m input=precip_abs
-t.register --o type=rast -i input=precip_abs file="${n3}"
+t.register --o type=raster -i input=precip_abs file="${n3}"
cat "${n3}"
t.topology input=precip_abs
t.topology -m input=precip_abs
-t.register --o type=rast -i input=precip_abs file="${n4}"
+t.register --o type=raster -i input=precip_abs file="${n4}"
cat "${n4}"
t.topology input=precip_abs
t.topology -m input=precip_abs
-t.register --o type=rast -i input=precip_abs file="${n5}"
+t.register --o type=raster -i input=precip_abs file="${n5}"
cat "${n5}"
t.topology input=precip_abs
t.topology -m input=precip_abs
-t.register --o type=rast -i input=maps file="${n6}"
+t.register --o type=raster -i input=maps file="${n6}"
cat "${n6}"
t.topology input=maps
t.topology -ms input=maps
t.remove type=strds input=precip_abs,maps
-t.unregister type=rast file="${n1}"
-t.unregister type=rast maps=A,B,C,D
+t.unregister type=raster file="${n1}"
+t.unregister type=raster maps=A,B,C,D
Modified: grass/trunk/temporal/t.topology/test.t.topology.reltime.sh
===================================================================
--- grass/trunk/temporal/t.topology/test.t.topology.reltime.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.topology/test.t.topology.reltime.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -71,31 +71,31 @@
t.create --o type=strds temporaltype=relative output=precip_rel_d title="A test with input files of unti days" descr="A test with input files"
t.create --o type=strds temporaltype=relative output=precip_rel_y title="A test with input files of unit years" descr="A test with input files"
-t.register --o type=rast -i --v input=precip_rel_d file="${n1}" start=0 increment=1 unit=days
+t.register --o type=raster -i --v input=precip_rel_d file="${n1}" start=0 increment=1 unit=days
cat "${n1}"
t.topology input=precip_rel_d
t.topology -m input=precip_rel_d
-t.register --o type=rast -i input=precip_rel_d file="${n2}" unit=days
+t.register --o type=raster -i input=precip_rel_d file="${n2}" unit=days
cat "${n2}"
t.topology input=precip_rel_d
t.topology -m input=precip_rel_d
-t.register --o type=rast -i input=precip_rel_d file="${n3}" unit=days
+t.register --o type=raster -i input=precip_rel_d file="${n3}" unit=days
cat "${n3}"
t.topology input=precip_rel_d
t.topology -m input=precip_rel_d
-t.register --o type=rast -i input=precip_rel_y file="${n4}" unit=years
+t.register --o type=raster -i input=precip_rel_y file="${n4}" unit=years
cat "${n4}"
t.topology input=precip_rel_y
t.topology -m input=precip_rel_y
-t.register --o type=rast -i input=precip_rel_y file="${n5}" unit=years
+t.register --o type=raster -i input=precip_rel_y file="${n5}" unit=years
cat "${n5}"
t.topology input=precip_rel_y
t.topology -m input=precip_rel_y
t.remove type=strds input=precip_rel_d
t.remove type=strds input=precip_rel_y
-t.unregister type=rast file="${n1}"
+t.unregister type=raster file="${n1}"
Modified: grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh
===================================================================
--- grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -34,11 +34,11 @@
t.vect.db.select input=prec_observer where="cat = 1" separator=" | "
# @postprocess
-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_abs1
t.remove type=stvds input=prec_observer
t.unregister type=vector maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
g.remove -f type=vector name=prec_observer,test_extract
-g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=raster name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/testsuite/raster/raster_md5test.sh
===================================================================
--- grass/trunk/testsuite/raster/raster_md5test.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/testsuite/raster/raster_md5test.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -48,7 +48,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove -f type=rast name=$TMPNAME > /dev/null
+ g.remove -f type=raster name=$TMPNAME > /dev/null
}
# check if a MASK is already present:
@@ -68,7 +68,7 @@
#restore user mask if present:
if test -f $LOCATION/cell/$USERMASK ; then
echo "Restoring user MASK"
- g.remove -f type=rast name=MASK > /dev/null
+ g.remove -f type=raster name=MASK > /dev/null
g.rename $USERMASK,MASK > /dev/null
fi
}
Modified: grass/trunk/testsuite/raster/rhemisphere.sh
===================================================================
--- grass/trunk/testsuite/raster/rhemisphere.sh 2014-12-19 19:16:08 UTC (rev 63618)
+++ grass/trunk/testsuite/raster/rhemisphere.sh 2014-12-19 19:20:07 UTC (rev 63619)
@@ -24,7 +24,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove --q -f type=rast name=$TMP > /dev/null
+ g.remove --q -f type=raster name=$TMP > /dev/null
}
########################
More information about the grass-commit
mailing list