From 0695f861d4c272820374b008b50ffe07be60ee25 Mon Sep 17 00:00:00 2001 From: Veronica Guo Date: Tue, 8 Oct 2019 09:35:10 -0400 Subject: [PATCH 1/7] Fix inverter names in documentation - to match new cec updates --- docs/sphinx/source/forecasts.rst | 2 +- docs/sphinx/source/modelchain.rst | 2 +- docs/sphinx/source/pvsystem.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/sphinx/source/forecasts.rst b/docs/sphinx/source/forecasts.rst index 56e88acf74..2d0e89e145 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 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..c5c3d8d4e4 100644 --- a/docs/sphinx/source/pvsystem.rst +++ b/docs/sphinx/source/pvsystem.rst @@ -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) From 7b6516d60e486b36ac3e5bf08a8a98b4f916e1fa Mon Sep 17 00:00:00 2001 From: Veronica Guo Date: Wed, 16 Oct 2019 22:54:49 -0400 Subject: [PATCH 2/7] Add an example module in cec data file. --- pvlib/data/sam-library-cec-modules-2019-03-05.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/pvlib/data/sam-library-cec-modules-2019-03-05.csv b/pvlib/data/sam-library-cec-modules-2019-03-05.csv index 0366e9286e..4370c27929 100644 --- a/pvlib/data/sam-library-cec-modules-2019-03-05.csv +++ b/pvlib/data/sam-library-cec-modules-2019-03-05.csv @@ -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 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 From 364bf54dd4f24e378a580cb3f38ac0ecd45638dd Mon Sep 17 00:00:00 2001 From: Veronica Guo Date: Wed, 16 Oct 2019 23:46:29 -0400 Subject: [PATCH 3/7] Fix `run_model()` inputs in doc --- docs/sphinx/source/forecasts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/forecasts.rst b/docs/sphinx/source/forecasts.rst index 2d0e89e145..2637f8d811 100644 --- a/docs/sphinx/source/forecasts.rst +++ b/docs/sphinx/source/forecasts.rst @@ -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... From b2a0c42143be688206d229d775eba2d114ce2405 Mon Sep 17 00:00:00 2001 From: Veronica Guo Date: Thu, 17 Oct 2019 00:03:22 -0400 Subject: [PATCH 4/7] Fix old NREL data link --- pvlib/pvsystem.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py index bebe2f1263..23ed14caec 100644 --- a/pvlib/pvsystem.py +++ b/pvlib/pvsystem.py @@ -1800,7 +1800,9 @@ 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 -------- From 749aaea709f9595a4142b2ed6b5de93a8d34ef00 Mon Sep 17 00:00:00 2001 From: Veronica Guo Date: Thu, 17 Oct 2019 00:19:33 -0400 Subject: [PATCH 5/7] Update whatsnew --- docs/sphinx/source/whatsnew/v0.7.0.rst | 2 ++ 1 file changed, 2 insertions(+) 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`) From c55fa1ca6e526e23c03fb1313d5f292e5be5df71 Mon Sep 17 00:00:00 2001 From: Veronica Guo Date: Thu, 17 Oct 2019 00:22:37 -0400 Subject: [PATCH 6/7] Fix lint error --- pvlib/pvsystem.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py index 23ed14caec..9cdaacd6d9 100644 --- a/pvlib/pvsystem.py +++ b/pvlib/pvsystem.py @@ -1800,7 +1800,8 @@ def retrieve_sam(name=None, path=None): Notes ----- - Files available at https://github.com/NREL/SAM/tree/develop/deploy/libraries + 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 From 7ce6d915e68925dae5d3b350064fa6d297f942c8 Mon Sep 17 00:00:00 2001 From: Veronica Guo Date: Thu, 17 Oct 2019 17:07:10 -0400 Subject: [PATCH 7/7] Use Canadian Solar CS5P-220M in examples --- docs/sphinx/source/introexamples.rst | 2 +- docs/sphinx/source/pvsystem.rst | 2 +- pvlib/data/sam-library-cec-modules-2019-03-05.csv | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) 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/pvsystem.rst b/docs/sphinx/source/pvsystem.rst index c5c3d8d4e4..52b59746e7 100644 --- a/docs/sphinx/source/pvsystem.rst +++ b/docs/sphinx/source/pvsystem.rst @@ -130,7 +130,7 @@ 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_'] system = pvsystem.PVSystem(module_parameters=module_parameters, inverter_parameters=inverter_parameters) diff --git a/pvlib/data/sam-library-cec-modules-2019-03-05.csv b/pvlib/data/sam-library-cec-modules-2019-03-05.csv index 4370c27929..0366e9286e 100644 --- a/pvlib/data/sam-library-cec-modules-2019-03-05.csv +++ b/pvlib/data/sam-library-cec-modules-2019-03-05.csv @@ -4527,7 +4527,6 @@ 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 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