@@ -38,26 +38,33 @@ def get_solarposition(time, latitude, longitude,
3838 Parameters
3939 ----------
4040 time : pandas.DatetimeIndex
41+
4142 latitude : float
43+
4244 longitude : float
45+
4346 altitude : None or float
4447 If None, computed from pressure. Assumed to be 0 m
4548 if pressure is also None.
49+
4650 pressure : None or float
4751 If None, computed from altitude. Assumed to be 101325 Pa
4852 if altitude is also None.
49- method : string
50- 'pyephem' uses the PyEphem package: :func:`pyephem`
51-
52- 'nrel_c' uses the NREL SPA C code [3]: :func:`spa_c`
5353
54+ method : string
5455 'nrel_numpy' uses an implementation of the NREL SPA algorithm
55- described in [1] (default): :func:`spa_python`
56+ described in [1] (default, recommended ): :py :func:`spa_python`
5657
5758 'nrel_numba' uses an implementation of the NREL SPA algorithm
58- described in [1], but also compiles the code first: :func:`spa_python`
59+ described in [1], but also compiles the code first:
60+ :py:func:`spa_python`
61+
62+ 'pyephem' uses the PyEphem package: :py:func:`pyephem`
63+
64+ 'ephemeris' uses the pvlib ephemeris code: :py:func:`ephemeris`
65+
66+ 'nrel_c' uses the NREL SPA C code [3]: :py:func:`spa_c`
5967
60- 'ephemeris' uses the pvlib ephemeris code: :func:`ephemeris`
6168 temperature : float
6269 Degrees C.
6370
@@ -114,13 +121,15 @@ def spa_c(time, latitude, longitude, pressure=101325, altitude=0,
114121 raw_spa_output = False ):
115122 """
116123 Calculate the solar position using the C implementation of the NREL
117- SPA code
124+ SPA code.
118125
119126 The source files for this code are located in './spa_c_files/', along with
120127 a README file which describes how the C code is wrapped in Python.
121128 Due to license restrictions, the C code must be downloaded seperately
122129 and used in accordance with it's license.
123130
131+ This function is slower and no more accurate than :py:func:`spa_python`.
132+
124133 Parameters
125134 ----------
126135 time : pandas.DatetimeIndex
@@ -266,7 +275,7 @@ def spa_python(time, latitude, longitude,
266275 For most simulations specifing delta_t is sufficient.
267276 Difference between terrestrial time and UT1.
268277 *Note: delta_t = None will break code using nrel_numba,
269- this will be fixed in a future version.
278+ this will be fixed in a future version.*
270279 The USNO has historical and forecasted delta_t [3].
271280 atmos_refrac : float, optional
272281 The approximate atmospheric refraction (in degrees)
@@ -807,7 +816,7 @@ def nrel_earthsun_distance(time, how='numpy', delta_t=67.0, numthreads=4):
807816 For most simulations specifing delta_t is sufficient.
808817 Difference between terrestrial time and UT1.
809818 *Note: delta_t = None will break code using nrel_numba,
810- this will be fixed in a future version.
819+ this will be fixed in a future version.*
811820 By default, use USNO historical data and predictions
812821
813822 numthreads : int, optional
0 commit comments