Skip to content

Commit f8d75df

Browse files
PequePeque
committed
Update CEC module and inverter names
To match those from the latest database.
1 parent 24245e1 commit f8d75df

File tree

5 files changed

+20
-24
lines changed

5 files changed

+20
-24
lines changed

‎docs/sphinx/source/introexamples.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ configuration at a handful of sites listed below.
4545
sandia_modules = pvlib.pvsystem.retrieve_sam('SandiaMod')
4646
sapm_inverters = pvlib.pvsystem.retrieve_sam('cecinverter')
4747
module = sandia_modules['Canadian_Solar_CS5P_220M___2009_']
48-
inverter = sapm_inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
48+
inverter = sapm_inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_']
4949
5050
# specify constant ambient air temp and wind for simplicity
5151
temp_air = 20

‎docs/sphinx/source/modelchain.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ objects, module data, and inverter data.
5151
cec_inverters = pvlib.pvsystem.retrieve_sam('cecinverter')
5252
5353
sandia_module = sandia_modules['Canadian_Solar_CS5P_220M___2009_']
54-
cec_inverter = cec_inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
54+
cec_inverter = cec_inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_']
5555
5656
Now we create a Location object, a PVSystem object, and a ModelChain
5757
object.

‎docs/sphinx/source/pvsystem.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ the :py:func:`~pvlib.pvsystem.retrieve_sam` function:
132132
modules = pvsystem.retrieve_sam('cecmod')
133133
module_parameters = modules['Example_Module']
134134
inverters = pvsystem.retrieve_sam('cecinverter')
135-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
135+
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_']
136136
system = pvsystem.PVSystem(module_parameters=module_parameters, inverter_parameters=inverter_parameters)
137137
138138
@@ -176,4 +176,4 @@ The :py:class:`~pvlib.tracking.SingleAxisTracker` is a subclass of
176176
includes a few more keyword arguments and attributes that are specific
177177
to trackers, plus the
178178
:py:meth:`~pvlib.tracking.SingleAxisTracker.singleaxis` method. It also
179-
overrides the `get_aoi` and `get_irradiance` methods.
179+
overrides the `get_aoi` and `get_irradiance` methods.

‎pvlib/test/test_modelchain.py

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def system(sam_data):
2323
module = 'Canadian_Solar_CS5P_220M___2009_'
2424
module_parameters = modules[module].copy()
2525
inverters = sam_data['cecinverter']
26-
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'].copy()
26+
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_'].copy()
2727
system = PVSystem(surface_tilt=32.2, surface_azimuth=180,
2828
module=module,
2929
module_parameters=module_parameters,
@@ -34,13 +34,13 @@ def system(sam_data):
3434
@pytest.fixture
3535
def cec_dc_snl_ac_system(sam_data):
3636
modules = sam_data['cecmod']
37-
module = 'Canadian_Solar_CS5P_220M'
37+
module = 'Canadian_Solar_Inc__CS5P_220M'
3838
module_parameters = modules[module].copy()
3939
module_parameters['b'] = 0.05
4040
module_parameters['EgRef'] = 1.121
4141
module_parameters['dEgdT'] = -0.0002677
4242
inverters = sam_data['cecinverter']
43-
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'].copy()
43+
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_'].copy()
4444
system = PVSystem(surface_tilt=32.2, surface_azimuth=180,
4545
module=module,
4646
module_parameters=module_parameters,
@@ -50,10 +50,10 @@ def cec_dc_snl_ac_system(sam_data):
5050

5151
@pytest.fixture
5252
def cec_dc_native_snl_ac_system(sam_data):
53-
module = 'Canadian_Solar_CS5P_220M'
53+
module = 'Canadian_Solar_Inc__CS5P_220M'
5454
module_parameters = sam_data['cecmod'][module].copy()
5555
inverters = sam_data['cecinverter']
56-
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'].copy()
56+
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_'].copy()
5757
system = PVSystem(surface_tilt=32.2, surface_azimuth=180,
5858
module=module,
5959
module_parameters=module_parameters,
@@ -67,7 +67,7 @@ def pvsyst_dc_snl_ac_system(sam_data, pvsyst_module_params):
6767
module_parameters = pvsyst_module_params
6868
module_parameters['b'] = 0.05
6969
inverters = sam_data['cecinverter']
70-
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'].copy()
70+
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_'].copy()
7171
system = PVSystem(surface_tilt=32.2, surface_azimuth=180,
7272
module=module,
7373
module_parameters=module_parameters,
@@ -78,7 +78,7 @@ def pvsyst_dc_snl_ac_system(sam_data, pvsyst_module_params):
7878
@pytest.fixture
7979
def cec_dc_adr_ac_system(sam_data):
8080
modules = sam_data['cecmod']
81-
module = 'Canadian_Solar_CS5P_220M'
81+
module = 'Canadian_Solar_Inc__CS5P_220M'
8282
module_parameters = modules[module].copy()
8383
module_parameters['b'] = 0.05
8484
module_parameters['EgRef'] = 1.121
@@ -96,7 +96,7 @@ def cec_dc_adr_ac_system(sam_data):
9696
def pvwatts_dc_snl_ac_system(sam_data):
9797
module_parameters = {'pdc0': 220, 'gamma_pdc': -0.003}
9898
inverters = sam_data['cecinverter']
99-
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'].copy()
99+
inverter = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_'].copy()
100100
system = PVSystem(surface_tilt=32.2, surface_azimuth=180,
101101
module_parameters=module_parameters,
102102
inverter_parameters=inverter)
@@ -513,8 +513,7 @@ def test_basic_chain_required(sam_data):
513513
modules = sam_data['sandiamod']
514514
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
515515
inverters = sam_data['cecinverter']
516-
inverter_parameters = inverters[
517-
'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
516+
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_']
518517
with pytest.raises(ValueError):
519518
dc, ac = modelchain.basic_chain(times, latitude, longitude,
520519
module_parameters, inverter_parameters,
@@ -532,8 +531,7 @@ def test_basic_chain_alt_az(sam_data):
532531
modules = sam_data['sandiamod']
533532
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
534533
inverters = sam_data['cecinverter']
535-
inverter_parameters = inverters[
536-
'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
534+
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_']
537535

538536
dc, ac = modelchain.basic_chain(times, latitude, longitude,
539537
module_parameters, inverter_parameters,
@@ -555,8 +553,7 @@ def test_basic_chain_strategy(sam_data):
555553
modules = sam_data['sandiamod']
556554
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
557555
inverters = sam_data['cecinverter']
558-
inverter_parameters = inverters[
559-
'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
556+
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_']
560557

561558
dc, ac = modelchain.basic_chain(
562559
times, latitude, longitude, module_parameters, inverter_parameters,
@@ -579,8 +576,7 @@ def test_basic_chain_altitude_pressure(sam_data):
579576
modules = sam_data['sandiamod']
580577
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
581578
inverters = sam_data['cecinverter']
582-
inverter_parameters = inverters[
583-
'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
579+
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_']
584580

585581
dc, ac = modelchain.basic_chain(times, latitude, longitude,
586582
module_parameters, inverter_parameters,

‎pvlib/test/test_pvsystem.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ def test_adrinverter_invalid_and_night(sam_data):
12681268

12691269
def test_snlinverter(sam_data):
12701270
inverters = sam_data['cecinverter']
1271-
testinv = 'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'
1271+
testinv = 'ABB__MICRO_0_25_I_OUTD_US_208__208V_'
12721272
vdcs = pd.Series(np.linspace(0,50,3))
12731273
idcs = pd.Series(np.linspace(0,11,3))
12741274
pdcs = idcs * vdcs
@@ -1279,7 +1279,7 @@ def test_snlinverter(sam_data):
12791279

12801280
def test_PVSystem_snlinverter(sam_data):
12811281
inverters = sam_data['cecinverter']
1282-
testinv = 'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'
1282+
testinv = 'ABB__MICRO_0_25_I_OUTD_US_208__208V_'
12831283
system = pvsystem.PVSystem(inverter=testinv,
12841284
inverter_parameters=inverters[testinv])
12851285
vdcs = pd.Series(np.linspace(0,50,3))
@@ -1292,7 +1292,7 @@ def test_PVSystem_snlinverter(sam_data):
12921292

12931293
def test_snlinverter_float(sam_data):
12941294
inverters = sam_data['cecinverter']
1295-
testinv = 'ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'
1295+
testinv = 'ABB__MICRO_0_25_I_OUTD_US_208__208V_'
12961296
vdcs = 25.
12971297
idcs = 5.5
12981298
pdcs = idcs * vdcs
@@ -1303,7 +1303,7 @@ def test_snlinverter_float(sam_data):
13031303

13041304
def test_snlinverter_Pnt_micro(sam_data):
13051305
inverters = sam_data['cecinverter']
1306-
testinv = 'Enphase_Energy__M250_60_2LL_S2x___ZC____NA__208V_208V__CEC_2013_'
1306+
testinv = 'Enphase_Energy_Inc___M250_60_2LL_S2x___ZC____NA___208V_'
13071307
vdcs = pd.Series(np.linspace(0,50,3))
13081308
idcs = pd.Series(np.linspace(0,11,3))
13091309
pdcs = idcs * vdcs

0 commit comments

Comments
 (0)