Explorar el Código

r.sun: num_partitions -> npartitions (https://trac.osgeo.org/grass/ticket/2409)
(merge https://trac.osgeo.org/grass/changeset/63715 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63716 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa hace 10 años
padre
commit
f55225d2cb
Se han modificado 3 ficheros con 5 adiciones y 5 borrados
  1. 1 1
      lib/gis/renamed_options
  2. 1 1
      raster/r.sun/main.c
  3. 3 3
      raster/r.sun/r.sun.html

+ 1 - 1
lib/gis/renamed_options

@@ -281,7 +281,7 @@ r.sun|coefdh:coef_dh
 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

+ 1 - 1
raster/r.sun/main.c

@@ -492,7 +492,7 @@ int main(int argc, char *argv[])
 	_("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;

+ 3 - 3
raster/r.sun/r.sun.html

@@ -230,11 +230,11 @@ if the <em>-p</em> flag has been used.
 
 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 @@ The amount of memory by <b>r.sun</b> is estimated as follows:
 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>