Skip to content

Commit 0cf6c8a

Browse files
AdamRJensencwhansekandersolar
authored
Update CAMS documentation (#2457)
* Update CAMS documentation * Update v0.12.1.rst * Move gridded dataset description to notes * Fix whatsnew entry * FIx previous whatsnew entry * Add Marion to Whatsnew * Update pvlib/iotools/sodapro.py Co-authored-by: Cliff Hansen <[email protected]> * Update pvlib/iotools/sodapro.py * Update pvlib/iotools/sodapro.py --------- Co-authored-by: Cliff Hansen <[email protected]> Co-authored-by: Kevin Anderson <[email protected]>
1 parent bedd9e1 commit 0cf6c8a

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

docs/sphinx/source/whatsnew/v0.12.1.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ Documentation
4242
(:issue:`2423`, :pull:`2426`)
4343
* Clarify which SAPM coefficients are required by the ``module`` parameter in
4444
:py:func:`~pvlib.pvsystem.sapm` (:issue:`2392`, :pull:`2435`)
45-
* Update references in :py:func`~pvlib.irradiance.get_extra_radiation`
46-
(:issue:`2333`, :pull:`2347`)
45+
* Update references in :py:func:`~pvlib.irradiance.get_extra_radiation`
46+
(:issue:`2333`, :pull:`2437`)
47+
* Update references in :py:func:`~pvlib.iotools.get_cams` and :py:func:`~pvlib.iotools.read_cams`
48+
(:issue:`2427`, :pull:`2457`)
4749

4850
Requirements
4951
~~~~~~~~~~~~
@@ -68,3 +70,5 @@ Contributors
6870
* Will Holmgren (:ghuser:`wholmgren`)
6971
* Muhammad Rebaal (:ghuser:`Muhammad-Rebaal`)
7072
* omahs (:ghuser:`omahs`)
73+
* Adam R. Jensen (:ghuser:`AdamRJensen`)
74+
* Marion Schroedter-Homscheidt (:ghuser:`mschroedter`)

pvlib/iotools/sodapro.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,12 @@ def get_cams(latitude, longitude, start, end, email, identifier='mcclear',
143143
e.g. `sza` becomes `solar_zenith`. See variable :const:`VARIABLE_MAP` for
144144
the complete mapping.
145145
146+
For large geospatial areas, CAMS offers a pre-calculated
147+
gridded dataset [4]_ over land and coastal areas. This dataset
148+
may not include the most recent data coverage and may not be
149+
based on the most recent CAMS version. This dataset is not available
150+
through pvlib.
151+
146152
See Also
147153
--------
148154
pvlib.iotools.read_cams, pvlib.iotools.parse_cams
@@ -155,13 +161,15 @@ def get_cams(latitude, longitude, start, end, email, identifier='mcclear',
155161
156162
References
157163
----------
158-
.. [1] `CAMS solar radiation documentation
159-
<https://atmosphere.copernicus.eu/solar-radiation>`_
164+
.. [1] `CAMS solar radiation time-series documentation. Climate Data Store.
165+
<https://ads.atmosphere.copernicus.eu/datasets/cams-solar-radiation-timeseries>`_
160166
.. [2] `CAMS Radiation Automatic Access (SoDa)
161167
<https://www.soda-pro.com/help/cams-services/cams-radiation-service/automatic-access>`_
162168
.. [3] A. R. Jensen et al., pvlib iotools — Open-source Python functions
163169
for seamless access to solar irradiance data. Solar Energy. 2023. Vol
164170
266, pp. 112092. :doi:`10.1016/j.solener.2023.112092`
171+
.. [4] `CAMS gridded solar radiation documentation.
172+
<https://ads.atmosphere.copernicus.eu/datasets/cams-gridded-solar-radiation>`_
165173
"""
166174
try:
167175
time_step_str = TIME_STEPS_MAP[time_step]
@@ -268,8 +276,8 @@ def parse_cams(fbuf, integrated=False, label=None, map_variables=True):
268276
269277
References
270278
----------
271-
.. [1] `CAMS solar radiation documentation
272-
<https://atmosphere.copernicus.eu/solar-radiation>`_
279+
.. [1] `CAMS solar radiation time-series documentation. Climate Data Store.
280+
<https://ads.atmosphere.copernicus.eu/datasets/cams-solar-radiation-timeseries>`_
273281
"""
274282
metadata = {}
275283
# Initial lines starting with # contain metadata
@@ -370,8 +378,8 @@ def read_cams(filename, integrated=False, label=None, map_variables=True):
370378
371379
References
372380
----------
373-
.. [1] `CAMS solar radiation documentation
374-
<https://atmosphere.copernicus.eu/solar-radiation>`_
381+
.. [1] `CAMS solar radiation time-series documentation. Climate Data Store.
382+
<https://ads.atmosphere.copernicus.eu/datasets/cams-solar-radiation-timeseries>`_
375383
"""
376384
with open(str(filename), 'r') as fbuf:
377385
content = parse_cams(fbuf, integrated, label, map_variables)

0 commit comments

Comments
 (0)