v.vol.rst: remove unused SITESLIB dependency; header + manual cosmetics

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@60272 15284696-431f-4ddb-bdfa-cd5b030d7da7

vector/v.vol.rst/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = v.vol.rst
 
-LIBES = $(SITESLIB) $(VECTORLIB) $(RASTER3DLIB) $(BITMAPLIB) $(DBMILIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(SITESDEP) $(VECTORDEP) $(RASTER3DDEP) $(BITMAPDEP) $(DBMIDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(VECTORLIB) $(RASTER3DLIB) $(BITMAPLIB) $(DBMILIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(VECTORDEP) $(RASTER3DDEP) $(BITMAPDEP) $(DBMIDEP) $(RASTERDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

vector/v.vol.rst/dataoct.c

@@ -1,7 +1,7 @@
 /*
  ****************************************************************************
  *
- * MODULE:       s.vol.rst: program for 3D(volume) interpolation and geometry
+ * MODULE:       v.vol.rst: program for 3D (volume) interpolation and geometry
  *               analysis from scattered point data using regularized spline
  *               with tension
  *
@@ -11,9 +11,9 @@
  *               GRASS 4.2, GRASS 5.0 version and modifications:
  *               H. Mitasova,  I. Kosinovsky, D. Gerdes, J. Hofierka
  *
- * PURPOSE:      s.vol.rst interpolates the values to 3-dimensional grid from
+ * PURPOSE:      v.vol.rst interpolates the values to 3-dimensional grid from
  *               point data (climatic stations, drill holes etc.) given in a
- *               sites file named input. Output grid3 file is elev. 
+ *               3D vector point input. Output grid3 file is elev. 
  *               Regularized spline with tension is used for the
  *               interpolation.
  *
@@ -21,8 +21,8 @@
  *               I. Kosinovsky, D. Gerdes, J. Hofierka
  *
  *               This program is free software under the GNU General Public
- *              License (>=v2). Read the file COPYING that comes with GRASS
- *              for details.
+ *               License (>=v2). Read the file COPYING that comes with GRASS
+ *               for details.
  *
  *****************************************************************************/
 

vector/v.vol.rst/oct.c

@@ -1,7 +1,7 @@
 /*
  ****************************************************************************
  *
- * MODULE:       s.vol.rst: program for 3D(volume) interpolation and geometry
+ * MODULE:       v.vol.rst: program for 3D (volume) interpolation and geometry
  *               analysis from scattered point data using regularized spline
  *               with tension
  *
@@ -11,9 +11,9 @@
  *               GRASS 4.2, GRASS 5.0 version and modifications:
  *               H. Mitasova,  I. Kosinovsky, D. Gerdes, J. Hofierka
  *
- * PURPOSE:      s.vol.rst interpolates the values to 3-dimensional grid from
+ * PURPOSE:      v.vol.rst interpolates the values to 3-dimensional grid from
  *               point data (climatic stations, drill holes etc.) given in a
- *               sites file named input. Output grid3 file is elev. 
+ *               3D vector point input. Output grid3 file is elev. 
  *               Regularized spline with tension is used for the
  *               interpolation.
  *
@@ -21,8 +21,8 @@
  *               I. Kosinovsky, D. Gerdes, J. Hofierka
  *
  *               This program is free software under the GNU General Public
- *              License (>=v2). Read the file COPYING that comes with GRASS
- *              for details.
+ *               License (>=v2). Read the file COPYING that comes with GRASS
+ *               for details.
  *
  *****************************************************************************/
 

vector/v.vol.rst/user1.c

@@ -1,7 +1,7 @@
 /*
  ****************************************************************************
  *
- * MODULE:       s/v.vol.rst: program for 3D(volume) interpolation and geometry
+ * MODULE:       v.vol.rst: program for 3D (volume) interpolation and geometry
  *               analysis from scattered point data using regularized spline
  *               with tension
  *
@@ -11,9 +11,9 @@
  *               GRASS 4.2, GRASS 5.0 version and modifications:
  *               H. Mitasova,  I. Kosinovsky, D. Gerdes, J. Hofierka
  *
- * PURPOSE:      s/v.vol.rst interpolates the values to 3-dimensional grid from
+ * PURPOSE:      v.vol.rst interpolates the values to 3-dimensional grid from
  *               point data (climatic stations, drill holes etc.) given in a
- *               sites file named input. Output grid3 file is elev. 
+ *               3D vector point input. Output grid3 file is elev. 
  *               Regularized spline with tension is used for the
  *               interpolation.
  *
@@ -21,8 +21,8 @@
  *               I. Kosinovsky, D. Gerdes, J. Hofierka
  *
  *               This program is free software under the GNU General Public
- *              License (>=v2). Read the file COPYING that comes with GRASS
- *              for details.
+ *               License (>=v2). Read the file COPYING that comes with GRASS
+ *               for details.
  *
  *****************************************************************************/
 

vector/v.vol.rst/user2.c

@@ -1,7 +1,7 @@
 /*
  ****************************************************************************
  *
- * MODULE:       s.vol.rst: program for 3D(volume) interpolation and geometry
+ * MODULE:       v.vol.rst: program for 3D (volume) interpolation and geometry
  *               analysis from scattered point data using regularized spline
  *               with tension
  *
@@ -11,9 +11,9 @@
  *               GRASS 4.2, GRASS 5.0 version and modifications:
  *               H. Mitasova,  I. Kosinovsky, D. Gerdes, J. Hofierka
  *
- * PURPOSE:      s.vol.rst interpolates the values to 3-dimensional grid from
+ * PURPOSE:      v.vol.rst interpolates the values to 3-dimensional grid from
  *               point data (climatic stations, drill holes etc.) given in a
- *               sites file named input. Output grid3 file is elev. 
+ *               3D vector point input. Output grid3 file is elev. 
  *               Regularized spline with tension is used for the
  *               interpolation.
  *
@@ -21,8 +21,8 @@
  *               I. Kosinovsky, D. Gerdes, J. Hofierka
  *
  *               This program is free software under the GNU General Public
- *              License (>=v2). Read the file COPYING that comes with GRASS
- *              for details.
+ *               License (>=v2). Read the file COPYING that comes with GRASS
+ *               for details.
  *
  *****************************************************************************/
 

vector/v.vol.rst/user3.c

@@ -1,7 +1,7 @@
 /*
  ****************************************************************************
  *
- * MODULE:       s.vol.rst: program for 3D(volume) interpolation and geometry
+ * MODULE:       v.vol.rst: program for 3D (volume) interpolation and geometry
  *               analysis from scattered point data using regularized spline
  *               with tension
  *
@@ -11,9 +11,9 @@
  *               GRASS 4.2, GRASS 5.0 version and modifications:
  *               H. Mitasova,  I. Kosinovsky, D. Gerdes, J. Hofierka
  *
- * PURPOSE:      s.vol.rst interpolates the values to 3-dimensional grid from
+ * PURPOSE:      v.vol.rst interpolates the values to 3-dimensional grid from
  *               point data (climatic stations, drill holes etc.) given in a
- *               sites file named input. Output grid3 file is elev. 
+ *               3D vector point input. Output grid3 file is elev. 
  *               Regularized spline with tension is used for the
  *               interpolation.
  *
@@ -21,8 +21,8 @@
  *               I. Kosinovsky, D. Gerdes, J. Hofierka
  *
  *               This program is free software under the GNU General Public
- *              License (>=v2). Read the file COPYING that comes with GRASS
- *              for details.
+ *               License (>=v2). Read the file COPYING that comes with GRASS
+ *               for details.
  *
  *****************************************************************************/
 #include <stdio.h>
@@ -36,7 +36,6 @@
 #include <grass/vector.h>
 #include <grass/dbmi.h>
 
-#include <grass/site.h>
 #include "oct.h"
 #include "surf.h"
 #include "dataoct.h"
@@ -663,10 +662,7 @@ int POINT(int n_points, struct quadruple *points, struct point_3d skip_point)
     double errmax, h, xx, yy, r2, hz, zz, ww, err, xmm, ymm,
 	zmm, wmm, r, etar;
     int n1, mm, m, mmax, inside;
-    Site *site;
 
-    if ((site = G_site_new_struct(-1, 3, 0, 1)) == NULL)
-	G_fatal_error("Memory error for site struct");
     errmax = .0;
     n1 = n_points + 1;
     if (!cv) {

vector/v.vol.rst/user4.c

@@ -1,7 +1,7 @@
 /*
  ****************************************************************************
  *
- * MODULE:       s.vol.rst: program for 3D(volume) interpolation and geometry
+ * MODULE:       v.vol.rst: program for 3D (volume) interpolation and geometry
  *               analysis from scattered point data using regularized spline
  *               with tension
  *
@@ -11,9 +11,9 @@
  *               GRASS 4.2, GRASS 5.0 version and modifications:
  *               H. Mitasova,  I. Kosinovsky, D. Gerdes, J. Hofierka
  *
- * PURPOSE:      s.vol.rst interpolates the values to 3-dimensional grid from
+ * PURPOSE:      v.vol.rst interpolates the values to 3-dimensional grid from
  *               point data (climatic stations, drill holes etc.) given in a
- *               sites file named input. Output grid3 file is elev. 
+ *               3D vector point input. Output grid3 file is elev. 
  *               Regularized spline with tension is used for the
  *               interpolation.
  *
@@ -21,8 +21,8 @@
  *               I. Kosinovsky, D. Gerdes, J. Hofierka
  *
  *               This program is free software under the GNU General Public
- *              License (>=v2). Read the file COPYING that comes with GRASS
- *              for details.
+ *               License (>=v2). Read the file COPYING that comes with GRASS
+ *               for details.
  *
  *****************************************************************************/
 

vector/v.vol.rst/v.vol.rst.html

@@ -148,9 +148,10 @@ very long time, so it might be worth to use just a sample data
 representing the whole dataset.
 
 <p><i>Example 
- (based on <a href="http://www.grassbook.org/data_menu2nd.phtml">Slovakia3d dataset</a>):</i>
+ (based on <a href="http://www.grassbook.org/data_menu2nd.php">Slovakia3d dataset</a>):</i>
 <p><div class="code"><pre>
 v.info -c precip3d
+g.region n=5530000 s=5275000 w=4186000 e=4631000 res=500 -p
 v.vol.rst -c input=precip3d wcolumn=precip zmult=50 segmax=700 cvdev=cvdevmap tension=10
 v.db.select cvdevmap
 v.univar cvdevmap col=flt1 type=point
@@ -274,33 +275,38 @@ Data, Journal of Computational Physics, 23, p.93-123.
 Springer-Verlag, New York, pp. 6-94.
 
 <h2>SEE ALSO</h2>
+
+<em>
 <a href="g.region.html">g.region</a>,
 <a href="v.in.ascii.html">v.in.ascii</a>,
 <a href="r3.mask.html">r3.mask</a>,
 <a href="v.in.db.html">v.in.db</a>,
 <a href="v.surf.rst.html">v.surf.rst</a>,
 <a href="v.univar.html">v.univar</a>
+</em>
 
 <h2>AUTHOR</h2>
-<p>Original version of program (in FORTRAN) and GRASS enhancements: <br>
+
+Original version of program (in FORTRAN) and GRASS enhancements: <br>
 Lubos Mitas, NCSA, University of Illinois at Urbana-Champaign,
 Illinois, USA, since 2000 at Department of Physics, 
 North Carolina State University, Raleigh, USA
-<a href="mailto:lubos_mitas@ncsu.edu">lubos_mitas@ncsu.edu</a><br>
+<a href="mailto:lubos_mitas@ncsu.edu">lubos_mitas@ncsu.edu</a>
+<br>
 Helena Mitasova, Department of Marine, Earth and Atmospheric Sciences,
-North Carolina State University, Raleigh, USA, <a
- href="mailto:hmitaso@unity.ncsu.edu">hmitaso@unity.ncsu.edu</a>
-<p>Modified program (translated to C, adapted for GRASS, new
+North Carolina State University, Raleigh, USA,
+<a href="mailto:hmitaso@unity.ncsu.edu">hmitaso@unity.ncsu.edu</a>
+<p>
+Modified program (translated to C, adapted for GRASS, new
 segmentation procedure): <br>
 Irina Kosinovsky, US Army CERL, Champaign, Illinois, USA <br>
 Dave Gerdes, US Army CERL, Champaign, Illinois, USA 
-<p>Modifications for g3d library, geometric parameters,
+<p>
+Modifications for g3d library, geometric parameters,
 cross-validation, deviations: <br>
 Jaro Hofierka, Department of Geography and Regional Development,
-University of Presov, Presov, Slovakia, <a
- href="MAILTO:hofierka@fhpv.unipo.sk">hofierka@fhpv.unipo.sk</a>, <a
- href="http://www.geomodel.sk">http://www.geomodel.sk</a> <br>
-&nbsp; 
-
+University of Presov, Presov, Slovakia,
+<a href="mailto:hofierka@fhpv.unipo.sk">hofierka@fhpv.unipo.sk</a>,
+<a href="http://www.geomodel.sk">http://www.geomodel.sk</a>
 
 <p><i>Last changed: $Date$</i> 

vector/v.vol.rst/vector.c

@@ -1,7 +1,7 @@
 /*
  ****************************************************************************
  *
- * MODULE:       s.vol.rst: program for 3D(volume) interpolation and geometry
+ * MODULE:       v.vol.rst: program for 3D (volume) interpolation and geometry
  *               analysis from scattered point data using regularized spline
  *               with tension
  *
@@ -11,9 +11,9 @@
  *               GRASS 4.2, GRASS 5.0 version and modifications:
  *               H. Mitasova,  I. Kosinovsky, D. Gerdes, J. Hofierka
  *
- * PURPOSE:      s.vol.rst interpolates the values to 3-dimensional grid from
+ * PURPOSE:      v.vol.rst interpolates the values to 3-dimensional grid from
  *               point data (climatic stations, drill holes etc.) given in a
- *               sites file named input. Output grid3 file is elev. 
+ *               3D vector point input. Output grid3 file is elev. 
  *               Regularized spline with tension is used for the
  *               interpolation.
  *
@@ -35,7 +35,6 @@
 #include <grass/vector.h>
 #include <grass/dbmi.h>
 
-#include <grass/site.h>
 #include "oct.h"
 #include "surf.h"
 #include "dataoct.h"