Merge branch 'master' into map_variables_psm3

Author: AdamRJensen

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,7 @@
  - [ ] Closes #xxxx
  - [ ] I am familiar with the [contributing guidelines](https://pvlib-python.readthedocs.io/en/latest/contributing.html)
  - [ ] Tests added
- - [ ] Updates entries to [`docs/sphinx/source/api.rst`](https://github.com/pvlib/pvlib-python/blob/master/docs/sphinx/source/api.rst) for API changes.
+ - [ ] Updates entries in [`docs/sphinx/source/reference`](https://github.com/pvlib/pvlib-python/blob/master/docs/sphinx/source/reference) for API changes.
  - [ ] Adds description and name entries in the appropriate "what's new" file in [`docs/sphinx/source/whatsnew`](https://github.com/pvlib/pvlib-python/tree/master/docs/sphinx/source/whatsnew) for all changes. Includes link to the GitHub Issue with `` :issue:`num` `` or this Pull Request with `` :pull:`num` ``. Includes contributor name and/or GitHub username (link with `` :ghuser:`user` ``).
  - [ ] New code is fully documented. Includes [numpydoc](https://numpydoc.readthedocs.io/en/latest/format.html) compliant docstrings, examples, and comments where necessary.
  - [ ] Pull request is nearly complete and ready for detailed review.

benchmarks/asv.conf.json

@@ -115,7 +115,7 @@
         // minimum supported versions
         {
             "python": "3.6",
-            "numpy": "1.12.0",
+            "numpy": "1.16.0",
             "pandas": "0.22.0",
             "scipy": "1.2.0",
             // Note: these don't have a minimum in setup.py

ci/requirements-py36-min.yml

@@ -15,7 +15,7 @@ dependencies:
     - pip:
         - dataclasses
         - h5py==3.1.0
-        - numpy==1.12.0
+        - numpy==1.16.0
         - pandas==0.22.0
         - scipy==1.2.0
         - pytest-rerunfailures # conda version is >3.6

ci/requirements-py36.yml

@@ -10,7 +10,7 @@ dependencies:
     - netcdf4
     - nose
     - numba
-    - numpy >= 1.12.0
+    - numpy >= 1.16.0
     - pandas >= 0.22.0
     - pip
     - pytest

ci/requirements-py37.yml

@@ -10,7 +10,7 @@ dependencies:
     - netcdf4
     - nose
     - numba
-    - numpy >= 1.12.0
+    - numpy >= 1.16.0
     - pandas >= 0.22.0
     - pip
     - pytest

ci/requirements-py38.yml

@@ -10,7 +10,7 @@ dependencies:
     - netcdf4
     - nose
     - numba
-    - numpy >= 1.12.0
+    - numpy >= 1.16.0
     - pandas >= 0.22.0
     - pip
     - pytest

ci/requirements-py39.yml

@@ -10,7 +10,7 @@ dependencies:
     # - netcdf4  # pulls in a different version of numpy with ImportError
     - nose
     # - numba  # python 3.9 compat in early 2021
-    - numpy >= 1.12.0
+    - numpy >= 1.16.0
     - pandas >= 0.22.0
     - pip
     - pytest

docs/sphinx/source/conf.py

@@ -159,6 +159,7 @@
     "use_edit_page_button": True,
     "show_toc_level": 1,
     "footer_items": ["copyright", "sphinx-version", "sidebar-ethical-ads"],
+    "left_sidebar_end": [],
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
@@ -199,9 +200,7 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {
-    "**": ["search-field", "sidebar-nav-bs"]  # "sidebar-ethical-ads"
-}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.

docs/sphinx/source/contributing.rst

@@ -150,13 +150,14 @@ a timely manner is to:
 
 #. Start by creating an issue. The issue should be well-defined and
    actionable.
-#. Ask the maintainers to tag the issue with the appropriate milestone.
+#. Ask the `maintainers <https://github.com/orgs/pvlib/people>`_ to tag
+   the issue with the appropriate milestone.
 #. Make a limited-scope pull request. It can be a lot of work to check all of
    the boxes in `pull request guidelines
    <https://github.com/pvlib/pvlib-python/blob/master/.github/PULL_REQUEST_TEMPLATE.md>`_,
    especially for pull requests with a lot of new primary code.
    See :ref:`pull-request-scope`.
-#. Tag pvlib community members or ``@pvlib/maintainer`` when the pull
+#. Tag pvlib community members or ``@pvlib`` when the pull
    request is ready for review. (see :ref:`pull-request-reviews`)
 
 
@@ -166,7 +167,7 @@ Pull request reviews
 --------------------
 
 The pvlib community and maintainers will review your pull request in a
-timely fashion. Please "ping" ``@pvlib/maintainer`` if it seems that
+timely fashion. Please "ping" ``@pvlib`` if it seems that
 your pull request has been forgotten at any point in the pull request
 process.
 

docs/sphinx/source/reference/pv_modeling.rst

@@ -43,6 +43,7 @@ PV temperature models
    temperature.fuentes
    temperature.ross
    temperature.noct_sam
+   temperature.prilliman
    pvsystem.PVSystem.get_cell_temperature
 
 Temperature Model Parameters

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

@@ -8,11 +8,18 @@ Breaking changes
 
 Deprecations
 ~~~~~~~~~~~~
+* :py:func:`pvlib.modelchain.basic_chain` is deprecated.
+  See :py:meth:`pvlib.modelchain.ModelChain.with_pvwatts` and
+  :py:meth:`pvlib.modelchain.ModelChain.with_sapm` for alternative simplified
+  :py:class:`~pvlib.modelchain.ModelChain` interfaces, although note that the
+  inputs do not directly translate. (:pull:`1401`)
 
 Enhancements
 ~~~~~~~~~~~~
 * Added ``map_variables`` option to :py:func:`pvlib.iotools.get_psm3` and
   :py:func:`pvlib.iotools.read_psm3` (:pull:`1374`)
+* Added :py:func:`pvlib.temperature.prilliman` for modeling cell temperature
+  at short time steps (:issue:`1081`, :pull:`1391`)
 
 Bug fixes
 ~~~~~~~~~
@@ -24,16 +31,28 @@ Bug fixes
   argument was not being passed to the ``optimalinclination`` request parameter (:pull:`1356`)
 * Fixed bug in :py:func:`pvlib.bifacial.pvfactors_timeseries` where scalar ``surface_tilt``
   and ``surface_azimuth`` inputs caused an error (:issue:`1127`, :issue:`1332`, :pull:`1361`) 
-
+* Changed the metadata entry for the wind speed unit to "Wind Speed Units" in
+  the PSM3 iotools function (:pull:`1375`)
+* Improved convergence when determining the maximum power point using
+  for :py:func:`pvlib.pvsystem.singlediode` with ``method='lambertw'``. Tolerance
+  is determined for the voltage at the maximum power point, and is improved
+  from 0.01 V to 1e-8 V. (:issue:`1087`, :pull:`1089`)
 
 Testing
 ~~~~~~~
+* Updated test values to match the new values returned by the PVGIS TMY API. The difference
+  is very minor (0.01 W/m2, affecting only a few beam irradiance values) (:pull:`1396`)
 
 Documentation
 ~~~~~~~~~~~~~
+* Fix documentation return error in :py:meth:`pvlib.forecast.ForecastModel.cloud_cover_to_transmittance_linear`
+  (:issue:`1367`, :pull:`1370`)
+
 
 Requirements
 ~~~~~~~~~~~~
+* numpy >= 1.16.0 is now required for all python versions. (:pull:`1400`)
+
 
 Contributors
 ~~~~~~~~~~~~
@@ -43,3 +62,4 @@ Contributors
 * Christian Weickhmann (:ghuser:`cweickhmann`)
 * Kevin Anderson (:ghuser:`kanderso-nrel`)
 * Adam R. Jensen (:ghuser:`AdamRJensen`)
+* Johann Loux (:ghuser:`JoLo90`)

docs/tutorials/irradiance.ipynb

@@ -367,7 +367,7 @@
    "source": [
     "See the online documentation for clear sky modeling examples.\n",
     "\n",
-    "http://pvlib-python.readthedocs.io/en/latest/clearsky.html\n",
+    "http://pvlib-python.readthedocs.io/en/stable/user_guide/clearsky.html\n",
     "\n",
     "Here we only generate data for the functions below."
    ]

pvlib/clearsky.py

@@ -679,23 +679,6 @@ def _to_centered_series(vals, idx, samples_per_window):
     return pd.Series(index=idx, data=vals).shift(shift)
 
 
-def _get_sample_intervals(times, win_length):
-    """ Calculates time interval and samples per window for Reno-style clear
-    sky detection functions
-    """
-    deltas = np.diff(times.values) / np.timedelta64(1, '60s')
-
-    # determine if we can proceed
-    if times.inferred_freq and len(np.unique(deltas)) == 1:
-        sample_interval = times[1] - times[0]
-        sample_interval = sample_interval.seconds / 60  # in minutes
-        samples_per_window = int(win_length / sample_interval)
-        return sample_interval, samples_per_window
-    else:
-        raise NotImplementedError('algorithm does not yet support unequal '
-                                  'times. consider resampling your data.')
-
-
 def _clear_sample_index(clear_windows, samples_per_window, align, H):
     """
     Returns indices of clear samples in clear windows
@@ -849,8 +832,8 @@ def detect_clearsky(measured, clearsky, times=None, window_length=10,
     else:
         clear = clearsky
 
-    sample_interval, samples_per_window = _get_sample_intervals(times,
-                                                                window_length)
+    sample_interval, samples_per_window = \
+        tools._get_sample_intervals(times, window_length)
 
     # generate matrix of integers for creating windows with indexing
     H = hankel(np.arange(samples_per_window),

pvlib/data/pvgis_tmy_test.dat

@@ -1065,7 +1065,7 @@ time(UTC),G(h),Gb(n),Gd(h),IR(h),RH,SP,T2m,WD10m,WS10m
 2012-02-14 07:00:00+00:00,44.0,70.76,37.0,275.2,66.69,98767.0,-3.67,360.0,1.19
 2012-02-14 08:00:00+00:00,159.0,160.52,118.0,276.55,64.28,98799.0,-2.04,360.0,0.98
 2012-02-14 09:00:00+00:00,236.0,125.11,188.0,274.22,57.82,98741.0,-0.49,6.0,1.17
-2012-02-14 10:00:00+00:00,278.0,88.44,236.0,271.88,51.37,98683.0,1.07,13.0,1.36
+2012-02-14 10:00:00+00:00,278.0,88.45,236.0,271.88,51.37,98683.0,1.07,13.0,1.36
 2012-02-14 11:00:00+00:00,308.0,86.06,263.0,269.55,44.91,98624.0,2.62,19.0,1.54
 2012-02-14 12:00:00+00:00,309.0,87.72,263.0,265.02,42.7,98582.0,3.48,22.0,1.66
 2012-02-14 13:00:00+00:00,286.0,95.98,240.0,260.48,40.5,98540.0,4.35,24.0,1.78
@@ -1686,7 +1686,7 @@ time(UTC),G(h),Gb(n),Gd(h),IR(h),RH,SP,T2m,WD10m,WS10m
 2014-03-12 04:00:00+00:00,0.0,0.0,0.0,284.17,89.84,100116.0,4.47,11.0,1.57
 2014-03-12 05:00:00+00:00,0.0,0.0,0.0,285.0,91.44,100148.0,4.33,9.0,1.42
 2014-03-12 06:00:00+00:00,19.0,52.18,16.0,281.98,82.23,100168.0,6.64,9.0,1.17
-2014-03-12 07:00:00+00:00,181.0,395.63,88.0,278.97,73.01,100187.0,8.95,10.0,0.91
+2014-03-12 07:00:00+00:00,181.0,395.64,88.0,278.97,73.01,100187.0,8.95,10.0,0.91
 2014-03-12 08:00:00+00:00,366.0,632.25,117.0,275.95,63.8,100207.0,11.25,10.0,0.66
 2014-03-12 09:00:00+00:00,523.0,745.74,133.0,273.12,55.45,100123.0,12.55,20.0,0.66
 2014-03-12 10:00:00+00:00,642.0,834.31,130.0,270.28,47.1,100038.0,13.85,29.0,0.66
@@ -3413,7 +3413,7 @@ time(UTC),G(h),Gb(n),Gd(h),IR(h),RH,SP,T2m,WD10m,WS10m
 2011-05-23 03:00:00+00:00,0.0,0.0,0.0,339.85,87.48,99191.0,17.81,342.0,1.6
 2011-05-23 04:00:00+00:00,0.0,0.0,0.0,339.75,86.94,99223.0,18.88,346.0,1.81
 2011-05-23 05:00:00+00:00,156.0,428.31,67.0,339.65,86.4,99255.0,19.94,350.0,2.01
-2011-05-23 06:00:00+00:00,345.0,670.72,90.0,335.33,79.48,99278.0,21.39,1.0,1.9
+2011-05-23 06:00:00+00:00,345.0,670.71,90.0,335.33,79.48,99278.0,21.39,1.0,1.9
 2011-05-23 07:00:00+00:00,530.0,776.28,108.0,331.02,72.56,99301.0,22.84,12.0,1.79
 2011-05-23 08:00:00+00:00,697.0,837.05,122.0,326.7,65.64,99323.0,24.28,23.0,1.68
 2011-05-23 09:00:00+00:00,830.0,869.59,134.0,327.22,63.29,99310.0,24.74,32.0,1.91

pvlib/data/test_read_psm3.csv

@@ -1,4 +1,4 @@
-Source,Location ID,City,State,Country,Latitude,Longitude,Time Zone,Elevation,Local Time Zone,Clearsky DHI Units,Clearsky DNI Units,Clearsky GHI Units,Dew Point Units,DHI Units,DNI Units,GHI Units,Solar Zenith Angle Units,Temperature Units,Pressure Units,Relative Humidity Units,Precipitable Water Units,Wind Direction Units,Wind Speed,Cloud Type -15,Cloud Type 0,Cloud Type 1,Cloud Type 2,Cloud Type 3,Cloud Type 4,Cloud Type 5,Cloud Type 6,Cloud Type 7,Cloud Type 8,Cloud Type 9,Cloud Type 10,Cloud Type 11,Cloud Type 12,Fill Flag 0,Fill Flag 1,Fill Flag 2,Fill Flag 3,Fill Flag 4,Fill Flag 5,Surface Albedo Units,Version
+Source,Location ID,City,State,Country,Latitude,Longitude,Time Zone,Elevation,Local Time Zone,Clearsky DHI Units,Clearsky DNI Units,Clearsky GHI Units,Dew Point Units,DHI Units,DNI Units,GHI Units,Solar Zenith Angle Units,Temperature Units,Pressure Units,Relative Humidity Units,Precipitable Water Units,Wind Direction Units,Wind Speed Units,Cloud Type -15,Cloud Type 0,Cloud Type 1,Cloud Type 2,Cloud Type 3,Cloud Type 4,Cloud Type 5,Cloud Type 6,Cloud Type 7,Cloud Type 8,Cloud Type 9,Cloud Type 10,Cloud Type 11,Cloud Type 12,Fill Flag 0,Fill Flag 1,Fill Flag 2,Fill Flag 3,Fill Flag 4,Fill Flag 5,Surface Albedo Units,Version
 NSRDB,155474,-,-,-,40.53,-108.54,-7,2133,-7,w/m2,w/m2,w/m2,c,w/m2,w/m2,w/m2,Degree,c,mbar,%,cm,Degrees,m/s,N/A,Clear,Probably Clear,Fog,Water,Super-Cooled Water,Mixed,Opaque Ice,Cirrus,Overlapping,Overshooting,Unknown,Dust,Smoke,N/A,Missing Image,Low Irradiance,Exceeds Clearsky,Missing CLoud Properties,Rayleigh Violation,N/A,v3.0.1
 Year,Month,Day,Hour,Minute,DHI,DNI,GHI,Clearsky DHI,Clearsky DNI,Clearsky GHI,Cloud Type,Dew Point,Solar Zenith Angle,Fill Flag,Surface Albedo,Wind Speed,Precipitable Water,Wind Direction,Relative Humidity,Temperature,Pressure,,,,,,,,,,,,,,,,,,,,,,,,
 2017,1,1,0,0,0,0,0,0,0,0,1,-10,162.05,0,0.866,0.3,0.417,166.4,74.79,-8,780,,,,,,,,,,,,,,,,,,,,,,,,

pvlib/data/tmy_45.000_8.000_2005_2016.csv

@@ -1081,7 +1081,7 @@ time(UTC),T2m,RH,G(h),Gb(n),Gd(h),IR(h),WS10m,WD10m,SP
 20120214:0700,-3.67,66.69,44.0,70.76,37.0,275.2,1.19,360.0,98767.0
 20120214:0800,-2.04,64.28,159.0,160.52,118.0,276.55,0.98,360.0,98799.0
 20120214:0900,-0.49,57.82,236.0,125.11,188.0,274.22,1.17,6.0,98741.0
-20120214:1000,1.07,51.37,278.0,88.44,236.0,271.88,1.36,13.0,98683.0
+20120214:1000,1.07,51.37,278.0,88.45,236.0,271.88,1.36,13.0,98683.0
 20120214:1100,2.62,44.91,308.0,86.06,263.0,269.55,1.54,19.0,98624.0
 20120214:1200,3.48,42.7,309.0,87.72,263.0,265.02,1.66,22.0,98582.0
 20120214:1300,4.35,40.5,286.0,95.98,240.0,260.48,1.78,24.0,98540.0
@@ -1702,7 +1702,7 @@ time(UTC),T2m,RH,G(h),Gb(n),Gd(h),IR(h),WS10m,WD10m,SP
 20140312:0400,4.47,89.84,0.0,-0.0,0.0,284.17,1.57,11.0,100116.0
 20140312:0500,4.33,91.44,0.0,-0.0,0.0,285.0,1.42,9.0,100148.0
 20140312:0600,6.64,82.23,19.0,52.18,16.0,281.98,1.17,9.0,100168.0
-20140312:0700,8.95,73.01,181.0,395.63,88.0,278.97,0.91,10.0,100187.0
+20140312:0700,8.95,73.01,181.0,395.64,88.0,278.97,0.91,10.0,100187.0
 20140312:0800,11.25,63.8,366.0,632.25,117.0,275.95,0.66,10.0,100207.0
 20140312:0900,12.55,55.45,523.0,745.74,133.0,273.12,0.66,20.0,100123.0
 20140312:1000,13.85,47.1,642.0,834.31,130.0,270.28,0.66,29.0,100038.0
@@ -3429,7 +3429,7 @@ time(UTC),T2m,RH,G(h),Gb(n),Gd(h),IR(h),WS10m,WD10m,SP
 20110523:0300,17.81,87.48,0.0,-0.0,0.0,339.85,1.6,342.0,99191.0
 20110523:0400,18.88,86.94,0.0,0.0,0.0,339.75,1.81,346.0,99223.0
 20110523:0500,19.94,86.4,156.0,428.31,67.0,339.65,2.01,350.0,99255.0
-20110523:0600,21.39,79.48,345.0,670.72,90.0,335.33,1.9,1.0,99278.0
+20110523:0600,21.39,79.48,345.0,670.71,90.0,335.33,1.9,1.0,99278.0
 20110523:0700,22.84,72.56,530.0,776.28,108.0,331.02,1.79,12.0,99301.0
 20110523:0800,24.28,65.64,697.0,837.05,122.0,326.7,1.68,23.0,99323.0
 20110523:0900,24.74,63.29,830.0,869.59,134.0,327.22,1.91,32.0,99310.0

pvlib/data/tmy_45.000_8.000_2005_2016.epw

@@ -1072,7 +1072,7 @@ DATA PERIODS,1,1,Data,Thursday, 1/ 1,12/31
 2012,2,14,8,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,-3.67,-8.97,66.69,98766.85,9999,9999,275.20,44.00,70.76,37.00,999999,999999,999999,9999,360,1.2,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2012,2,14,9,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,-2.04,-7.89,64.28,98799.21,9999,9999,276.55,159.00,160.52,118.00,999999,999999,999999,9999,360,1.0,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2012,2,14,10,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,-0.49,-7.78,57.82,98740.97,9999,9999,274.22,236.00,125.11,188.00,999999,999999,999999,9999,6,1.2,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
-2012,2,14,11,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,1.07,-7.86,51.37,98682.72,9999,9999,271.88,278.00,88.44,236.00,999999,999999,999999,9999,13,1.4,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
+2012,2,14,11,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,1.07,-7.86,51.37,98682.72,9999,9999,271.88,278.00,88.45,236.00,999999,999999,999999,9999,13,1.4,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2012,2,14,12,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,2.62,-8.16,44.91,98624.48,9999,9999,269.55,308.00,86.06,263.00,999999,999999,999999,9999,19,1.5,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2012,2,14,13,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,3.48,-8.02,42.70,98582.41,9999,9999,265.02,309.00,87.72,263.00,999999,999999,999999,9999,22,1.7,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2012,2,14,14,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,4.35,-7.93,40.50,98540.35,9999,9999,260.48,286.00,95.98,240.00,999999,999999,999999,9999,24,1.8,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
@@ -1693,7 +1693,7 @@ DATA PERIODS,1,1,Data,Thursday, 1/ 1,12/31
 2014,3,12,5,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,4.47,2.95,89.84,100116.14,9999,9999,284.17,0.00,-0.00,0.00,999999,999999,999999,9999,11,1.6,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2014,3,12,6,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,4.33,3.06,91.44,100148.50,9999,9999,285.00,0.00,-0.00,0.00,999999,999999,999999,9999,9,1.4,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2014,3,12,7,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,6.64,3.82,82.23,100167.91,9999,9999,281.98,19.00,52.18,16.00,999999,999999,999999,9999,9,1.2,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
-2014,3,12,8,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,8.95,4.37,73.01,100187.33,9999,9999,278.97,181.00,395.63,88.00,999999,999999,999999,9999,10,0.9,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
+2014,3,12,8,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,8.95,4.37,73.01,100187.33,9999,9999,278.97,181.00,395.64,88.00,999999,999999,999999,9999,10,0.9,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2014,3,12,9,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,11.25,4.65,63.80,100206.74,9999,9999,275.95,366.00,632.25,117.00,999999,999999,999999,9999,10,0.7,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2014,3,12,10,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,12.55,3.87,55.45,100122.62,9999,9999,273.12,523.00,745.74,133.00,999999,999999,999999,9999,20,0.7,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2014,3,12,11,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,13.85,2.75,47.10,100038.48,9999,9999,270.28,642.00,834.31,130.00,999999,999999,999999,9999,29,0.7,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
@@ -3420,7 +3420,7 @@ DATA PERIODS,1,1,Data,Thursday, 1/ 1,12/31
 2011,5,23,4,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,17.81,15.71,87.48,99190.73,9999,9999,339.85,0.00,-0.00,0.00,999999,999999,999999,9999,342,1.6,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2011,5,23,5,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,18.88,16.66,86.94,99223.08,9999,9999,339.75,0.00,0.00,0.00,999999,999999,999999,9999,346,1.8,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2011,5,23,6,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,19.94,17.60,86.40,99255.44,9999,9999,339.65,156.00,428.31,67.00,999999,999999,999999,9999,350,2.0,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
-2011,5,23,7,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,21.39,17.69,79.48,99278.10,9999,9999,335.33,345.00,670.72,90.00,999999,999999,999999,9999,1,1.9,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
+2011,5,23,7,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,21.39,17.69,79.48,99278.10,9999,9999,335.33,345.00,670.71,90.00,999999,999999,999999,9999,1,1.9,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2011,5,23,8,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,22.84,17.65,72.56,99300.74,9999,9999,331.02,530.00,776.28,108.00,999999,999999,999999,9999,12,1.8,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2011,5,23,9,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,24.28,17.44,65.64,99323.39,9999,9999,326.70,697.00,837.05,122.00,999999,999999,999999,9999,23,1.7,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99
 2011,5,23,10,0,B8B8E8B8?1A1A1A1?0?0?0?0B8B8?0?0?0?0?0?0?0?0,24.74,17.30,63.29,99310.45,9999,9999,327.22,830.00,869.59,134.00,999999,999999,999999,9999,32,1.9,99,99,9999,99999,9,999999999,999,0.999,999,99,999,999,99