Merge branch 'dev' into features/tests

Conflicts:
	example/basic_example.ipynb
	tests/test_modelchain.py
	tests/test_power_output.py
	tests/test_tools.py

Author: SabineHaas

.gitignore

@@ -91,3 +91,6 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# tests
+.pytest_cache

README.rst

@@ -61,6 +61,10 @@ If you are interested in wind models and want to help improve the existing model
 As the windpowerlib started with contributors from the `oemof developer group <https://github.com/orgs/oemof/teams/oemof-developer-group>`_ we use the same 
 `developer rules <http://oemof.readthedocs.io/en/stable/developing_oemof.html>`_.
 
+Citing the windpowerlib
+========================
+
+We use the zenodo project to get a DOI for each version. `Search zenodo for the right citation of your windpowerlib version <https://zenodo.org/search?page=1&size=20&q=windpowerlib>`_.
 
 License
 ============

VERSION

@@ -61,7 +61,7 @@
 # General information about the project.
 project = u'windpowerlib'
 copyright = u'2016, oemof developer group'
-author = u'Uwe Krien, oemof developing group'
+author = u'oemof developing group'
 
 import windpowerlib
 
@@ -285,7 +285,7 @@
 
 # Bibliographic Dublin Core info.
 epub_title = u'windpowerlib'
-epub_author = u'Uwe Krien, oemof developing group'
+epub_author = u'oemof developing group'
 epub_publisher = u'oemof developing group'
 epub_copyright = u'2016, oemof developing group'
 

doc/conf.py

@@ -64,6 +64,10 @@ If you are interested in wind models and want to help improve the existing model
 As the windpowerlib started with contributors from the `oemof developer group <https://github.com/orgs/oemof/teams/oemof-developer-group>`_ we use the same 
 `developer rules <http://oemof.readthedocs.io/en/stable/developing_oemof.html>`_.
 
+Citing the windpowerlib
+========================
+
+We use the zenodo project to get a DOI for each version. `Search zenodo for the right citation of your windpowerlib version <https://zenodo.org/search?page=1&size=20&q=windpowerlib>`_.
 
 License
 ============

doc/getting_started.rst

@@ -14,6 +14,16 @@ Classes
    modelchain.ModelChain
 
 
+Temperature
+==============
+
+Function for calculating air temperature at hub height.
+
+.. autosummary::
+   :toctree: temp/
+
+   temperature.linear_gradient
+
 Density
 ==============
 
@@ -22,11 +32,9 @@ Functions for calculating air density at hub height.
 .. autosummary::
    :toctree: temp/
 
-   density.temperature_gradient
-   density.temperature_interpol
-   density.rho_barometric
-   density.rho_ideal_gas
-   
+   density.barometric
+   density.ideal_gas
+  
 
 Wind speed
 ==============
@@ -36,8 +44,8 @@ Functions for calculating wind speed at hub height.
 .. autosummary::
    :toctree: temp/
 
-   wind_speed.logarithmic_wind_profile
-   wind_speed.v_wind_hellman
+   wind_speed.logarithmic_profile
+   wind_speed.hellman
 
 
 Wind turbine data
@@ -63,10 +71,9 @@ Functions for calculating power output of a wind turbine.
 .. autosummary::
    :toctree: temp/
 
-   power_output.cp_curve
-   power_output.cp_curve_density_corr
-   power_output.p_curve
-   power_output.p_curve_density_corr
+   power_output.power_coefficient_curve
+   power_output.power_curve
+   power_output.power_curve_density_correction
 
 
 ModelChain
@@ -91,8 +98,9 @@ Methods of the ModelChain object.
 .. autosummary::
    :toctree: temp/
 
-   modelchain.ModelChain.rho_hub
-   modelchain.ModelChain.v_wind_hub
+   modelchain.ModelChain.temperature_hub
+   modelchain.ModelChain.density_hub
+   modelchain.ModelChain.wind_speed_hub
    modelchain.ModelChain.turbine_power_output
 
 
@@ -104,8 +112,7 @@ Additional functions used in the windpowerlib.
 .. autosummary::
    :toctree: temp/
 
-   tools.smallest_difference
-   tools.linear_extra_interpolation
+   tools.linear_interpolation_extrapolation
 
 
 Example

doc/modules.rst

@@ -1,3 +1,5 @@
 sphinx>=1.4
 ipykernel
-nbsphinx
+nbsphinx
+pandas
+numpy

doc/requirements.txt

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

doc/whats_new.rst

@@ -0,0 +1,14 @@
+v0.1.0 ()
++++++++++++++++++++++++++
+
+Documentation
+#############
+
+Testing
+####### 
+
+Other changes
+#############
+
+Contributors
+############

doc/whatsnew/v0-1-0.txt

@@ -1,4 +1,4 @@
-v0.0.5 ()
+v0.0.5 (April 10, 2017)
 +++++++++++++++++++++++++
 
 New features
@@ -22,16 +22,9 @@ Testing
 
  * tests for all modules were added
 
-Bug fixes
-#########
-
-
-Other changes
-#############
-
-
 Contributors
 ############
 
  * Sabine Haas
- * Birgit Schachler
+ * Birgit Schachler
+ * Uwe Krien