[GRASS-SVN] r65991 - in grass-addons/grass7/raster/r.green/r.green.hydro: . r.green.hydro.technical r.green.hydro.technical/turbines
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 21 06:35:30 PDT 2015
Author: zarch
Date: 2015-08-21 06:35:30 -0700 (Fri, 21 Aug 2015)
New Revision: 65991
Added:
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/Makefile
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.html
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_input.png
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_output.png
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_picstruct.png
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Coclea.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Crossflow.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Francis.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_dop.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_sing.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MicroPelton.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniBanki.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniFrancis.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_dop.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_sing.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniPelton.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Pelton.txt
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/list.txt
Modified:
grass-addons/grass7/raster/r.green/r.green.hydro/Makefile
Log:
r.green: Add r.green.hydro.technical
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/Makefile
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/Makefile 2015-08-21 12:34:57 UTC (rev 65990)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/Makefile 2015-08-21 13:35:30 UTC (rev 65991)
@@ -4,11 +4,12 @@
SUBDIRS = r.green.hydro.theoretical \
r.green.hydro.recommended \
- r.green.hydro.financial \
+ r.green.hydro.technical \
+ r.green.hydro.financial \
r.green.hydro.closest \
r.green.hydro.optimal \
r.green.hydro.structure \
- r.green.hydro.delplants \
+ r.green.hydro.delplants \
libhydro
include $(MODULE_TOPDIR)/include/Make/Dir.make
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/Makefile
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/Makefile (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/Makefile 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,7 @@
+MODULE_TOPDIR = ../../../..
+
+PGM = r.green.hydro.technical
+
+include $(MODULE_TOPDIR)/include/Make/Script.make
+
+default: script
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/Makefile
___________________________________________________________________
Added: svn:mime-type
+ text/x-makefile
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.html
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.html (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.html 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,130 @@
+<h2>DESCRIPTION</h2>
+<em>r.green.hydro.technical</em> calculates the hydropower potential considering technical constrains that include head losses, efficiencies of the turbine, the shaft, the alternator and the transformer.<br><br>
+The input is a vector map with the intakes and restitutions of the potential plants as the one computed by r.green.hydro.recommended. The output is a vector map with the structure (derivation channel and penstock) for each potential plant with the value of the corrected power including these technical constrains.
+
+<h2>NOTES</h2>
+
+Firstly, the module computes the <b>structure</b>. As the current potential concerns especially small hydropower (inferior to 20 MW), the structure suggested is the one for small hydropower detailed in the picture below. It is composed of an intake (A) which diverts water from the river. This water is conveyed into a derivation channel (B) with a very low slope and arrives in a forebay tank (C) which regulates the fluctuation of discharge. Finally, the penstock (D) conveys the water with the highest possible head to the turbine-alternator group (E) which produces electricity. The water is then released in the river (restitution F). We use the following vocabulary: the structure of the plant corresponds to the part with the derivation channel, the forebay tank and the penstock, whereas the segment of the plant corresponds to the part of the river (water not diverted) between the intake (A) and the restitution (F).<br><br>
+
+<center>
+<img src="r_green_hydro_technical_picstruct.png" alt="structure"><br>
+Structure of the plants considered in the module
+</center><br><br>
+
+The power is maximized for the highest head in the penstock so the derivation channel is computed along the same quote (the low slope is neglected here) until the point which maximizes the head along the penstock. The structure is computed for both sides of the river in order to determine which one produces the most power.<br><br>
+
+Using the computed structure, the module calculates the <b>head losses</b> :<br><br>
+<blockquote>- in the derivation channel <br>
+<blockquote>There are regular losses calculated thanks to Manning's formula : <i>
+Δh<SUB>deriv</SUB>=L*(Q/(ks*A*Rh<SUP>2/3</SUP>))<SUP>2</SUP></i><br>
+<blockquote>where Rh is the hydraulic radius (m),<br>
+A the cross sectional area of flow (m<SUP>2</SUP>),<br>
+L is the channel length (m),<br>
+Q is the discharge (m<SUP>3</SUP>/s),<br>
+ks the Strickler coefficient (m<SUP>1/3</SUP>/s), we consider steel as default parameter, with ks=75 m<SUP>1/3</SUP>/s.<br><br></blockquote></blockquote>
+
+- in the forebay tank<br>
+<blockquote>There are singular losses caused by the change of section in the forebay tank and to the change of direction in the penstock (steep slope).<br>
+
+In any case, singular head losses are expressed like this : <i>Δh<SUB>sing</SUB>=K*V<SUP>2</SUP>/(2g)</i><br>
+<blockquote>where V is the velocity (m/s), <br>
+g the gravity term (9,81 m/s<sup>2</sup>), <br>
+K is a coefficient determined according to the kind of singularity.</blockquote>
+
+In our case, the singular losses are the sum of the ones for these three phenomena :<br>
+<blockquote>- enlargement at the entrance of the forebay tank : K<SUB>1</SUB>=1 and V=1 m/s<br>
+- narrowing at the exit of the forebay tank : K<SUB>2</SUB>=0.5 and V=4Q/(πD<SUP>2</SUP>) m/s<br>
+- bend at the beginning of the penstock : K<SUB>3</SUB>=(gross head/L)<SUP>2</SUP>+2*sin(ASIN(gross head/L)/2)<SUP>4</SUP> and V=4Q/(πD<SUP>2</SUP>) m/s
+<br><br></blockquote></blockquote>
+
+- in the penstock<br>
+<blockquote>There are regular losses calculated thanks to this formula : <i>Δh<SUB>pen</SUB>=(f*8*L*Q<SUP>2</SUP>)/(π<SUP>2</SUP>*D<SUP>5</SUP>*g)</i><br>
+<blockquote>where L is penstock length (m), <br>
+D is the penstock diameter (m), <br>
+Q is the discharge (m<SUP>3</SUP>/s), <br>
+f is Darcy-Weisbach friction coefficient, which can be determined by Colebrooke formula. We consider steel by default with absolute roughness of ε = 0,015 mm.<br><br></blockquote></blockquote></blockquote>
+
+Then, the module chooses the <b>turbine</b> which is the most accurate for each plant. The data of possible turbines are gathered in the folder turbine. For each turbine there is a file text with the ranges of discharge and head required to use it. There is also the efficiency in function of QW/Q_design. The turbine is designed to work at Q_design and QW corresponds to the real discharge which flows is the turbine. As we don't consider the duration curves but only the mean annual discharge, we assume that QW=Q_design.<br><br>
+
+There is already a large choice of turbines available in turbine folder but the user is encouraged to create a file text with the turbines he wants to consider. The file has to have the same scheme with the correct information at the corresponding lines :<br>
+<blockquote><pre>TURBINE ALPHA_C
+Name of the turbine Value of alpha_c
+Q_MIN Q_MAX
+Value of q_min Value of q_max
+DH_MIN DH_MAX
+Value of dh_min Value of dh_max
+QW/Q_design ETA
+Coordinates of the curve efficiency=f(QW/Q_design)<br><br></pre></blockquote>
+
+To choose the turbine, the module first selects the turbines with ranges of discharge and head containing the values of the corresponding potential plant. Among these turbines, it chooses the one which has the best efficiency for QW=Q_design.<br><br>
+
+Thus the efficiency of the turbine is found. The global efficiency also includes the <b>efficiencies</b> of the shaft, the alternator and the transformer which can be chosen or are respectively equal to 1, 0.96 and 0.99 by default.<br><br>
+
+Finally, the corrected value of power which can be exploited is calculated.<br>
+It corresponds to <i>P=η*ρ*g*Q*Δh<SUB>net</SUB></i><br>
+<blockquote>where η is the global efficiency of the plant (turbine, shaft, alternator and transformer),<br>
+ρ the density of water (1000 kg/m<sup>3</sup>), <br>
+g the gravity term (9,81 m/s<sup>2</sup>), <br>
+Q the discharge (m<SUP>3</SUP>/s),<br>
+Δh<SUB>net</SUB> the net head, that means the gross head minus head losses<br><br></blockquote>
+
+The output map of the module is the one with the structure for each plant, including in the <b>table</b> the data of :<br>
+<blockquote>- discharge (m<sup>3</sup>/s)<br>
+- gross head (m)<br>
+- kind of the channel : derivation (conduct) or penstock<br>
+- side of the river (option0 or option1)<br>
+- diameter of the channel (m)<br>
+- losses in the channel (m)<br><br>
+
+Moreover, only in the penstock's line of the structure, there are :<br>
+- singular losses (m) in the forebay tank between the derivation channel and the penstock<br>
+- the total losses (m) for each structure, which are the sum of the regular losses in the derivation channel and in the penstock and the singular losses in the forebay tank<br>
+- net head (m), which is the gross head minus the total losses<br>
+- hydraulic power (hyd_power, in kW) which is the power considering the gross head and a global efficiency equal to 1. It corresponds to the theoretical power (the maximum)<br>
+- efficiency of the selected turbine (e_turbine)<br>
+- kind of the selected turbine (turbine)<br>
+- power (kW) which can be exploited considering the technical constrains<br>
+- global efficiency (power/hyd_power)<br>
+- max_power : yes or no, yes for the side (option1 or option0) which produces the most power</blockquote>
+
+
+<h2>EXAMPLE</h2>
+This example is based on the case-study of Gesso and Vermenagna valleys in the Natural Park of the Maritime Alps, Piedmont, Italy.<br><br>
+
+Here is the input vector map potentialplants with the intakes and restitutions (in red) computed by r.green.hydro.recommended. The vector map with the segments of river is also visibile in blue on this picture. These potential plants have a maximum length of 800m and a distance of 800m between them.
+
+<center>
+<img src="r_green_hydro_technical_input.png" alt="input"><br>
+Potential intakes and restitutions
+</center><br><br>
+
+The following command computes the structure of the potential plants for each side of the river and include the corrected power on the output map table :<br>
+<div class="code"><pre>r.green.hydro.technical plant=potentialplants elevation=elevation structplants=techplants</pre></div><br>
+
+The result is shown in the following vector map called techplants. The table of this map is completed as explained in the end of the NOTES part.<br><br>
+
+<center>
+<img src="r_green_hydro_technical_output.png" alt="output"><br>
+Structure of the potential plants in black (techplants map)
+</center><br><br>
+
+
+<h2>SEE ALSO</h2>
+<em>
+<a href="r.green.hydro.discharge.html">r.green.hydro.discharge</a><br>
+<a href="r.green.hydro.delplants.html">r.green.hydro.delplants</a><br>
+<a href="r.green.hydro.theoretical.html">r.green.hydro.theoretical</a><br>
+<a href="r.green.hydro.legal.html">r.green.hydro.legal</a><br>
+<a href="r.green.hydro.optimal.html">r.green.hydro.optimal</a><br>
+<a href="r.green.hydro.recommended.html">r.green.hydro.recommended</a><br>
+<a href="r.green.hydro.structure.html">r.green.hydro.structure</a><br>
+<a href="r.green.hydro.economic.html">r.green.hydro.economic</a><br>
+</em>
+
+<h2>REFERENCE</h2>
+Picture of the plant structure taken from Micro-hydropower Systems - A Buyer's Guide, Natural Resources Canada, 2004<br>
+Sources for the theory : Courses of French engineering schools ENSE3 Grenoble-INP (Hydraulique des ecoulements en charge) and ENGEES Strasbourg (Hydraulique a surface libre)
+
+<h2>AUTHORS</h2>
+Giulia Garegnani (Eurac Research, Bolzano, Italy), Julie Gros (Eurac Research, Bolzano, Italy), Manual written by Julie Gros.<br>
+Last changed: $Date : 2015-06-12 15:46 GMT+1$
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,682 @@
+#!/usr/bin/env python
+# -- coding: utf-8 --
+#
+############################################################################
+#
+# MODULE: r.green.hydro.technical
+# AUTHOR(S): Giulia Garegnani, Julie Gros
+# PURPOSE:
+#
+# COPYRIGHT: (C) 2014 by the GRASS Development Team
+#
+# This program is free software under the GNU General Public
+# License (>=v2). Read the file COPYING that comes with GRASS
+# for details.
+#
+############################################################################
+#
+#
+#%module
+#% description: Hydropower potential with technical constrains
+#% keywords: raster
+#% overwrite: yes
+#%end
+#%option G_OPT_V_INPUT
+#% key: plant
+#% type: string
+#% label: Name of input vector map with segments of potential plants
+#% required: yes
+#%end
+#%option G_OPT_R_ELEV
+#% required: yes
+#%end
+#%option G_OPT_V_FIELD
+#% key: plant_layer
+#% label: Name of the vector map layer of the plants
+#% required: no
+#% answer: 1
+#% guisection: Input columns
+#%end
+#%option
+#% key: plant_column_plant_id
+#% type: string
+#% description: Column name with the plant id
+#% required: no
+#% answer: plant_id
+#% guisection: Input columns
+#%end
+#%option
+#% key: plant_column_point_id
+#% type: string
+#% description: Column name with the point id
+#% required: no
+#% answer: cat
+#% guisection: Input columns
+#%end
+#%option
+#% key: plant_column_elevup
+#% type: string
+#% description: Column name with the elevation value at the intake (upstream) [m]
+#% required: no
+#% answer: elev_up
+#% guisection: Input columns
+#%end
+#%option
+#% key: plant_column_elevdown
+#% type: string
+#% description: Column name with the elevation value at the restitution (downstream) [m]
+#% required: no
+#% answer: elev_down
+#% guisection: Input columns
+#%end
+#%option
+#% key: plant_column_discharge
+#% type: string
+#% description: Column name with the discharge values [m3/s]
+#% required: no
+#% answer: discharge
+#% guisection: Input columns
+#%end
+#%option
+#% key: plant_column_power
+#% type: string
+#% description: Column name with the potential power [kW]
+#% required: no
+#% answer: pot_power
+#% guisection: Input columns
+#%end
+#%flag
+#% key: d
+#% description: Debug with intermediate maps
+#%end
+#%flag
+#% key: c
+#% description: Clean vector lines
+#%end
+#%option G_OPT_V_OUTPUT
+#% key: output_struct
+#% label: Name of output vector with potential plants and their structure
+#% required: yes
+#%end
+#%option G_OPT_V_OUTPUT
+#% key: output_plant
+#% label: Name of output vector map with segments of potential plants
+#% required: yes
+#%end
+#%option G_OPT_V_OUTPUT
+#% key: output_point
+#% label: Name of output vector map with potential intakes and restitution
+#% required: no
+#%end
+#%option
+#% key: ks_derivation
+#% type: double
+#% description: Strickler coefficient of the derivation [m^(1/3)/s]
+#% required: no
+#% answer: 75
+#% guisection: Head losses
+#%end
+#%option
+#% key: velocity_derivation
+#% type: double
+#% description: Flow velocity in the derivation pipe [m^(1/3)/s]
+#% required: no
+#% answer: 1.
+#% guisection: Head losses
+#%end
+#%option
+#% key: percentage_losses
+#% type: double
+#% description: Percentage of losses (/gross head), if the diameter is not defined [%]
+#% required: no
+#% answer: 4
+#% guisection: Head losses
+#%end
+#%option
+#% key: roughness_penstock
+#% type: double
+#% description: Roughness of the pensotck [mm]
+#% required: no
+#% answer: 0.015
+#% guisection: Head losses
+#%end
+#%option
+#% key: turbine_folder
+#% type: string
+#% description: Path to the folder contening the text file with info about all kind of turbines
+#% required: no
+#% answer:
+#% guisection: Turbine
+#%end
+#%option
+#% key: turbine_list
+#% type: string
+#% description: Path to the text file contening the list of the turbines considered
+#% required: no
+#% answer:
+#% guisection: Turbine
+#%end
+#%option
+#% key: efficiency_shaft
+#% type: double
+#% description: Efficiency of the shaft (bearings friction) [-]
+#% required: no
+#% answer: 1
+#% guisection: Efficiency
+#%end
+#%option
+#% key: efficiency_alt
+#% type: double
+#% description: Efficiency of the alternator [-]
+#% required: no
+#% answer: 0.96
+#% guisection: Efficiency
+#%end
+#%option
+#% key: efficiency_transf
+#% type: double
+#% description: Efficiency of the transformer (magnetic losses) [-]
+#% required: no
+#% answer: 0.99
+#% guisection: Efficiency
+#%end
+#%option
+#% key: ndigits
+#% type: integer
+#% description: Number of digits to use for the elevation in the contour line vector map
+#% required: no
+#% answer: 0
+#% guisection: Contour
+#%end
+#%option
+#% key: resolution
+#% type: double
+#% description: Resolution use for the contour line vector map, if 0.25 approximate 703.31 tp 703.25
+#% required: no
+#% guisection: Contour
+#%end
+#%option G_OPT_V_OUTPUT
+#% key: contour
+#% description: Name of the contour line vector map
+#% required: no
+#% guisection: Contour
+#%end
+
+# import system libraries
+from __future__ import print_function
+import os
+import sys
+import atexit
+
+# import grass libraries
+from grass.script import core as gcore
+
+from grass.pygrass.utils import set_path
+from grass.pygrass.messages import get_msgr
+from grass.pygrass.vector import VectorTopo
+
+from math import pi, log10, sin, acos, asin, sqrt
+
+try:
+ from scipy.optimize import fsolve
+except ImportError:
+ gcore.warning('You should install scipy to use this module: '
+ 'pip install scipy')
+
+import numpy as np
+
+# r.green lib
+set_path('r.green', 'libhydro', '..')
+set_path('r.green', 'libgreen', os.path.join('..', '..'))
+# finally import the module in the library
+from libgreen.utils import cleanup
+from libhydro.optimal import conv_segpoints
+
+DEBUG = False
+TMPRAST = []
+
+if "GISBASE" not in os.environ:
+ print("You must be in GRASS GIS to run this program.")
+ sys.exit(1)
+
+def add_columns(vector, cols):
+ """Add new column if not already present in the vector table.
+ columns is a list of tuple with the column name and the column type."""
+ for cname, ctype in cols:
+ if cname not in vector.table.columns:
+ vector.table.columns.add(cname, ctype)
+
+def diam_pen(discharge, length, gross_head, percentage, epsilon=0.015):
+
+ def diam(x, *args):
+ q, l, h, p, e = args
+ return (sqrt((100 * 8 * l * q ** 2) /
+ (p * h * pi ** 2 * 9.81 * x ** 5)) +
+ 2 * log10((e * 0.001) / (3.71 * x) +
+ (2.51 * 0.000001 * pi) / (4 * q * l) *
+ sqrt((100 * 8 * l * q ** 2) /
+ (p * h * pi ** 2 * 9.81 * x))
+ )
+ )
+ out = fsolve(diam, 0.1,
+ args=(discharge, length, gross_head, percentage, epsilon))[0]
+ return out
+
+
+def losses_Colebrooke(discharge, length, diameter, epsilon=0.015):
+
+ def coeff_f(x, *args):
+ q, l, d, e = args
+ return x + 2 * log10((e * 0.001) / (3.71 * d) +
+ (x * 2.51 * 0.000001 * pi * d ** 2) / (4 * q * l))
+
+ out = fsolve(coeff_f, 0, args=(discharge, length, diameter, epsilon))
+ f = 1 / out**2
+ h_colebrooke = (
+ (f[0] * 8 * length * discharge ** 2) /
+ (pi ** 2 * diameter ** 5 * 9.81))
+ return h_colebrooke
+
+
+def losses_Strickler(discharge, length, diameter, theta, velocity, ks=75):
+ """Return Strickler losses.
+
+ Parameters
+ -----------
+
+ discharge: float [m³/s]
+ Design discharge
+ length: float [m]
+ Design length of the pipe/derivation
+ diameter: float [m]
+ Design diameter for the derivation pipe
+ theta: [radians]
+ Angle of the circular section not wet by the water
+ velocity: [m/s]
+ Water velocity
+ ks: [m**(1/3)/s]
+ Strickler coefficient of the pipe material
+
+
+ Example
+ -------
+
+ >>> Q, d, ks = 1., 2., 75.
+ >>> v = 4 * Q / (pi * d**2)
+ >>> hs = losses_Strickler(discharge=Q, length=1., diameter=d,
+ ... theta=0., velocity=v, ks=ks)
+ >>> hs == 1. / (ks ** 2.)
+ """
+ # circolar section
+ r = diameter * 0.5
+ A = 0.5 * r**2 * (2 * pi - theta + sin(theta))
+ pw = r * (2* pi - theta)
+ Rh = A / pw
+
+ if round(discharge / A, 5) == round(velocity, 5):
+ import ipdb; ipdb.set_trace()
+
+ # i = v**2 / (ks**2 * Rh ** (4/3))
+ # hs = i * l
+ return velocity**2 / (ks**2 * Rh**(4./3.)) * length
+
+
+def singular_losses(gross_head, length, discharge, diameter_penstock):
+ msgr = get_msgr()
+ if diameter_penstock != 0 and gross_head != 0:
+ # TODO: check when gross_head>length not physically
+ if gross_head > length:
+ msgr.warning("To check length of penstock, gross head greater than "
+ "length")
+ h_sing = (1. / (2. * 9.81) +
+ (0.5 + (gross_head / length) ** 2 + 2 *
+ (sin(asin(min(1, gross_head / length)) / 2)) ** 4) *
+ ((8 * discharge ** 2) /
+ (9.81 * pi ** 2 * diameter_penstock ** 4)))
+ else:
+ h_sing = 0
+ return h_sing
+
+
+class Turbine(object):
+
+ def __init__(self, name, flow_proportion,
+ efficiency,
+ q_max, q_min,
+ alpha_c):
+ self.name = name
+ self.flow_proportion = np.array(flow_proportion)
+ self.efficiency = np.array(efficiency)
+ self.q_max = q_max
+ self.q_min = q_min
+ self.alpha_c = alpha_c
+
+
+def compute_losses(struct, options,
+ percentage_losses, roughness_penstock, ks_derivation):
+ # add necessary columns
+ cols = [('diameter', 'DOUBLE'),
+ ('losses', 'DOUBLE'),
+ ('sg_losses', 'DOUBLE'),
+ ('tot_losses', 'DOUBLE'),
+ ('net_head', 'DOUBLE'),
+ ('power', 'hyd_power')]
+ add_columns(struct, cols)
+ # extract intake id
+ list_intakeid = list(set(struct.table.execute('SELECT intake_id FROM %s' %
+ struct.table.name).fetchall()
+ )
+ )
+
+ theta = acos(1./6.) * 2
+ velocity = float(options['velocity_derivation'])
+ # compute structure losses
+ for line in struct:
+ gross_head = float(line.attrs['gross_head'])
+ discharge = float(line.attrs['discharge'])
+ length = line.length()
+
+ if length > 0 and discharge > 0:
+ if line.attrs['kind'] == 'penstock':
+ diameter = line.attrs['diameter']
+ if not diameter:
+ diameter = diam_pen(discharge, length, gross_head,
+ percentage_losses, roughness_penstock)
+ line.attrs['diameter'] = diameter
+
+ losses = losses_Colebrooke(discharge, length,
+ diameter, roughness_penstock)
+
+ elif line.attrs['kind'] == 'conduct':
+ diameter = line.attrs['diameter']
+ if not diameter:
+ # diameter formula: d = sqrt(4 * Q / (v * pi))
+ # with:
+ # - d as diameter
+ # - Q as discharge
+ # - v as velocity (v == 1)
+ diameter = ((4*discharge) / (velocity * pi))**(0.5)
+ line.attrs['diameter'] = diameter
+
+ losses = losses_Strickler(discharge, length,
+ diameter, theta, velocity,
+ ks_derivation)
+ else:
+ losses = 0
+
+ line.attrs['losses'] = losses # in [m]
+ # TODO: fix as function of velocity
+ line.attrs['sg_losses'] = singular_losses(gross_head, length,
+ discharge, diameter)
+ # save the changes
+ struct.table.conn.commit()
+
+ # TODO: make it more readable/pythonic
+ sql0 = "SELECT losses FROM %s WHERE (intake_id=%i AND side='option0');"
+ sql1 = "SELECT losses FROM %s WHERE (intake_id=%i AND side='option1');"
+ for i in list_intakeid:
+ struct.rewind()
+
+ bothlosses0 = list(
+ struct.table.execute(
+ sql0 %
+ (struct.table.name, i[0])).fetchall())
+ if (bothlosses0[0][0] and bothlosses0[1][0]):
+ totallosses0 = bothlosses0[0][0] + bothlosses0[1][0]
+
+ bothlosses1 = list(
+ struct.table.execute(
+ sql1 %
+ (struct.table.name, i[0])).fetchall())
+ if (bothlosses1[0][0] and bothlosses1[1][0]):
+ totallosses1 = bothlosses1[0][0] + bothlosses1[1][0]
+
+ for line in struct:
+ sing_losses = line.attrs['sg_losses']
+
+ if (line.attrs['intake_id'] == i[0] and
+ line.attrs['side'] == 'option0' and
+ line.attrs['kind'] == 'penstock'):
+ line.attrs['tot_losses'] = totallosses0 + sing_losses
+ tot_losses = float(line.attrs['tot_losses'])
+ line.attrs['net_head'] = line.attrs['gross_head'] - tot_losses
+ # net_head = float(line.attrs['net_head'])
+
+ if (line.attrs['intake_id'] == i[0] and
+ line.attrs['side'] == 'option1' and
+ line.attrs['kind'] == 'penstock'):
+ line.attrs['tot_losses'] = totallosses1 + sing_losses
+ tot_losses = float(line.attrs['tot_losses'])
+ line.attrs['net_head'] = line.attrs['gross_head'] - tot_losses
+ # net_head = float(line.attrs['net_head'])
+
+ if line.attrs['kind'] == 'conduct':
+ line.attrs['tot_losses'] = line.attrs['net_head'] = 0
+
+ struct.table.conn.commit()
+ return list_intakeid
+
+
+def compute_power(struct, list_intakeid, turbine_list, turbine_folder,
+ efficiency_shaft, efficiency_alt, efficiency_transf):
+ cols = [('e_turbine', 'DOUBLE'),
+ ('turbine', 'VARCHAR'),
+ ('e_global', 'DOUBLE'),
+ ('power', 'DOUBLE'),
+ ('max_power', 'VARCHAR(3)')]
+
+
+
+ struct.rewind()
+
+ # TODO: make it more readable/pythonic
+ for line in struct:
+
+ net_head = float(line.attrs['net_head'])
+ discharge = float(line.attrs['discharge'])
+
+ if line.attrs['net_head'] > 0:
+ possible_turb = turb_char(net_head, discharge,
+ turbine_list, turbine_folder)
+ efficiency = np.zeros(len(possible_turb))
+
+ for i in range(0, len(possible_turb)):
+ file_in = open(
+ os.path.join(
+ turbine_folder,
+ '%s.txt' %
+ (possible_turb[i])))
+ param = np.genfromtxt(file_in, dtype='f8')
+ for j in range(7, len(param)):
+ if param[j, 0] == 1:
+ efficiency[i] = param[j, 1]
+
+ if efficiency.any():
+ eta = max(efficiency)
+ for i in range(0, len(possible_turb)):
+ if efficiency[i] == eta:
+ kind_turbine = possible_turb[i]
+ else:
+ eta = 0
+ kind_turbine = 'not found'
+
+ line.attrs['e_turbine'] = eta
+ line.attrs['turbine'] = kind_turbine
+ line.attrs['power'] = (9.81 * net_head * discharge * eta *
+ efficiency_shaft * efficiency_alt *
+ efficiency_transf)
+ line.attrs['e_global'] = (9.81 * net_head * discharge * eta *
+ efficiency_shaft * efficiency_alt *
+ efficiency_transf /
+ float(line.attrs['hyd_power']))
+ struct.table.conn.commit()
+
+ for i in range(0, len(list_intakeid)):
+ struct.rewind()
+ list_power = list(
+ struct.table.execute(
+ 'SELECT power FROM %s WHERE intake_id=%i;' %
+ (struct.table.name, list_intakeid[i][0])).fetchall())
+ pmax = max(list_power)[0]
+ for line in struct:
+ if line.attrs['intake_id'] == list_intakeid[i][0] and line.attrs['kind'] == 'penstock':
+ if line.attrs['power'] == pmax:
+ line.attrs['max_power'] = 'yes'
+ else:
+ line.attrs['max_power'] = 'no'
+ struct.table.conn.commit()
+
+
+def load_turbines(list_turb, folder_turb, _cache=[None, ]):
+ def txt2py(txt):
+ """Convert a text to an integer, float or string.
+
+ >>> txt2py('a string')
+ 'a string'
+ >>> txt2py('1234')
+ 1234
+ >>> txt2py('12.34')
+ 12.34
+
+ """
+ if val.isdigit():
+ # convert ot integer
+ return int(txt)
+ try:
+ return float(val)
+ except ValueError:
+ return txt
+
+ if _cache[0] is None:
+ with open(list_turb) as tu:
+ turbines = {turbine.strip(): None for turbine in tu.readlines()}
+
+ for turb in turbines.keys():
+ with open(os.path.join(folder_turb, '%s.txt' % (turb))) as file_in:
+ params, append = {}, False
+ for line in file_in:
+ key, val = line.strip().split()
+ if append:
+ params['qw/qd'].append(float(key))
+ params['eta'].append(float(val))
+ if key == 'QW/Q_design':
+ params['qw/qd'] = []
+ params['eta'] = []
+ append = True
+ else:
+ params[key.lower()] = txt2py(val)
+ turbines[turb] = params
+ # add the parsed result to the function internal cache
+ _cache[0] = turbines
+
+ return _cache[0]
+
+
+def turb_char(net_head, discharge, list_turb, folder_turb, ndigits=6):
+ turbines_specifications = load_turbines(list_turb, folder_turb)
+ turbines = {}
+ for turb, spec in turbines_specifications.items():
+ if ((spec['q_min'] <= discharge <= spec['q_max']) and
+ (spec['dh_min'] <= net_head <= spec['dh_max'])):
+ flow = np.around(np.array(spec['qw/qd']), ndigits)
+ eta = np.around(np.array(spec['eta']), ndigits)
+ turbines[turb] = Turbine(name=turb, flow_proportion=flow,
+ efficiency=eta,
+ q_max=round(spec['q_max'], 3),
+ q_min=round(spec['q_min'], 3),
+ alpha_c=round(spec['alpha_c'], ndigits))
+ return turbines.keys()
+
+
+def main(options, flags):
+ TMPRAST = []
+ DEBUG = True if flags['d'] else False
+ atexit.register(cleanup, raster=TMPRAST, debug=DEBUG)
+
+ elevation = options['elevation']
+ plant = options['plant']
+ output_struct = options['output_struct']
+ output_plant = options['output_plant']
+ percentage_losses = float(options['percentage_losses'])
+ roughness_penstock = float(options['roughness_penstock'])
+ ks_derivation = float(options['ks_derivation'])
+ plant_layer = float(options['plant_layer'])
+ plant_column_discharge = options['plant_column_discharge']
+ plant_column_plant_id = options['plant_column_plant_id']
+ plant_column_point_id = options['plant_column_point_id']
+ plant_column_elevup = options['plant_column_elevup']
+ plant_column_elevdown = options['plant_column_elevdown']
+ plant_column_power = options['plant_column_power']
+ turbine_folder = (options['turbine_folder'] if options['turbine_folder']
+ else os.path.join(os.path.abspath('.'), 'turbines'))
+ turbine_list = (options['turbine_list'] if options['turbine_list'] else
+ os.path.join(os.path.abspath('.'), 'turbines', 'list.txt'))
+ efficiency_shaft = float(options['efficiency_shaft'])
+ efficiency_alt = float(options['efficiency_alt'])
+ efficiency_transf = float(options['efficiency_transf'])
+
+ #import ipdb; ipdb.set_trace()
+ #c = flags['c']
+ msgr = get_msgr()
+
+ #import ipdb; ipdb.set_trace()
+
+ TMPRAST.extend(['new_river', 'buff_area'])
+ if not gcore.overwrite():
+ for m in TMPRAST:
+ if gcore.find_file(m)['name']:
+ msgr.fatal(_("Temporary raster map %s exists") % (m))
+ # FIXME:check if it works for vectors
+
+ if options['output_point']:
+ conv_segpoints(plant, options['output_point'])
+
+ # set the opions to execute the r.green.hydro.structure
+## TODO: uncomment this at the end of the debug session and before commit
+# struct_opts = dict(elevation=elevation, plant=plant,
+# output_struct=output_struct,
+# ndigits=options['ndigits'],
+# contour=options['contour'], overwrite=gcore.overwrite())
+# if options['resolution']:
+# struct_opts['resolution'] = options['resolution']
+# gcore.run_command('r.green.hydro.structure', **struct_opts)
+#
+# gcore.run_command('v.build', map=output_struct)
+## --------------------------------------------------------------------------
+ with VectorTopo(output_struct, mode='rw') as struct:
+ list_intakeid = compute_losses(struct, options,
+ percentage_losses, roughness_penstock,
+ ks_derivation)
+
+ compute_power(struct, list_intakeid, turbine_list, turbine_folder,
+ efficiency_shaft, efficiency_alt, efficiency_transf)
+
+ gcore.run_command('g.copy', vector=(plant, output_plant))
+
+ with VectorTopo(output_plant, mode='rw') as out, \
+ VectorTopo(output_struct, mode='r') as struct:
+
+ cols = [('pot_power', 'hyd_power'),
+ ('tot_losses', 'DOUBLE'),
+ ('net_head', 'DOUBLE'),
+ ('e_global', 'DOUBLE'),
+ ('power', 'DOUBLE')]
+
+ add_columns(out, cols)
+
+ scols = 'tot_losses', 'net_head', 'e_global', 'power'
+ wherecond = 'plant_id={!r} AND kind LIKE {!r} AND max_power LIKE {!r}'
+ for seg in out:
+ where = wherecond.format(str(seg.attrs['plant_id']), 'penstock', 'yes')
+ sqlcode = struct.table.filters.select(
+ ','.join(scols)).where(where).get_sql()
+ svalues = struct.table.execute(sqlcode).fetchone()
+ for col, value in zip(scols, svalues):
+ seg.attrs[col] = value
+ out.table.conn.commit()
+
+
+if __name__ == "__main__":
+ atexit.register(cleanup)
+ options, flags = gcore.parser()
+ sys.exit(main(options, flags))
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py
___________________________________________________________________
Added: svn:mime-type
+ text/x-python
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_input.png
===================================================================
(Binary files differ)
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_input.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_output.png
===================================================================
(Binary files differ)
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_output.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_picstruct.png
===================================================================
(Binary files differ)
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r_green_hydro_technical_picstruct.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Coclea.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Coclea.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Coclea.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,37 @@
+PRODUCER ATRO
+ALPHA_C 0.503507
+Q_MIN 0.2
+Q_MAX 5.5
+DH_MIN 0
+DH_MAX 10
+QW/Q_design ETA
+0.503507E+00 0.331126E-02
+0.619083E+00 10.26490E-02
+0.808732E+00 20.19870E-02
+0.968653E+00 30.46360E-02
+0.118764E+01 41.39070E-02
+0.143664E+01 50.99340E-02
+0.172990E+01 61.25830E-02
+0.208232E+01 71.85430E-02
+0.227363E+01 76.15890E-02
+0.246544E+01 78.80790E-02
+0.265735E+01 81.12580E-02
+0.287918E+01 82.45030E-02
+0.327898E+01 83.11260E-02
+0.361923E+01 84.76820E-02
+0.401894E+01 85.76160E-02
+0.443365E+01 86.09270E-02
+0.487780E+01 87.08610E-02
+0.542575E+01 87.74830E-02
+0.589963E+01 88.41060E-02
+0.634398E+01 88.74170E-02
+0.675870E+01 89.07280E-02
+0.717341E+01 89.40400E-02
+0.755850E+01 89.73510E-02
+0.794349E+01 90.39730E-02
+0.832848E+01 91.05960E-02
+0.875791E+01 91.72180E-02
+0.908374E+01 92.05300E-02
+0.942438E+01 92.38410E-02
+0.972068E+01 92.38410E-02
+1.000000E+01 92.38410E-02
\ No newline at end of file
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Coclea.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Crossflow.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Crossflow.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Crossflow.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,57 @@
+TURBINE Crossflow
+ALPHA_C 0.800000E-01
+Q_MIN 1
+Q_MAX 10
+DH_MIN 0
+DH_MAX 60
+QW/Q_design ETA
+0.800000E-01 0.000000E+00
+0.815348E-01 0.434783E-01
+0.839329E-01 0.772947E-01
+0.863309E-01 0.115942E+00
+0.935252E-01 0.164251E+00
+0.983213E-01 0.202899E+00
+0.107914E+00 0.236715E+00
+0.117506E+00 0.275362E+00
+0.127098E+00 0.314010E+00
+0.136691E+00 0.357488E+00
+0.148681E+00 0.396135E+00
+0.163070E+00 0.434783E+00
+0.175060E+00 0.468599E+00
+0.187050E+00 0.497585E+00
+0.203837E+00 0.536232E+00
+0.220624E+00 0.565217E+00
+0.235012E+00 0.594203E+00
+0.254197E+00 0.628019E+00
+0.270983E+00 0.647343E+00
+0.292566E+00 0.676328E+00
+0.316547E+00 0.700483E+00
+0.340528E+00 0.714976E+00
+0.369305E+00 0.739130E+00
+0.395683E+00 0.748792E+00
+0.417266E+00 0.763285E+00
+0.443645E+00 0.777778E+00
+0.467626E+00 0.787440E+00
+0.491607E+00 0.797101E+00
+0.510791E+00 0.806763E+00
+0.534772E+00 0.816425E+00
+0.558753E+00 0.826087E+00
+0.585132E+00 0.830918E+00
+0.606715E+00 0.835749E+00
+0.630695E+00 0.840580E+00
+0.659472E+00 0.840580E+00
+0.681055E+00 0.840580E+00
+0.702638E+00 0.840580E+00
+0.729017E+00 0.835749E+00
+0.748201E+00 0.835749E+00
+0.767386E+00 0.830918E+00
+0.793765E+00 0.826087E+00
+0.822542E+00 0.826087E+00
+0.841727E+00 0.821256E+00
+0.868106E+00 0.816425E+00
+0.889688E+00 0.816425E+00
+0.911271E+00 0.816425E+00
+0.930456E+00 0.806763E+00
+0.952038E+00 0.801932E+00
+0.973621E+00 0.801932E+00
+1.000000E+00 0.801932E+00
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Crossflow.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Francis.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Francis.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Francis.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,58 @@
+PRODUCER ENERCA
+ALPHA_C 0.297535
+Q_MIN 0.4
+Q_MAX 100
+DH_MIN 0.5
+DH_MAX 600
+QW/Q_design ETA
+0.297535E+00 0.303899E+00
+0.301727E+00 0.314897E+00
+0.307308E+00 0.327462E+00
+0.312895E+00 0.341601E+00
+0.318488E+00 0.357313E+00
+0.325464E+00 0.373020E+00
+0.332440E+00 0.388728E+00
+0.339429E+00 0.407581E+00
+0.346418E+00 0.426434E+00
+0.353412E+00 0.446860E+00
+0.360420E+00 0.470433E+00
+0.368791E+00 0.489281E+00
+0.375780E+00 0.508135E+00
+0.384164E+00 0.530129E+00
+0.391158E+00 0.550556E+00
+0.398141E+00 0.567836E+00
+0.407895E+00 0.586680E+00
+0.417643E+00 0.603951E+00
+0.430169E+00 0.624359E+00
+0.442689E+00 0.643194E+00
+0.455215E+00 0.663602E+00
+0.469111E+00 0.680859E+00
+0.481619E+00 0.696548E+00
+0.496898E+00 0.713801E+00
+0.512171E+00 0.729481E+00
+0.528827E+00 0.745156E+00
+0.545489E+00 0.762404E+00
+0.562145E+00 0.778079E+00
+0.576029E+00 0.792191E+00
+0.592678E+00 0.806293E+00
+0.607945E+00 0.820399E+00
+0.624601E+00 0.836075E+00
+0.646788E+00 0.851731E+00
+0.673136E+00 0.870521E+00
+0.693940E+00 0.886182E+00
+0.716121E+00 0.900266E+00
+0.734153E+00 0.914364E+00
+0.754939E+00 0.925306E+00
+0.767421E+00 0.934703E+00
+0.782663E+00 0.942517E+00
+0.799276E+00 0.947182E+00
+0.817252E+00 0.947122E+00
+0.836612E+00 0.947058E+00
+0.855971E+00 0.946994E+00
+0.875324E+00 0.945357E+00
+0.894683E+00 0.945293E+00
+0.915425E+00 0.945224E+00
+0.936173E+00 0.946728E+00
+0.955533E+00 0.946664E+00
+0.973509E+00 0.946605E+00
+1.000000E+00 0.944972E+00
\ No newline at end of file
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Francis.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_dop.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_dop.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_dop.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,67 @@
+PRODUCER ENERCA
+ALPHA_C 0.14
+Q_MIN 2
+Q_MAX 900
+DH_MIN 2
+DH_MAX 80
+QW/Q_design ETA
+0.140000E+00 0.301206E+00
+0.144110E+00 0.324382E+00
+0.148817E+00 0.347558E+00
+0.153525E+00 0.370734E+00
+0.158219E+00 0.391976E+00
+0.164455E+00 0.417074E+00
+0.169176E+00 0.442184E+00
+0.173884E+00 0.465360E+00
+0.178605E+00 0.490470E+00
+0.186396E+00 0.521359E+00
+0.191090E+00 0.542601E+00
+0.197327E+00 0.567699E+00
+0.205078E+00 0.592784E+00
+0.211314E+00 0.617882E+00
+0.217523E+00 0.639112E+00
+0.225274E+00 0.664197E+00
+0.234540E+00 0.689271E+00
+0.243807E+00 0.714344E+00
+0.254561E+00 0.735536E+00
+0.265329E+00 0.758663E+00
+0.276083E+00 0.779855E+00
+0.286837E+00 0.801047E+00
+0.299093E+00 0.820292E+00
+0.314365E+00 0.837579E+00
+0.325065E+00 0.851033E+00
+0.338755E+00 0.858660E+00
+0.352458E+00 0.868221E+00
+0.367663E+00 0.875835E+00
+0.384369E+00 0.881503E+00
+0.404106E+00 0.887145E+00
+0.417782E+00 0.892838E+00
+0.432960E+00 0.896583E+00
+0.446595E+00 0.896472E+00
+0.461746E+00 0.896349E+00
+0.473867E+00 0.896250E+00
+0.489004E+00 0.894192E+00
+0.502639E+00 0.894081E+00
+0.517790E+00 0.893958E+00
+0.531453E+00 0.897715E+00
+0.549674E+00 0.903370E+00
+0.564838E+00 0.905181E+00
+0.578474E+00 0.905070E+00
+0.598183E+00 0.906844E+00
+0.619394E+00 0.906672E+00
+0.639090E+00 0.906511E+00
+0.657257E+00 0.904429E+00
+0.679997E+00 0.906178E+00
+0.701207E+00 0.906005E+00
+0.723933E+00 0.905820E+00
+0.742114E+00 0.905672E+00
+0.763325E+00 0.905499E+00
+0.786051E+00 0.905314E+00
+0.804232E+00 0.905166E+00
+0.826958E+00 0.904981E+00
+0.857259E+00 0.904734E+00
+0.884544E+00 0.906446E+00
+0.911815E+00 0.906224E+00
+0.939100E+00 0.907936E+00
+0.964856E+00 0.907727E+00
+1.000000E+00 0.909390E+00
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_dop.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_sing.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_sing.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_sing.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,59 @@
+PRODUCER ENERCA
+ALPHA_C 0.153
+Q_MIN 2
+Q_MAX 900
+DH_MIN 2
+DH_MAX 80
+QW/Q_design ETA
+0.153000E+00 0.304964E+00
+0.159247E+00 0.324259E+00
+0.166971E+00 0.345476E+00
+0.176224E+00 0.368615E+00
+0.183962E+00 0.391766E+00
+0.191686E+00 0.412983E+00
+0.202440E+00 0.434175E+00
+0.211652E+00 0.451511E+00
+0.223935E+00 0.474625E+00
+0.236191E+00 0.493870E+00
+0.248433E+00 0.511181E+00
+0.260675E+00 0.528492E+00
+0.274433E+00 0.545791E+00
+0.286675E+00 0.563102E+00
+0.300446E+00 0.582335E+00
+0.317220E+00 0.597674E+00
+0.332478E+00 0.613026E+00
+0.350767E+00 0.628354E+00
+0.370572E+00 0.643668E+00
+0.387332E+00 0.657074E+00
+0.404092E+00 0.670479E+00
+0.420839E+00 0.681949E+00
+0.436071E+00 0.693433E+00
+0.454347E+00 0.706825E+00
+0.472622E+00 0.720218E+00
+0.490911E+00 0.735545E+00
+0.510702E+00 0.748926E+00
+0.528977E+00 0.762319E+00
+0.547239E+00 0.773777E+00
+0.565501E+00 0.785235E+00
+0.583763E+00 0.796694E+00
+0.602052E+00 0.812021E+00
+0.621829E+00 0.823467E+00
+0.640077E+00 0.832991E+00
+0.659841E+00 0.842503E+00
+0.681106E+00 0.850068E+00
+0.703886E+00 0.857620E+00
+0.723649E+00 0.867132E+00
+0.746416E+00 0.872750E+00
+0.764651E+00 0.880340E+00
+0.784374E+00 0.884048E+00
+0.802582E+00 0.887769E+00
+0.822291E+00 0.889543E+00
+0.840485E+00 0.891329E+00
+0.858693E+00 0.895050E+00
+0.878389E+00 0.894889E+00
+0.895055E+00 0.894754E+00
+0.917794E+00 0.896503E+00
+0.942035E+00 0.896305E+00
+0.960216E+00 0.896157E+00
+0.979912E+00 0.895997E+00
+1.000000E+00 0.895836E+00
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Kaplan_sing.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MicroPelton.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MicroPelton.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MicroPelton.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,50 @@
+PRODUCER ENERCA
+ALPHA_C 0.3
+Q_MIN 0.002
+Q_MAX 0.04
+DH_MIN 30
+DH_MAX 100
+QW/Q_design ETA
+0.300000E+00 0.531221E+00
+0.312246E+00 0.548860E+00
+0.325101E+00 0.564738E+00
+0.339242E+00 0.584141E+00
+0.357240E+00 0.601789E+00
+0.373951E+00 0.621197E+00
+0.388092E+00 0.637077E+00
+0.400947E+00 0.652954E+00
+0.416373E+00 0.668837E+00
+0.433085E+00 0.686483E+00
+0.447226E+00 0.702363E+00
+0.462652E+00 0.718245E+00
+0.476793E+00 0.734125E+00
+0.493505E+00 0.748248E+00
+0.506360E+00 0.758841E+00
+0.521786E+00 0.769439E+00
+0.534641E+00 0.778270E+00
+0.552639E+00 0.788872E+00
+0.569350E+00 0.797711E+00
+0.586062E+00 0.806550E+00
+0.604060E+00 0.817152E+00
+0.622057E+00 0.824232E+00
+0.640054E+00 0.833072E+00
+0.656766E+00 0.841911E+00
+0.674763E+00 0.848990E+00
+0.692760E+00 0.854308E+00
+0.713329E+00 0.859631E+00
+0.730041E+00 0.863185E+00
+0.748038E+00 0.866742E+00
+0.768606E+00 0.870303E+00
+0.789174E+00 0.873864E+00
+0.807172E+00 0.875659E+00
+0.825169E+00 0.875692E+00
+0.848309E+00 0.875735E+00
+0.865020E+00 0.875766E+00
+0.881732E+00 0.875797E+00
+0.899729E+00 0.874069E+00
+0.917727E+00 0.874102E+00
+0.935724E+00 0.875897E+00
+0.955007E+00 0.874171E+00
+0.973004E+00 0.875966E+00
+0.988430E+00 0.875995E+00
+0.100000E+01 0.876019E+00
\ No newline at end of file
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MicroPelton.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniBanki.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniBanki.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniBanki.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,43 @@
+PRODUCER ENERCA
+ALPHA_C 0.817996E-01
+Q_MIN 0.02
+Q_MAX 10
+DH_MIN 5
+DH_MAX 200
+0.817996E-01 0.0484830E-02
+0.817996E-01 7.9499800E-02
+0.817996E-01 16.765800E-02
+0.858896E-01 24.367100E-02
+0.879346E-01 30.751300E-02
+0.879346E-01 37.742200E-02
+0.920245E-01 43.823700E-02
+0.940695E-01 50.815800E-02
+0.102249E+00 58.115600E-02
+0.114519E+00 64.506100E-02
+0.128834E+00 66.338500E-02
+0.149284E+00 69.694400E-02
+0.171779E+00 72.139700E-02
+0.200409E+00 74.892600E-02
+0.229039E+00 76.125800E-02
+0.253579E+00 76.748700E-02
+0.290389E+00 77.986800E-02
+0.325153E+00 78.919800E-02
+0.353783E+00 78.937200E-02
+0.386503E+00 79.261100E-02
+0.421268E+00 79.586200E-02
+0.456033E+00 80.215200E-02
+0.488753E+00 80.843000E-02
+0.515337E+00 81.163100E-02
+0.537832E+00 81.480700E-02
+0.578732E+00 81.809500E-02
+0.607362E+00 82.130900E-02
+0.650307E+00 82.157000E-02
+0.689162E+00 82.180600E-02
+0.721881E+00 82.808400E-02
+0.768916E+00 82.533100E-02
+0.811861E+00 82.255200E-02
+0.854806E+00 81.673400E-02
+0.893661E+00 81.697000E-02
+0.932515E+00 80.808800E-02
+0.963190E+00 80.523500E-02
+1.000000E+00 80.523500E-02
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniBanki.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniFrancis.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniFrancis.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniFrancis.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,60 @@
+PRODUCER ENERCA
+ALPHA_C 0.3
+Q_MIN 0.2
+Q_MAX 3
+DH_MIN 15
+DH_MAX 100
+QW/Q_design ETA
+0.300000E+00 0.303894E+00
+0.304946E+00 0.322751E+00
+0.313348E+00 0.338454E+00
+0.318999E+00 0.357311E+00
+0.328814E+00 0.377728E+00
+0.335850E+00 0.396581E+00
+0.345656E+00 0.415425E+00
+0.354077E+00 0.434274E+00
+0.361113E+00 0.453127E+00
+0.370947E+00 0.476690E+00
+0.377992E+00 0.497116E+00
+0.386422E+00 0.517538E+00
+0.394853E+00 0.537959E+00
+0.403273E+00 0.556808E+00
+0.414473E+00 0.577220E+00
+0.427058E+00 0.597628E+00
+0.441037E+00 0.619604E+00
+0.453603E+00 0.636866E+00
+0.466178E+00 0.655700E+00
+0.482908E+00 0.674521E+00
+0.498272E+00 0.696493E+00
+0.510819E+00 0.710609E+00
+0.524770E+00 0.727866E+00
+0.538711E+00 0.743550E+00
+0.552615E+00 0.752942E+00
+0.567923E+00 0.765476E+00
+0.583231E+00 0.778009E+00
+0.597144E+00 0.788975E+00
+0.609673E+00 0.799944E+00
+0.623596E+00 0.812482E+00
+0.636124E+00 0.823452E+00
+0.651441E+00 0.837559E+00
+0.666739E+00 0.848519E+00
+0.682047E+00 0.861053E+00
+0.695942E+00 0.868872E+00
+0.711221E+00 0.876687E+00
+0.727895E+00 0.886070E+00
+0.743194E+00 0.897030E+00
+0.759867E+00 0.906413E+00
+0.776541E+00 0.915796E+00
+0.793205E+00 0.923606E+00
+0.813996E+00 0.926683E+00
+0.830633E+00 0.929774E+00
+0.848654E+00 0.932861E+00
+0.866657E+00 0.932801E+00
+0.886053E+00 0.934310E+00
+0.905441E+00 0.934246E+00
+0.923443E+00 0.934186E+00
+0.938676E+00 0.934136E+00
+0.952524E+00 0.934090E+00
+0.969142E+00 0.934035E+00
+0.984375E+00 0.933984E+00
+1.000000E+00 0.933943E+00
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniFrancis.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_dop.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_dop.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_dop.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,67 @@
+PRODUCER ENERCA
+ALPHA_C 0.14
+Q_MIN 1
+Q_MAX 10
+DH_MIN 1.5
+DH_MAX 10.5
+QW/Q_design ETA
+0.140000E+00 0.301206E+00
+0.144110E+00 0.324382E+00
+0.148817E+00 0.347558E+00
+0.153525E+00 0.370734E+00
+0.158219E+00 0.391976E+00
+0.164455E+00 0.417074E+00
+0.169176E+00 0.442184E+00
+0.173884E+00 0.465360E+00
+0.178605E+00 0.490470E+00
+0.186396E+00 0.521359E+00
+0.191090E+00 0.542601E+00
+0.197327E+00 0.567699E+00
+0.205078E+00 0.592784E+00
+0.211314E+00 0.617882E+00
+0.217523E+00 0.639112E+00
+0.225274E+00 0.664197E+00
+0.234540E+00 0.689271E+00
+0.243807E+00 0.714344E+00
+0.254561E+00 0.735536E+00
+0.265329E+00 0.758663E+00
+0.276083E+00 0.779855E+00
+0.286837E+00 0.801047E+00
+0.299093E+00 0.820292E+00
+0.314365E+00 0.837579E+00
+0.325065E+00 0.851033E+00
+0.338755E+00 0.858660E+00
+0.352458E+00 0.868221E+00
+0.367663E+00 0.875835E+00
+0.384369E+00 0.881503E+00
+0.404106E+00 0.887145E+00
+0.417782E+00 0.892838E+00
+0.432960E+00 0.896583E+00
+0.446595E+00 0.896472E+00
+0.461746E+00 0.896349E+00
+0.473867E+00 0.896250E+00
+0.489004E+00 0.894192E+00
+0.502639E+00 0.894081E+00
+0.517790E+00 0.893958E+00
+0.531453E+00 0.897715E+00
+0.549674E+00 0.903370E+00
+0.564838E+00 0.905181E+00
+0.578474E+00 0.905070E+00
+0.598183E+00 0.906844E+00
+0.619394E+00 0.906672E+00
+0.639090E+00 0.906511E+00
+0.657257E+00 0.904429E+00
+0.679997E+00 0.906178E+00
+0.701207E+00 0.906005E+00
+0.723933E+00 0.905820E+00
+0.742114E+00 0.905672E+00
+0.763325E+00 0.905499E+00
+0.786051E+00 0.905314E+00
+0.804232E+00 0.905166E+00
+0.826958E+00 0.904981E+00
+0.857259E+00 0.904734E+00
+0.884544E+00 0.906446E+00
+0.911815E+00 0.906224E+00
+0.939100E+00 0.907936E+00
+0.964856E+00 0.907727E+00
+1.000000E+00 0.909390E+00
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_dop.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_sing.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_sing.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_sing.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,59 @@
+PRODUCER ENERCA
+ALPHA_C 0.153
+Q_MIN 1
+Q_MAX 10
+DH_MIN 1.5
+DH_MAX 10.5
+QW/Q_design ETA
+0.153000E+00 0.304964E+00
+0.159247E+00 0.324259E+00
+0.166971E+00 0.345476E+00
+0.176224E+00 0.368615E+00
+0.183962E+00 0.391766E+00
+0.191686E+00 0.412983E+00
+0.202440E+00 0.434175E+00
+0.211652E+00 0.451511E+00
+0.223935E+00 0.474625E+00
+0.236191E+00 0.493870E+00
+0.248433E+00 0.511181E+00
+0.260675E+00 0.528492E+00
+0.274433E+00 0.545791E+00
+0.286675E+00 0.563102E+00
+0.300446E+00 0.582335E+00
+0.317220E+00 0.597674E+00
+0.332478E+00 0.613026E+00
+0.350767E+00 0.628354E+00
+0.370572E+00 0.643668E+00
+0.387332E+00 0.657074E+00
+0.404092E+00 0.670479E+00
+0.420839E+00 0.681949E+00
+0.436071E+00 0.693433E+00
+0.454347E+00 0.706825E+00
+0.472622E+00 0.720218E+00
+0.490911E+00 0.735545E+00
+0.510702E+00 0.748926E+00
+0.528977E+00 0.762319E+00
+0.547239E+00 0.773777E+00
+0.565501E+00 0.785235E+00
+0.583763E+00 0.796694E+00
+0.602052E+00 0.812021E+00
+0.621829E+00 0.823467E+00
+0.640077E+00 0.832991E+00
+0.659841E+00 0.842503E+00
+0.681106E+00 0.850068E+00
+0.703886E+00 0.857620E+00
+0.723649E+00 0.867132E+00
+0.746416E+00 0.872750E+00
+0.764651E+00 0.880340E+00
+0.784374E+00 0.884048E+00
+0.802582E+00 0.887769E+00
+0.822291E+00 0.889543E+00
+0.840485E+00 0.891329E+00
+0.858693E+00 0.895050E+00
+0.878389E+00 0.894889E+00
+0.895055E+00 0.894754E+00
+0.917794E+00 0.896503E+00
+0.942035E+00 0.896305E+00
+0.960216E+00 0.896157E+00
+0.979912E+00 0.895997E+00
+1.000000E+00 0.895836E+00
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniKaplan_sing.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniPelton.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniPelton.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniPelton.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,57 @@
+PRODUCER ENERCA
+ALPHA_C 0.18
+Q_MIN 0.004
+Q_MAX 1
+DH_MIN 50
+DH_MAX 500
+QW/Q_design ETA
+0.180000E+00 0.552973E+00
+0.195264E+00 0.574054E+00
+0.208119E+00 0.589865E+00
+0.217118E+00 0.602162E+00
+0.229973E+00 0.617973E+00
+0.244114E+00 0.635541E+00
+0.258254E+00 0.651351E+00
+0.268539E+00 0.667162E+00
+0.280108E+00 0.681216E+00
+0.292963E+00 0.695270E+00
+0.304533E+00 0.707568E+00
+0.319959E+00 0.723378E+00
+0.335386E+00 0.733919E+00
+0.346955E+00 0.746216E+00
+0.361096E+00 0.756757E+00
+0.376522E+00 0.767297E+00
+0.393234E+00 0.777838E+00
+0.409946E+00 0.786622E+00
+0.427943E+00 0.797162E+00
+0.445940E+00 0.805946E+00
+0.462652E+00 0.814730E+00
+0.480650E+00 0.821757E+00
+0.496076E+00 0.828784E+00
+0.516644E+00 0.835811E+00
+0.535927E+00 0.842838E+00
+0.553924E+00 0.849865E+00
+0.571922E+00 0.855135E+00
+0.591204E+00 0.858649E+00
+0.609202E+00 0.862162E+00
+0.627199E+00 0.865676E+00
+0.645196E+00 0.870946E+00
+0.663194E+00 0.872703E+00
+0.682476E+00 0.877973E+00
+0.700474E+00 0.879730E+00
+0.718471E+00 0.881486E+00
+0.733897E+00 0.885000E+00
+0.750609E+00 0.885000E+00
+0.767321E+00 0.888514E+00
+0.786604E+00 0.888514E+00
+0.804601E+00 0.888514E+00
+0.822598E+00 0.890270E+00
+0.840595E+00 0.890270E+00
+0.858593E+00 0.890270E+00
+0.877876E+00 0.890270E+00
+0.894587E+00 0.890270E+00
+0.912585E+00 0.890270E+00
+0.937009E+00 0.890270E+00
+0.960149E+00 0.890270E+00
+0.983288E+00 0.890270E+00
+0.100000E+01 0.890270E+00
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/MiniPelton.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Pelton.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Pelton.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Pelton.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,59 @@
+PRODUCER ENERCA
+ALPHA_C 0.100000E-01
+Q_MIN 0.02
+Q_MAX 80
+DH_MIN 50
+DH_MAX 1800
+QW/Q_design ETA
+0.100000E-01 0.502575E+00
+0.110419E+00 0.527236E+00
+0.120704E+00 0.546613E+00
+0.130988E+00 0.567751E+00
+0.139986E+00 0.588889E+00
+0.148985E+00 0.608266E+00
+0.159269E+00 0.629404E+00
+0.169553E+00 0.648781E+00
+0.179838E+00 0.668157E+00
+0.192693E+00 0.687534E+00
+0.202977E+00 0.703388E+00
+0.213261E+00 0.721003E+00
+0.226116E+00 0.735095E+00
+0.238972E+00 0.749187E+00
+0.251827E+00 0.761518E+00
+0.264682E+00 0.775610E+00
+0.280108E+00 0.787940E+00
+0.298106E+00 0.802033E+00
+0.310961E+00 0.812602E+00
+0.323816E+00 0.819648E+00
+0.340528E+00 0.824932E+00
+0.357240E+00 0.830217E+00
+0.376522E+00 0.837263E+00
+0.395805E+00 0.840786E+00
+0.417659E+00 0.846070E+00
+0.438227E+00 0.849594E+00
+0.461367E+00 0.854878E+00
+0.481935E+00 0.858401E+00
+0.501218E+00 0.861924E+00
+0.521786E+00 0.863686E+00
+0.539783E+00 0.868970E+00
+0.562923E+00 0.872493E+00
+0.587348E+00 0.876016E+00
+0.610487E+00 0.879539E+00
+0.633627E+00 0.883062E+00
+0.652909E+00 0.886585E+00
+0.676049E+00 0.890108E+00
+0.692760E+00 0.891870E+00
+0.709472E+00 0.893631E+00
+0.730041E+00 0.895393E+00
+0.753180E+00 0.897154E+00
+0.773748E+00 0.898916E+00
+0.795602E+00 0.900678E+00
+0.818742E+00 0.902439E+00
+0.843166E+00 0.902439E+00
+0.867591E+00 0.902439E+00
+0.893302E+00 0.902439E+00
+0.911299E+00 0.902439E+00
+0.931867E+00 0.902439E+00
+0.951150E+00 0.902439E+00
+0.970433E+00 0.902439E+00
+0.100000E+01 0.902439E+00
\ No newline at end of file
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/Pelton.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Added: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/list.txt
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/list.txt (rev 0)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/list.txt 2015-08-21 13:35:30 UTC (rev 65991)
@@ -0,0 +1,11 @@
+Coclea
+Crossflow
+Francis
+Kaplan_dop
+Kaplan_sing
+MicroPelton
+MiniFrancis
+MiniKaplan_dop
+MiniKaplan_sing
+MiniPelton
+Pelton
\ No newline at end of file
Property changes on: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/turbines/list.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
More information about the grass-commit
mailing list