[GRASS-SVN] r63511 - in grass/branches/releasebranch_7_0: . raster raster/r.surf.idw
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 12 11:27:06 PST 2014
Author: martinl
Date: 2014-12-12 11:27:06 -0800 (Fri, 12 Dec 2014)
New Revision: 63511
Removed:
grass/branches/releasebranch_7_0/raster/r.surf.idw2/
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/raster/Makefile
grass/branches/releasebranch_7_0/raster/r.surf.idw/main.c
grass/branches/releasebranch_7_0/raster/r.surf.idw/r.surf.idw.html
Log:
r.surf.idw moved to addons
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482,63497,63505
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453,63457,63459,63473,63482,63497,63505,63508,63510
Modified: grass/branches/releasebranch_7_0/raster/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/raster/Makefile 2014-12-12 18:56:52 UTC (rev 63510)
+++ grass/branches/releasebranch_7_0/raster/Makefile 2014-12-12 19:27:06 UTC (rev 63511)
@@ -106,7 +106,6 @@
r.surf.fractal \
r.surf.gauss \
r.surf.idw \
- r.surf.idw2 \
r.surf.random \
r.terraflow \
r.texture \
Modified: grass/branches/releasebranch_7_0/raster/r.surf.idw/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.surf.idw/main.c 2014-12-12 18:56:52 UTC (rev 63510)
+++ grass/branches/releasebranch_7_0/raster/r.surf.idw/main.c 2014-12-12 19:27:06 UTC (rev 63511)
@@ -105,7 +105,7 @@
G_add_keyword(_("interpolation"));
G_add_keyword(_("IDW"));
module->description =
- _("Surface interpolation utility for raster map.");
+ _("Provides surface interpolation from raster point data by Inverse Distance Squared Weighting.");
parm.input = G_define_standard_option(G_OPT_R_INPUT);
Modified: grass/branches/releasebranch_7_0/raster/r.surf.idw/r.surf.idw.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.surf.idw/r.surf.idw.html 2014-12-12 18:56:52 UTC (rev 63510)
+++ grass/branches/releasebranch_7_0/raster/r.surf.idw/r.surf.idw.html 2014-12-12 19:27:06 UTC (rev 63511)
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>
<em>r.surf.idw</em> fills a grid cell (raster) matrix with
-interpolated values generated from a set of input layer
+interpolated values generated from input raster
data points. It uses a numerical approximation technique
based on distance squared weighting of the values of
nearest data points. The number of nearest data points used
@@ -21,12 +21,11 @@
<p>The <b>npoints</b> parameter defines the number of nearest data points used
to determine the interpolated value of an output raster cell.
-<A NAME="notes.html"></a>
<h2>NOTES</h2>
<em>r.surf.idw</em> is a surface generation utility which
uses inverse distance squared weighting (as described in
-<b>Applied Geostatistics</b> by E. H. Isaaks and R. M.
+<i>Applied Geostatistics</i> by E. H. Isaaks and R. M.
Srivastava, Oxford University Press, 1989) to assign
interpolated values. The implementation includes a
customized data structure somewhat akin to a sparse matrix
@@ -36,7 +35,7 @@
geodesic.
<p>
-Unlike <em><a href="r.surf.idw2.html">r.surf.idw2</a></em>, which processes
+Unlike <em><a href="http://grass.osgeo.org/grass70/manuals/addons/r.surf.idw2.html">r.surf.idw2</a></em> (addons), which processes
all input data points in each interpolation cycle, <em>r.surf.idw</em>
attempts to minimize the number of input data for which distances must be
calculated. Execution speed is therefore a function of the search effort,
@@ -44,10 +43,10 @@
<p>
<em>r.surf.idw</em> will generally outperform
-<em><a href="r.surf.idw2.html">r.surf.idw2</a></em> except when the input data
+<em>r.surf.idw2</em> except when the input data
layer contains few non-zero data, i.e. when the cost of the search exceeds
the cost of the additional distance calculations performed by
-<em><a href="r.surf.idw2.html">r.surf.idw2</a></em>. The relative performance
+<em>r.surf.idw2</em>. The relative performance
of these utilities will depend on the comparative speed of boolean, integer
and floating point operations on a particular platform.
@@ -67,8 +66,9 @@
for the former may include unacceptable nonconformities in
the surface pattern.
+<a name="minuse.html"></a>
<p>
-The <A NAME="minuse.html"><b>-e</b></a> flag option provides a standard
+The <b>-e</b> flag option provides a standard
surface-generation error analysis facility. It produces an output raster map
of the difference of interpolated values minus input values for those cells
whose input data are non-zero. For each interpolation cycle, the known value
@@ -81,15 +81,15 @@
<h2>SEE ALSO</h2>
-<em><a href="r.surf.contour.html">r.surf.contour</a></em>,
-<em><a href="r.surf.idw2.html">r.surf.idw2</a></em>,
-<em><a href="r.surf.gauss.html">r.surf.gauss</a></em>,
-<em><a href="r.surf.fractal.html">r.surf.fractal</a></em>,
-<em><a href="r.surf.random.html">r.surf.random</a></em>,
-<em><a href="v.surf.idw.html">v.surf.idw</a></em>,
-<em><a href="v.surf.rst.html">v.surf.rst</a></em>
+<em>
+ <a href="r.surf.contour.html">r.surf.contour</a>,
+ <a href="r.surf.gauss.html">r.surf.gauss</a>,
+ <a href="r.surf.fractal.html">r.surf.fractal</a>,
+ <a href="r.surf.random.html">r.surf.random</a>,
+ <a href="v.surf.idw.html">v.surf.idw</a>,
+ <a href="v.surf.rst.html">v.surf.rst</a>
+</em>
-
<h2>AUTHOR</h2>
Greg Koerper <br>
@@ -98,4 +98,5 @@
200 S.W. 35th Street, JSB <br>
Corvallis, OR 97333
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>
More information about the grass-commit
mailing list