diff --git a/docs/sphinx/source/forecasts.rst b/docs/sphinx/source/forecasts.rst index 56e88acf74..2637f8d811 100644 --- a/docs/sphinx/source/forecasts.rst +++ b/docs/sphinx/source/forecasts.rst @@ -447,7 +447,7 @@ for details. sandia_modules = retrieve_sam('sandiamod') cec_inverters = retrieve_sam('cecinverter') module = sandia_modules['Canadian_Solar_CS5P_220M___2009_'] - inverter = cec_inverters['SMA_America__SC630CP_US_315V__CEC_2012_'] + inverter = cec_inverters['SMA_America__SC630CP_US__with_ABB_EcoDry_Ultra_transformer_'] temperature_model_parameters = TEMPERATURE_MODEL_PARAMETERS['sapm']['open_rack_glass_glass'] # model a big tracker for more fun @@ -461,7 +461,7 @@ for details. mc = ModelChain(system, fx_model.location) # extract relevant data for model chain - mc.run_model(fx_data.index, weather=fx_data); + mc.run_model(fx_data); Now we plot a couple of modeling intermediates and the forecast power. Here's the forecast plane of array irradiance... diff --git a/docs/sphinx/source/introexamples.rst b/docs/sphinx/source/introexamples.rst index e1b01d94ca..c574cc346d 100644 --- a/docs/sphinx/source/introexamples.rst +++ b/docs/sphinx/source/introexamples.rst @@ -45,7 +45,7 @@ configuration at a handful of sites listed below. sandia_modules = pvlib.pvsystem.retrieve_sam('SandiaMod') sapm_inverters = pvlib.pvsystem.retrieve_sam('cecinverter') module = sandia_modules['Canadian_Solar_CS5P_220M___2009_'] - inverter = sapm_inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'] + inverter = sapm_inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_'] temperature_model_parameters = pvlib.temperature.TEMPERATURE_MODEL_PARAMETERS['sapm']['open_rack_glass_glass'] # specify constant ambient air temp and wind for simplicity diff --git a/docs/sphinx/source/modelchain.rst b/docs/sphinx/source/modelchain.rst index 4025451cda..b0ef39bf0f 100644 --- a/docs/sphinx/source/modelchain.rst +++ b/docs/sphinx/source/modelchain.rst @@ -53,7 +53,7 @@ objects, module data, and inverter data. cec_inverters = pvlib.pvsystem.retrieve_sam('cecinverter') sandia_module = sandia_modules['Canadian_Solar_CS5P_220M___2009_'] - cec_inverter = cec_inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'] + cec_inverter = cec_inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_'] Now we create a Location object, a PVSystem object, and a ModelChain object. diff --git a/docs/sphinx/source/pvsystem.rst b/docs/sphinx/source/pvsystem.rst index aa10d03767..52b59746e7 100644 --- a/docs/sphinx/source/pvsystem.rst +++ b/docs/sphinx/source/pvsystem.rst @@ -130,9 +130,9 @@ the :py:func:`~pvlib.pvsystem.retrieve_sam` function: # retrieve_sam returns a dict. the dict keys are module names, # and the values are model parameters for that module modules = pvsystem.retrieve_sam('cecmod') - module_parameters = modules['Example_Module'] + module_parameters = modules['Canadian_Solar_Inc__CS5P_220M'] inverters = pvsystem.retrieve_sam('cecinverter') - inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_'] + inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208__208V_'] system = pvsystem.PVSystem(module_parameters=module_parameters, inverter_parameters=inverter_parameters) diff --git a/docs/sphinx/source/whatsnew/v0.7.0.rst b/docs/sphinx/source/whatsnew/v0.7.0.rst index d358c88249..c989894de0 100644 --- a/docs/sphinx/source/whatsnew/v0.7.0.rst +++ b/docs/sphinx/source/whatsnew/v0.7.0.rst @@ -117,6 +117,7 @@ Testing Documentation ~~~~~~~~~~~~~ * Corrected docstring for `pvsystem.PVSystem.sapm` +* Fixed broken ipython examples from CEC data updates Removal of prior version deprecations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -146,3 +147,4 @@ Contributors * Anton Driesse (:ghuser:`adriesse`) * Alexander Morgan (:ghuser:`alexandermorgan`) * Miguel Sánchez de León Peque (:ghuser:`Peque`) +* Veronica Guo (:ghuser:`veronicaguo`) diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py index bebe2f1263..9cdaacd6d9 100644 --- a/pvlib/pvsystem.py +++ b/pvlib/pvsystem.py @@ -1800,7 +1800,10 @@ def retrieve_sam(name=None, path=None): Notes ----- - Files available at https://sam.nrel.gov/sites/default/files/ + Files available at + https://github.com/NREL/SAM/tree/develop/deploy/libraries + Documentation for module and inverter data sets: + https://sam.nrel.gov/photovoltaic/pv-sub-page-2.html Examples --------