Update MIDC variable mapping (#2006)

* Update midc VARIABLE_MAP

* Add subscripts to dni mapping

* Update v0.10.5.rst

* Update midc.py

* Fix whatsnew entries

* Implement review changes

Author: AdamRJensen

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

@@ -9,6 +9,8 @@ Breaking changes
 ~~~~~~~~~~~~~~~~
 * The deprecated ``pvlib.modelchain.basic_chain`` has now been removed. (:pull:`1862`)
 * Remove the `poa_horizontal_ratio` function and all of its references. (:issue:`1697`, :pull:`2021`)
+* Updated `~pvlib.iotools.MIDC_VARIABLE_MAP`~ to reflect
+  changes in instrumentation. (:pull:`2006`)
 * ``pvlib.iotools.read_srml_month_from_solardat`` was deprecated in v0.10.0 and has
   now been completely removed. The function is replaced by :py:func:`~pvlib.iotools.get_srml()`.
   (:pull:`1779`, :pull:`1989`)

pvlib/iotools/midc.py

@@ -20,15 +20,21 @@
 MIDC_VARIABLE_MAP = {
     'BMS': {
         'Global CMP22 (vent/cor) [W/m^2]': 'ghi',
-        'Direct NIP [W/m^2]': 'dni',
+        'Direct CHP1-1 [W/m^2]': 'dni_chp1',
+        # NIP was mapped to dni for pvlib<=0.10.5
+        'Direct NIP [W/m^2]': 'dni_nip',
         'Diffuse CM22-1 (vent/cor) [W/m^2]': 'dhi',
         'Avg Wind Speed @ 6ft [m/s]': 'wind_speed',
         'Tower Dry Bulb Temp [deg C]': 'temp_air',
         'Tower RH [%]': 'relative_humidity'},
     'UOSMRL': {
         'Global CMP22 [W/m^2]': 'ghi',
-        'Direct NIP [W/m^2]': 'dni',
-        'Diffuse Schenk [W/m^2]': 'dhi',
+        'Direct CHP1 [W/m^2]': 'dni_chp1',
+        'Diffuse [W/m^2]': 'dhi',
+        # NIP was mapped to dni for pvlib<=0.10.5
+        'Direct NIP [W/m^2]': 'dni_nip',
+        # Schenk was mapped to dhi for pvlib<=0.10.5
+        # 'Diffuse Schenk [W/m^2]': 'dhi',
         'Air Temperature [deg C]': 'temp_air',
         'Relative Humidity [%]': 'relative_humidity',
         'Avg Wind Speed @ 10m [m/s]': 'wind_speed'},
@@ -80,18 +86,17 @@
         'Air Temperature [deg C]': 'temp_air',
         'Rel Humidity [%]': 'relative_humidity',
         'Avg Wind Speed @ 3m [m/s]': 'wind_speed'},
-    'VTIF': {
+    'NWTC': {
         'Global Horizontal [W/m^2]': 'ghi',
         'Direct Normal [W/m^2]': 'dni',
         'Diffuse Horizontal [W/m^2]': 'dhi',
-        'Air Temperature [deg C]': 'temp_air',
-        'Avg Wind Speed @ 3m [m/s]': 'wind_speed',
-        'Rel Humidity [%]': 'relative_humidity'},
-    'NWTC': {
-        'Global PSP [W/m^2]': 'ghi',
+        # PSP instrument was removed Feb. 2021
+        # PSP was mapped to ghi for pvlib<=0.10.5
+        # 'Global PSP [W/m^2]': 'ghi',
         'Temperature @ 2m [deg C]': 'temp_air',
         'Avg Wind Speed @ 2m [m/s]': 'wind_speed',
-        'Relative Humidity [%]': 'relative_humidity'}}
+        'Relative Humidity [%]': 'relative_humidity'},
+}
 
 
 # Maps problematic timezones to 'Etc/GMT' for parsing.