[GRASS-SVN] r63921 - in grass/branches/releasebranch_7_0: raster3d/r3.cross.rast raster3d/r3.to.rast scripts/r.mapcalculator scripts/r3.mapcalculator

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-01-01 14:29:40 -0800 (Thu, 01 Jan 2015)
New Revision: 63921

Modified:
   grass/branches/releasebranch_7_0/raster3d/r3.cross.rast/test.r3.cross.rast.sh
   grass/branches/releasebranch_7_0/raster3d/r3.to.rast/test.r3.to.rast.sh
   grass/branches/releasebranch_7_0/scripts/r.mapcalculator/r.mapcalculator
   grass/branches/releasebranch_7_0/scripts/r3.mapcalculator/r3.mapcalculator
Log:
use new element names (#2409)

Modified: grass/branches/releasebranch_7_0/raster3d/r3.cross.rast/test.r3.cross.rast.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.cross.rast/test.r3.cross.rast.sh	2015-01-01 22:24:49 UTC (rev 63920)
+++ grass/branches/releasebranch_7_0/raster3d/r3.cross.rast/test.r3.cross.rast.sh	2015-01-01 22:29:40 UTC (rev 63921)
@@ -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/branches/releasebranch_7_0/raster3d/r3.to.rast/test.r3.to.rast.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.to.rast/test.r3.to.rast.sh	2015-01-01 22:24:49 UTC (rev 63920)
+++ grass/branches/releasebranch_7_0/raster3d/r3.to.rast/test.r3.to.rast.sh	2015-01-01 22:29:40 UTC (rev 63921)
@@ -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/branches/releasebranch_7_0/scripts/r.mapcalculator/r.mapcalculator
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.mapcalculator/r.mapcalculator	2015-01-01 22:24:49 UTC (rev 63920)
+++ grass/branches/releasebranch_7_0/scripts/r.mapcalculator/r.mapcalculator	2015-01-01 22:29:40 UTC (rev 63921)
@@ -153,8 +153,8 @@
 	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

Modified: grass/branches/releasebranch_7_0/scripts/r3.mapcalculator/r3.mapcalculator
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r3.mapcalculator/r3.mapcalculator	2015-01-01 22:24:49 UTC (rev 63920)
+++ grass/branches/releasebranch_7_0/scripts/r3.mapcalculator/r3.mapcalculator	2015-01-01 22:29:40 UTC (rev 63921)
@@ -145,8 +145,8 @@
 	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