[GRASS-SVN] r63286 - in grass/trunk/temporal: t.info/testsuite t.rast.to.rast3 t.rast3d.extract/testsuite t.rast3d.list/testsuite t.rast3d.mapcalc t.rast3d.univar/testsuite t.register
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Nov 29 06:43:31 PST 2014
Author: neteler
Date: 2014-11-29 06:43:31 -0800 (Sat, 29 Nov 2014)
New Revision: 63286
Modified:
grass/trunk/temporal/t.info/testsuite/test.t.info.sh
grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.html
grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
grass/trunk/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
grass/trunk/temporal/t.register/test.t.register.raster3d.sh
Log:
temporal testsuite: update keys to use new element names (#2409)
Modified: grass/trunk/temporal/t.info/testsuite/test.t.info.sh
===================================================================
--- grass/trunk/temporal/t.info/testsuite/test.t.info.sh 2014-11-29 07:39:09 UTC (rev 63285)
+++ grass/trunk/temporal/t.info/testsuite/test.t.info.sh 2014-11-29 14:43:31 UTC (rev 63286)
@@ -43,11 +43,11 @@
t.info -g type=rast input=prec_2
-t.register type=rast3d -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.register type=3draster -i input=precip_abs1 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
t.info type=str3ds input=precip_abs1
t.info -g type=str3ds input=precip_abs1
-t.register type=rast3d -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
+t.register type=3draster -i input=precip_abs2 maps=prec_1,prec_2 start="2001-01-01" increment="20 years"
t.info type=str3ds input=precip_abs2
t.info -g type=str3ds input=precip_abs2
t.info -h type=str3ds input=precip_abs2
Modified: grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.html
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.html 2014-11-29 07:39:09 UTC (rev 63285)
+++ grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.html 2014-11-29 14:43:31 UTC (rev 63286)
@@ -111,7 +111,7 @@
t.rast.to.rast3 input=A output=cube
-t.info type=rast3d input=cube
+t.info type=3draster input=cube
+-------------------- 3D Raster Dataset -------------------------------------+
| |
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-11-29 07:39:09 UTC (rev 63285)
+++ grass/trunk/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2014-11-29 14:43:31 UTC (rev 63286)
@@ -30,56 +30,56 @@
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=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.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=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.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=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.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=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.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=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.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=3draster input=precipitation
r3.info precipitation
t.register --o --v -i type=rast input=precip_abs file=${n1}
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=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.info type=strds input=precip_rel
t.rast.to.rast3 --o input=precip_rel output=precipitation
-t.info type=rast3d input=precipitation
+t.info type=3draster input=precipitation
r3.info precipitation
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-11-29 07:39:09 UTC (rev 63285)
+++ grass/trunk/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-11-29 14:43:31 UTC (rev 63286)
@@ -15,12 +15,12 @@
r3.mapcalc --o expr="prec_6 = rand(0, 650)" -s
t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register -i type=rast3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
+t.register -i type=3draster input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
# The @test
t.rast3d.extract --o input=precip_abs1 output=precip_abs2 where="start_time > '2001-06-01'" expression=" if(precip_abs1 > 400, precip_abs1, null())" base=new_prec
t.info type=str3ds input=precip_abs2
-t.unregister type=rast3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=3draster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=str3ds input=precip_abs1,precip_abs2
Modified: grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-11-29 07:39:09 UTC (rev 63285)
+++ grass/trunk/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-11-29 14:43:31 UTC (rev 63286)
@@ -74,36 +74,36 @@
t.create type=str3ds temporaltype=absolute output=volume_abs5 title="A test with input files" descr="A test with input files"
# The first @test
-t.register type=rast3d input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=3draster input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
t.rast3d.list separator=" | " method=comma input=volume_abs1
t.rast3d.list input=volume_abs1
t.rast3d.list separator=" | " method=cols input=volume_abs1
t.rast3d.list separator=" | " method=delta input=volume_abs1
t.rast3d.list separator=" | " method=deltagaps input=volume_abs1
-t.register -i type=rast3d input=volume_abs2 file="${n2}"
+t.register -i type=3draster input=volume_abs2 file="${n2}"
t.rast3d.list separator=" | " method=comma input=volume_abs2
t.rast3d.list input=volume_abs2
t.rast3d.list separator=" | " method=cols input=volume_abs2
t.rast3d.list separator=" | " method=delta input=volume_abs2
t.rast3d.list separator=" | " method=deltagaps input=volume_abs2
-t.register -i type=rast3d input=volume_abs3 file="${n3}"
+t.register -i type=3draster input=volume_abs3 file="${n3}"
t.rast3d.list separator=" | " method=comma input=volume_abs3
t.rast3d.list separator=" | " method=delta input=volume_abs3
t.rast3d.list separator=" | " method=deltagaps input=volume_abs3
-t.register -i type=rast3d input=volume_abs4 file="${n4}"
+t.register -i type=3draster input=volume_abs4 file="${n4}"
t.rast3d.list separator=" | " method=comma input=volume_abs4
t.rast3d.list separator=" | " method=delta input=volume_abs4
t.rast3d.list separator=" | " method=deltagaps input=volume_abs4
-t.register -i type=rast3d input=volume_abs5 file="${n5}"
+t.register -i type=3draster input=volume_abs5 file="${n5}"
t.rast3d.list separator=" | " method=comma input=volume_abs5
t.rast3d.list input=volume_abs5
t.rast3d.list separator=" | " method=cols input=volume_abs5
t.rast3d.list separator=" | " method=delta input=volume_abs5
t.rast3d.list separator=" | " method=deltagaps input=volume_abs5
-t.unregister type=rast3d maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
+t.unregister type=3draster maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
t.remove type=str3ds input=volume_abs1,volume_abs2,volume_abs3,volume_abs4,volume_abs5
Modified: grass/trunk/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh 2014-11-29 07:39:09 UTC (rev 63285)
+++ grass/trunk/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh 2014-11-29 14:43:31 UTC (rev 63286)
@@ -16,8 +16,8 @@
t.create --o type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
t.create --o type=str3ds temporaltype=absolute output=precip_abs2 title="A test" descr="A test"
-t.register -i type=rast3d input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
-t.register --o type=rast3d input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.register -i type=3draster input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-01" increment="3 months"
+t.register --o type=3draster input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.info type=str3ds input=precip_abs1
t.info type=str3ds input=precip_abs2
@@ -33,6 +33,6 @@
method=equal nprocs=6
t.info type=str3ds input=precip_abs4
-t.unregister type=rast3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.unregister type=rast3d maps=new_prec_1,new_prec_2,new_prec_3,new_prec_4,new_prec_5,new_prec_6
+t.unregister type=3draster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=3draster maps=new_prec_1,new_prec_2,new_prec_3,new_prec_4,new_prec_5,new_prec_6
t.remove type=str3ds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
Modified: grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
===================================================================
--- grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-11-29 07:39:09 UTC (rev 63285)
+++ grass/trunk/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-11-29 14:43:31 UTC (rev 63286)
@@ -17,7 +17,7 @@
r3.mapcalc expr="prec_6 = rand(0, 650)" -s
t.create type=str3ds temporaltype=absolute output=precip_abs1 title="A test" descr="A test"
-t.register type=rast3d --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
+t.register type=3draster --v -i input=precip_abs1 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 start="2001-01-15 12:05:45" increment="14 days"
t.info type=str3ds input=precip_abs1
# The first @test
Modified: grass/trunk/temporal/t.register/test.t.register.raster3d.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.raster3d.sh 2014-11-29 07:39:09 UTC (rev 63285)
+++ grass/trunk/temporal/t.register/test.t.register.raster3d.sh 2014-11-29 14:43:31 UTC (rev 63286)
@@ -30,12 +30,12 @@
t.create --v --o type=str3ds temporaltype=absolute output=volume_abs6 title="A test" descr="A test"
t.create --v --o type=str3ds temporaltype=absolute output=volume_abs7 title="A test" descr="A test"
-t.register type=rast3d --o --v -i input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="1 seconds"
+t.register type=3draster --o --v -i input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="1 seconds"
t.info type=str3ds input=volume_abs1
-t.unregister --v type=rast3d input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=3draster input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.info type=str3ds input=volume_abs1
-t.register type=rast3d --o --v -i input=volume_abs2 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 seconds, 5 minutes"
+t.register type=3draster --o --v -i input=volume_abs2 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 seconds, 5 minutes"
t.info type=str3ds input=volume_abs2
r3.info volume_1
r3.info volume_2
@@ -44,28 +44,28 @@
r3.info volume_5
r3.info volume_6
-t.register type=rast3d --o --v -i input=volume_abs3 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="8 hours"
+t.register type=3draster --o --v -i input=volume_abs3 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="8 hours"
t.info type=str3ds input=volume_abs3
-t.unregister --v type=rast3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=3draster maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.info type=str3ds input=volume_abs3
-t.register type=rast3d --o input=volume_abs4 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="3 days"
+t.register type=3draster --o input=volume_abs4 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="3 days"
t.info type=str3ds input=volume_abs4
-t.register type=rast3d --o input=volume_abs5 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="4 weeks"
+t.register type=3draster --o input=volume_abs5 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="4 weeks"
t.info type=str3ds input=volume_abs5
-t.register type=rast3d --o input=volume_abs6 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-08-01" increment="2 months"
+t.register type=3draster --o input=volume_abs6 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-08-01" increment="2 months"
t.info type=str3ds input=volume_abs6
-t.register type=rast3d --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
+t.register type=3draster --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="20 years, 3 months, 1 days, 4 hours"
t.info type=str3ds input=volume_abs7
# Register with different valid time again
-t.register type=rast3d --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=3draster --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=str3ds input=volume_abs7
# Register with different valid time again creating intervals
-t.register type=rast3d -i --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
+t.register type=3draster -i --o input=volume_abs7 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6 start="2001-01-01" increment="99 years, 9 months, 9 days, 9 hours"
t.info type=str3ds input=volume_abs7
-t.unregister --v type=rast3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=3draster maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.remove --v type=str3ds input=volume_abs1,volume_abs2,volume_abs3,volume_abs4,volume_abs5,volume_abs6,volume_abs7
More information about the grass-commit
mailing list