Skip to content

Commit

Permalink
Merge 6c4fefb into f63ec62
Browse files Browse the repository at this point in the history
  • Loading branch information
SabineHaas committed May 10, 2019
2 parents f63ec62 + 6c4fefb commit 0af30fe
Show file tree
Hide file tree
Showing 6 changed files with 217 additions and 63 deletions.
2 changes: 1 addition & 1 deletion doc/whatsnew/v0-1-2.txt
Expand Up @@ -19,7 +19,7 @@ Bug fixes

Other changes
#############
* Make windpowerlib work offline: turbine data from oedb is stored in a hdf5 file for offline usage
* Make windpowerlib work offline: turbine data from oedb is stored in csv files for offline usage
* Make :py:func:`~windpowerlib.wind_turbine.get_turbine_types` also accessible via `get_turbine_types()` --> from windpowerlib import get_turbine_types


Expand Down
3 changes: 2 additions & 1 deletion tests/test_wind_turbine.py
Expand Up @@ -38,4 +38,5 @@ def test_get_turbine_data_from_file(self):
file_='not_existent')

def test_get_turbine_types(self):
get_turbine_types(print_out=False)
get_turbine_types(print_out=True, filter_=True)
get_turbine_types(print_out=False, filter_=False)
53 changes: 53 additions & 0 deletions windpowerlib/data/oedb_power_coefficient_curves.csv
@@ -0,0 +1,53 @@
turbine_type,0.0,0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.2,4.5,5.0,5.2,5.5,6.0,6.2,6.5,7.0,7.5,8.0,8.1,8.5,8.8,9.0,9.5,10.0,10.2,10.5,11.0,11.1,11.5,12.0,12.5,13.0,13.5,14.0,14.5,15.0,15.5,16.0,16.5,17.0,17.5,18.0,18.5,19.0,19.5,20.0,20.5,21.0,21.5,22.0,22.5,23.0,23.5,24.0,24.5,25.0,26.0,nominal_power
E-141/4200,,,0.0,,0.29,,0.4,,0.42,,,0.44,,,0.45,,,0.45,,0.44,,,,0.41,,0.36,,,0.31,,,0.25,,0.2,,0.16,,0.13,,0.11,,0.09,,0.08,,0.06,,0.05,,0.05,,0.04,,0.04,,0.03,,0.03,,4200
E-126/4200,,,0.0,,0.0,,0.28,,0.37,,,0.41,,,0.44,,,0.45,,0.45,,,,0.43,,0.4,,,0.35,,,0.3,,0.24,,0.2,,0.16,,0.13,,0.11,,0.09,,0.08,,0.07,,0.06,,0.05,,0.04,,0.04,,0.03,,4200
E-101/3500,,,0.0,,0.08,,0.28,,0.37,,,0.41,,,0.44,,,0.46,,0.47,,,,0.47,,0.46,,,0.43,,,0.38,,0.32,,0.26,,0.21,,0.17,,0.15,,0.12,,0.1,,0.09,,0.08,,0.07,,0.06,,0.05,,0.05,,3500
E-115/3200,,,0.0,,0.06,,0.28,,0.38,,,0.42,,,0.45,,,0.47,,0.46,,,,0.45,,0.42,,,0.35,,,0.29,,0.23,,0.18,,0.15,,0.12,,0.1,,0.09,,0.07,,0.06,,0.05,,0.05,,0.04,,0.04,,0.03,,3200
E-101/3050,,,0.0,,0.076,,0.279,,0.376,,,0.421,,,0.452,,,0.469,,0.478,,,,0.478,,0.477,,,0.439,,,0.358,,0.283,,0.227,,0.184,,0.152,,0.127,,0.107,,0.091,,0.078,,0.067,,0.058,,0.051,,0.045,,0.04,,3050
E-115/3000,,,0.0,,0.058,,0.279,,0.376,,,0.421,,,0.451,,,0.469,,0.47,,,,0.445,,0.401,,,0.338,,,0.27,,0.212,,0.17,,0.138,,0.114,,0.095,,0.08,,0.068,,0.058,,0.05,,0.044,,0.038,,0.034,,0.03,,3000
E-82/3000,,,0.0,,0.0,,0.286,,0.396,,,0.43,,,0.459,,,0.473,,0.483,,,,0.481,,0.467,,,0.437,,,0.394,,0.352,,0.312,,0.267,,0.226,,0.19,,0.16,,0.136,,0.117,,0.101,,0.088,,0.077,,0.068,,0.06,,3000
E-92/2350,,,0.0,,0.11,,0.27,,0.38,,,0.41,,,0.44,,,0.46,,0.47,,,,0.47,,0.45,,,0.39,,,0.32,,0.26,,0.21,,0.17,,0.14,,0.12,,0.1,,0.08,,0.07,,0.06,,0.05,,0.05,,0.04,,0.04,,2350
E-82/2350,,,0.0,,0.12,,0.29,,0.4,,,0.43,,,0.46,,,0.48,,0.49,,,,0.5,,0.49,,,0.44,,,0.38,,0.32,,0.26,,0.22,,0.18,,0.15,,0.12,,0.11,,0.09,,0.08,,0.07,,0.06,,0.05,,0.05,,2350
E-82/2300,,,0.0,,0.12,,0.29,,0.4,,,0.43,,,0.46,,,0.48,,0.49,,,,0.5,,0.49,,,0.44,,,0.38,,0.32,,0.26,,0.22,,0.18,,0.15,,0.12,,0.11,,0.09,,0.08,,0.07,,0.06,,0.05,,0.05,,2300
E-70/2300,,,0.0,,0.1,,0.27,,0.36,,,0.42,,,0.46,,,0.48,,0.5,,,,0.5,,0.5,,,0.49,,,0.45,,0.39,,0.34,,0.28,,0.23,,0.19,,0.16,,0.14,,0.12,,0.1,,0.09,,0.08,,0.07,,0.06,,2300
E-82/2000,,,0.0,,0.12,,0.29,,0.4,,,0.43,,,0.46,,,0.48,,0.49,,,,0.5,,0.49,,,0.42,,,0.35,,0.29,,0.23,,0.19,,0.15,,0.13,,0.11,,0.09,,0.08,,0.07,,0.06,,0.05,,0.05,,0.04,,2000
E-70/2000,,,0.0,,0.1,,0.27,,0.36,,,0.42,,,0.46,,,0.48,,0.5,,,,0.5,,0.5,,,0.49,,,0.45,,0.39,,0.34,,0.28,,0.23,,0.19,,0.16,,0.14,,0.12,,0.1,,0.09,,0.08,,0.07,,0.06,,2000
E-53/800,,,0.0,,0.19,,0.39,,0.44,,,0.46,,,0.48,,,0.49,,0.49,,,,0.49,,0.48,,,0.42,,,0.34,,0.27,,0.22,,0.18,,0.15,,0.12,,0.1,,0.09,,0.08,,0.06,,0.06,,0.05,,0.04,,0.04,,800
N131/3600,0.0,0.0,0.0,0.0,0.0,0.0,0.067,0.254,0.348,,0.4,0.429,,0.444,0.451,,0.456,0.458,0.46,0.46,,0.458,,0.453,0.435,0.403,,0.365,0.326,,0.287,0.252,0.223,0.198,0.177,0.159,0.143,0.129,0.117,0.106,0.097,0.089,0.081,0.075,0.069,0.064,0.059,0.055,,,,,,,,,,,,3600
N131/3300,,,,,,,0.148,0.299,0.373,,0.413,0.433,,0.444,0.451,,0.455,0.458,0.46,0.458,,0.452,,0.438,0.41,0.374,,0.336,0.299,,0.263,0.231,0.205,0.182,0.162,0.146,0.131,0.118,0.107,0.098,0.089,0.081,0.075,0.069,0.063,0.058,0.054,0.05,,,,,,,,,,,,3300
N131/3000,,,,,,,0.148,0.294,0.367,,0.407,0.428,,0.442,0.45,,0.455,0.458,0.458,0.453,,0.444,,0.421,0.387,0.349,,0.31,0.273,,0.239,0.21,0.186,0.165,0.148,0.132,0.119,0.108,0.098,0.089,0.081,0.074,0.068,0.062,0.057,0.053,0.049,0.045,,,,,,,,,,,,3000
N117/2400,0.0,0.0,0.0,0.0,0.0,0.0,0.13,0.29,0.37,,0.41,0.43,,0.45,0.45,,0.46,0.46,0.46,0.46,,0.45,,0.43,0.39,0.35,,0.31,0.28,,0.24,0.21,0.19,0.17,0.15,0.13,0.12,0.11,0.1,0.09,0.08,0.07,0.07,0.06,0.06,0.05,0.05,0.05,,,,,,,,,,,,2400
N100/2500,,,,,,,0.023,0.224,0.329,,0.392,0.427,,0.447,0.456,,0.462,0.465,0.468,0.468,,0.466,,0.462,0.457,0.44,,0.411,0.376,,0.339,0.302,0.267,0.237,0.212,0.19,0.171,0.155,0.14,0.127,0.116,0.106,0.097,0.089,0.082,0.076,0.07,0.065,0.061,0.056,0.053,0.049,0.046,0.043,0.04,0.038,0.035,0.033,,2500
V90/2000,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.254,0.379,,0.407,0.433,,0.438,0.46,,0.461,0.449,0.447,0.442,,0.452,,0.439,0.43,0.408,,0.389,0.361,,0.327,0.296,0.262,0.234,0.211,0.188,0.168,0.153,0.139,0.128,0.116,,,,,,,,,,,,,,,,,,,2000
N90/2500,,,,,,,0.01,0.221,0.337,,0.4,0.435,,0.454,0.465,,0.471,0.475,0.478,0.477,,0.473,,0.465,0.455,0.442,,0.427,0.409,,0.385,0.355,0.323,0.291,0.261,0.234,0.21,0.19,0.172,0.157,0.143,0.131,0.12,0.11,0.101,0.094,0.087,0.08,0.074,0.069,0.065,0.06,0.056,0.053,0.049,0.046,0.044,0.041,0.037,2500
V126/3450,0.0,0.0,0.0,0.0,0.0,0.0,0.17,0.308,0.376,,0.407,0.423,,0.433,0.439,,0.444,0.447,0.449,0.45,,0.449,,0.446,0.438,0.417,,0.381,0.338,,0.297,0.261,0.231,0.206,0.184,0.165,0.148,0.134,0.121,0.11,0.101,0.092,0.084,0.077,0.071,0.066,0.061,0.056,0.052,0.049,0.045,0.042,0.04,,,,,,,3450
V126/3300,0.0,0.0,0.0,0.0,0.0,0.0,0.15,0.3,0.37,,0.4,0.42,,0.42,0.43,,0.44,0.44,0.44,0.44,,0.44,,0.44,0.43,0.41,,0.37,0.32,,0.28,0.25,0.22,0.2,0.18,0.16,0.14,0.13,0.12,0.11,0.1,0.09,0.08,0.07,0.07,0.06,0.06,0.05,0.05,0.05,0.04,0.04,0.04,,,,,,,3300
V126/3000,,,,,,,0.097,0.269,0.354,,0.397,0.416,,0.425,0.432,,0.436,0.439,0.441,0.441,,0.44,,0.437,0.418,0.382,,0.338,0.295,,0.258,0.227,0.201,0.179,0.16,0.143,0.129,0.116,0.105,0.096,0.087,0.08,0.073,0.067,0.062,0.057,0.053,0.049,0.046,0.042,0.04,0.037,0.034,,,,,,,3000
V117/3450,,,,,,,0.124,0.276,0.356,,0.395,0.413,,0.425,0.434,,0.44,0.445,0.449,0.451,,0.453,,0.454,0.451,0.441,,0.42,0.385,,0.343,0.303,0.268,0.238,0.213,0.191,0.172,0.155,0.141,0.128,0.117,0.107,0.098,0.09,0.083,0.076,0.071,0.065,0.061,0.057,0.053,0.049,0.046,0.043,0.04,0.038,0.036,0.034,,3450
V117/3300,,,,,,,0.135,0.283,0.349,,0.38,0.397,,0.41,0.42,,0.427,0.433,0.437,0.44,,0.441,,0.44,0.436,0.426,,0.402,0.367,,0.328,0.29,0.257,0.228,0.204,0.183,0.164,0.148,0.135,0.122,0.112,0.102,0.094,0.086,0.079,0.073,0.068,0.063,0.058,0.054,0.05,0.047,0.044,0.041,0.039,0.036,0.034,0.032,,3300
V112/3450,0.0,0.0,0.0,0.0,0.0,0.0,0.043,0.205,0.318,,0.378,0.41,,0.425,0.435,,0.442,0.448,0.451,0.453,,0.455,,0.456,0.454,0.446,,0.431,0.405,,0.369,0.33,0.293,0.26,0.232,0.208,0.188,0.169,0.154,0.14,0.127,0.116,0.107,0.098,0.09,0.083,0.077,0.071,0.066,0.062,0.058,0.054,0.05,0.047,0.044,0.041,0.039,0.037,,3450
V112/3300,0.0,0.0,0.0,0.0,0.0,0.0,0.14,0.28,0.35,,0.38,0.4,,0.41,0.42,,0.43,0.44,0.44,0.44,,0.45,,0.44,0.44,0.43,,0.41,0.38,,0.35,0.31,0.28,0.25,0.22,0.2,0.18,0.16,0.15,0.13,0.12,0.11,0.1,0.09,0.09,0.08,0.07,0.07,0.06,0.06,0.06,0.05,0.05,0.05,0.04,0.04,0.04,0.04,,3300
V112/3075,0.0,0.0,0.0,0.0,0.0,0.0,0.16,0.28,0.34,,0.38,0.4,,0.41,0.43,,0.43,0.44,0.44,0.45,,0.45,,0.45,0.44,0.43,,0.4,0.37,,0.33,0.29,0.26,0.23,0.21,0.19,0.17,0.15,0.14,0.12,0.11,0.1,0.1,0.09,0.08,0.07,0.07,0.06,0.06,0.06,0.05,0.05,0.05,0.04,0.04,0.04,0.04,0.03,,3075
V112/3000,,,,,,,0.141,0.263,0.337,,0.375,0.399,,0.416,0.427,,0.434,0.441,0.444,0.446,,0.446,,0.444,0.439,0.426,,0.402,0.372,,0.332,0.294,0.261,0.232,0.207,0.186,0.167,0.151,0.137,0.124,0.113,0.104,0.095,0.087,0.08,0.074,0.069,0.064,0.059,0.055,0.051,0.048,0.045,0.042,0.039,0.037,0.035,0.033,,3000
SWT130/3600,,,,,,,0.196,,0.354,,,0.414,,,0.443,,,0.455,,0.457,,,,0.444,,0.401,,,0.327,,,0.256,,0.202,,0.161,,0.131,,0.108,,0.09,,0.076,,0.065,,0.055,,0.048,,0.042,,0.036,,0.032,,0.028,,3600
SWT120/3600,,,,,,,0.0,,0.392,,,0.438,,,0.458,,,0.466,,0.47,,,,0.471,,0.447,,,0.378,,,0.3,,0.236,,0.189,,0.154,,0.127,,0.106,,0.089,,0.076,,0.065,,0.056,,0.049,,0.043,,0.038,,0.033,,3600
SWT130/3300,,,,,,,0.191,,0.346,,,0.405,,,0.433,,,0.445,,0.448,,,,0.437,,0.384,,,0.303,,,0.235,,0.185,,0.148,,0.12,,0.099,,0.083,,0.07,,0.059,,0.051,,0.044,,0.038,,0.033,,0.029,,0.026,,3300
SWT113/3200,,,,,,,0.386,,0.43,,,0.456,,,0.47,,,0.477,,0.479,,,,0.472,,0.442,,,0.377,,,0.3,,0.237,,0.19,,0.154,,0.127,,0.106,,0.089,,0.076,,0.065,,0.056,,0.049,,0.043,,0.038,,0.033,,3200
SWT142/3150,,,,,,,0.21,,0.385,,,0.453,,,0.462,,,0.457,,0.443,,,,0.398,,0.319,,,0.244,,,0.188,,0.148,,0.118,,0.096,,0.079,,0.066,,0.056,,0.047,,0.041,,0.035,,0.03,,0.027,,,,,,3150
SWT113/2300,,,,,,,0.398,,0.435,,,0.458,,,0.47,,,0.476,,0.476,,,,0.448,,0.366,,,0.281,,,0.217,,0.17,,0.136,,0.111,,0.091,,0.076,,0.064,,0.055,,0.047,,0.04,,0.035,,0.031,,0.027,,0.024,,2300
S114/3400,0.0,,0.0,,0.0,,0.14,,0.35,,,0.42,,,0.45,,,0.46,,0.47,,,,0.46,,0.44,,,0.39,,,0.32,,0.25,,0.2,,0.16,,0.13,,0.11,,0.09,,0.08,,0.07,,0.06,,0.05,,,,,,,,3400
S122/3200,,,,,,,0.285,,0.402,,,0.437,,,0.449,,,0.456,,0.444,,,,0.425,,0.392,,,0.326,,,0.259,,0.203,,0.163,,0.132,,0.109,,0.091,,0.077,,0.065,,0.056,,0.048,,0.042,,,,,,,,3200
S122/3000,,,,,,,0.186,,0.358,,,0.415,,,0.442,,,0.46,,0.453,,,,0.43,,0.387,,,0.312,,,0.242,,0.191,,0.153,,0.124,,0.102,,0.085,,0.072,,0.061,,0.052,,0.045,,0.039,,,,,,,,3000
MM100/2000,0.0,,0.0,,0.0,,0.15,,0.33,,,0.4,,,0.44,,,0.45,,0.46,,,,0.45,,0.4,,,0.31,,,0.24,,0.19,,0.15,,0.12,,0.1,,0.09,,0.07,,0.06,,0.05,,0.05,,0.04,,,,,,,,2000
ENO126/3500,,,,,,,0.155,,0.419,,,0.444,,,0.442,,,0.446,,0.45,,,,0.419,,0.39,,,0.331,,,0.265,,0.209,,0.167,,0.136,,0.112,,0.093,,0.079,,0.067,,0.057,,0.049,,0.043,,0.038,,0.033,,0.029,,3500
GE130/3200,,,,,,,0.255,0.367,0.413,,0.433,0.442,,0.448,0.45,,0.452,0.443,0.451,0.446,,0.436,,0.417,0.393,0.361,,0.326,0.292,,0.259,0.229,0.203,0.181,0.161,0.145,0.13,0.118,0.107,0.097,0.088,0.081,0.074,0.068,0.063,0.058,0.054,0.05,0.046,0.043,0.04,0.037,0.035,0.033,0.031,0.029,0.027,0.025,,3200
GE120/2750,0.0,0.0,0.0,0.0,0.0,0.0,0.13,0.3,0.39,,0.43,0.45,,0.46,0.47,,0.48,0.48,0.48,0.47,,0.46,,0.43,0.4,0.36,,0.33,0.29,,0.26,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,0.23,,2750
GE103/2750,0.0,0.0,0.0,0.0,0.0,0.0,0.12,0.25,0.32,,0.36,0.39,,0.42,0.43,,0.44,0.44,0.45,0.45,,0.45,,0.45,0.43,0.42,,0.39,0.36,,0.33,0.3,0.27,0.25,0.22,0.2,0.18,0.16,0.15,0.13,0.12,0.11,0.1,0.09,0.09,0.08,0.07,0.07,0.06,0.06,0.06,0.05,0.05,0.05,0.04,0.04,0.04,0.04,,2750
GE120/2500,0.0,0.0,0.0,0.0,0.0,0.0,0.13,0.3,0.39,,0.43,0.45,,0.46,0.47,,0.48,0.48,0.48,0.47,,0.46,,0.43,0.39,0.35,,0.31,0.27,,0.24,0.21,0.19,0.17,0.15,0.13,0.12,0.11,0.1,0.09,0.08,0.07,0.065,0.06,0.055,0.05,0.05,0.05,,,,,,,,,,,,2500
ENO114/3500,,,,,,,0.138,,,0.384,,,0.426,,,0.428,,0.421,,,0.427,,0.42,,,,0.404,,,0.378,,0.315,,0.251,,0.201,,0.163,,0.135,,0.112,,0.094,,0.08,,0.069,,0.06,,0.052,,0.045,,0.04,,0.035,,3500
ENO100/2200,,,,,,,0.29,,0.408,,,0.431,,,0.443,,,0.445,,0.442,,,,0.428,,0.388,,,0.325,,,0.262,,0.206,,0.165,,0.134,,0.111,,0.092,,0.078,,0.066,,0.057,,0.049,,0.043,,0.037,,0.033,,0.029,,2200
E48/800,,,0.0,,0.0,,0.17,,0.35,,,0.43,,,0.46,,,0.47,,0.48,,,,0.5,,0.5,,,0.45,,,0.39,,0.32,,0.27,,0.22,,0.18,,0.15,,0.13,,0.11,,0.09,,0.08,,0.07,,0.06,,0.05,,0.05,,800
V90/2000/GS,,,,,,,,,0.301,,0.36,0.39,,0.409,0.421,,0.429,0.435,0.44,0.443,,0.442,,0.437,0.427,0.412,,0.391,0.365,,0.332,0.298,0.266,0.237,0.212,0.19,0.171,0.154,0.14,0.127,0.116,0.106,0.097,0.089,0.082,0.076,0.07,0.065,0.06,0.056,0.052,0.049,0.046,0.043,0.04,0.038,0.035,0.033,,2000
V100/1800,,,,,,,0.1,0.252,0.351,,0.404,0.426,,0.437,0.441,,0.446,0.451,0.451,0.449,,0.444,,0.431,0.403,0.364,,0.32,0.28,,0.246,0.217,,0.17,,0.136,,0.111,,0.091,,0.076,,0.064,,0.055,,0.047,,,,,,,,,,,,1800
V100/1800/GS,,,,,,,0.092,0.194,0.302,,0.367,0.401,,0.42,0.429,,0.435,0.441,0.443,0.444,,0.441,,0.431,0.406,0.368,,0.326,0.286,,0.251,0.221,0.195,0.174,0.155,0.139,0.125,0.113,0.102,0.093,0.085,0.078,0.071,0.065,0.06,0.056,0.051,0.048,,,,,,,,,,,,1800
V117/3600,,,,,,,0.124,0.276,0.356,,0.395,0.413,,0.425,0.434,,0.44,0.445,0.449,0.451,,0.453,,0.453,0.45,0.441,,0.421,0.39,,0.354,0.315,0.28,0.249,0.222,0.199,0.179,0.162,0.147,0.133,0.122,0.111,0.102,0.094,0.086,0.08,0.074,0.068,0.063,0.059,0.055,0.051,0.048,0.045,0.042,0.04,0.037,0.035,,3600

0 comments on commit 0af30fe

Please sign in to comment.