Browse Source

use new element names (https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63921 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 năm trước cách đây
mục cha
commit
54e5ec210b

+ 1 - 1
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
 

+ 4 - 4
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 

+ 2 - 2
scripts/r.mapcalculator/r.mapcalculator

@@ -153,8 +153,8 @@ if [ -z "$GIS_OPT_OUTFILE" ]; then
 	g.message -e "Please enter a name for the resulting map and try again."
 	exit 1
 elif [ "$GIS_FLAG_O" = 1 ]; then
-	echo `g.list type=rast | grep -w "$GIS_OPT_OUTFILE" `
-	outtest=`g.list type=rast | grep -w $GIS_OPT_OUTFILE`
+	echo `g.list type=raster | grep -w "$GIS_OPT_OUTFILE" `
+	outtest=`g.list type=raster | grep -w $GIS_OPT_OUTFILE`
 	if [ -n "$outtest" ]; then
 		g.message -e "File $GIS_OPT_OUTFILE exists. Exiting."
 		exit 0

+ 2 - 2
scripts/r3.mapcalculator/r3.mapcalculator

@@ -145,8 +145,8 @@ if [ -z "$GIS_OPT_OUTFILE" ]; then
 	g.message -e "Please enter a name for the resulting map and try again."
 	exit 1
 elif [ "$GIS_FLAG_O" = 1 ]; then
-	echo `g.list type=rast | grep -w "$GIS_OPT_OUTFILE" `
-	outtest=`g.list type=rast | grep -w $GIS_OPT_OUTFILE`
+	echo `g.list type=raster | grep -w "$GIS_OPT_OUTFILE" `
+	outtest=`g.list type=raster | grep -w $GIS_OPT_OUTFILE`
 	if [ -n "$outtest" ]; then
 		g.message -e "File $GIS_OPT_OUTFILE exists. Exiting."
 		exit 0