Merge branch 'restructure/classes' into dev

Author: SabineHaas

example/basic_example.ipynb

@@ -177,7 +177,7 @@
     "# specification of own wind turbine (Note: power coefficient values and\n",
     "# nominal power have to be in Watt)\n",
     "myTurbine = {\n",
-    "    'object_name': 'myTurbine',\n",
+    "    'name': 'myTurbine',\n",
     "    'nominal_power': 3e6,  # in W\n",
     "    'hub_height': 105,  # in m\n",
     "    'rotor_diameter': 90,  # in m\n",
@@ -202,7 +202,7 @@
     "# if you want to use the power coefficient curve change the value of\n",
     "# 'fetch_curve' to 'power_coefficient_curve'\n",
     "enerconE126 = {\n",
-    "    'object_name': 'ENERCON E 126 7500',  # turbine name as in register\n",
+    "    'name': 'ENERCON E 126 7500',  # turbine name as in register\n",
     "    'hub_height': 135,  # in m\n",
     "    'rotor_diameter': 127,  # in m\n",
     "    'fetch_curve': 'power_curve'  # fetch power curve\n",

example/basic_example.py

@@ -97,7 +97,7 @@ def initialise_wind_turbines():
     # specification of own wind turbine (Note: power coefficient values and
     # nominal power have to be in Watt)
     myTurbine = {
-        'object_name': 'myTurbine',
+        'name': 'myTurbine',
         'nominal_power': 3e6,  # in W
         'hub_height': 105,  # in m
         'rotor_diameter': 90,  # in m
@@ -113,7 +113,7 @@ def initialise_wind_turbines():
     # if you want to use the power coefficient curve change the value of
     # 'fetch_curve' to 'power_coefficient_curve'
     enerconE126 = {
-        'object_name': 'ENERCON E 126 7500',  # turbine name as in register
+        'name': 'ENERCON E 126 7500',  # turbine name as in register
         'hub_height': 135,  # in m
         'rotor_diameter': 127,  # in m
         'fetch_curve': 'power_curve'  # fetch power curve

tests/test_modelchain.py

@@ -13,7 +13,7 @@ class TestModelChain:
     def setup_class(self):
         self.test_turbine = {'hub_height': 100,
                              'rotor_diameter': 80,
-                             'object_name': 'ENERCON E 126 7500',
+                             'name': 'ENERCON E 126 7500',
                              'fetch_curve': 'power_curve'}
 
     def test_temperature_hub(self):
@@ -185,12 +185,12 @@ def test_run_model(self):
 
         test_turbine = {'hub_height': 100,
                         'rotor_diameter': 80,
-                        'object_name': 'ENERCON E 126 7500',
+                        'name': 'ENERCON E 126 7500',
                         'fetch_curve': 'power_curve'}
 
         # Test with default parameters of modelchain (power curve)
         power_output_exp = pd.Series(data=[1731887.39768, 3820152.27489],
-                                     name='feedin_wind_turbine')
+                                     name='feedin_power_plant')
         test_mc = mc.ModelChain(wt.WindTurbine(**test_turbine))
         test_mc.run_model(weather_df)
         assert_series_equal(test_mc.power_output, power_output_exp)
@@ -200,15 +200,15 @@ def test_run_model(self):
                            'power_output_model': 'power_curve',
                            'density_correction': True}
         power_output_exp = pd.Series(data=[1433937.37959, 3285183.55084],
-                                     name='feedin_wind_turbine')
+                                     name='feedin_power_plant')
         test_mc = mc.ModelChain(wt.WindTurbine(**test_turbine),
                                 **test_modelchain)
         test_mc.run_model(weather_df)
         assert_series_equal(test_mc.power_output, power_output_exp)
 
         # Test with power coefficient curve and hellman
         power_output_exp = pd.Series(data=[559060.36156, 1251143.98621],
-                                     name='feedin_wind_turbine')
+                                     name='feedin_power_plant')
         test_turbine['fetch_curve'] = 'power_coefficient_curve'
         test_modelchain = {'wind_speed_model': 'hellman',
                            'power_output_model': 'power_coefficient_curve',
@@ -218,18 +218,6 @@ def test_run_model(self):
         test_mc.run_model(weather_df)
         assert_series_equal(test_mc.power_output, power_output_exp)
 
-        # Ideal gas equation and density corrected power coefficient curve
-        power_output_exp = pd.Series(data=[569117.952419, 1302746.06501],
-                                     name='feedin_wind_turbine')
-        test_modelchain = {'wind_speed_model': 'hellman',
-                           'density_model': 'ideal_gas',
-                           'power_output_model': 'power_coefficient_curve',
-                           'density_correction': True}
-        test_mc = mc.ModelChain(wt.WindTurbine(**test_turbine),
-                                **test_modelchain)
-        test_mc.run_model(weather_df)
-        assert_series_equal(test_mc.power_output, power_output_exp)
-
         # Raise ValueErrors due to wrong spelling of parameters
         with pytest.raises(ValueError):
             test_modelchain['power_output_model'] = 'wrong_spelling'
@@ -259,18 +247,12 @@ def test_run_model(self):
             test_mc = mc.ModelChain(wt.WindTurbine(**test_turbine),
                                     **test_modelchain)
             test_mc.run_model(weather_df)
-        with pytest.raises(TypeError):
-            test_modelchain = {'power_output_model': 'power_coefficient_curve',
-                               'density_correction': 'wrong_type'}
-            test_mc = mc.ModelChain(wt.WindTurbine(**test_turbine),
-                                    **test_modelchain)
-            test_mc.run_model(weather_df)
 
         # Raise TypeErrors due to missing cp- or p-values
         with pytest.raises(TypeError):
             test_turbine = {'hub_height': 100,
                             'rotor_diameter': 80,
-                            'object_name': 'ENERCON E 126 7500',
+                            'name': 'ENERCON E 126 7500',
                             'fetch_curve': 'power_curve'}
             test_modelchain = {'power_output_model': 'power_coefficient_curve',
                                'density_correction': True}
@@ -280,7 +262,7 @@ def test_run_model(self):
         with pytest.raises(TypeError):
             test_turbine = {'hub_height': 100,
                             'rotor_diameter': 80,
-                            'object_name': 'ENERCON E 126 7500',
+                            'name': 'ENERCON E 126 7500',
                             'fetch_curve': 'power_coefficient_curve'}
             test_modelchain = {'power_output_model': 'power_curve',
                                'density_corr': True}

tests/test_power_output.py

@@ -20,11 +20,10 @@ def test_power_coefficient_curve(self):
                       'power_coefficient_curve_values':
                           pd.Series([0.3, 0.4, 0.5])}
 
-        # Tests without density correction:
         # Test wind_speed as pd.Series with density and power_coefficient_curve
         # as pd.Series and np.array
         power_output_exp = pd.Series(data=[0.0, 244615.399, 0.0],
-                                     name='feedin_wind_turbine')
+                                     name='feedin_power_plant')
         assert_series_equal(power_coefficient_curve(**parameters),
                             power_output_exp)
         parameters['density'] = np.array(parameters['density'])
@@ -55,48 +54,6 @@ def test_power_coefficient_curve(self):
                         power_output_exp)
         assert isinstance(power_coefficient_curve(**parameters), np.ndarray)
 
-        # Tests with density correction:
-        # Test wind_speed as np.array with density and power_coefficient_curve
-        # as pd.Series and np.array
-        power_output_exp = np.array([0.0, 262869.785, 0.0])
-        parameters['density_correction'] = True
-        assert_allclose(power_coefficient_curve(**parameters),
-                        power_output_exp)
-        assert isinstance(power_coefficient_curve(**parameters), np.ndarray)
-        parameters['density'] = np.array(parameters['density'])
-        assert_allclose(power_coefficient_curve(**parameters),
-                        power_output_exp)
-        assert isinstance(power_coefficient_curve(**parameters), np.ndarray)
-        parameters['power_coefficient_curve_values'] = np.array(
-            parameters['power_coefficient_curve_values'])
-        parameters['power_coefficient_curve_wind_speeds'] = np.array(
-            parameters['power_coefficient_curve_wind_speeds'])
-        assert_allclose(power_coefficient_curve(**parameters),
-                        power_output_exp)
-        assert isinstance(power_coefficient_curve(**parameters), np.ndarray)
-
-        # Test wind_speed as pd.Series with density and power_coefficient_curve
-        # as np. array and pd.Series
-        power_output_exp = pd.Series(data=[0.0, 262869.785, 0.0],
-                                     name='feedin_wind_turbine')
-        parameters['wind_speed'] = pd.Series(data=parameters['wind_speed'])
-        assert_series_equal(power_coefficient_curve(**parameters),
-                            power_output_exp)
-        parameters['density'] = pd.Series(data=parameters['density'])
-        assert_series_equal(power_coefficient_curve(**parameters),
-                            power_output_exp)
-        parameters['power_coefficient_curve_wind_speeds'] = pd.Series(
-            data=parameters['power_coefficient_curve_wind_speeds'])
-        parameters['power_coefficient_curve_values'] = pd.Series(
-            data=parameters['power_coefficient_curve_values'])
-        assert_series_equal(power_coefficient_curve(**parameters),
-                            power_output_exp)
-
-        # Raise TypeErrors due to wrong type of `density_correction`
-        with pytest.raises(TypeError):
-            parameters['density'] = 'wrong_type'
-            power_coefficient_curve(**parameters)
-
     def test_power_curve(self):
         parameters = {'wind_speed': pd.Series(data=[2.0, 5.5, 7.0]),
                       'density': pd.Series(data=[1.3, 1.3, 1.3]),
@@ -111,7 +68,7 @@ def test_power_curve(self):
         # Test wind_speed as pd.Series and power_curve as pd.Series and
         # np.array
         power_output_exp = pd.Series(data=[0.0, 450.0, 0.0],
-                                     name='feedin_wind_turbine')
+                                     name='feedin_power_plant')
         assert_series_equal(power_curve(**parameters), power_output_exp)
         parameters['power_curve_values'] = np.array(
             parameters['power_curve_values'])
@@ -152,7 +109,7 @@ def test_power_curve(self):
         # Test wind_speed as pd.Series with density and power_curve as
         # np. array and pd.Series
         power_output_exp = pd.Series(data=[0.0, 461.00290572, 0.0],
-                                     name='feedin_wind_turbine')
+                                     name='feedin_power_plant')
         parameters['wind_speed'] = pd.Series(data=parameters['wind_speed'])
         assert_series_equal(power_curve(**parameters), power_output_exp)
         parameters['density'] = pd.Series(data=parameters['density'])
@@ -182,7 +139,7 @@ def test_power_curve_density_correction(self):
         # Test wind_speed as pd.Series with density and power_curve as
         # pd.Series and np.array
         power_output_exp = pd.Series(data=[0.0, 461.00290572, 0.0],
-                                     name='feedin_wind_turbine')
+                                     name='feedin_power_plant')
         assert_series_equal(power_curve_density_correction(**parameters),
                             power_output_exp)
         parameters['density'] = np.array(parameters['density'])