[GRASS-SVN] r63715 - in grass/trunk: lib/gis raster/r.sun

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-24 03:24:51 -0800 (Wed, 24 Dec 2014)
New Revision: 63715

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/raster/r.sun/main.c
   grass/trunk/raster/r.sun/r.sun.html
Log:
r.sun: num_partitions -> npartitions (#2409)


Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2014-12-24 11:22:42 UTC (rev 63714)
+++ grass/trunk/lib/gis/renamed_options	2014-12-24 11:24:51 UTC (rev 63715)
@@ -281,7 +281,7 @@
 r.sun|horizonstep:horizon_step
 r.sun|declin:declination
 r.sun|dist:distance_step
-r.sun|numpartitions:num_partitions
+r.sun|numpartitions:npartitions
 r.sun|civiltime:civil_time
 # r.surf.area
 r.surf.area|input:map

Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c	2014-12-24 11:22:42 UTC (rev 63714)
+++ grass/trunk/raster/r.sun/main.c	2014-12-24 11:24:51 UTC (rev 63715)
@@ -492,7 +492,7 @@
 	_("Sampling distance step coefficient (0.5-1.5)");
 
     parm.numPartitions = G_define_option();
-    parm.numPartitions->key = "num_partitions";
+    parm.numPartitions->key = "npartitions";
     parm.numPartitions->type = TYPE_INTEGER;
     parm.numPartitions->answer = NUM_PARTITIONS;
     parm.numPartitions->required = NO;

Modified: grass/trunk/raster/r.sun/r.sun.html
===================================================================
--- grass/trunk/raster/r.sun/r.sun.html	2014-12-24 11:22:42 UTC (rev 63714)
+++ grass/trunk/raster/r.sun/r.sun.html	2014-12-24 11:24:51 UTC (rev 63715)
@@ -230,11 +230,11 @@
 
 With a large number or columns and rows, <b>r.sun</b> can consume
 significant amount of memory. While output raster maps are not
-partitionable, the input raster maps are using the <em>num_partitions</em>
+partitionable, the input raster maps are using the <em>npartitions</em>
 parameter.
 
 In case of out of memory error (<tt>ERROR: G_malloc: out of memory</tt>), the
-<em>num_partitions</em> parameter can be used to run a segmented calculation
+<em>npartitions</em> parameter can be used to run a segmented calculation
 which consumes less memory during the computations.
 
 The amount of memory by <b>r.sun</b> is estimated as follows:
@@ -248,7 +248,7 @@
 memory_bytes = rows*cols*(IR*4 + horizon_steps + OR*4)
 
 # with input raster map partitioning:
-memory_bytes = rows*cols*((IR*4+horizon_steps)/num_partitions  + OR*4)
+memory_bytes = rows*cols*((IR*4+horizon_steps)/npartitions  + OR*4)
 </pre></div>
 
 <h2>EXAMPLES</h2>