Explorar el Código

r.series.interp renaming

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50162 15284696-431f-4ddb-bdfa-cd5b030d7da7
Soeren Gebbert hace 13 años
padre
commit
0e2292c148

+ 1 - 1
raster/r.series.interp/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-PGM = r.series.interpol
+PGM = r.series.interp
 
 LIBES = $(STATSLIB) $(RASTERLIB) $(GISLIB)
 DEPENDENCIES = $(STATSDEP) $(RASTERDEP) $(GISDEP)

+ 1 - 1
raster/r.series.interp/main.c

@@ -1,7 +1,7 @@
 
 /****************************************************************************
  *
- * MODULE:       r.series.interpol
+ * MODULE:       r.series.interp
  * AUTHOR(S):    Soeren Gebbert <soerengebbert googlemail.com>
  *               Code is based on r.series from Glynn Clements <glynn gclements.plus.com> 
  *

+ 3 - 3
raster/r.series.interp/r.series.interp.html

@@ -1,6 +1,6 @@
 <h2>DESCRIPTION</h2>
 
-<em>r.series.interpol</em> 
+<em>r.series.interp</em> 
 interpolates new raster maps located temporal or spatial in between existing raster maps. 
 The interpolation is performed at specific sampling positions. The sampling position for each output map must be specified,
 as well as the data position of the input maps. 
@@ -25,7 +25,7 @@ r.mapcalc --o expr="prec_5 = 500"
 <p>Interpolate
 
 <div class="code"><pre>
-r.series.interpol --o --v input=prec_1,prec_5 datapos=0.0,1.0\
+r.series.interp --o --v input=prec_1,prec_5 datapos=0.0,1.0\
                   output=prec_2,prec_3,prec_4 sampoint=0.25,0.5,0.75\ 
                   method=linear
 </pre></div>
@@ -44,7 +44,7 @@ EOF
 <p>Interpolate:
 
 <div class="code"><pre>
-r.series.interpol --o --v input=prec_1,prec_5 datapos=0.0,1.0 file=outfile.txt method=linear
+r.series.interp --o --v input=prec_1,prec_5 datapos=0.0,1.0 file=outfile.txt method=linear
 </pre></div>
 
 The resulting maps will have the values 200, 300 and 400.

+ 11 - 11
raster/r.series.interp/test_suite/test.r.series.interpol.sh

@@ -1,4 +1,4 @@
-# Test r.series.interpol 
+# Test r.series.interp 
 # We need to set a specific region in the
 # @preprocess step of this test. We generate
 # raster maps with r.mapcalc 
@@ -14,19 +14,19 @@ r.mapcalc --o expr="map_30 = 30"
 r.mapcalc --o expr="map_40 = 40"
 
 # We create an input files containing empty lines. 
-# However, r.series.interpol should process the 
+# However, r.series.interp should process the 
 # valid raster maps and positions listed in the files.
 
 # The first @test with map input and @precision=3
-r.series.interpol --o --v input=prec_1,prec_5 datapos=0.0,1.0 output=prec_2,prec_3,prec_4 samplingpos=0.25,0.5,0.75 method=linear
+r.series.interp --o --v input=prec_1,prec_5 datapos=0.0,1.0 output=prec_2,prec_3,prec_4 samplingpos=0.25,0.5,0.75 method=linear
 
 #r.out.ascii --o input=prec_2 output=test_1_prec_2.ref dp=3
 #r.out.ascii --o input=prec_3 output=test_1_prec_3.ref dp=3
 #r.out.ascii --o input=prec_4 output=test_1_prec_4.ref dp=3
 
 # The second @test with file input and @precision=3
-r.series.interpol --o --v input=prec_1,prec_5 datapos=0.0,1.0 outfile=outfile_1.txt method=linear
-r.series.interpol --o --v infile=infile_2.txt outfile=outfile_2.txt method=linear
+r.series.interp --o --v input=prec_1,prec_5 datapos=0.0,1.0 outfile=outfile_1.txt method=linear
+r.series.interp --o --v infile=infile_2.txt outfile=outfile_2.txt method=linear
 
 #r.out.ascii --o input=prec_2 output=test_2_prec_2.ref dp=3
 #r.out.ascii --o input=prec_3 output=test_2_prec_3.ref dp=3
@@ -41,16 +41,16 @@ r.series.interpol --o --v infile=infile_2.txt outfile=outfile_2.txt method=linea
 # We need @tests to check the @failure handling, as outputs, file and sampling points
 # are not handled by the grass parser
 # No outputs
-r.series.interpol --o --v input=prec_1,prec_5 datapos=0.0,1.0 samplingpos=0.25,0.5,0.75
+r.series.interp --o --v input=prec_1,prec_5 datapos=0.0,1.0 samplingpos=0.25,0.5,0.75
 # No sampling points
-r.series.interpol --o --v input=prec_1,prec_5 datapos=0.0,1.0 output=prec_2,prec_3,prec_4 
+r.series.interp --o --v input=prec_1,prec_5 datapos=0.0,1.0 output=prec_2,prec_3,prec_4 
 # Output and file at once
-r.series.interpol --o --v  input=prec_1,prec_5 datapos=0.0,1.0 outfile=outfile_1.txt \
+r.series.interp --o --v  input=prec_1,prec_5 datapos=0.0,1.0 outfile=outfile_1.txt \
                   output=prec_2,prec_3,prec_4 samplingpos=0.25,0.5,0.75 method=linear
 # Sampling points and file at once 
-r.series.interpol --o --v  input=prec_1,prec_5 datapos=0.0,1.0 outfile=outfile_1.txt samplingpos=0.25,0.5,0.75 method=linear
+r.series.interp --o --v  input=prec_1,prec_5 datapos=0.0,1.0 outfile=outfile_1.txt samplingpos=0.25,0.5,0.75 method=linear
 # Wrong input file
-r.series.interpol --o --v input=prec_1,prec_5 datapos=0.0,1.0 outfile=no_file_there method=linear
+r.series.interp --o --v input=prec_1,prec_5 datapos=0.0,1.0 outfile=no_file_there method=linear
 # Corrupt input file
-r.series.interpol --o --v  input=prec_1,prec_5 datapos=0.0,1.0 outfile=outfile_corrupt.txt method=linear
+r.series.interp --o --v  input=prec_1,prec_5 datapos=0.0,1.0 outfile=outfile_corrupt.txt method=linear