Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/sphinx/source/forecasts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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_']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check how the pages render on readthedocs? You should be able to login to readthedocs and set it up so that this branch is built. If you've done that, thanks already.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's no longer necessary for contributors to create their own readthedocs account. Click on the continuous-documentation/read-the-docs check in the merge status box below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've built this branch with readthedocs already and rendering looks good. Didn't realise there is continuous-documentation/read-the-docs below... that's so much easier. Thanks for pointing it out!

temperature_model_parameters = TEMPERATURE_MODEL_PARAMETERS['sapm']['open_rack_glass_glass']

# model a big tracker for more fun
Expand All @@ -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...
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/modelchain.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/source/pvsystem.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ the :py:func:`~pvlib.pvsystem.retrieve_sam` function:
modules = pvsystem.retrieve_sam('cecmod')
module_parameters = modules['Example_Module']
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)


Expand Down
2 changes: 2 additions & 0 deletions docs/sphinx/source/whatsnew/v0.7.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -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`)
1 change: 1 addition & 0 deletions pvlib/data/sam-library-cec-modules-2019-03-05.csv
Original file line number Diff line number Diff line change
Expand Up @@ -4527,6 +4527,7 @@ Eterbright Solar Corp. Cigs-3150E1,Thin Film,0,318.600000,295.100000,2.347000,1.
Eterbright Solar Corp. Cigs-3200A1,Thin Film,0,319.780000,299.900000,2.347000,1.9,1.235,110,6.120000,75.600000,5.420000,59,0.000612,-0.207900,45.500000,2.481587,6.198086,3.298782e-13,1.636608,128.269455,-21.742449,-0.285000,N,SAM 2018.11.11 r2,1/3/2019
Eterbright Solar Corp. Cigs-3200E1,Thin Film,0,320.220000,299.900000,2.347000,1.9,1.235,110,6.040000,75.600000,5.400000,59.300000,0.000604,-0.207900,45.500000,2.476407,6.104666,3.087447e-13,1.587451,148.272751,-22.121744,-0.285000,N,SAM 2018.11.11 r2,1/3/2019
Eterbright Solar Corp. Cigs-3250A1,Thin Film,0,324.964000,304.600000,2.347000,1.9,1.235,110,6.150000,75.700000,5.480000,59.300000,0.000615,-0.208175,45.500000,2.482062,6.219944,3.224702e-13,1.579775,138.905914,-21.943617,-0.285000,N,SAM 2018.11.11 r2,1/3/2019
Example Module,Multi-c-Si,0,72,48.9,0.67,1.58,0.8,18,7.5,10.4,6.6,8.4,0.003,-0.04,65,0.473,7.545,1.94E-09,0.094,15.72,10.6,-0.5,Y,MM105,10/16/2019
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than inserting this line, I would prefer that we change to a module from the current CEC file for this illustration. The Canadian Solar CS5P-220M module is often used in pvlib for testing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I agree. I'll make the update.

Exeltech AM24-1-B-6-0-00,Multi-c-Si,0,240.570000,211.900000,1.700000,1.596,1.065,96,5.280000,59.500000,4.950000,48.600000,0.002144,-0.213486,47.300000,2.587005,5.283658,5.361536e-10,0.673276,971.995300,9.716014,-0.492900,N,SAM 2018.11.11 r2,1/3/2019
Exiom Solution EX-175M,Mono-c-Si,0,175.088000,153.900000,1.277000,1.58,0.808,72,5.200000,44.200000,4.960000,35.300000,0.002211,-0.178525,45.400000,2.013504,5.307976,1.540679e-09,0.643426,987.530273,6.063856,-0.548981,N,SAM 2018.11.11 r2,1/3/2019
Exiom Solution EX-175MB,Mono-c-Si,0,175.088000,155.600000,1.277000,1.58,0.808,72,5.200000,44.200000,4.960000,35.300000,0.005101,-0.229221,47.400000,1.992301,5.308320,1.218901e-09,0.651860,909.974121,-19.620651,-0.460100,N,SAM 2018.11.11 r2,1/3/2019
Expand Down
5 changes: 4 additions & 1 deletion pvlib/pvsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------
Expand Down