Merge branch 'main' into deprecate-parse

Author: kandersolar

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

@@ -19,7 +19,8 @@ Deprecations
 
 Bug fixes
 ~~~~~~~~~
-
+* :py:func:`pvlib.iotools.get_pvgis_tmy` now returns the correct dtypes when
+  when ``outputformat='epw'``. (:issue:`2399`, :pull:`2417`)
 
 Enhancements
 ~~~~~~~~~~~~
@@ -50,8 +51,10 @@ Documentation
   (:issue:`2423`, :pull:`2426`)
 * Clarify which SAPM coefficients are required by the ``module`` parameter in
   :py:func:`~pvlib.pvsystem.sapm` (:issue:`2392`, :pull:`2435`)
-* Update references in :py:func`~pvlib.irradiance.get_extra_radiation`
-  (:issue:`2333`, :pull:`2347`)
+* Update references in :py:func:`~pvlib.irradiance.get_extra_radiation`
+  (:issue:`2333`, :pull:`2437`)
+* Update references in :py:func:`~pvlib.iotools.get_cams` and :py:func:`~pvlib.iotools.read_cams`
+  (:issue:`2427`, :pull:`2457`)
 
 Requirements
 ~~~~~~~~~~~~
@@ -76,3 +79,5 @@ Contributors
 * Will Holmgren (:ghuser:`wholmgren`)
 * Muhammad Rebaal (:ghuser:`Muhammad-Rebaal`)
 * omahs (:ghuser:`omahs`)
+* Adam R. Jensen (:ghuser:`AdamRJensen`)
+* Marion Schroedter-Homscheidt (:ghuser:`mschroedter`)

pvlib/iotools/pvgis.py

@@ -410,6 +410,9 @@ def _coerce_and_roll_tmy(tmy_data, tz, year):
         np.roll(tmy_data, tz, axis=0),
         columns=tmy_data.columns,
         index=new_index)
+    # GH 2399
+    new_tmy_data = \
+        new_tmy_data.astype(dtype=dict(zip(tmy_data.columns, tmy_data.dtypes)))
     return new_tmy_data
 
 

pvlib/iotools/sodapro.py

@@ -145,6 +145,12 @@ def get_cams(latitude, longitude, start, end, email, identifier='mcclear',
     e.g. `sza` becomes `solar_zenith`. See variable :const:`VARIABLE_MAP` for
     the complete mapping.
 
+    For large geospatial areas, CAMS offers a pre-calculated
+    gridded dataset [4]_ over land and coastal areas. This dataset
+    may not include the most recent data coverage and may not be
+    based on the most recent CAMS version. This dataset is not available
+    through pvlib.
+
     See Also
     --------
     pvlib.iotools.read_cams
@@ -157,13 +163,15 @@ def get_cams(latitude, longitude, start, end, email, identifier='mcclear',
 
     References
     ----------
-    .. [1] `CAMS solar radiation documentation
-       <https://atmosphere.copernicus.eu/solar-radiation>`_
+    .. [1] `CAMS solar radiation time-series documentation. Climate Data Store.
+       <https://ads.atmosphere.copernicus.eu/datasets/cams-solar-radiation-timeseries>`_
     .. [2] `CAMS Radiation Automatic Access (SoDa)
        <https://www.soda-pro.com/help/cams-services/cams-radiation-service/automatic-access>`_
     .. [3] A. R. Jensen et al., pvlib iotools — Open-source Python functions
        for seamless access to solar irradiance data. Solar Energy. 2023. Vol
        266, pp. 112092. :doi:`10.1016/j.solener.2023.112092`
+    .. [4] `CAMS gridded solar radiation documentation.
+       <https://ads.atmosphere.copernicus.eu/datasets/cams-gridded-solar-radiation>`_
     """
     try:
         time_step_str = TIME_STEPS_MAP[time_step]
@@ -272,8 +280,8 @@ def read_cams(filename, integrated=False, label=None, map_variables=True):
 
     References
     ----------
-    .. [1] `CAMS solar radiation documentation
-       <https://atmosphere.copernicus.eu/solar-radiation>`_
+    .. [1] `CAMS solar radiation time-series documentation. Climate Data Store.
+       <https://ads.atmosphere.copernicus.eu/datasets/cams-solar-radiation-timeseries>`_
     """
     metadata = {}
 
@@ -345,6 +353,5 @@ def read_cams(filename, integrated=False, label=None, map_variables=True):
 
     return data, metadata
 
-
 parse_cams = deprecated(since="0.12.1", name="parse_cams",
                         alternative="read_cams")(read_cams)