Fix comment and move oedb example up to make it more prominent

Author: birgits

example/modelchain_example.ipynb

@@ -157,7 +157,7 @@
    "source": [
     "To initialize a specific turbine you need a dictionary that contains the basic parameters. A turbine is defined by its nominal power, hub height, rotor diameter, and power or power coefficient curve.\n",
     "\n",
-    "There are three ways to initialize a WindTurbine object in the windpowerlib. You can either specify your own turbine, as done below for 'my_turbine', or fetch power and/or power coefficient curve data from data files provided by the windpowerlib, as done for the 'enercon_e126', or provide your turbine data in csv files as done for the 'dummy_turbine' with an example file.\n",
+    "There are three ways to initialize a WindTurbine object in the windpowerlib. You can either use turbine data from the OpenEnergy Database (oedb) turbine library that is provided along with the windpowerlib, as done for the 'enercon_e126', or specify your own turbine by directly providing a power (coefficient) curve, as done below for 'my_turbine', or provide your own turbine data in csv files, as done for 'dummy_turbine'.\n",
     "\n",
     "You can execute the following to get a table of all wind turbines for which power and/or power coefficient curves are provided."
    ]
@@ -228,28 +228,6 @@
     "print(df[df[\"turbine_type\"].str.contains(\"E-101\")])"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 33,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# specification of own wind turbine (Note: power coefficient values and\n",
-    "# nominal power have to be in Watt)\n",
-    "my_turbine = {\n",
-    "    'name': 'myTurbine',\n",
-    "    'nominal_power': 3e6,  # in W\n",
-    "    'hub_height': 105,  # in m\n",
-    "    'rotor_diameter': 90,  # in m\n",
-    "    'power_curve': pd.DataFrame(\n",
-    "            data={'value': [p * 1000 for p in [\n",
-    "                      0.0, 26.0, 180.0, 1500.0, 3000.0, 3000.0]],  # in W\n",
-    "                  'wind_speed': [0.0, 3.0, 5.0, 10.0, 15.0, 25.0]})  # in m/s\n",
-    "    }  \n",
-    "# initialisze WindTurbine object\n",
-    "my_turbine = WindTurbine(**my_turbine)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": 6,
@@ -270,13 +248,10 @@
    "source": [
     "# specification of wind turbine where power curve is provided in the \n",
     "# oedb turbine library\n",
-    "# if you want to use the power coefficient curve change the value of\n",
-    "# 'power_coefficient_curve' to 'oedb'.\n",
+    "\n",
     "enercon_e126 = {\n",
     "        'turbine_type': 'E-126/4200',  # turbine type as in oedb turbine library\n",
-    "        'hub_height': 135,  # in m\n",
-    "        'rotor_diameter': 127,  # in m (only needs to be provided when calculating the power \n",
-    "                                # output using the power coefficient curve)\n",
+    "        'hub_height': 135  # in m\n",
     "    }\n",
     "# initialize WindTurbine object\n",
     "e126 = WindTurbine(**enercon_e126)"

example/modelchain_example.py

@@ -94,15 +94,15 @@ def initialize_wind_turbines():
     Initializes three :class:`~.wind_turbine.WindTurbine` objects.
 
     This function shows three ways to initialize a WindTurbine object. You can
-    either specify your own turbine by directly providing a power (coefficient)
-    curve, as done below for 'my_turbine', or provide your own turbine data in
-    csv files as done for 'dummy_turbine', or you can use power and/or power
-    coefficient curve data from the OpenEnergy Database
-    (oedb) turbine library that is provided along with the windpowerlib,
-    as done for the 'enercon_e126'. Execute
-    ``windpowerlib.wind_turbine.get_turbine_types()`` to get a table
-    including all wind turbines for which power and/or power coefficient curves
-    are provided.
+    either use turbine data from the OpenEnergy Database (oedb) turbine library
+    that is provided along with the windpowerlib, as done for the
+    'enercon_e126', or specify your own turbine by directly providing a power
+    (coefficient) curve, as done below for 'my_turbine', or provide your own
+    turbine data in csv files, as done for 'dummy_turbine'.
+
+    To get a list of all wind turbines for which power and/or power coefficient
+    curves are provided execute `
+    `windpowerlib.wind_turbine.get_turbine_types()``.
 
     Returns
     -------
@@ -112,6 +112,15 @@ def initialize_wind_turbines():
 
     """
 
+    # specification of wind turbine where data is provided in the oedb
+    # turbine library
+    enercon_e126 = {
+        'turbine_type': 'E-126/4200',  # turbine type as in register
+        'hub_height': 135  # in m
+    }
+    # initialize WindTurbine object
+    e126 = WindTurbine(**enercon_e126)
+
     # specification of own wind turbine (Note: power values and nominal power
     # have to be in Watt)
     my_turbine = {
@@ -137,18 +146,6 @@ def initialize_wind_turbines():
     # initialize WindTurbine object
     dummy_turbine = WindTurbine(**dummy_turbine)
 
-    # specification of wind turbine where power curve is provided in the oedb
-    # turbine library
-    # if you want to use the power coefficient curve change the value of
-    # 'power_coefficient_curve' to True.
-    enercon_e126 = {
-        'turbine_type': 'E-126/4200',  # turbine type as in register
-        'hub_height': 135,  # in m
-        'rotor_diameter': 127,  # in m
-    }
-    # initialize WindTurbine object
-    e126 = WindTurbine(**enercon_e126)
-
     return my_turbine, e126, dummy_turbine