Skip to content

Commit d8b9968

Browse files
committed
trying to track down model differences
1 parent d030bb2 commit d8b9968

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

docs/sphinx/source/package_overview.rst

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ to accomplish our system modeling goal:
7474
dni_extra = pvlib.irradiance.extraradiation(times)
7575
dni_extra = pd.Series(dni_extra, index=times)
7676
airmass = pvlib.atmosphere.relativeairmass(solpos['apparent_zenith'])
77+
pressure = pvlib.atmosphere.alt2pres(altitude)
78+
am_abs = pvlib.atmosphere.absoluteairmass(airmass, pressure)
7779
aoi = pvlib.irradiance.aoi(system['surface_tilt'], system['surface_azimuth'],
7880
solpos['apparent_zenith'], solpos['azimuth'])
7981
total_irrad = pvlib.irradiance.total_irrad(system['surface_tilt'],
@@ -86,7 +88,7 @@ to accomplish our system modeling goal:
8688
temps = pvlib.pvsystem.sapm_celltemp(total_irrad['poa_global'], 0, 20)
8789
dc = pvlib.pvsystem.sapm(module, total_irrad['poa_direct'],
8890
total_irrad['poa_diffuse'], temps['temp_cell'],
89-
airmass, aoi)
91+
am_abs, aoi)
9092
ac = pvlib.pvsystem.snlinverter(inverter, dc['v_mp'], dc['p_mp'])
9193
annual_energy = ac.sum()
9294
energies[name] = annual_energy
@@ -105,11 +107,11 @@ Object oriented (Location, PVSystem, ModelChain)
105107
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
106108

107109
The first object oriented paradigm uses a model where
108-
a :class:`PVSystem <pvlib.pvsystem.PVSystem>` object represents an
110+
a :py:class:`~pvlib.pvsystem.PVSystem` object represents an
109111
assembled collection of modules, inverters, etc.,
110-
a :class:`Location <pvlib.location.Location>` object represents a
112+
a :py:class:`~pvlib.location.Location` object represents a
111113
particular place on the planet,
112-
and a :class:`ModelChain <pvlib.modelchain.ModelChain>` object describes
114+
and a :py:class:`~pvlib.modelchain.ModelChain` object describes
113115
the modeling chain used to calculate PV output at that Location.
114116
This can be a useful paradigm if you prefer to think about
115117
the PV system and its location as separate concepts or if
@@ -156,20 +158,20 @@ Object oriented (LocalizedPVSystem)
156158
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
157159

158160
The second object oriented paradigm uses a model where a
159-
:class:`LocalizedPVSystem <pvlib.pvsystem.LocalizedPVSystem>` represents a
161+
:py:class:`~pvlib.pvsystem.LocalizedPVSystem` represents a
160162
PV system at a particular place on the planet.
161163
This can be a useful paradigm if you're thinking about
162164
a power plant that already exists.
163165

164166
The following code demonstrates how to use a
165-
:class:`LocalizedPVSystem <pvlib.pvsystem.LocalizedPVSystem>`
167+
:py:class:`~pvlib.pvsystem.LocalizedPVSystem`
166168
object to accomplish our modeling goal:
167169

168170
.. ipython:: python
169171
170172
from pvlib.pvsystem import PVSystem, LocalizedPVSystem
171173
172-
other_system_params = {} # sometime helpful to break apart
174+
other_system_params = {} # sometimes helpful to break apart
173175
base_system = PVSystem(module_parameters=module,
174176
inverter_parameters=inverter,
175177
**other_system_params)

pvlib/pvsystem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def get_aoi(self, solar_zenith, solar_azimuth):
150150

151151

152152
def get_irradiance(self, solar_zenith, solar_azimuth, dni, ghi, dhi,
153-
dni_extra=None, airmass=None, model='isotropic',
153+
dni_extra=None, airmass=None, model='haydavies',
154154
**kwargs):
155155
"""
156156
Uses the :func:`irradiance.total_irrad` function to calculate

0 commit comments

Comments
 (0)