[GRASS-SVN] r63776 - in grass/branches/releasebranch_7_0: general/g.list raster/r.patch raster/r.watershed/front scripts/i.spectral scripts/v.dissolve temporal/t.merge temporal/t.merge/testsuite temporal/t.rast.accdetect/testsuite temporal/t.rast.accumulate/testsuite temporal/t.rast.aggregate.ds 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.rast3d.extract/testsuite temporal/t.rast3d.list/testsuite temporal/t.rast3d.mapcalc temporal/t.rast3d.univar/testsuite temporal/t.register temporal/t.remove temporal/t.rename temporal/t.sample temporal/t.shift temporal/t.snap temporal/t.support temporal/t.topology temporal/t.unregister temporal/t.vect.db.select temporal/t.vect.import vector/v.distance vector/v.lrs/v.lrs.create
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 26 15:50:11 PST 2014
Author: neteler
Date: 2014-12-26 15:50:11 -0800 (Fri, 26 Dec 2014)
New Revision: 63776
Modified:
grass/branches/releasebranch_7_0/general/g.list/g.list.html
grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html
grass/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html
grass/branches/releasebranch_7_0/scripts/i.spectral/i.spectral.html
grass/branches/releasebranch_7_0/scripts/v.dissolve/v.dissolve.html
grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.html
grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh
grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html
grass/branches/releasebranch_7_0/temporal/t.rast.colors/test.t.rast.colors.sh
grass/branches/releasebranch_7_0/temporal/t.rast.export/test.t.rast.export.sh
grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/t.rast.gapfill.html
grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/test.t.rast.gapfill.sh
grass/branches/releasebranch_7_0/temporal/t.rast.import/t.rast.import.html
grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.relative.sh
grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.sh
grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import_locations.sh
grass/branches/releasebranch_7_0/temporal/t.rast.list/test.t.rast.list.sh
grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/example.sh
grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/test.t.rast.neighbors.sh
grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh
grass/branches/releasebranch_7_0/temporal/t.rast.series/test.t.rast.series.sh
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.html
grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
grass/branches/releasebranch_7_0/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
grass/branches/releasebranch_7_0/temporal/t.register/t.register.html
grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.file.reltime.sh
grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.file.sh
grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.sh
grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster3d.sh
grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.html
grass/branches/releasebranch_7_0/temporal/t.rename/test.t.rename.sh
grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html
grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.html
grass/branches/releasebranch_7_0/temporal/t.shift/test.t.shift.absolue.sh
grass/branches/releasebranch_7_0/temporal/t.shift/test.t.shift.relative.sh
grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.html
grass/branches/releasebranch_7_0/temporal/t.snap/test.t.snap.absolute.sh
grass/branches/releasebranch_7_0/temporal/t.snap/test.t.snap.relative.sh
grass/branches/releasebranch_7_0/temporal/t.support/test.t.support.sh
grass/branches/releasebranch_7_0/temporal/t.topology/test.t.topology.abstime.sh
grass/branches/releasebranch_7_0/temporal/t.topology/test.t.topology.reltime.sh
grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html
grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh
grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.html
grass/branches/releasebranch_7_0/vector/v.distance/v.distance.html
grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.create/v.lrs.create.html
Log:
docs: update examples to use new element names; temporal test suite new element names update (#2409)
Modified: grass/branches/releasebranch_7_0/general/g.list/g.list.html
===================================================================
--- grass/branches/releasebranch_7_0/general/g.list/g.list.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/general/g.list/g.list.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -19,12 +19,12 @@
List all vector maps as continuous, sorted list with MAPSET info (i.e.
fully-qualified map names):
<div class="code"><pre>
-g.list type=vect -m
+g.list type=vector -m
</pre></div>
List all raster and vector maps ordered by mapset:
<div class="code"><pre>
-g.list type=rast -p
+g.list type=raster -p
</pre></div>
List all raster and vector maps as continuous, sorted list:
@@ -86,22 +86,22 @@
List all vector maps starting with letter "r":
<div class="code"><pre>
-g.list type=vect pattern="r*"
+g.list type=vector pattern="r*"
</pre></div>
List all vector maps starting with letter "r" or "a":
<div class="code"><pre>
-g.list type=vect pattern="[ra]*"
+g.list type=vector pattern="[ra]*"
</pre></div>
List all raster maps starting with "soil_" or "landuse_":
<div class="code"><pre>
-g.list type=rast pattern="{soil,landuse}_*"
+g.list type=raster pattern="{soil,landuse}_*"
</pre></div>
List certain raster maps with one variable character/number:
<div class="code"><pre>
-g.list type=rast pattern="N45E00?.meters"
+g.list type=raster pattern="N45E00?.meters"
</pre></div>
Use of <b>exclude</b> parameter:
@@ -129,31 +129,31 @@
List all soil maps starting with "soils" in their name:
<div class="code"><pre>
-g.list -r type=rast pattern='^soils'
+g.list -r type=raster pattern='^soils'
</pre></div>
List "tmp" if "tmp" raster map exists:
<div class="code"><pre>
-g.list -r type=rast pattern='^tmp$'
+g.list -r type=raster pattern='^tmp$'
</pre></div>
List "tmp0" ..."tmp9" if corresponding vector map exists
(each map name linewise):
<div class="code"><pre>
-g.list -r type=vect pattern='^tmp[0-9]$'
+g.list -r type=vector pattern='^tmp[0-9]$'
</pre></div>
List "tmp0"..."tmp9" if corresponding vector map exists
(each map name comma separated):
<div class="code"><pre>
-g.list -r type=vect separator=comma pattern='^tmp[0-9]$'
+g.list -r type=vector separator=comma pattern='^tmp[0-9]$'
</pre></div>
<h3>Extended regular expressions</h3>
List all precipitation maps for the years 1997-2012, comma separated:
<div class="code"><pre>
-g.list -e type=rast separator=comma pattern="precip_total.(199[7-9]|200[0-9]|201[0-2]).sum"
+g.list -e type=raster separator=comma pattern="precip_total.(199[7-9]|200[0-9]|201[0-2]).sum"
</pre></div>
<h3>Maps whose region overlaps with a saved region</h3>
@@ -162,13 +162,13 @@
the region of "test" raster map:
<div class="code"><pre>
g.region raster=test save=test_region
-g.list type=rast pattern='tmp_*' region=test_region
+g.list type=raster pattern='tmp_*' region=test_region
</pre></div>
List "tmp0"..."tmp9" vector maps whose region overlaps with
the current region:
<div class="code"><pre>
-g.list -r type=vect pattern='^tmp[0-9]$' region=.
+g.list -r type=vector pattern='^tmp[0-9]$' region=.
</pre></div>
List all raster and vector maps whose region overlaps with the default region
Modified: grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/raster/r.patch/r.patch.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -103,7 +103,7 @@
used in the order listed.
<div class="code"><pre>
-MAPS=`g.list type=rast sep=, pat="map_*"`
+MAPS=`g.list type=raster sep=, pat="map_*"`
g.region raster=$MAPS
r.patch in=$MAPS out=mosaic
</pre></div>
Modified: grass/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -422,7 +422,7 @@
abs(rwater.accum), \
null() )"
r.colors -g rwater.course col=bcyr
- g.remove -f type=rast name=MASK
+ g.remove -f type=raster name=MASK
# <i>Thinning is required before converting raster lines to vector</i>
r.thin in=rwater.course out=rwater.course.Thin
Modified: grass/branches/releasebranch_7_0/scripts/i.spectral/i.spectral.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/i.spectral/i.spectral.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/scripts/i.spectral/i.spectral.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -29,7 +29,7 @@
<div class="code"><pre>
g.region raster=lsat7_2002_10 -p
-LIST=`g.list type=rast pattern="lsat7_2002_[1-5,7]0" separator=","`
+LIST=`g.list type=raster pattern="lsat7_2002_[1-5,7]0" separator=","`
i.spectral input=$LIST coordinates=637502.25,221744.25
</pre></div>
Modified: grass/branches/releasebranch_7_0/scripts/v.dissolve/v.dissolve.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.dissolve/v.dissolve.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/scripts/v.dissolve/v.dissolve.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -50,7 +50,7 @@
<div class="code"><pre>
# patch tiles after import:
-v.patch -e `g.list type=vect pat="clc2000_*" separator=","` out=clc2000_patched
+v.patch -e `g.list type=vector pat="clc2000_*" separator=","` out=clc2000_patched
# remove duplicated tile boundaries:
v.clean clc2000_patched out=clc2000_clean tool=snap,break,rmdupl thresh=.01
Modified: grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.merge/t.merge.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -28,7 +28,7 @@
title="Daily precipitation" \
description="Test dataset with daily precipitation"
-t.register -i type=rast input=precipitation_daily_1 \
+t.register -i type=raster input=precipitation_daily_1 \
maps=map1,map2 start=2012-08-20 increment="1 days"
t.info precipitation_daily_1
@@ -94,7 +94,7 @@
title="Daily precipitation" \
description="Test dataset with daily precipitation"
-t.register -i type=rast input=precipitation_daily_2 \
+t.register -i type=raster input=precipitation_daily_2 \
maps=map3,map4 start=2012-08-22 increment="1 days"
t.info precipitation_daily_2
Modified: grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.merge/testsuite/test.t.merge.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.reverse.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accdetect/testsuite/test.t.rast.accdetect.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/testsuite/test.t.rast.accumulate.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -47,7 +47,7 @@
title="Daily precipitation" \
description="Test dataset with daily precipitation"
-t.register -i type=rast input=precipitation_daily \
+t.register -i type=raster input=precipitation_daily \
file=map_list.txt start="2012-08-20" increment="1 days"
t.info type=strds input=precipitation_daily
@@ -112,9 +112,9 @@
title="Points" \
description="Points for aggregation"
-t.register -i type=vect input=points \
+t.register -i type=vector input=points \
map=points_1 start="2012-08-20" increment="3 days"
-t.register -i type=vect input=points \
+t.register -i type=vector input=points \
map=points_2 start="2012-08-23" increment="4 days"
t.info type=stvds input=points
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.colors/test.t.rast.colors.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.colors/test.t.rast.colors.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.colors/test.t.rast.colors.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.export/test.t.rast.export.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.export/test.t.rast.export.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.export/test.t.rast.export.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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 directory=/tmp
t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar.gz compression=gzip directory=/tmp
t.rast.export format=GTiff input=precip_abs1 output=strds_export_gtiff.tar compression=no directory=/tmp
@@ -37,7 +37,7 @@
t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip directory=/tmp
t.rast.export format=pack input=precip_abs1 output=strds_export_pack.tar compression=no directory=/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/branches/releasebranch_7_0/temporal/t.rast.gapfill/t.rast.gapfill.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/t.rast.gapfill.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/t.rast.gapfill.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -24,16 +24,16 @@
r.mapcalc expr="map2 = 3"
r.mapcalc expr="map3 = 5"
-t.register type=rast maps=map1 start=2012-08-20 end=2012-08-21
-t.register type=rast maps=map2 start=2012-08-22 end=2012-08-23
-t.register type=rast maps=map3 start=2012-08-24 end=2012-08-25
+t.register type=raster maps=map1 start=2012-08-20 end=2012-08-21
+t.register type=raster maps=map2 start=2012-08-22 end=2012-08-23
+t.register type=raster maps=map3 start=2012-08-24 end=2012-08-25
t.create type=strds temporaltype=absolute \
output=precipitation_daily \
title="Daily precipitation" \
description="Test dataset with daily precipitation"
-t.register type=rast input=precipitation_daily maps=map1,map2,map3
+t.register type=raster input=precipitation_daily maps=map1,map2,map3
t.rast.list input=precipitation_daily columns=name,start_time,min,max
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/test.t.rast.gapfill.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/test.t.rast.gapfill.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.gapfill/test.t.rast.gapfill.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -21,17 +21,17 @@
EOF
t.create --v 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/branches/releasebranch_7_0/temporal/t.rast.import/t.rast.import.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.import/t.rast.import.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.import/t.rast.import.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -17,7 +17,7 @@
<div class="code"><pre>
t.rast.import input=lst_daily.tar.bzip2 output=lst_daily \
- base=lst extrdir=/tmp
+ base=lst directory=/tmp
</pre></div>
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.relative.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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 directory=test
t.rast.export input=precip_rel output=strds_export.tar.gz compression=gzip format=GTiff directory=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/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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 directory=test
t.rast.export input=precip_abs1 output=strds_export.tar.gz compression=gzip format=GTiff directory=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/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import_locations.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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 directory=test
t.rast.export input=precip_abs1 output=strds_export_pack.tar.gz compression=gzip format=pack directory=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/branches/releasebranch_7_0/temporal/t.rast.list/test.t.rast.list.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.list/test.t.rast.list.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.list/test.t.rast.list.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.mapcalc/example.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/example.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/example.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.operators.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.neighbors/test.t.rast.neighbors.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/test.t.rast.neighbors.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.neighbors/test.t.rast.neighbors.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.out.vtk/test.t.rast.out.vtk.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.series/test.t.rast.series.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.series/test.t.rast.series.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.series/test.t.rast.series.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/t.rast.to.rast3.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -42,73 +42,7 @@
# convert to 3D raster map
t.rast.to.rast3 in=tempmean_monthly_later_2012 at climate_2009_2012 out=tempmean_monthly_2012
-cat > "${n1}" << EOF
-a1|2001-01-01|2001-04-01
-a2|2001-05-01|2001-07-01
-a3|2001-08-01|2001-10-01
-EOF
-
-t.create type=strds temporaltype=absolute output=A title="A test" descr="A test"
-
-t.register -i type=rast input=A file=${n1}
-
-t.info type=strds input=A
-
- +-------------------- Space Time Raster Dataset -----------------------------+
- | |
- +-------------------- Basic information -------------------------------------+
- | Id: ........................ A at PERMANENT
- | Name: ...................... A
- | Mapset: .................... PERMANENT
- | Creator: ................... soeren
- | Temporal type: ............. absolute
- | Creation time: ............. 2014-11-23 16:28:21.170177
- | Modification time:.......... 2014-11-23 16:28:21.641846
- | Semantic type:.............. mean
- +-------------------- Absolute time -----------------------------------------+
- | Start time:................. 2001-01-01 00:00:00
- | End time:................... 2001-10-01 00:00:00
- | Granularity:................ 1 month
- | Temporal type of maps:...... interval
- +-------------------- Spatial extent ----------------------------------------+
- | North:...................... 80.0
- | South:...................... 0.0
- | East:.. .................... 120.0
- | West:....................... 0.0
- | Top:........................ 0.0
- | Bottom:..................... 0.0
- +-------------------- Metadata information ----------------------------------+
- | Raster register table:...... raster_map_register_c70e476695a04975a03ccb655ed0bb2c
- | North-South resolution min:. 10.0
- | North-South resolution max:. 10.0
- | East-west resolution min:... 10.0
- | East-west resolution max:... 10.0
- | Minimum value min:.......... 100.0
- | Minimum value max:.......... 300.0
- | Maximum value min:.......... 100.0
- | Maximum value max:.......... 300.0
- | Aggregation type:........... None
- | Number of registered maps:.. 3
- |
- | Title:
- | A test
- | Description:
- | A test
- | Command history:
- | # 2014-11-23 16:28:21
- | t.create type="strds" temporaltype="absolute"
- | output="A" title="A test" descr="A test"
- | # 2014-11-23 16:28:21
- | t.register -i type="rast" input="A"
- | file="/home/soeren/grassdata/LL/PERMANENT/.tmp/knecht/1.2"
- |
- +----------------------------------------------------------------------------+
-
-
-t.rast.to.rast3 input=A output=cube
-
-t.info type=rast3d input=cube
-
+t.info type=raster_3d input=tempmean_monthly_2012
+-------------------- 3D Raster Dataset -------------------------------------+
| |
+-------------------- Basic information -------------------------------------+
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.to.rast3/test.t.rast.to.rast3.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -30,56 +30,56 @@
t.info type=strds input=precip_abs
t.rast.to.rast3 --o input=precip_abs output=precipitation
-t.info type=raster3d input=precipitation
+t.info type=raster_3d input=precipitation
r3.info precipitation
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=raster3d input=precipitation
+t.info type=raster_3d input=precipitation
r3.info precipitation
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=raster3d input=precipitation
+t.info type=raster_3d input=precipitation
r3.info precipitation
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=raster3d input=precipitation
+t.info type=raster_3d input=precipitation
r3.info precipitation
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=raster3d input=precipitation
+t.info type=raster_3d input=precipitation
r3.info precipitation
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=raster3d input=precipitation
+t.info type=raster_3d input=precipitation
r3.info precipitation
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=raster3d input=precipitation
+t.info type=raster_3d input=precipitation
r3.info precipitation
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=raster3d input=precipitation
+t.info type=raster_3d input=precipitation
r3.info precipitation
t.unregister type=raster maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/branches/releasebranch_7_0/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.univar/testsuite/test.t.rast.univar.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/testsuite/test.t.rast3d.extract.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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=raster3d 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=raster_3d 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=raster3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster_3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=str3ds input=precip_abs1,precip_abs2
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.list/testsuite/test.t.rast3d.list.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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=raster3d input=volume_abs1 file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=raster_3d 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=raster3d input=volume_abs2 file="${n2}"
+t.register -i type=raster_3d 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=raster3d input=volume_abs3 file="${n3}"
+t.register -i type=raster_3d 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=raster3d input=volume_abs4 file="${n4}"
+t.register -i type=raster_3d 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=raster3d input=volume_abs5 file="${n5}"
+t.register -i type=raster_3d 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=raster3d maps=vol_1,vol_2,vol_3,vol_4,vol_5,vol_6
+t.unregister type=raster_3d 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/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.mapcalc/test.t.rast3d.mapcalc.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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=raster3d 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=raster3d input=precip_abs2 maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.register -i type=raster_3d 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=raster_3d 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=raster3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.unregister type=raster3d maps=new_prec_1,new_prec_2,new_prec_3,new_prec_4,new_prec_5,new_prec_6
+t.unregister type=raster_3d maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+t.unregister type=raster_3d 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/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.univar/testsuite/test.t.rast3d.univar.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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=raster3d --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_3d --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/branches/releasebranch_7_0/temporal/t.register/t.register.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/t.register.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.register/t.register.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -84,7 +84,7 @@
Register maps in a absolute space time dataset, creating a time interval
<div class="code"><pre>
-t.register -i type=rast input=precipitation_monthly \
+t.register -i type=raster input=precipitation_monthly \
maps=`g.list rast patt=*precip* sep=,` start=2009-01-01 \
increment="1 months"
</pre></div>
@@ -105,7 +105,7 @@
output=precip_abs title="Example" \
descr="Example"
-t.register -i type=rast input=precip_abs \
+t.register -i 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"
@@ -128,7 +128,7 @@
r.mapcalc expr="prec_7 = 700"
r.timestamp map=prec_7 date="1 jul 2001 / 1 aug 2001"
-t.register type=rast input=precip_abs maps=prec_7
+t.register type=raster input=precip_abs maps=prec_7
t.rast.list input=precip_abs
Modified: grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.file.reltime.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.file.reltime.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.file.reltime.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.file.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.file.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.file.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster3d.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster3d.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.register/test.t.register.raster3d.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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=raster3d --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=raster_3d --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=raster3d input=volume_abs1 maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=raster_3d 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=raster3d --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=raster_3d --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=raster3d --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=raster_3d --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=raster3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=raster_3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
t.info type=str3ds input=volume_abs3
-t.register type=raster3d --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=raster_3d --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=raster3d --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=raster_3d --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=raster3d --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=raster_3d --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=raster3d --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=raster_3d --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=raster3d --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=raster_3d --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=raster3d -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=raster_3d -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=raster3d maps=volume_1,volume_2,volume_3,volume_4,volume_5,volume_6
+t.unregister --v type=raster_3d 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
Modified: grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.remove/t.remove.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -26,8 +26,8 @@
North Carolina sample data location"
#Register maps from sample dataset (selecting a subset with g.list)
-t.register -i type=rast input=precip_months_sum \
- maps=$(g.list type=rast pattern=201*_precip separator=comma) \
+t.register -i type=raster input=precip_months_sum \
+ maps=$(g.list type=raster pattern=201*_precip separator=comma) \
start="2010-01-01" increment="1 months"
#Create some new data by aggregating with 1 years granularity
Modified: grass/branches/releasebranch_7_0/temporal/t.rename/test.t.rename.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rename/test.t.rename.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.rename/test.t.rename.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.sample/t.sample.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -78,7 +78,7 @@
t.create type=stvds temporaltype=absolute output=P \
title="A test with vector input files" descr="A test with vector input files"
-t.register type=rast -i input=A file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=raster -i input=A file="${n1}" start="2001-01-01" increment="1 months"
# Raster map layer in A
t.rast.list A
@@ -92,7 +92,7 @@
a6|PERMANENT|2001-06-01 00:00:00|2001-07-01 00:00:00
-t.register type=vect input=P file="${n2}"
+t.register type=vector input=P file="${n2}"
# Vector map layer in P
t.vect.list P
Modified: grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.shift/t.shift.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -44,7 +44,7 @@
title="Daily precipitation" \
description="Test dataset with daily precipitation"
-t.register -i type=rast input=precipitation_daily \
+t.register -i type=raster input=precipitation_daily \
maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6 \
start=2012-01-01 increment="1 day"
Modified: grass/branches/releasebranch_7_0/temporal/t.shift/test.t.shift.absolue.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.shift/test.t.shift.absolue.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.shift/test.t.shift.absolue.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.shift/test.t.shift.relative.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.shift/test.t.shift.relative.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.shift/test.t.shift.relative.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.snap/t.snap.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.snap/t.snap.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -28,8 +28,8 @@
title="Monthly precipitation" \
description="Dataset with monthly precipitation"
-t.register type=rast input=precipitation_monthly \
- maps=`g.list type=rast patt=2012*precip sep=,` \
+t.register type=raster input=precipitation_monthly \
+ maps=`g.list type=raster patt=2012*precip sep=,` \
start=2012-01-01 increment="1 months"
# please take attention to "Temporal type of maps" value
Modified: grass/branches/releasebranch_7_0/temporal/t.snap/test.t.snap.absolute.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.snap/test.t.snap.absolute.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.snap/test.t.snap.absolute.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.snap/test.t.snap.relative.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.snap/test.t.snap.relative.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.snap/test.t.snap.relative.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.support/test.t.support.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.support/test.t.support.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.support/test.t.support.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.topology/test.t.topology.abstime.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.topology/test.t.topology.abstime.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.topology/test.t.topology.abstime.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.topology/test.t.topology.reltime.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.topology/test.t.topology.reltime.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.topology/test.t.topology.reltime.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.unregister/t.unregister.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -36,17 +36,17 @@
<div class="code"><pre>
-t.register -i type=rast input=tempmean_monthly at climate_2009_2012 \
+t.register -i type=raster input=tempmean_monthly at climate_2009_2012 \
maps=2012_01_precip \
start="2013-01-01" increment="1 month"
# We unregister raster map 2012_01_precip from a space time dataset,
# the raster maps are still present in the temporal database
-t.unregister type=rast input=tempmean_monthly at climate_2009_2012 maps=2012_01_precip
+t.unregister type=raster input=tempmean_monthly at climate_2009_2012 maps=2012_01_precip
# We unregister raster map 2012_01_precip from the temporal database, hence
# the time stamps are removed
-t.unregister type=rast maps=2012_01_precip
+t.unregister type=raster maps=2012_01_precip
</pre></div>
Modified: grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-12-26 23:50:11 UTC (rev 63776)
@@ -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/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.import/t.vect.import.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -26,7 +26,7 @@
title="Random locations" \
description="Vector test dataset with random locations"
-t.register -i type=vect input=random_locations \
+t.register -i type=vector input=random_locations \
file=map_list.txt start="2012-01-01" increment="1 months"
t.vect.list random_locations
Modified: grass/branches/releasebranch_7_0/vector/v.distance/v.distance.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.distance/v.distance.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/vector/v.distance/v.distance.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -149,7 +149,7 @@
# we need to give the lines category numbers, create a table, and create
# a column in that table to hold the distance data.
v.category vdistance_vectors_raw out=vdistance_vectors type=line op=add
-g.remove -f type=vect name=vdistance_vectors_raw
+g.remove -f type=vector name=vdistance_vectors_raw
v.db.addtable map=vdistance_vectors column="length DOUBLE"
v.to.db map=vdistance_vectors option=length column=length
Modified: grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.create/v.lrs.create.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.create/v.lrs.create.html 2014-12-26 23:33:06 UTC (rev 63775)
+++ grass/branches/releasebranch_7_0/vector/v.lrs/v.lrs.create/v.lrs.create.html 2014-12-26 23:50:11 UTC (rev 63776)
@@ -43,7 +43,7 @@
# vector line needs to be polyline
v.build.polylines busroute_tmp2 out=busroute_tmp3
v.category busroute_tmp3 out=busroute op=add
-g.remove -f type=vect name=busroute_tmp,busroute_tmp2,busroute_tmp3
+g.remove -f type=vector name=busroute_tmp,busroute_tmp2,busroute_tmp3
</pre></div>
The result can be visualized:
More information about the grass-commit
mailing list