[GRASS-SVN] r66496 - grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Oct 14 05:45:50 PDT 2015


Author: Giulia
Date: 2015-10-14 05:45:50 -0700 (Wed, 14 Oct 2015)
New Revision: 66496

Modified:
   grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.html
   grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.py
Log:
r.green: small changes in the gui and in the html

Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.html
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.html	2015-10-14 12:44:49 UTC (rev 66495)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.html	2015-10-14 12:45:50 UTC (rev 66496)
@@ -5,7 +5,7 @@
 
 The three input files are the rivers considered (vector), the discharge for each point of this river (raster) and the elevation raster map to calculate the gross head.<br><br>
 
-The power is defined as :<br>
+The power is defined as:<br>
 
 <center>P=η * ρ * g * Q * Δh</center>
 
@@ -15,7 +15,7 @@
 Q the discharge of the river<br>
 Δh the gross head of the considered segment</blockquote><br>
 
-The module maximizes the power over a given range by a brute-force search in order to examine all possible arrangements of Q and Δh. Thus, the potential segments can be shorter than the maximum length plant chosen because it depends on the maximization of the product  Q * Δh. <br><br>
+The module maximizes the power over a given range by a brute-force search in order to examine all possible arrangements of Q and Δh. Thus, the potential segments can be shorter than the maximum plant length chosen because it depends on the maximization of the product  Q * Δh. <br><br>
 
 For each potential segment, the potential power is given in kW in attribute.
 
@@ -30,7 +30,7 @@
 Input vector map availablestreams
 </center><br>
 
-The following command computes the potential plants for a plant length range from 10 to 800 m and a distance between plants of 800m :<br><br>
+The following command computes the potential plants for a plant length range from 10 to 800 m and a distance between plants of 800 m :<br><br>
 
 <div class="code"><pre>r.green.hydro.optimal 
 discharge=discharge 

Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.py	2015-10-14 12:44:49 UTC (rev 66495)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.py	2015-10-14 12:45:50 UTC (rev 66496)
@@ -64,7 +64,7 @@
 #%option
 #% key: p_max
 #% type: double
-#% description: Max mean power [kW]
+#% description: Maximum mean power [kW]
 #% required: no
 #%end
 #%option
@@ -76,7 +76,7 @@
 #%end
 #%option G_OPT_V_OUTPUT
 #% key: output_plant
-#% label: Name of output vector map with segments of potential power segments [kW]
+#% label: Name of output vector map with potential power for each river segment [kW]
 #% required: yes
 #%end
 #%option G_OPT_V_OUTPUT



More information about the grass-commit mailing list