pvlib 0.13.1a1__py3-none-any.whl → 0.15.0__py3-none-any.whl

pvlib/bifacial/infinite_sheds.py

@@ -301,7 +301,8 @@ def get_irradiance_poa(surface_tilt, surface_azimuth, solar_zenith,
         sky_diffuse_comps_horizontal = haydavies(0, 180, dhi, dni, dni_extra,
                                                  solar_zenith, solar_azimuth,
                                                  return_components=True)
-        circumsolar_horizontal = sky_diffuse_comps_horizontal['circumsolar']
+        circumsolar_horizontal = \
+            sky_diffuse_comps_horizontal['poa_circumsolar']
 
         # Call haydavies a second time where circumsolar_normal is facing
         # directly towards sun, and can be added to DNI
@@ -309,7 +310,7 @@ def get_irradiance_poa(surface_tilt, surface_azimuth, solar_zenith,
                                              dni, dni_extra, solar_zenith,
                                              solar_azimuth,
                                              return_components=True)
-        circumsolar_normal = sky_diffuse_comps_normal['circumsolar']
+        circumsolar_normal = sky_diffuse_comps_normal['poa_circumsolar']
 
         dhi = dhi - circumsolar_horizontal
         dni = dni + circumsolar_normal

pvlib/inverter.py

@@ -388,8 +388,8 @@ def pvwatts(pdc, pdc0, eta_inv_nom=0.96, eta_inv_ref=0.9637):
 
     References
     ----------
-    .. [1] A. P. Dobos, "PVWatts Version 5 Manual,"
-       http://pvwatts.nrel.gov/downloads/pvwattsv5.pdf (2014).
+    .. [1] A. P. Dobos, "PVWatts Version 5 Manual", NREL, Golden, CO, USA,
+       Technical Report NREL/TP-6A20-62641, 2014, :doi:`10.2172/1158421`.
     """
 
     pac0 = eta_inv_nom * pdc0

pvlib/iotools/__init__.py

@@ -8,9 +8,6 @@ from pvlib.iotools.midc import read_midc_raw_data_from_nrel  # noqa: F401
 from pvlib.iotools.crn import read_crn  # noqa: F401
 from pvlib.iotools.solrad import read_solrad  # noqa: F401
 from pvlib.iotools.solrad import get_solrad  # noqa: F401
-from pvlib.iotools.psm3 import get_psm3  # noqa: F401
-from pvlib.iotools.psm3 import read_psm3  # noqa: F401
-from pvlib.iotools.psm3 import parse_psm3  # noqa: F401
 from pvlib.iotools.psm4 import get_nsrdb_psm4_aggregated  # noqa: F401
 from pvlib.iotools.psm4 import get_nsrdb_psm4_tmy  # noqa: F401
 from pvlib.iotools.psm4 import get_nsrdb_psm4_conus  # noqa: F401
@@ -45,3 +42,5 @@ from pvlib.iotools.meteonorm import get_meteonorm_observation_realtime  # noqa:
 from pvlib.iotools.meteonorm import get_meteonorm_observation_training  # noqa: F401, E501
 from pvlib.iotools.meteonorm import get_meteonorm_tmy  # noqa: F401
 from pvlib.iotools.nasa_power import get_nasa_power  # noqa: F401
+from pvlib.iotools.era5 import get_era5  # noqa: F401
+from pvlib.iotools.merra2 import get_merra2  # noqa: F401

pvlib/iotools/acis.py

@@ -413,8 +413,8 @@ def get_acis_station_data(station, start, end, trace_val=0.001,
                  'climdiv,valid_daterange,tzo,network')
     }
     df, metadata = _get_acis(start, end, params, map_variables, url, **kwargs)
-    df = df.replace("M", np.nan)
-    df = df.replace("T", trace_val)
+    df = df.mask(df == 'M', np.nan)
+    df = df.mask(df == 'T', trace_val)
     df = df.astype(float)
     return df, metadata
 

pvlib/iotools/era5.py

@@ -0,0 +1,207 @@
+import requests
+import pandas as pd
+from io import BytesIO, StringIO
+import zipfile
+import time
+
+
+VARIABLE_MAP = {
+    # short names
+    'd2m': 'temp_dew',
+    't2m': 'temp_air',
+    'sp': 'pressure',
+    'ssrd': 'ghi',
+    'tp': 'precipitation',
+    'strd': 'longwave_down',
+
+    # long names
+    '2m_dewpoint_temperature': 'temp_dew',
+    '2m_temperature': 'temp_air',
+    'surface_pressure': 'pressure',
+    'surface_solar_radiation_downwards': 'ghi',
+    'total_precipitation': 'precipitation',
+    'surface_thermal_radiation_downwards': 'longwave_down',
+}
+
+
+def _same(x):
+    return x
+
+
+def _k_to_c(temp_k):
+    return temp_k - 273.15
+
+
+def _j_to_w(j):
+    return j / 3600
+
+
+def _m_to_cm(m):
+    return m / 100
+
+
+UNITS = {
+    'u100': _same,
+    'v100': _same,
+    'u10': _same,
+    'v10': _same,
+    'd2m': _k_to_c,
+    't2m': _k_to_c,
+    'msl': _same,
+    'sst': _k_to_c,
+    'skt': _k_to_c,
+    'sp': _same,
+    'ssrd': _j_to_w,
+    'strd': _j_to_w,
+    'tp': _m_to_cm,
+}
+
+
+def get_era5(latitude, longitude, start, end, variables, api_key,
+             map_variables=True, timeout=60,
+             url='https://cds.climate.copernicus.eu/api/retrieve/v1/'):
+    """
+    Retrieve ERA5 reanalysis data from the ECMWF's Copernicus Data Store.
+
+    A CDS API key is needed to access this API.  Register for one at [1]_.
+
+    This API [2]_ provides a subset of the full ERA5 dataset.  See [3]_ for
+    the available variables.  Data are available on a 0.25° x 0.25° grid.
+
+    Parameters
+    ----------
+    latitude : float
+        In decimal degrees, north is positive (ISO 19115).
+    longitude: float
+        In decimal degrees, east is positive (ISO 19115).
+    start : datetime like or str
+        First day of the requested period.  Assumed to be UTC if not localized.
+    end : datetime like or str
+        Last day of the requested period.  Assumed to be UTC if not localized.
+    variables : list of str
+        List of variable names to retrieve, for example
+        ``['ghi', 'temp_air']``. Both pvlib and ERA5 names can be used.
+        See [1]_ for additional options.
+    api_key : str
+        ECMWF CDS API key.
+    map_variables : bool, default True
+        When true, renames columns of the DataFrame to pvlib variable names
+        where applicable. Also converts units of some variables. See variable
+        :const:`VARIABLE_MAP` and :const:`UNITS`.
+    timeout : int, default 60
+        Number of seconds to wait for the requested data to become available
+        before timeout.
+    url : str, optional
+        API endpoint URL.
+
+    Raises
+    ------
+    Exception
+        If ``timeout`` is reached without the job finishing.
+
+    Returns
+    -------
+    data : pd.DataFrame
+        Time series data. The index corresponds to the start of the interval.
+    meta : dict
+        Metadata.
+
+    References
+    ----------
+    .. [1] https://cds.climate.copernicus.eu/
+    .. [2] https://cds.climate.copernicus.eu/datasets/reanalysis-era5-single-levels-timeseries?tab=overview
+    .. [3] https://confluence.ecmwf.int/pages/viewpage.action?pageId=505390919
+    """  # noqa: E501
+
+    def _to_utc_dt_notz(dt):
+        dt = pd.to_datetime(dt)
+        if dt.tzinfo is not None:
+            dt = dt.tz_convert("UTC")
+        return dt
+
+    start = _to_utc_dt_notz(start).strftime("%Y-%m-%d")
+    end = _to_utc_dt_notz(end).strftime("%Y-%m-%d")
+
+    headers = {'PRIVATE-TOKEN': api_key}
+
+    # allow variables to be specified with pvlib names
+    reverse_map = {v: k for k, v in VARIABLE_MAP.items()}
+    variables = [reverse_map.get(k, k) for k in variables]
+
+    # Step 1: submit data request (add it to the queue)
+    params = {
+        "inputs": {
+            "variable": variables,
+            "location": {"longitude": longitude, "latitude": latitude},
+            "date": [f"{start}/{end}"],
+            "data_format": "csv"
+        }
+    }
+    slug = "processes/reanalysis-era5-single-levels-timeseries/execution"
+    response = requests.post(url + slug, json=params, headers=headers,
+                             timeout=timeout)
+    submission_response = response.json()
+    if not response.ok:
+        raise Exception(submission_response)  # likely need to accept license
+
+    job_id = submission_response['jobID']
+
+    # Step 2: poll until the data request is ready
+    slug = "jobs/" + job_id
+    poll_interval = 1
+    num_polls = 0
+    while True:
+        response = requests.get(url + slug, headers=headers, timeout=timeout)
+        poll_response = response.json()
+        job_status = poll_response['status']
+
+        if job_status == 'successful':
+            break  # ready to proceed to next step
+        elif job_status == 'failed':
+            msg = (
+                'Request failed. Please check the ECMWF website for details: '
+                'https://cds.climate.copernicus.eu/requests?tab=all'
+            )
+            raise Exception(msg)
+
+        num_polls += 1
+        if num_polls * poll_interval > timeout:
+            raise requests.exceptions.Timeout(
+                'Request timed out. Try increasing the timeout parameter or '
+                'reducing the request size.'
+            )
+
+        time.sleep(1)
+
+    # Step 3: get the download link for our requested dataset
+    slug = "jobs/" + job_id + "/results"
+    response = requests.get(url + slug, headers=headers, timeout=timeout)
+    results_response = response.json()
+    download_url = results_response['asset']['value']['href']
+
+    # Step 4: finally, download our dataset.  it's a zipfile of one CSV
+    response = requests.get(download_url, timeout=timeout)
+    zipbuffer = BytesIO(response.content)
+    archive = zipfile.ZipFile(zipbuffer)
+    filename = archive.filelist[0].filename
+    csvbuffer = StringIO(archive.read(filename).decode('utf-8'))
+    df = pd.read_csv(csvbuffer)
+
+    # and parse into the usual formats
+    metadata = submission_response['metadata']  # include messages from ECMWF
+    metadata['jobID'] = job_id
+    if not df.empty:
+        metadata['latitude'] = df['latitude'].values[0]
+        metadata['longitude'] = df['longitude'].values[0]
+
+    df.index = pd.to_datetime(df['valid_time']).dt.tz_localize('UTC')
+    df = df.drop(columns=['valid_time', 'latitude', 'longitude'])
+
+    if map_variables:
+        # convert units and rename
+        for shortname in df.columns:
+            converter = UNITS.get(shortname, _same)
+            df[shortname] = converter(df[shortname])
+        df = df.rename(columns=VARIABLE_MAP)
+
+    return df, metadata

pvlib/iotools/merra2.py

@@ -0,0 +1,196 @@
+import pandas as pd
+import requests
+from io import StringIO
+
+
+VARIABLE_MAP = {
+    'SWGDN': 'ghi',
+    'SWGDNCLR': 'ghi_clear',
+    'ALBEDO': 'albedo',
+    'LWGNT': 'longwave_net',
+    'LWGEM': 'longwave_up',
+    'LWGAB': 'longwave_down',
+    'T2M': 'temp_air',
+    'T2MDEW': 'temp_dew',
+    'PS': 'pressure',
+    'TOTEXTTAU': 'aod550',
+}
+
+
+def get_merra2(latitude, longitude, start, end, username, password, dataset,
+               variables, map_variables=True):
+    """
+    Retrieve MERRA-2 time-series irradiance and meteorological reanalysis data
+    from NASA's GESDISC data archive.
+
+    MERRA-2 [1]_ offers modeled data for many atmospheric quantities at hourly
+    resolution on a 0.5° x 0.625° global grid.
+
+    Access must be granted to the GESDISC data archive before EarthData
+    credentials will work.  See [2]_ for instructions.
+
+    Parameters
+    ----------
+    latitude : float
+        In decimal degrees, north is positive (ISO 19115).
+    longitude: float
+        In decimal degrees, east is positive (ISO 19115).
+    start : datetime like or str
+        First timestamp of the requested period. If a timezone is not
+        specified, UTC is assumed.
+    end : datetime like or str
+        Last timestamp of the requested period. If a timezone is not
+        specified, UTC is assumed. Must be in the same year as ``start``.
+    username : str
+        NASA EarthData username.
+    password : str
+        NASA EarthData password.
+    dataset : str
+        Dataset name (with version), e.g. "M2T1NXRAD.5.12.4".
+    variables : list of str
+        List of variable names to retrieve.  See the documentation of the
+        specific dataset you are accessing for options.
+    map_variables : bool, default True
+        When true, renames columns of the DataFrame to pvlib variable names
+        where applicable. See variable :const:`VARIABLE_MAP`.
+
+    Raises
+    ------
+    ValueError
+        If ``start`` and ``end`` are in different years, when converted to UTC.
+
+    Returns
+    -------
+    data : pd.DataFrame
+        Time series data. The index corresponds to the middle of the interval.
+    meta : dict
+        Metadata.
+
+    Notes
+    -----
+    The following datasets provide quantities useful for PV modeling:
+
+    +------------------------------------+-----------+---------------+
+    | Dataset                            | Variable  | pvlib name    |
+    +====================================+===========+===============+
+    | `M2T1NXRAD.5.12.4 <M2T1NXRAD_>`_   | SWGDN     | ghi           |
+    |                                    +-----------+---------------+
+    |                                    | SWGDNCLR  | ghi_clear     |
+    |                                    +-----------+---------------+
+    |                                    | ALBEDO    | albedo        |
+    |                                    +-----------+---------------+
+    |                                    | LWGAB     | longwave_down |
+    |                                    +-----------+---------------+
+    |                                    | LWGNT     | longwave_net  |
+    |                                    +-----------+---------------+
+    |                                    | LWGEM     | longwave_up   |
+    +------------------------------------+-----------+---------------+
+    | `M2T1NXSLV.5.12.4 <M2T1NXSLV_>`_   | T2M       | temp_air      |
+    |                                    +-----------+---------------+
+    |                                    | U10       | n/a           |
+    |                                    +-----------+---------------+
+    |                                    | V10       | n/a           |
+    |                                    +-----------+---------------+
+    |                                    | T2MDEW    | temp_dew      |
+    |                                    +-----------+---------------+
+    |                                    | PS        | pressure      |
+    |                                    +-----------+---------------+
+    |                                    | TO3       | n/a           |
+    |                                    +-----------+---------------+
+    |                                    | TQV       | n/a           |
+    +------------------------------------+-----------+---------------+
+    | `M2T1NXAER.5.12.4 <M2T1NXAER_>`_   | TOTEXTTAU | aod550        |
+    |                                    +-----------+---------------+
+    |                                    | TOTSCATAU | n/a           |
+    |                                    +-----------+---------------+
+    |                                    | TOTANGSTR | n/a           |
+    +------------------------------------+-----------+---------------+
+
+    .. _M2T1NXRAD: https://disc.gsfc.nasa.gov/datasets/M2T1NXRAD_5.12.4/summary
+    .. _M2T1NXSLV: https://disc.gsfc.nasa.gov/datasets/M2T1NXSLV_5.12.4/summary
+    .. _M2T1NXAER: https://disc.gsfc.nasa.gov/datasets/M2T1NXAER_5.12.4/summary
+
+    A complete list of datasets and their documentation is available at [3]_.
+
+    Note that MERRA2 does not currently provide DNI or DHI.
+
+    References
+    ----------
+    .. [1] https://gmao.gsfc.nasa.gov/gmao-products/merra-2/
+    .. [2] https://disc.gsfc.nasa.gov/earthdata-login
+    .. [3] https://disc.gsfc.nasa.gov/datasets?project=MERRA-2
+    """
+
+    # general API info here:
+    # https://docs.unidata.ucar.edu/tds/5.0/userguide/netcdf_subset_service_ref.html  # noqa: E501
+
+    def _to_utc_dt_notz(dt):
+        dt = pd.to_datetime(dt)
+        if dt.tzinfo is not None:
+            # convert to utc, then drop tz so that isoformat() is clean
+            dt = dt.tz_convert("UTC").tz_localize(None)
+        return dt
+
+    start = _to_utc_dt_notz(start)
+    end = _to_utc_dt_notz(end)
+
+    if (year := start.year) != end.year:
+        raise ValueError("start and end must be in the same year (in UTC)")
+
+    url = (
+        "https://goldsmr4.gesdisc.eosdis.nasa.gov/thredds/ncss/grid/"
+        f"MERRA2_aggregation/{dataset}/{dataset}_Aggregation_{year}.ncml"
+    )
+
+    parameters = {
+        'var': ",".join(variables),
+        'latitude': latitude,
+        'longitude': longitude,
+        'time_start': start.isoformat() + "Z",
+        'time_end': end.isoformat() + "Z",
+        'accept': 'csv',
+    }
+
+    auth = (username, password)
+
+    with requests.Session() as session:
+        session.auth = auth
+        login = session.request('get', url, params=parameters)
+        response = session.get(login.url, auth=auth, params=parameters)
+
+    response.raise_for_status()
+
+    content = response.content.decode('utf-8')
+    buffer = StringIO(content)
+    df = pd.read_csv(buffer)
+
+    df.index = pd.to_datetime(df['time'])
+
+    meta = {}
+    meta['dataset'] = dataset
+    meta['station'] = df['station'].values[0]
+    meta['latitude'] = df['latitude[unit="degrees_north"]'].values[0]
+    meta['longitude'] = df['longitude[unit="degrees_east"]'].values[0]
+
+    # drop the non-data columns
+    dropcols = ['time', 'station', 'latitude[unit="degrees_north"]',
+                'longitude[unit="degrees_east"]']
+    df = df.drop(columns=dropcols)
+
+    # column names are like T2M[unit="K"] by default.  extract the unit
+    # for the metadata, then rename col to just T2M
+    units = {}
+    rename = {}
+    for col in df.columns:
+        name, _ = col.split("[", maxsplit=1)
+        unit = col.split('"')[1]
+        units[name] = unit
+        rename[col] = name
+
+    meta['units'] = units
+    df = df.rename(columns=rename)
+
+    if map_variables:
+        df = df.rename(columns=VARIABLE_MAP)
+
+    return df, meta

pvlib/iotools/psm4.py

@@ -714,7 +714,6 @@ def read_nsrdb_psm4(filename, map_variables=True):
     pvlib.iotools.get_nsrdb_psm4_tmy
     pvlib.iotools.get_nsrdb_psm4_conus
     pvlib.iotools.get_nsrdb_psm4_full_disc
-    pvlib.iotools.read_psm3
 
     References
     ----------

pvlib/irradiance.py

@@ -16,7 +16,7 @@ from scipy.optimize import bisect
 from pvlib import atmosphere, solarposition, tools
 import pvlib  # used to avoid dni name collision in complete_irradiance
 
-from pvlib._deprecation import pvlibDeprecationWarning, renamed_kwarg_warning
+from pvlib._deprecation import pvlibDeprecationWarning
 import warnings
 
 
@@ -793,10 +793,11 @@ def haydavies(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
 
     diffuse_components : OrderedDict (array input) or DataFrame (Series input)
         Keys/columns are:
-            * sky_diffuse: Total sky diffuse
-            * isotropic
-            * circumsolar
-            * horizon
+            * poa_sky_diffuse: Total sky diffuse
+            * poa_isotropic
+            * poa_circumsolar
+            * poa_horizon (always zero, not accounted for by the
+              Hay-Davies model)
 
     Notes
     ------
@@ -855,13 +856,13 @@ def haydavies(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
 
     if return_components:
         diffuse_components = OrderedDict()
-        diffuse_components['sky_diffuse'] = sky_diffuse
+        diffuse_components['poa_sky_diffuse'] = sky_diffuse
 
         # Calculate the individual components
-        diffuse_components['isotropic'] = poa_isotropic
-        diffuse_components['circumsolar'] = poa_circumsolar
-        diffuse_components['horizon'] = np.where(
-            np.isnan(diffuse_components['isotropic']), np.nan, 0.)
+        diffuse_components['poa_isotropic'] = poa_isotropic
+        diffuse_components['poa_circumsolar'] = poa_circumsolar
+        diffuse_components['poa_horizon'] = np.where(
+            np.isnan(diffuse_components['poa_isotropic']), np.nan, 0.)
 
         if isinstance(sky_diffuse, pd.Series):
             diffuse_components = pd.DataFrame(diffuse_components)
@@ -1111,10 +1112,10 @@ def perez(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
 
     diffuse_components : OrderedDict (array input) or DataFrame (Series input)
         Keys/columns are:
-            * sky_diffuse: Total sky diffuse
-            * isotropic
-            * circumsolar
-            * horizon
+            * poa_sky_diffuse: Total sky diffuse
+            * poa_isotropic
+            * poa_circumsolar
+            * poa_horizon
 
 
     References
@@ -1197,12 +1198,12 @@ def perez(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
 
     if return_components:
         diffuse_components = OrderedDict()
-        diffuse_components['sky_diffuse'] = sky_diffuse
+        diffuse_components['poa_sky_diffuse'] = sky_diffuse
 
         # Calculate the different components
-        diffuse_components['isotropic'] = dhi * term1
-        diffuse_components['circumsolar'] = dhi * term2
-        diffuse_components['horizon'] = dhi * term3
+        diffuse_components['poa_isotropic'] = dhi * term1
+        diffuse_components['poa_circumsolar'] = dhi * term2
+        diffuse_components['poa_horizon'] = dhi * term3
 
         # Set values of components to 0 when sky_diffuse is 0
         mask = sky_diffuse == 0
@@ -1353,10 +1354,10 @@ def perez_driesse(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
 
     diffuse_components : OrderedDict (array input) or DataFrame (Series input)
         Keys/columns are:
-            * sky_diffuse: Total sky diffuse
-            * isotropic
-            * circumsolar
-            * horizon
+            * poa_sky_diffuse: Total sky diffuse
+            * poa_isotropic
+            * poa_circumsolar
+            * poa_horizon
 
     Notes
     -----
@@ -1417,12 +1418,12 @@ def perez_driesse(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
 
     if return_components:
         diffuse_components = OrderedDict()
-        diffuse_components['sky_diffuse'] = sky_diffuse
+        diffuse_components['poa_sky_diffuse'] = sky_diffuse
 
         # Calculate the different components
-        diffuse_components['isotropic'] = dhi * term1
-        diffuse_components['circumsolar'] = dhi * term2
-        diffuse_components['horizon'] = dhi * term3
+        diffuse_components['poa_isotropic'] = dhi * term1
+        diffuse_components['poa_circumsolar'] = dhi * term2
+        diffuse_components['poa_horizon'] = dhi * term3
 
         if isinstance(sky_diffuse, pd.Series):
             diffuse_components = pd.DataFrame(diffuse_components)
@@ -1612,11 +1613,6 @@ def ghi_from_poa_driesse_2023(surface_tilt, surface_azimuth,
         return ghi
 
 
-@renamed_kwarg_warning(
-    since='0.11.2',
-    old_param_name='clearsky_ghi',
-    new_param_name='ghi_clear',
-    removal="0.14.0")
 def clearsky_index(ghi, ghi_clear, max_clearsky_index=2.0):
     """
     Calculate the clearsky index.
@@ -2155,16 +2151,6 @@ def _dirint_bins(times, kt_prime, zenith, w, delta_kt_prime):
     return kt_prime_bin, zenith_bin, w_bin, delta_kt_prime_bin
 
 
-@renamed_kwarg_warning(
-    since='0.11.2',
-    old_param_name='ghi_clearsky',
-    new_param_name='ghi_clear',
-    removal="0.14.0")
-@renamed_kwarg_warning(
-    since='0.11.2',
-    old_param_name='dni_clearsky',
-    new_param_name='dni_clear',
-    removal="0.14.0")
 def dirindex(ghi, ghi_clear, dni_clear, zenith, times, pressure=101325.,
              use_delta_kt_prime=True, temp_dew=None, min_cos_zenith=0.065,
              max_zenith=87):
@@ -3661,11 +3647,6 @@ def _get_dirint_coeffs():
     return coeffs[1:, 1:, :, :]
 
 
-@renamed_kwarg_warning(
-    since='0.11.2',
-    old_param_name='clearsky_dni',
-    new_param_name='dni_clear',
-    removal="0.14.0")
 def dni(ghi, dhi, zenith, dni_clear=None, clearsky_tolerance=1.1,
         zenith_threshold_for_zero_dni=88.0,
         zenith_threshold_for_clearsky_limit=80.0):

pvlib/ivtools/sdm/__init__.py

@@ -10,7 +10,8 @@ from pvlib.ivtools.sdm.cec import (  # noqa: F401
 
 from pvlib.ivtools.sdm.desoto import (  # noqa: F401
     fit_desoto,
-    fit_desoto_sandia
+    fit_desoto_batzelis,
+    fit_desoto_sandia,
 )
 
 from pvlib.ivtools.sdm.pvsyst import (  # noqa: F401