@@ -63,13 +63,13 @@ def get_pvgis_hourly(latitude, longitude, start=None, end=None,
63
63
In decimal degrees, between -90 and 90, north is positive (ISO 19115)
64
64
longitude: float
65
65
In decimal degrees, between -180 and 180, east is positive (ISO 19115)
66
- start: int or datetime like, default: None
66
+ start : int or datetime like, optional
67
67
First year of the radiation time series. Defaults to first year
68
68
available.
69
- end: int or datetime like, default: None
69
+ end : int or datetime like, optional
70
70
Last year of the radiation time series. Defaults to last year
71
71
available.
72
- raddatabase: str, default: None
72
+ raddatabase : str, optional
73
73
Name of radiation database. Options depend on location, see [3]_.
74
74
components: bool, default: True
75
75
Output solar radiation components (beam, diffuse, and reflected).
@@ -87,14 +87,14 @@ def get_pvgis_hourly(latitude, longitude, start=None, end=None,
87
87
and pvlib<=0.9.5 is offset by 180 degrees.
88
88
usehorizon: bool, default: True
89
89
Include effects of horizon
90
- userhorizon: list of float, default: None
90
+ userhorizon : list of float, optional
91
91
Optional user specified elevation of horizon in degrees, at equally
92
92
spaced azimuth clockwise from north, only valid if ``usehorizon`` is
93
- true, if ``usehorizon`` is true but ``userhorizon`` is ``None`` then
93
+ true, if ``usehorizon`` is true but ``userhorizon`` is not specified then
94
94
PVGIS will calculate the horizon [4]_
95
95
pvcalculation: bool, default: False
96
96
Return estimate of hourly PV production.
97
- peakpower: float, default: None
97
+ peakpower : float, optional
98
98
Nominal power of PV system in kW. Required if pvcalculation=True.
99
99
pvtechchoice: {'crystSi', 'CIS', 'CdTe', 'Unknown'}, default: 'crystSi'
100
100
PV technology.
@@ -309,12 +309,12 @@ def read_pvgis_hourly(filename, pvgis_format=None, map_variables=True):
309
309
----------
310
310
filename : str, pathlib.Path, or file-like buffer
311
311
Name, path, or buffer of hourly data file downloaded from PVGIS.
312
- pvgis_format : str, default None
312
+ pvgis_format : str, optional
313
313
Format of PVGIS file or buffer. Equivalent to the ``outputformat``
314
314
parameter in the PVGIS API. If ``filename`` is a file and
315
- ``pvgis_format`` is ``None`` then the file extension will be used to
316
- determine the PVGIS format to parse. If ``filename`` is a buffer, then
317
- ``pvgis_format`` is required and must be in ``['csv', 'json']``.
315
+ ``pvgis_format`` is not specified then the file extension will be used
316
+ to determine the PVGIS format to parse. If ``filename`` is a buffer,
317
+ then ``pvgis_format`` is required and must be in ``['csv', 'json']``.
318
318
map_variables: bool, default True
319
319
When true, renames columns of the DataFrame to pvlib variable names
320
320
where applicable. See variable :const:`VARIABLE_MAP`.
@@ -336,11 +336,11 @@ def read_pvgis_hourly(filename, pvgis_format=None, map_variables=True):
336
336
Raises
337
337
------
338
338
ValueError
339
- if ``pvgis_format`` is ``None`` and the file extension is neither
339
+ if ``pvgis_format`` is not specified and the file extension is neither
340
340
``.csv`` nor ``.json`` or if ``pvgis_format`` is provided as
341
341
input but isn't in ``['csv', 'json']``
342
342
TypeError
343
- if ``pvgis_format`` is ``None`` and ``filename`` is a buffer
343
+ if ``pvgis_format`` is not specified and ``filename`` is a buffer
344
344
345
345
See Also
346
346
--------
@@ -409,14 +409,13 @@ def get_pvgis_tmy(latitude, longitude, outputformat='json', usehorizon=True,
409
409
documentation [2]_ for more info.
410
410
usehorizon : bool, default True
411
411
include effects of horizon
412
- userhorizon : list of float, default None
413
- optional user specified elevation of horizon in degrees, at equally
414
- spaced azimuth clockwise from north, only valid if ``usehorizon`` is
415
- true, if ``usehorizon`` is true but ``userhorizon`` is ``None`` then
416
- PVGIS will calculate the horizon [3]_
417
- startyear : int, default None
412
+ userhorizon : list of float, optional
413
+ Optional user-specified elevation of horizon in degrees, at equally
414
+ spaced azimuth clockwise from north. If not specified, PVGIS will
415
+ calculate the horizon [3]_. If specified, requires ``usehorizon=True``.
416
+ startyear : int, optional
418
417
first year to calculate TMY
419
- endyear : int, default None
418
+ endyear : int, optional
420
419
last year to calculate TMY, must be at least 10 years from first year
421
420
map_variables: bool, default True
422
421
When true, renames columns of the Dataframe to pvlib variable names
@@ -573,12 +572,13 @@ def read_pvgis_tmy(filename, pvgis_format=None, map_variables=True):
573
572
----------
574
573
filename : str, pathlib.Path, or file-like buffer
575
574
Name, path, or buffer of file downloaded from PVGIS.
576
- pvgis_format : str, default None
575
+ pvgis_format : str, optional
577
576
Format of PVGIS file or buffer. Equivalent to the ``outputformat``
578
577
parameter in the PVGIS TMY API. If ``filename`` is a file and
579
- ``pvgis_format`` is ``None`` then the file extension will be used to
580
- determine the PVGIS format to parse. For PVGIS files from the API with
581
- ``outputformat='basic'``, please set ``pvgis_format`` to ``'basic'``.
578
+ ``pvgis_format`` is not specified then the file extension will be used
579
+ to determine the PVGIS format to parse. For PVGIS files from the API
580
+ with ``outputformat='basic'``, please set ``pvgis_format`` to
581
+ ``'basic'``.
582
582
If ``filename`` is a buffer, then ``pvgis_format`` is required and must
583
583
be in ``['csv', 'epw', 'json', 'basic']``.
584
584
map_variables: bool, default True
@@ -600,11 +600,11 @@ def read_pvgis_tmy(filename, pvgis_format=None, map_variables=True):
600
600
Raises
601
601
------
602
602
ValueError
603
- if ``pvgis_format`` is ``None`` and the file extension is neither
603
+ if ``pvgis_format`` is not specified and the file extension is neither
604
604
``.csv``, ``.json``, nor ``.epw``, or if ``pvgis_format`` is provided
605
605
as input but isn't in ``['csv', 'epw', 'json', 'basic']``
606
606
TypeError
607
- if ``pvgis_format`` is ``None`` and ``filename`` is a buffer
607
+ if ``pvgis_format`` is not specified and ``filename`` is a buffer
608
608
609
609
See Also
610
610
--------
0 commit comments