@@ -31,10 +31,6 @@ class ModelChain(object):
3131 Parameter to define which model to use to calculate the density of air
3232 at hub height. Valid options are 'barometric' and 'ideal_gas'.
3333 Default: 'barometric'.
34- temperature_model : string
35- Parameter to define which model to use to calculate the temperature at
36- hub height. Valid options are 'gradient' and 'interpolation'.
37- Default: 'gradient'.
3834 power_output_model : string
3935 Parameter to define which model to use to calculate the turbine power
4036 output. Valid options are 'cp_values' and 'p_values'.
@@ -63,10 +59,6 @@ class ModelChain(object):
6359 Parameter to define which model to use to calculate the density of air
6460 at hub height. Valid options are 'barometric' and 'ideal_gas'.
6561 Default: 'barometric'.
66- temperature_model : string
67- Parameter to define which model to use to calculate the temperature at
68- hub height. Valid options are 'gradient' and 'interpolation'.
69- Default: 'gradient'.
7062 power_output_model : string
7163 Parameter to define which model to use to calculate the turbine power
7264 output. Valid options are 'cp_values' and 'p_values'.
@@ -90,8 +82,7 @@ class ModelChain(object):
9082 ... 'd_rotor': 127,
9183 ... 'wind_conv_type': 'ENERCON E 126 7500'}
9284 >>> e126 = wind_turbine.WindTurbine(**enerconE126)
93- >>> modelchain_data = {'rho_model': 'ideal_gas',
94- ... 'temperature_model': 'interpolation'}
85+ >>> modelchain_data = {'rho_model': 'ideal_gas'}
9586 >>> e126_md = modelchain.ModelChain(e126, **modelchain_data)
9687 >>> print(e126.d_rotor)
9788 127
@@ -102,7 +93,6 @@ def __init__(self, wind_turbine,
10293 obstacle_height = 0 ,
10394 wind_model = 'logarithmic' ,
10495 rho_model = 'barometric' ,
105- temperature_model = 'gradient' ,
10696 power_output_model = 'p_values' ,
10797 density_corr = False ,
10898 hellman_exp = None ):
@@ -111,7 +101,6 @@ def __init__(self, wind_turbine,
111101 self .obstacle_height = obstacle_height
112102 self .wind_model = wind_model
113103 self .rho_model = rho_model
114- self .temperature_model = temperature_model
115104 self .power_output_model = power_output_model
116105 self .density_corr = density_corr
117106 self .hellman_exp = hellman_exp
@@ -123,16 +112,13 @@ def rho_hub(self, weather, data_height):
123112
124113 The density is calculated using the method specified by the parameter
125114 `rho_model`. Previous to the calculation of density the temperature at
126- hub height is calculated using the method specified by the parameter
127- `temperature_model`.
115+ hub height is calculated using a linear temperature gradient.
128116
129117 Parameters
130118 ----------
131119 weather : DataFrame or Dictionary
132120 Containing columns or keys with timeseries for temperature
133- `temp_air` in K and pressure `pressure` in Pa, as well as
134- optionally the temperature `temp_air_2` in K at a different height
135- for interpolation.
121+ `temp_air` in K and pressure `pressure` in Pa.
136122 If a Dictionary is used the data inside the dictionary has to be of
137123 the types pandas.Series or numpy.array.
138124 data_height : DataFrame or Dictionary
@@ -329,8 +315,8 @@ def run_model(self, weather, data_height):
329315 Containing columns or keys with the timeseries for wind speed
330316 `v_wind` in m/s, roughness length `z0` in m, temperature
331317 `temp_air` in K and pressure `pressure` in Pa, as well as
332- optionally wind speed `v_wind_2` in m/s and temperature
333- `temp_air_2` in K at different height for interpolation.
318+ optionally wind speed `v_wind_2` in m/s in K at different height
319+ for interpolation.
334320 If a Dictionary is used the data inside the dictionary has to be of
335321 the types pandas.Series or numpy.array.
336322 data_height : DataFrame or Dictionary
0 commit comments