[GRASS-SVN] r35751 - in grass/branches/develbranch_6/raster:
r.basins.fill r.in.ascii r.li/r.li.daemon r.li/r.li.setup
r.mapcalc wildfire
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Feb 3 20:36:44 EST 2009
Author: hamish
Date: 2009-02-03 20:36:44 -0500 (Tue, 03 Feb 2009)
New Revision: 35751
Modified:
grass/branches/develbranch_6/raster/r.basins.fill/description.html
grass/branches/develbranch_6/raster/r.in.ascii/description.html
grass/branches/develbranch_6/raster/r.li/r.li.daemon/description.html
grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html
grass/branches/develbranch_6/raster/r.mapcalc/r.mapcalc.html
grass/branches/develbranch_6/raster/r.mapcalc/r3.mapcalc.html
grass/branches/develbranch_6/raster/wildfire/README
Log:
itc -> osgeo in URLs
Modified: grass/branches/develbranch_6/raster/r.basins.fill/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.basins.fill/description.html 2009-02-03 21:39:12 UTC (rev 35750)
+++ grass/branches/develbranch_6/raster/r.basins.fill/description.html 2009-02-04 01:36:44 UTC (rev 35751)
@@ -36,7 +36,7 @@
<h2>SEE ALSO</h2>
See Appendix A of the <b>GRASS</b> <a
-href="http://grass.itc.it/gdp/raster/r.watershed.ps">Tutorial:
+href="http://grass.osgeo.org/gdp/raster/r.watershed.ps">Tutorial:
r.watershed</a> for further details on the combined use of
<em>r.basins.fill</em> and <em><a href="r.watershed.html">r.watershed</a></em>.
@@ -52,4 +52,5 @@
<br>
Larry Band, Dept. of Geography, University of Toronto, Canada
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>
Modified: grass/branches/develbranch_6/raster/r.in.ascii/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.in.ascii/description.html 2009-02-03 21:39:12 UTC (rev 35750)
+++ grass/branches/develbranch_6/raster/r.in.ascii/description.html 2009-02-04 01:36:44 UTC (rev 35751)
@@ -110,7 +110,7 @@
<a href="r.out.arc.html">r.out.arc</a>,
<a href="r.in.bin.html">r.in.bin</a>,
<a href="r3.in.ascii.html">r3.in.ascii</a></em>,
-<a href="http://grass.itc.it/gdp/html_grass5/ascii_formats.html">GRASS ASCII formats</a>
+<a href="http://grass.osgeo.org/gdp/html_grass5/ascii_formats.html">GRASS ASCII formats</a>
</em>
<h2>AUTHOR</h2>
@@ -118,4 +118,5 @@
Michael Shapiro, U.S. Army Construction Engineering Research Laboratory<br>
Surfer support by Roger Miller
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>
Modified: grass/branches/develbranch_6/raster/r.li/r.li.daemon/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.daemon/description.html 2009-02-03 21:39:12 UTC (rev 35750)
+++ grass/branches/develbranch_6/raster/r.li/r.li.daemon/description.html 2009-02-04 01:36:44 UTC (rev 35751)
@@ -67,7 +67,7 @@
<H2>SEE ALSO</H2>
-<EM><A HREF="http://grass.itc.it/gdp/landscape/r_le_manual5.pdf">old r.le manual</A></EM><BR>
+<EM><A HREF="http://grass.osgeo.org/gdp/landscape/r_le_manual5.pdf">old r.le manual</A></EM><BR>
<EM><A HREF="r.li.html">r.li</A></EM> package overview <BR>
<EM><A HREF="r.li.patchdensity.html">r.li.patchdensity</A></EM>,
<EM><A HREF="r.li.setup.html">r.li.setup</A></EM>
@@ -87,7 +87,8 @@
<a href="mailto:porta at cli.di.unipi.it">porta at cli.di.unipi.it</a><br>
<BR>
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>
<HR>
<P><a href="index.html">Main index</a> - <a href="raster.html">raster index</a> - <a href="full_index.html">Full index</a>
Modified: grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html 2009-02-03 21:39:12 UTC (rev 35750)
+++ grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html 2009-02-04 01:36:44 UTC (rev 35751)
@@ -136,7 +136,7 @@
relative coordinates.
<H2>SEE ALSO</H2>
-<EM><A HREF="http://grass.itc.it/gdp/landscape/r_le_manual5.pdf">
+<EM><A HREF="http://grass.osgeo.org/gdp/landscape/r_le_manual5.pdf">
old r.le manual</A></EM><BR>
<EM><A HREF="r.li.html">r.li</A></EM> package overview <BR>
<EM><A HREF="r.li.daemon.html">r.li.daemon</A></EM>,
@@ -155,4 +155,5 @@
<a href="mailto:cavallini at faunalia.it">cavallini at faunalia.it</a>
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>
Modified: grass/branches/develbranch_6/raster/r.mapcalc/r.mapcalc.html
===================================================================
--- grass/branches/develbranch_6/raster/r.mapcalc/r.mapcalc.html 2009-02-03 21:39:12 UTC (rev 35750)
+++ grass/branches/develbranch_6/raster/r.mapcalc/r.mapcalc.html 2009-02-04 01:36:44 UTC (rev 35751)
@@ -7,13 +7,19 @@
</head>
<body bgcolor="white">
<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
+
+
<h2>NAME</h2>
<em><b>r.mapcalc</b></em>
+
+
<h2>DESCRIPTION</h2>
<em>r.mapcalc</em> performs arithmetic on raster map layers.
New raster map layers can be created which are arithmetic expressions
involving existing raster map layers, integer or floating point constants,
and functions.
+
+
<h2>PROGRAM USE</h2>
If used without command line arguments, <em>r.mapcalc</em> will read its
input, one line at a time, from standard input
@@ -39,6 +45,8 @@
is entering input to <em>r.mapcalc</em> on the command line, expressions
should be enclosed within single quotes. See NOTES, below.
<p>
+
+
<h2>OPERATORS AND ORDER OF PRECEDENCE</h2>
The following operators are supported:
<div class="code"><pre>
@@ -82,6 +90,8 @@
The logical operators give a 1 result if the comparison is true, 0 otherwise.
<p>
<p>
+
+
<h2>RASTER MAP LAYER NAMES</h2>
Anything in the expression which is not a number, operator, or function name
is taken to be a raster map layer name.
@@ -149,6 +159,8 @@
(This method of overriding the mapset search path is common to all
GRASS commands, not just <em>r.mapcalc</em>.)
<p>
+
+
<h2>THE NEIGHBORHOOD MODIFIER</h2>
Maps and images are data base files stored in raster format, i.e.,
two-dimensional matrices of integer values.
@@ -161,8 +173,9 @@
and <em>map[0,1]</em> refers to the cell one column to the right of the current cell.
This syntax permits the development of neighborhood-type filters within a single
map or across multiple maps.
+<p>
-<p>
+
<h2>RASTER MAP LAYER VALUES FROM THE CATEGORY FILE</h2>
Sometimes it is desirable to use a value associated with a category's
<em>label</em> instead of the category value itself. If a raster
@@ -202,6 +215,8 @@
a floating point number. I the category label does not start
with a number or is missing, it will be represented by NULL
(no data) in the resulting raster map.
+
+
<h2>GREY SCALE EQUIVALENTS AND COLOR SEPARATES</h2>
It is often helpful to manipulate the colors assigned to map categories.
This is particularly useful when the spectral properties of cells have meaning
@@ -280,6 +295,8 @@
red
</pre></div>
<p>
+
+
<h2>FUNCTIONS</h2>
The functions currently supported are listed in the table below.
The type of the result is indicated in the last column.
@@ -339,6 +356,8 @@
null() NULL value
</pre></div>
Note, that the row() and col() indexing starts with 1.
+
+
<h2>FLOATING POINT VALUES IN THE EXPRESSION</h2>
Floating point numbers are allowed in the expression. A floating point
number is a number which contains a decimal point:
@@ -363,6 +382,8 @@
<div class="code"><pre>
r.mapcalc "ndvi=float(lsat.4 - lsat.3) / (lsat.4 + lsat.3)"
</pre></div>
+
+
<h2>NULL support</h2>
<menu>
<li>Division by zero should result in NULL.
@@ -472,6 +493,8 @@
unknown quantity. E.g. if x and y are both unknown, then the values of
"x == y" and "x != y" are also unknown; if they both have unknown
values, the user doesn't know whether or not they both have the same value.
+
+
<h2>EXAMPLES</h2>
To compute the average of two raster map layers
<em>a</em> and <em>b</em>:
@@ -525,6 +548,8 @@
4, 50
100, 50
</pre></div>
+
+
<h2>NOTES</h2>
Extra care must be taken if the expression is given on the command line.
Some characters have special meaning to the UNIX shell.
@@ -566,6 +591,8 @@
<p>
The environment variable GRASS_RND_SEED is read to initialise the
random number generator.
+
+
<h2>BUGS</h2>
Continuation lines must end with a \ and have NO trailing white space
(blanks or tabs). If the user does leave white space at the end of
@@ -592,12 +619,14 @@
<p>
r.mapcalc does not print a warning in case of operations on NULL cells.
It is left to the user to utilize the isnull() function.
+
+
<h2>SEE ALSO</h2>
-<b><a href="http://grass.itc.it/gdp/raster/mapcalc-algebra.pdf">r.mapcalc: An Algebra for GIS and Image
+<b><a href="http://grass.osgeo.org/gdp/raster/mapcalc-algebra.pdf">r.mapcalc: An Algebra for GIS and Image
Processing</a></b>, by Michael Shapiro and Jim Westervelt, U.S. Army
Construction Engineering Research Laboratory (March/1991).
<p>
-<b><a href="http://grass.itc.it/gdp/raster/mapcalc.pdf">Performing Map Calculations on GRASS Data:
+<b><a href="http://grass.osgeo.org/gdp/raster/mapcalc.pdf">Performing Map Calculations on GRASS Data:
r.mapcalc Program Tutorial</a></b>, by Marji Larson, Michael Shapiro and Scott
Tweddale, U.S. Army Construction Engineering Research Laboratory (December
1991)
@@ -613,15 +642,19 @@
<a href="r.colors.html">r.colors</a>,
<a href="r.fillnulls.html">r.fillnulls</a>
</em>
+
+
<h2>AUTHORS</h2>
Michael Shapiro, U.S.Army Construction Engineering
Research Laboratory
<p>
Glynn Clements
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>
+
<hr>
<p><a href="index.html">Main index</a> - <a href="raster.html">raster index</a> - <a href="full_index.html">Full index</a></p>
-<p>© 1999-2008 <a href="http://grass.osgeo.org">GRASS Development Team</a></p>
+<p>© 1999-2009 <a href="http://grass.osgeo.org">GRASS Development Team</a></p>
</body>
</html>
Modified: grass/branches/develbranch_6/raster/r.mapcalc/r3.mapcalc.html
===================================================================
--- grass/branches/develbranch_6/raster/r.mapcalc/r3.mapcalc.html 2009-02-03 21:39:12 UTC (rev 35750)
+++ grass/branches/develbranch_6/raster/r.mapcalc/r3.mapcalc.html 2009-02-04 01:36:44 UTC (rev 35751)
@@ -7,13 +7,19 @@
</head>
<body bgcolor="white">
<img src="grass_logo.png" alt="GRASS logo"><hr align=center size=6 noshade>
-<H2>NAME</H2>
+
+
+<h2>NAME</H2>
<EM><B>r3.mapcalc</B></EM>
-<H2>DESCRIPTION</H2>
+
+
+<h2>DESCRIPTION</H2>
<EM>r3.mapcalc</EM> performs arithmetic on 3D grid volume data. New 3D grids
can be created which are arithmetic expressions involving existing 3D grids,
integer or floating point constants, and functions.
-<H2>PROGRAM USE</H2>
+
+
+<h2>PROGRAM USE</H2>
If used without command line arguments, <EM>r3.mapcalc</EM> will read its
input, one line at a time, from standard input (which is the keyboard,
unless redirected from a file or across a pipe).
@@ -38,7 +44,9 @@
is entering input to <EM>r.mapcalc</EM> on the command line, expressions
should be enclosed within single quotes. See NOTES, below.
<P>
-<H2>OPERATORS AND ORDER OF PRECEDENCE</H2>
+
+
+<h2>OPERATORS AND ORDER OF PRECEDENCE</H2>
The following operators are supported:
<div class="code"><PRE>
Operator Meaning Type Precedence
@@ -81,7 +89,9 @@
The logical operators give a 1 result if the comparison is true, 0 otherwise.
<P>
<P>
-<H2>3D GRID NAMES</H2>
+
+
+<h2>3D GRID NAMES</H2>
Anything in the expression which is not a number, operator, or function
name is taken to be a 3D grid name. Examples:
<P>
@@ -145,7 +155,9 @@
method of overriding the mapset search path is common to all GRASS commands,
not just <EM>r3.mapcalc</EM>.)
<P>
-<H2>THE NEIGHBORHOOD MODIFIER</H2>
+
+
+<h2>THE NEIGHBORHOOD MODIFIER</H2>
3D grids are data base files stored in voxel format, i.e., three-dimensional
matrices of float/double values. In <EM>r3.mapcalc</EM>, 3D grids may be
followed by a <EM>neighborhood</EM> modifier that specifies a relative offset
@@ -161,7 +173,9 @@
grid or across multiple 3D grids.
<P>
-<H2>FUNCTIONS</H2>
+
+
+<h2>FUNCTIONS</H2>
The functions currently supported are listed in the table below.
The type of the result is indicated in the last column.
<EM>F</EM>
@@ -223,7 +237,9 @@
null() NULL value
</PRE></div>
Note, that the row(), col() and depth() indexing starts with 1.
-<H2>FLOATING POINT VALUES IN THE EXPRESSION</H2>
+
+
+<h2>FLOATING POINT VALUES IN THE EXPRESSION</H2>
Floating point numbers are allowed in the expression. A floating point
number is a number which contains a decimal point:
<div class="code"><PRE>
@@ -247,7 +263,9 @@
<div class="code"><PRE>
r.mapcalc "ndvi=float(lsat.4 - lsat.3) / (lsat.4 + lsat.3)"
</PRE></div>
-<H2>NULL support</H2>
+
+
+<h2>NULL support</H2>
<menu>
<li>Division by zero should result in NULL.
<li>Modulus by zero should result in NULL.
@@ -356,7 +374,9 @@
unknown quantity. E.g. if x and y are both unknown, then the values of
"x == y" and "x != y" are also unknown; if they both have unknown
values, the user doesn't know whether or not they both have the same value.
-<H2>EXAMPLES</H2>
+
+
+<h2>EXAMPLES</H2>
To compute the average of two 3D grids
<EM>a</EM> and <EM>b</EM>:
<div class="code"><PRE>
@@ -408,7 +428,9 @@
4, 50
100, 50
</pre></div>
-<H2>NOTES</H2>
+
+
+<h2>NOTES</H2>
Extra care must be taken if the expression is given on the command line.
Some characters have special meaning to the UNIX shell.
These include, among others:
@@ -447,7 +469,9 @@
<P>
The environment variable GRASS_RND_SEED is read to initialise the
random number generator.
-<H2>BUGS</H2>
+
+
+<h2>BUGS</H2>
Continuation lines must end with a \ and have NO trailing white space
(blanks or tabs). If the user does leave white space at the end of
continuation lines, the error messages produced by <EM>r.mapcalc</EM> will
@@ -473,26 +497,30 @@
<P>
r.mapcalc does not print a warning in case of operations on NULL cells.
It is left to the user to utilize the isnull() function.
-<H2>SEE ALSO</H2>
-<B><A HREF="http://grass.itc.it/gdp/raster/mapcalc-algebra.pdf">r.mapcalc: An Algebra for GIS and Image
+
+
+<h2>SEE ALSO</H2>
+<B><A HREF="http://grass.osgeo.org/gdp/raster/mapcalc-algebra.pdf">r.mapcalc: An Algebra for GIS and Image
Processing</A></B>, by Michael Shapiro and Jim Westervelt, U.S. Army
Construction Engineering Research Laboratory (March/1991).
<P>
-<B><A HREF="http://grass.itc.it/gdp/raster/mapcalc.pdf">Performing Map Calculations on GRASS Data:
+<B><A HREF="http://grass.osgeo.org/gdp/raster/mapcalc.pdf">Performing Map Calculations on GRASS Data:
r.mapcalc Program Tutorial</A></B>, by Marji Larson, Michael Shapiro and Scott
Tweddale, U.S. Army Construction Engineering Research Laboratory (December
1991)
<p>
<EM><a href="r.mapcalc.html">r.mapcalc</a></EM>
+
<h2>AUTHORS</h2>
Tomas Paudits & Jaro Hofierka, funded by GeoModel s.r.o., Slovakia
<br><a href="mailto:tpaudits at mailbox.sk">tpaudits at mailbox.sk</a>,
<a href="MAILTO:hofierka at geomodel.sk">hofierka at geomodel.sk</a>
-<p><i>Last changed: $Date$</i>
+<p>
+<i>Last changed: $Date$</i>
<hr>
<p><a href="index.html">Main index</a> - <a href="raster3D.html">raster3D index</a> - <a href="full_index.html">Full index</a></p>
-<p>© 1999-2008 <a href="http://grass.osgeo.org">GRASS Development Team</a></p>
+<p>© 1999-2009 <a href="http://grass.osgeo.org">GRASS Development Team</a></p>
</body>
</html>
Modified: grass/branches/develbranch_6/raster/wildfire/README
===================================================================
--- grass/branches/develbranch_6/raster/wildfire/README 2009-02-03 21:39:12 UTC (rev 35750)
+++ grass/branches/develbranch_6/raster/wildfire/README 2009-02-04 01:36:44 UTC (rev 35751)
@@ -1,6 +1,6 @@
A sample location is available from
-http://grass.itc.it/download/data.php
+http://grass.osgeo.org/download/data.php
Fire simulation data set:
- sample data for r.ros, r.spread, and r.spreadpath fire simulation modules.
More information about the grass-commit
mailing list