update shell scripts to use new element names (https://trac.osgeo.org…

…/grass/ticket/2409)

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

raster/r.mapcalc/testsuite/const_map_test.sh

@@ -43,7 +43,7 @@ TMPNAME="`echo ${PID}_tmp_testmap | sed 's+\.+_+g'`"
 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 @@ finalcleanup()
  #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
 }

raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh

@@ -51,7 +51,7 @@ r.series.accumulate basemap=basemap input=map_a, \
                     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
 

raster/r.sim/r.sim.water/spearfish.sh

@@ -57,5 +57,5 @@ echo "Now open paraview from this command line and load the vtk files as time se
 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

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

@@ -45,4 +45,4 @@ r.to.rast3elev --o -l  input=elev_45_double,elev_25_double,elev_5_double elevati
 # 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

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

@@ -34,7 +34,7 @@ r3.cross.rast --o input=volume_null elevation=elev_NAN output=test_cross_section
 r3.cross.rast --o input=volume_null elevation=elev_cross output=test_cross_section_result
 
 # Export of the 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
 

raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh

@@ -124,15 +124,15 @@ r3.in.bin --o output=test_in_bin_float_13 byte=4 null=-9999 \
     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
 
 for i in `ls test_in_bin_float_*.txt` ; do 
     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

raster3d/r3.retile/test.r3.retile.sh

@@ -36,7 +36,7 @@ r3.retile --o input=volume_null output=test_retile_map_10 tiledim=34x46x22 -c
 r3.info -g map=test_retile_map_10 > test_retile_map_10_info.txt
 
 # Create the validation files
-for map in `g.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
 

raster3d/r3.to.rast/test.r3.to.rast.sh

@@ -21,8 +21,8 @@ r3.to.rast --o input=volume_null output=test_raster_slice_1
 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 @@ g.region res=7.5 -p3
 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 @@ g.region res=5 -p3
 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 

scripts/r.unpack/test_suite/test.r.unpack.sh

@@ -21,7 +21,7 @@ r.pack --o --v -c input=test_float  output=test_float_uncompressed.pack
 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.unpack -o --v -o input=test_double_uncompressed.pack output=test_double_uncomp
 #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

scripts/v.unpack/test_suite/test.v.unpack.sh

@@ -19,7 +19,7 @@ db.copy from_table=probe_orig to_table=probe_3_2
 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_2 output=probe_2_uncompressed.pack
 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.category input=probe_2_uncompressed option=report
 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

temporal/t.merge/testsuite/test.t.merge.sh

@@ -38,7 +38,7 @@ t.merge inputs=precip_abs1 output=precip_abs4
 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.info precip_abs4
 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

temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh

@@ -16,7 +16,7 @@ r.mapcalc expr="temp_2 = 25"
 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

temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh

@@ -16,7 +16,7 @@ r.mapcalc expr="temp_5 = 25"
 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 @@ r.mapcalc expr="maximum = 78"
 
 # 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 \

temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh

@@ -16,7 +16,7 @@ r.mapcalc expr="prec_5 = rand(0, 23)" -s
 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="lower = 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" \

temporal/t.rast.aggregate.ds/testsuite/test.t.rast.aggregate.ds.sh

@@ -28,10 +28,10 @@ soil_3|2001-08-01|2001-12-01
 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"
 

temporal/t.rast.colors/test.t.rast.colors.sh

@@ -15,7 +15,7 @@ r.mapcalc --o expr="prec_6 = 600"
 # @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 @@ t.rast.colors input=precip_abs color=grey.log
 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

temporal/t.rast.export/test.t.rast.export.sh

@@ -28,7 +28,7 @@ EOF
 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.bz2 com
 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

temporal/t.rast.gapfill/test.t.rast.gapfill.sh

@@ -18,17 +18,17 @@ prec_3|2001-05-01|2001-06-01
 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

temporal/t.rast.import/test.t.rast.import.relative.sh

@@ -36,7 +36,7 @@ t.create type=strds temporaltype=relative output=precip_rel \
     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 @@ t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_rel extrdir=test
 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

temporal/t.rast.import/test.t.rast.import.sh

@@ -35,7 +35,7 @@ eval `g.gisenv`
 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 @@ t.rast.import --o input=strds_export_pack.tar.bz2 output=precip_abs1 extrdir=tes
 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

temporal/t.rast.import/test.t.rast.import_locations.sh

@@ -33,7 +33,7 @@ eval `g.gisenv`
 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 @@ t.rast.import --o location=new_test_4 input=strds_export_pack.tar.gz output=prec
               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