Added labels for cecinverter [Issue 75]

Author: jforbess

docs/sphinx/source/whatsnew/v0.2.1.txt

@@ -7,6 +7,12 @@ This is a minor release from 0.2. It includes a large number of bug fixes
 for the IPython notebook tutorials.
 We recommend that all users upgrade to this version.
 
+Enhancements
+~~~~~~~~~~~~
+
+* Update component info from SAM (csvs dated 2015-6-30) (:issue:`75`)
+
+
 Bug fixes
 ~~~~~~~~~
 
@@ -16,4 +22,5 @@ Bug fixes
 Contributors
 ~~~~~~~~~~~~
 
-* Will Holmgren
+* Will Holmgren
+* Jessica Forbess

pvlib/pvsystem.py

@@ -537,7 +537,7 @@ def retrieve_sam(name=None, samfile=None):
             url = 'https://sam.nrel.gov/sites/sam.nrel.gov/files/sam-library-cec-modules-2015-6-30.csv'
         elif name == 'sandiamod':
             url = 'https://sam.nrel.gov/sites/sam.nrel.gov/files/sam-library-sandia-modules-2015-6-30.csv'
-        elif name == 'sandiainverter': # Still only one current inverter set, so left it as sandia, to avoid breaking old code
+        elif name in ['cecinverter', 'sandiainverter']: # Allowing either, to provide for old code, while aligning with current expectations
             url = 'https://sam.nrel.gov/sites/sam.nrel.gov/files/sam-library-cec-inverters-2015-6-30.csv'
         elif samfile is None:
             raise ValueError('invalid name {}'.format(name))
@@ -562,6 +562,13 @@ def retrieve_sam(name=None, samfile=None):
 
 def _parse_raw_sam_df(csvdata):
     df = pd.read_csv(csvdata, index_col=0, skiprows=[1,2])
+    colnames = df.columns.values.tolist()
+    parsedcolnames = []
+    for cn in colnames:
+        parsedcolnames.append(cn.replace(' ', '_'))
+
+    df.columns = parsedcolnames        
+
     parsedindex = []
     for index in df.index:
         parsedindex.append(index.replace(' ', '_').replace('-', '_')
@@ -646,7 +653,7 @@ def sapm(module, poa_direct, poa_diffuse, temp_cell, airmass_absolute, aoi):
     Mbvmp      Coefficient providing the irradiance dependence for the
                BetaVmp temperature coefficient at reference irradiance (V/C)
     N          Empirically determined "diode factor" (dimensionless)
-    Cells in Series    Number of cells in series in a module's cell string(s)
+    Cells_in_Series    Number of cells in series in a module's cell string(s)
     IXO        Ix at reference conditions
     IXXO       Ixx at reference conditions
     FD         Fraction of diffuse irradiance used by module
@@ -695,12 +702,12 @@ def sapm(module, poa_direct, poa_diffuse, temp_cell, airmass_absolute, aoi):
         (1 + module['Aimp']*(temp_cell - T0)) )
 
     dfout['v_oc'] = (( module['Voco'] +
-        module['Cells in Series']*delta*np.log(Ee) + Bvoco*(temp_cell - T0) )
+        module['Cells_in_Series']*delta*np.log(Ee) + Bvoco*(temp_cell - T0) )
         .clip_lower(0))
 
     dfout['v_mp'] = ( module['Vmpo'] +
-        module['C2']*module['Cells in Series']*delta*np.log(Ee) +
-        module['C3']*module['Cells in Series']*((delta*np.log(Ee)) ** 2) +
+        module['C2']*module['Cells_in_Series']*delta*np.log(Ee) +
+        module['C3']*module['Cells_in_Series']*((delta*np.log(Ee)) ** 2) +
         Bvmpo*(temp_cell - T0) ).clip_lower(0)
 
     dfout['p_mp'] = dfout['i_mp'] * dfout['v_mp']

pvlib/test/test_pvsystem.py

@@ -99,7 +99,7 @@ def test_physicaliam():
 def test_retrieve_sam_network():
     sam_data['cecmod'] = pvsystem.retrieve_sam('cecmod')
     sam_data['sandiamod'] = pvsystem.retrieve_sam('sandiamod')
-    sam_data['sandiainverter'] = pvsystem.retrieve_sam('sandiainverter')
+    sam_data['cecinverter'] = pvsystem.retrieve_sam('cecinverter')
 
 
 def test_sapm():
@@ -180,7 +180,7 @@ def test_sapm_celltemp_with_index():
 
 
 def test_snlinverter():
-    inverters = sam_data['sandiainverter']
+    inverters = sam_data['cecinverter']
     testinv = 'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'
     vdcs = pd.Series(np.linspace(0,50,3))
     idcs = pd.Series(np.linspace(0,11,3))
@@ -191,7 +191,7 @@ def test_snlinverter():
 
 
 def test_snlinverter_float():
-    inverters = sam_data['sandiainverter']
+    inverters = sam_data['cecinverter']
     testinv = 'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'
     vdcs = 25.
     idcs = 5.5