Skip to content

Commit c654dba

Browse files
committed
Fix doctests for run_model_from_poa and run_model_from_effective_irradiance
1 parent 4984391 commit c654dba

File tree

1 file changed

+19
-23
lines changed

1 file changed

+19
-23
lines changed

pvlib/modelchain.py

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,26 +1723,25 @@ def run_model_from_poa(self, data):
17231723
>>> from pvlib.modelchain import ModelChain
17241724
>>> location = Location(35, -110)
17251725
>>> mount = FixedMount(surface_tilt=30, surface_azimuth=180)
1726-
>>> array = Array(mount=mount, module_parameters={'pdc0': 300, 'gamma_pdc': -0.004},temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1726+
>>> array = Array(mount=mount,module_parameters={'pdc0': 300, 'gamma_pdc': -0.004},temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
17271727
>>> system = PVSystem(arrays=[array],inverter_parameters={'pdc0': 300})
1728-
>>> mc = ModelChain(system, location,dc_model="pvwatts",ac_model="pvwatts", aoi_model="no_loss", spectral_model="no_loss", temperature_model="faiman")
1728+
>>> mc = ModelChain(system, location,dc_model="pvwatts",ac_model="pvwatts",aoi_model="no_loss",spectral_model="no_loss",temperature_model="faiman")
17291729
>>> poa = pd.DataFrame({
17301730
... 'poa_global': [900, 850],
17311731
... 'poa_direct': [600, 560],
17321732
... 'poa_diffuse': [300, 290],
17331733
... },
17341734
... index=pd.date_range("2021-06-01", periods=2, freq="h"))
1735-
>>>
1736-
>>> _ = mc.run_model_from_poa(poa)
1735+
>>> mc.run_model_from_poa(poa) # doctest: +ELLIPSIS
1736+
ModelChain: ...
17371737
17381738
Multi-array system:
1739-
17401739
>>> mount1 = FixedMount(surface_tilt=30, surface_azimuth=180)
17411740
>>> mount2 = FixedMount(surface_tilt=10, surface_azimuth=90)
1742-
>>> array1 = Array(mount=mount1, module_parameters={'pdc0': 300, 'gamma_pdc': -0.004}, temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1743-
>>> array2 = Array(mount=mount2, module_parameters={'pdc0': 300, 'gamma_pdc': -0.004}, temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1744-
>>> system = PVSystem(arrays=[array1, array2],inverter_parameters={'pdc0': 300})
1745-
>>> mc = ModelChain(system, location,dc_model="pvwatts",ac_model="pvwatts", aoi_model="no_loss", spectral_model="no_loss", temperature_model="faiman")
1741+
>>> array1 = Array(mount=mount1,module_parameters={'pdc0': 300, 'gamma_pdc': -0.004},temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1742+
>>> array2 = Array(mount=mount2,module_parameters={'pdc0': 200, 'gamma_pdc': -0.004},temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1743+
>>> system = PVSystem(arrays=[array1, array2],inverter_parameters={'pdc0': 500})
1744+
>>> mc = ModelChain(system, location,dc_model="pvwatts",ac_model="pvwatts",aoi_model="no_loss",spectral_model="no_loss",temperature_model="faiman")
17461745
>>> poa1 = pd.DataFrame({
17471746
... 'poa_global': [900, 880],
17481747
... 'poa_direct': [600, 580],
@@ -1755,8 +1754,8 @@ def run_model_from_poa(self, data):
17551754
... 'poa_diffuse': [300, 300],
17561755
... },
17571756
... index=poa1.index)
1758-
>>> _ = mc.run_model_from_poa([poa1, poa2])
1759-
1757+
>>> mc.run_model_from_poa([poa1, poa2]) # doctest: +ELLIPSIS
1758+
ModelChain: ...
17601759
Notes
17611760
-----
17621761
Assigns attributes to results: ``times``, ``weather``,
@@ -1844,34 +1843,31 @@ def run_model_from_effective_irradiance(self, data):
18441843
Examples
18451844
--------
18461845
Single-array system:
1847-
18481846
>>> import pandas as pd
18491847
>>> from pvlib.pvsystem import PVSystem, Array, FixedMount
18501848
>>> from pvlib.location import Location
18511849
>>> from pvlib.modelchain import ModelChain
18521850
>>> location = Location(35, -110)
18531851
>>> mount = FixedMount(surface_tilt=30, surface_azimuth=180)
1854-
>>> array = Array(mount=mount,module_parameters={'pdc0': 300, 'gamma_pdc': -0.004}, temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1852+
>>> array = Array(mount=mount, module_parameters={'pdc0': 300, 'gamma_pdc': -0.004},temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
18551853
>>> system = PVSystem(arrays=[array],inverter_parameters={'pdc0': 300})
1856-
>>> mc = ModelChain(system, location,dc_model="pvwatts",ac_model="pvwatts", aoi_model="no_loss", spectral_model="no_loss", temperature_model="faiman")
1857-
>>>
1854+
>>> mc = ModelChain(system, location,dc_model="pvwatts",ac_model="pvwatts",aoi_model="no_loss",spectral_model="no_loss",temperature_model="faiman")
18581855
>>> eff = pd.DataFrame({
18591856
... 'effective_irradiance': [900, 920],
18601857
... 'temp_air': [25, 24],
18611858
... 'wind_speed': [2.0, 1.5],
18621859
... },
18631860
... index=pd.date_range("2021-06-01", periods=2, freq="h"))
1864-
>>>
1865-
>>> _ = mc.run_model_from_effective_irradiance(eff)
1861+
>>> mc.run_model_from_effective_irradiance(eff) # doctest: +ELLIPSIS
1862+
ModelChain: ...
18661863
18671864
Multi-array system:
1868-
18691865
>>> mount1 = FixedMount(surface_tilt=30, surface_azimuth=180)
18701866
>>> mount2 = FixedMount(surface_tilt=10, surface_azimuth=90)
1871-
>>> array1 = Array(mount=mount1, module_parameters={'pdc0': 300, 'gamma_pdc': -0.004}, temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1872-
>>> array2 = Array(mount=mount2, module_parameters={'pdc0': 300, 'gamma_pdc': -0.004}, temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1867+
>>> array1 = Array(tilt=30, azimuth=180,module_parameters={'pdc0': 300, 'gamma_pdc': -0.004},temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
1868+
>>> array2 = Array(tilt=10, azimuth=90,module_parameters={'pdc0': 300, 'gamma_pdc': -0.004},temperature_model_parameters={'u0': 25.0, 'u1': 6.84})
18731869
>>> system = PVSystem(arrays=[array1, array2],inverter_parameters={'pdc0': 300})
1874-
>>> mc = ModelChain(system, location,dc_model="pvwatts",ac_model="pvwatts", aoi_model="no_loss", spectral_model="no_loss",temperature_model="faiman")
1870+
>>> mc = ModelChain(system, location,dc_model="pvwatts",ac_model="pvwatts",aoi_model="no_loss",spectral_model="no_loss",temperature_model="faiman")
18751871
>>> eff1 = pd.DataFrame({
18761872
... 'effective_irradiance': [900, 920],
18771873
... 'temp_air': [25, 24],
@@ -1884,8 +1880,8 @@ def run_model_from_effective_irradiance(self, data):
18841880
... 'wind_speed': [1.8, 1.2],
18851881
... },
18861882
... index=eff1.index)
1887-
>>> _ = mc.run_model_from_effective_irradiance([eff1, eff2])
1888-
1883+
>>> mc.run_model_from_effective_irradiance([eff1, eff2]) # doctest: +ELLIPSIS
1884+
ModelChain: ...
18891885
18901886
Notes
18911887
-----

0 commit comments

Comments
 (0)