Skip to content

Commit 8e3b1ec

Browse files
committed
Implement feedback from code review from kandersolar
1 parent 239cff1 commit 8e3b1ec

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

pvlib/iotools/meteonorm.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
'direct_normal_irradiance': 'dni',
1313
'direct_horizontal_irradiance': 'bhi',
1414
'global_clear_sky_irradiance': 'ghi_clear',
15+
'diffuse_clear_sky_irradiance': 'dhi_clear',
16+
'direct_normal_clear_sky_irradiance': 'dni_clear',
17+
'direct_horizontal_clear_sky_irradiance': 'bhi_clear',
1518
'diffuse_tilted_irradiance': 'poa_diffuse',
1619
'direct_tilted_irradiance': 'poa_direct',
1720
'global_tilted_irradiance': 'poa',
@@ -96,7 +99,7 @@ def get_meteonorm(latitude, longitude, start, end, api_key, endpoint,
9699
-------
97100
data : pd.DataFrame
98101
Time series data. The index corresponds to the start (left) of the
99-
interval unless ``interval_index`` is set to False.
102+
interval unless ``interval_index`` is set to True.
100103
meta : dict
101104
Metadata.
102105
@@ -144,12 +147,11 @@ def get_meteonorm(latitude, longitude, start, end, api_key, endpoint,
144147
if isinstance(parameters, str):
145148
parameters = [parameters]
146149

150+
# allow the use of pvlib parameter names
151+
parameter_dict = {v: k for k, v in VARIABLE_MAP.items()}
152+
parameters = [parameter_dict.get(p, p) for p in parameters]
147153
# convert list to string with values separated by commas
148-
if not isinstance(parameters, (str, type(None))):
149-
# allow the use of pvlib parameter names
150-
parameter_dict = {v: k for k, v in VARIABLE_MAP.items()}
151-
parameters = [parameter_dict.get(p, p) for p in parameters]
152-
params['parameters'] = ','.join(parameters)
154+
params['parameters'] = ','.join(parameters)
153155

154156
if not isinstance(horizon, str):
155157
params['horizon'] = ','.join(map(str, horizon))
@@ -216,7 +218,7 @@ def get_meteonorm_tmy(latitude, longitude, api_key,
216218
'slope_west_east'].
217219
albedo : float, optional
218220
Constant ground albedo. If no value is specified a baseline albedo of
219-
0.2 is used and albedo cahnges due to snow fall is modeled. If a value
221+
0.2 is used and albedo changes due to snow fall are modeled. If a value
220222
is specified, then snow fall is not modeled.
221223
turbidity : list or 'auto', optional
222224
List of 12 monthly mean atmospheric Linke turbidity values. The default
@@ -252,7 +254,7 @@ def get_meteonorm_tmy(latitude, longitude, api_key,
252254
-------
253255
data : pd.DataFrame
254256
Time series data. The index corresponds to the start (left) of the
255-
interval unless ``interval_index`` is set to False.
257+
interval unless ``interval_index`` is set to True.
256258
meta : dict
257259
Metadata.
258260
@@ -291,12 +293,11 @@ def get_meteonorm_tmy(latitude, longitude, api_key,
291293
if isinstance(parameters, str):
292294
parameters = [parameters]
293295

296+
# allow the use of pvlib parameter names
297+
parameter_dict = {v: k for k, v in VARIABLE_MAP.items()}
298+
parameters = [parameter_dict.get(p, p) for p in parameters]
294299
# convert list to string with values separated by commas
295-
if not isinstance(parameters, (str, type(None))):
296-
# allow the use of pvlib parameter names
297-
parameter_dict = {v: k for k, v in VARIABLE_MAP.items()}
298-
parameters = [parameter_dict.get(p, p) for p in parameters]
299-
params['parameters'] = ','.join(parameters)
300+
params['parameters'] = ','.join(parameters)
300301

301302
if not isinstance(horizon, str):
302303
params['horizon'] = ','.join(map(str, horizon))

0 commit comments

Comments
 (0)