From f6bb0f4e2e138cdd8d0b9475a6385e468c4bb5ef Mon Sep 17 00:00:00 2001 From: SabineH Date: Thu, 17 Jan 2019 12:25:57 +0100 Subject: [PATCH] Fix notebooks --- doc/modelchain_example_notebook.ipynb | 8 +++++--- example/modelchain_example.ipynb | 2 +- example/modelchain_example.py | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/modelchain_example_notebook.ipynb b/doc/modelchain_example_notebook.ipynb index 675f3bdb..752d0856 100644 --- a/doc/modelchain_example_notebook.ipynb +++ b/doc/modelchain_example_notebook.ipynb @@ -188,7 +188,8 @@ "12 Enercon E-82/2350 True True\n", "13 Enercon E-82/3000 True True\n", "14 Enercon E-92/2350 True True\n", - "15 Enercon E48/800 True True\n" + "15 Enercon E/126/7500 True False\n", + "16 Enercon E48/800 True True\n" ] } ], @@ -256,7 +257,7 @@ "DEBUG:urllib3.connectionpool:Starting new HTTP connection (1): oep.iks.cs.ovgu.de:80\n", "DEBUG:urllib3.connectionpool:http://oep.iks.cs.ovgu.de:80 \"GET //api/v0/schema/model_draft/tables/openfred_windpower_powercurve/rows/ HTTP/1.1\" 301 438\n", "DEBUG:urllib3.connectionpool:Starting new HTTP connection (1): openenergy-platform.org:80\n", - "DEBUG:urllib3.connectionpool:http://openenergy-platform.org:80 \"GET /api/v0/schema/model_draft/tables/openfred_windpower_powercurve/rows/ HTTP/1.1\" 200 149329\n", + "DEBUG:urllib3.connectionpool:http://openenergy-platform.org:80 \"GET /api/v0/schema/model_draft/tables/openfred_windpower_powercurve/rows/ HTTP/1.1\" 200 150623\n", "INFO:root:Data base connection successful.\n" ] } @@ -284,12 +285,13 @@ "source": [ "# specification of wind turbine where power coefficient curve is provided\n", "# by a csv file\n", + "source = 'data/example_power_coefficient_curves.csv'\n", "dummy_turbine = {\n", " 'name': 'DUMMY 1', # turbine type as in file #\n", " 'hub_height': 100, # in m\n", " 'rotor_diameter': 70, # in m\n", " 'fetch_curve': 'power_coefficient_curve', # fetch cp curve #\n", - " 'data_source': 'example_power_coefficient_curves.csv' # data source\n", + " 'data_source': source # data source\n", "}\n", "# initialize WindTurbine object\n", "dummy_turbine = WindTurbine(**dummy_turbine)" diff --git a/example/modelchain_example.ipynb b/example/modelchain_example.ipynb index 9467aa02..752d0856 100644 --- a/example/modelchain_example.ipynb +++ b/example/modelchain_example.ipynb @@ -285,7 +285,7 @@ "source": [ "# specification of wind turbine where power coefficient curve is provided\n", "# by a csv file\n", - "source = 'data/example_coefficient_curves.csv'\n", + "source = 'data/example_power_coefficient_curves.csv'\n", "dummy_turbine = {\n", " 'name': 'DUMMY 1', # turbine type as in file #\n", " 'hub_height': 100, # in m\n", diff --git a/example/modelchain_example.py b/example/modelchain_example.py index 4443d7dc..89975cd9 100644 --- a/example/modelchain_example.py +++ b/example/modelchain_example.py @@ -135,7 +135,6 @@ def initialize_wind_turbines(): # by a csv file csv_file = os.path.join(os.path.dirname(__file__), 'data', 'example_power_coefficient_curves.csv') - # todo adapt in jupyter notebook!!! dummy_turbine = { 'name': 'DUMMY 1', # turbine type as in file # 'hub_height': 100, # in m