Minor changes to notebooks

wind-python · Dec 17, 2018 · f7e77c2 · f7e77c2
1 parent f547c8d
commit f7e77c2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/doc/further_example_notebook.ipynb b/doc/further_example_notebook.ipynb
@@ -6,11 +6,9 @@
    "source": [
     "# Further usage\n",
     "\n",
-    "This example shows you a further usage of the windpowerlib and builds on the basic_example.\n",
+    "This example shows you the further usage of the windpowerlib. Functions that are used in the basic usage example, like the initialization of wind turbines, are imported and used without further explanations.\n",
     "\n",
-    "In this example the power output of a wind farm containing two different wind turbine types is calulated. Apart from that, this example shows you how to calculate the power output of a wind turbine cluster. A cluster can be useful if you want to calculate the feed-in of a region for which you want to use one single weather data grid point.\n",
-    "\n",
-    "Functions that are used in the basic usage example, like the initialization of wind turbines, are imported and used without further explanations."
+    "In this example the power output of a wind farm containing two different wind turbine types is calulated. Apart from that, this example shows you how to calculate the power output of a wind turbine cluster. A cluster can be useful if you want to calculate the feed-in of a region for which you want to use one single weather data grid point."
    ]
   },
   {
@@ -78,7 +76,7 @@
     "\n",
     "To initialize a specific wind farm you can use a dictionary that contains the basic parameters. A wind farm is defined by its name, wind turbine fleet, and optionally also by a wind farm efficiency and the wind farm's location.\n",
     "\n",
-    "A wind farm efficiency can be a constant value or be dependent on the wind speed. The coordinates are not being used here but are necessary if you need to assign your find farm to a certain weather data point."
+    "A wind farm efficiency can be a constant value or be dependent on the wind speed. The coordinates are not being used here but are necessary if you need to assign your wind farm to a certain weather data point."
    ]
   },
   {
@@ -95,6 +93,7 @@
     "                           {'wind_turbine': e126,\n",
     "                            'number_of_turbines': 3}\n",
     "                           ]}\n",
+    "\n",
     "# initialize WindFarm object\n",
     "example_farm = WindFarm(**example_farm_data)"
    ]
@@ -149,7 +148,8 @@
     "# specification of cluster data\n",
     "example_cluster_data = {\n",
     "    'name': 'example_cluster',\n",
-    "    'wind_farms': [example_farm, example_farm_2]}\n",
+    "    'wind_farms': [example_farm, example_farm_2],\n",
+    "    'coordinates': [52.2, 13.1]}\n",
     "\n",
     "# initialize WindTurbineCluster object\n",
     "example_cluster = WindTurbineCluster(**example_cluster_data)\n"
@@ -164,8 +164,7 @@
     "The TurbineClusterModelChain is a class that provides all necessary steps to calculate the power output of a wind farm or wind turbine cluster. \n",
     "\n",
     "Like the ModelChain (see basic example) you can use the TurbineClusterModelChain with default parameters as shown here for the wind farm or specify custom parameters as done here for the cluster.\n",
-    "If you use the 'run_model' method first the wind speed and density (if necessary) at hub height are calculated and then used to calculate the power output. \n",
-    "todo adapt"
+    "If you use the 'run_model' method first the aggregated power curve and the mean hub height of the wind farm/cluster is calculated, then inherited functions of the ModelChain are used to calculate the wind speed and density (if necessary) at hub height. After that, depending on the parameters, wake losses are applied and at last the power output is calulated."
    ]
   },
   {

diff --git a/example/further_example.ipynb b/example/further_example.ipynb
@@ -6,11 +6,9 @@
    "source": [
     "# Further usage\n",
     "\n",
-    "This example shows you a further usage of the windpowerlib and builds on the basic_example.\n",
+    "This example shows you the further usage of the windpowerlib. Functions that are used in the basic usage example, like the initialization of wind turbines, are imported and used without further explanations.\n",
     "\n",
-    "In this example the power output of a wind farm containing two different wind turbine types is calulated. Apart from that, this example shows you how to calculate the power output of a wind turbine cluster. A cluster can be useful if you want to calculate the feed-in of a region for which you want to use one single weather data grid point.\n",
-    "\n",
-    "Functions that are used in the basic usage example, like the initialization of wind turbines, are imported and used without further explanations."
+    "In this example the power output of a wind farm containing two different wind turbine types is calulated. Apart from that, this example shows you how to calculate the power output of a wind turbine cluster. A cluster can be useful if you want to calculate the feed-in of a region for which you want to use one single weather data grid point."
    ]
   },
   {
@@ -78,7 +76,7 @@
     "\n",
     "To initialize a specific wind farm you can use a dictionary that contains the basic parameters. A wind farm is defined by its name, wind turbine fleet, and optionally also by a wind farm efficiency and the wind farm's location.\n",
     "\n",
-    "A wind farm efficiency can be a constant value or be dependent on the wind speed. The coordinates are not being used here but are necessary if you need to assign your find farm to a certain weather data point."
+    "A wind farm efficiency can be a constant value or be dependent on the wind speed. The coordinates are not being used here but are necessary if you need to assign your wind farm to a certain weather data point."
    ]
   },
   {
@@ -95,6 +93,7 @@
     "                           {'wind_turbine': e126,\n",
     "                            'number_of_turbines': 3}\n",
     "                           ]}\n",
+    "\n",
     "# initialize WindFarm object\n",
     "example_farm = WindFarm(**example_farm_data)"
    ]
@@ -149,7 +148,8 @@
     "# specification of cluster data\n",
     "example_cluster_data = {\n",
     "    'name': 'example_cluster',\n",
-    "    'wind_farms': [example_farm, example_farm_2]}\n",
+    "    'wind_farms': [example_farm, example_farm_2],\n",
+    "    'coordinates': [52.2, 13.1]}\n",
     "\n",
     "# initialize WindTurbineCluster object\n",
     "example_cluster = WindTurbineCluster(**example_cluster_data)\n"
@@ -164,8 +164,7 @@
     "The TurbineClusterModelChain is a class that provides all necessary steps to calculate the power output of a wind farm or wind turbine cluster. \n",
     "\n",
     "Like the ModelChain (see basic example) you can use the TurbineClusterModelChain with default parameters as shown here for the wind farm or specify custom parameters as done here for the cluster.\n",
-    "If you use the 'run_model' method first the wind speed and density (if necessary) at hub height are calculated and then used to calculate the power output. \n",
-    "todo adapt"
+    "If you use the 'run_model' method first the aggregated power curve and the mean hub height of the wind farm/cluster is calculated, then inherited functions of the ModelChain are used to calculate the wind speed and density (if necessary) at hub height. After that, depending on the parameters, wake losses are applied and at last the power output is calulated."
    ]
   },
   {