Merge branch 'dev' into features/tests

Conflicts:
	example/basic_example.py
	windpowerlib/tests/modelchain_tests.py
	windpowerlib/wind_speed.py
	windpowerlib/wind_turbine.py

Author: SabineHaas

doc/conf.py

@@ -14,6 +14,8 @@
 
 import sys
 import os
+import sphinx
+from sphinx.errors import VersionRequirementError
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -23,7 +25,10 @@
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.4.3'
+if needs_sphinx > sphinx.__display_version__:
+    message = 'This project needs at least Sphinx v%s' % needs_sphinx
+    raise VersionRequirementError(message)
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

doc/index.rst

@@ -4,7 +4,7 @@ Welcome to the windpowerlib documentation!
 Contents:
 
 .. toctree::
-   :maxdepth: 5
+   :maxdepth: 2
    :glob:   
 
    getting_started

doc/modules.rst

@@ -1,5 +1,8 @@
 .. currentmodule:: windpowerlib
 
+#############
+API
+#############
 
 Classes
 =========
@@ -8,7 +11,7 @@ Classes
    :toctree: temp/
 
    wind_turbine.WindTurbine
-   modelchain.Modelchain
+   modelchain.ModelChain
 
 
 Density
@@ -66,28 +69,28 @@ Functions for calculating power output of a wind turbine.
    power_output.p_curve_density_corr
 
 
-Modelchain
+ModelChain
 ==============
 
-Creating a Modelchain object.
+Creating a ModelChain object.
 
 .. autosummary::
    :toctree: temp/
 
-   modelchain.Modelchain
+   modelchain.ModelChain
 
-Running the modelchain.
+Running the ModelChain.
 
 .. autosummary::
    :toctree: temp/
 
-   modelchain.Modelchain.run_model
+   modelchain.ModelChain.run_model
 
-Methods of the Modelchain object.
+Methods of the ModelChain object.
 
 .. autosummary::
    :toctree: temp/
 
-   modelchain.Modelchain.rho_hub
-   modelchain.Modelchain.v_wind_hub
-   modelchain.Modelchain.turbine_power_output
+   modelchain.ModelChain.rho_hub
+   modelchain.ModelChain.v_wind_hub
+   modelchain.ModelChain.turbine_power_output

doc/whats_new.rst

@@ -8,6 +8,5 @@ These are new features and improvements of note in each release
     :local:
     :backlinks: top
 
-.. include::  whatsnew/v004.txt
-.. include::  whatsnew/v003.txt
-.. include::  whatsnew/v001.txt
+.. include::  whatsnew/v005.txt
+.. include::  whatsnew/v004.txt

example/basic_example.py

@@ -21,10 +21,10 @@
 # Feel free to remove or change these lines
 # import warnings
 # warnings.simplefilter(action="ignore", category=RuntimeWarning)
-logging.getLogger().setLevel(logging.INFO)
+logging.getLogger().setLevel(logging.DEBUG)
 
 
-def read_weather_data(filename, datetime_column='Unnamed: 0',
+def read_weather_data(filename, datetime_column='time_index',
                       **kwargs):
     r"""
     Fetches weather data from a file.
@@ -61,12 +61,9 @@ def read_weather_data(filename, datetime_column='Unnamed: 0',
 
 # Read weather data from csv
 weather = read_weather_data('weather.csv')
-weather.index.name = ''
 
 # Specification of the weather data set CoastDat2 (example data)
-coastDat2 = {
-    'dhi': 0,
-    'dirhi': 0,
+data_height = {
     'pressure': 0,
     'temp_air': 2,
     'v_wind': 10,
@@ -78,14 +75,14 @@ def read_weather_data(filename, datetime_column='Unnamed: 0',
 enerconE126 = {
     'hub_height': 135,
     'd_rotor': 127,
-    'fetch_curve': 'P',  # 'P' vor p-curve and 'cp' for cp-curve
+    'fetch_curve': 'p',  # 'p' for p-curve and 'cp' for cp-curve
     'turbine_name': 'ENERCON E 126 7500'}  # Turbine name as in register. Use
                                            # wind_turbine.get_turbine_types()
                                            # for a full list.
 vestasV90 = {
     'hub_height': 105,
     'd_rotor': 90,
-    'fetch_curve': 'P',
+    'fetch_curve': 'p',
     'turbine_name': 'VESTAS V 90 3000'}
 
 # Initialize WindTurbine objects
@@ -103,10 +100,10 @@ def read_weather_data(filename, datetime_column='Unnamed: 0',
 
 # Calculate turbine power output
 mc_e126 = modelchain.ModelChain(e126, **modelchain_data).run_model(
-    weather, coastDat2)
+    weather, data_height)
 e126.power_output = mc_e126.power_output
 mc_v90 = modelchain.ModelChain(v90, **modelchain_data).run_model(
-    weather, coastDat2)
+    weather, data_height)
 v90.power_output = mc_v90.power_output
 
 # Plot turbine power output

example/weather.csv

@@ -15,7 +15,7 @@ def setup_class(self):
         self.d_rotor = 80
         self.cp_values = pd.DataFrame(data={'cp': [0.3, 0.4, 0.5]},
                                       index=[4.0, 5.0, 6.0])
-        self.p_values = pd.DataFrame(data={'P': [300, 400, 500]},
+        self.p_values = pd.DataFrame(data={'p': [300, 400, 500]},
                                      index=[4.0, 5.0, 6.0])
 
     def test_cp_curve(self):