From bbfe282ea367372507cd72cf79a7d5844e5f1659 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 09:15:07 -0600 Subject: [PATCH 01/19] link to pvlib.solarposition.nrel_earthsun_distance --- pvlib/irradiance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 846560df84..36f3126281 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -53,7 +53,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, methods. kwargs : - Passed to solarposition.nrel_earthsun_distance + Passed to :py:func:`~pvlib.solarposition.nrel_earthsun_distance` Returns ------- From bead0e3cdda606f7888732cafad97e6ff652fc99 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 09:16:08 -0600 Subject: [PATCH 02/19] add solar constant units --- pvlib/irradiance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 36f3126281..04671bb324 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -41,7 +41,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, Day of year, array of days of year, or datetime-like object solar_constant : float, default 1366.1 - The solar constant. + The solar constant. [Wm⁻²] method : string, default 'spencer' The method by which the ET radiation should be calculated. From 93f675b0e37fc09f4eacf12a026389a8e6657e54 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 09:23:39 -0600 Subject: [PATCH 03/19] (incomplete) reference updates --- pvlib/irradiance.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 04671bb324..191b5a67bc 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -44,12 +44,13 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, The solar constant. [Wm⁻²] method : string, default 'spencer' - The method by which the ET radiation should be calculated. - Options include ``'pyephem', 'spencer', 'asce', 'nrel'``. + The method by which the extraterrestrial radiation should be + calculated. Options include: ``'pyephem', 'spencer' [2]_, 'asce' [3]_, + 'nrel'``. epoch_year : int, default 2014 The year in which a day of year input will be calculated. Only - applies to day of year input used with the pyephem or nrel + applies to day of year input used with the 'pyephem' or 'nrel' methods. kwargs : @@ -69,18 +70,23 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, Clear Sky Models: Implementation and Analysis", Sandia National Laboratories, SAND2012-2389, 2012. - .. [2] http://solardata.uoregon.edu/SolarRadiationBasics.html, Eqs. + .. [2] J. W. Spencer, "Fourier series representation of the sun," Search, + vol. 2, p. 172, 1971. + + .. [3] R. G. Allen, Environmental, and E. Water Resources institute. Task + Committee on Standardization of Reference, The ASCE standardized + reference evapotranspiration equation. Reston, Va.: American Society of + Civil Engineers, 2005 + + .. [4] http://solardata.uoregon.edu/SolarRadiationBasics.html, Eqs. SR1 and SR2 - .. [3] Partridge, G. W. and Platt, C. M. R. 1976. Radiative Processes + .. [5] Partridge, G. W. and Platt, C. M. R. 1976. Radiative Processes in Meteorology and Climatology. - .. [4] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of + .. [6] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of Thermal Processes, 2nd edn. J. Wiley and Sons, New York. - .. [5] ASCE, 2005. The ASCE Standardized Reference Evapotranspiration - Equation, Environmental and Water Resources Institute of the American - Civil Engineers, Ed. R. G. Allen et al. """ to_doy, to_datetimeindex, to_output = \ From a65e8819075aa17e66b6bac9d9e4d17dc590974b Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 14:06:06 -0600 Subject: [PATCH 04/19] add nrel reference, remove `` --- pvlib/irradiance.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 191b5a67bc..62c172986c 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -45,8 +45,8 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, method : string, default 'spencer' The method by which the extraterrestrial radiation should be - calculated. Options include: ``'pyephem', 'spencer' [2]_, 'asce' [3]_, - 'nrel'``. + calculated. Options include: 'pyephem', 'spencer' [2]_, 'asce' [3]_, + 'nrel' [4]_. epoch_year : int, default 2014 The year in which a day of year input will be calculated. Only @@ -78,13 +78,17 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, reference evapotranspiration equation. Reston, Va.: American Society of Civil Engineers, 2005 - .. [4] http://solardata.uoregon.edu/SolarRadiationBasics.html, Eqs. + .. [4] Reda, I., Andreas, A., 2003. Solar position algorithm for solar + radiation applications. Technical report: NREL/TP-560- 34302. Golden, + USA, http://www.nrel.gov + + .. [5] http://solardata.uoregon.edu/SolarRadiationBasics.html, Eqs. SR1 and SR2 - .. [5] Partridge, G. W. and Platt, C. M. R. 1976. Radiative Processes + .. [6] Partridge, G. W. and Platt, C. M. R. 1976. Radiative Processes in Meteorology and Climatology. - .. [6] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of + .. [7] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of Thermal Processes, 2nd edn. J. Wiley and Sons, New York. """ From f85ce83bd93db4956a3e7a430623d2ded23bed4f Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 14:10:09 -0600 Subject: [PATCH 05/19] ieee formatting [4] --- pvlib/irradiance.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 62c172986c..bc65ce6083 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -78,9 +78,8 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, reference evapotranspiration equation. Reston, Va.: American Society of Civil Engineers, 2005 - .. [4] Reda, I., Andreas, A., 2003. Solar position algorithm for solar - radiation applications. Technical report: NREL/TP-560- 34302. Golden, - USA, http://www.nrel.gov + .. [4] I. Reda, A. Andreas, "Solar position algorithm for solar + radiation applications" NREL Golden, USA. NREL/TP-560- 34302, 2008. .. [5] http://solardata.uoregon.edu/SolarRadiationBasics.html, Eqs. SR1 and SR2 From aaee8da1bc93974ab6234225adde0a1687bd1024 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 14:19:15 -0600 Subject: [PATCH 06/19] text suggestion to link Reno and Beckman refs --- pvlib/irradiance.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index bc65ce6083..2b4093c2f8 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -33,7 +33,10 @@ def __getattr__(attr): def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, method='spencer', epoch_year=2014, **kwargs): """ - Determine extraterrestrial radiation from day of year. + Determine extraterrestrial radiation from day of year. Specific references + for each method of caclulating the earth-sun distance are cited in the + parameter descriptions below, while a more general discussion of the + different models may also be found in [1]_ and [2]_. Parameters ---------- @@ -54,7 +57,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, methods. kwargs : - Passed to :py:func:`~pvlib.solarposition.nrel_earthsun_distance` + Passed to :py:func:`~pvlib.solarposition.nrel_earthsun_distance`. Returns ------- @@ -70,25 +73,25 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, Clear Sky Models: Implementation and Analysis", Sandia National Laboratories, SAND2012-2389, 2012. - .. [2] J. W. Spencer, "Fourier series representation of the sun," Search, + .. [2] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of + Thermal Processes, 2nd edn. J. Wiley and Sons, New York. + + [3] J. W. Spencer, "Fourier series representation of the sun," Search, vol. 2, p. 172, 1971. - .. [3] R. G. Allen, Environmental, and E. Water Resources institute. Task + .. [4] R. G. Allen, Environmental, and E. Water Resources institute. Task Committee on Standardization of Reference, The ASCE standardized reference evapotranspiration equation. Reston, Va.: American Society of Civil Engineers, 2005 - .. [4] I. Reda, A. Andreas, "Solar position algorithm for solar + .. [5] I. Reda, A. Andreas, "Solar position algorithm for solar radiation applications" NREL Golden, USA. NREL/TP-560- 34302, 2008. - .. [5] http://solardata.uoregon.edu/SolarRadiationBasics.html, Eqs. + .. [6] http://solardata.uoregon.edu/SolarRadiationBasics.html, Eqs. SR1 and SR2 - .. [6] Partridge, G. W. and Platt, C. M. R. 1976. Radiative Processes - in Meteorology and Climatology. - - .. [7] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of - Thermal Processes, 2nd edn. J. Wiley and Sons, New York. + .. [7] Partridge, G. W. and Platt, C. M. R. 1976. Radiative Processes + in Meteorology and Climatology. """ From bdc3311477f628df0d16f33facde304d42ea1c60 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 14:24:04 -0600 Subject: [PATCH 07/19] remove partridge, update uoregon --- pvlib/irradiance.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 2b4093c2f8..599e965f39 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -36,7 +36,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, Determine extraterrestrial radiation from day of year. Specific references for each method of caclulating the earth-sun distance are cited in the parameter descriptions below, while a more general discussion of the - different models may also be found in [1]_ and [2]_. + different models may also be found in [1]_, [2]_, and [3]_. Parameters ---------- @@ -48,8 +48,8 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, method : string, default 'spencer' The method by which the extraterrestrial radiation should be - calculated. Options include: 'pyephem', 'spencer' [2]_, 'asce' [3]_, - 'nrel' [4]_. + calculated. Options include: 'pyephem', 'spencer' [4]_, 'asce' [5]_, + 'nrel' [6]_. epoch_year : int, default 2014 The year in which a day of year input will be calculated. Only @@ -75,24 +75,22 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, .. [2] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of Thermal Processes, 2nd edn. J. Wiley and Sons, New York. - - [3] J. W. Spencer, "Fourier series representation of the sun," Search, + + .. [3] "Solar Radiation Basics". University of Oregon. Accessed: 04 April, + 2025. [Online.] Available Date: Mon, 14 Apr 2025 14:26:54 -0600 Subject: [PATCH 08/19] blank space --- pvlib/irradiance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 599e965f39..625f742636 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -75,7 +75,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, .. [2] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of Thermal Processes, 2nd edn. J. Wiley and Sons, New York. - + .. [3] "Solar Radiation Basics". University of Oregon. Accessed: 04 April, 2025. [Online.] Available Date: Mon, 14 Apr 2025 14:29:14 -0600 Subject: [PATCH 09/19] close url --- pvlib/irradiance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 625f742636..6d68cc1cc9 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -78,7 +78,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, .. [3] "Solar Radiation Basics". University of Oregon. Accessed: 04 April, 2025. [Online.] Available .. [4] J. W. Spencer, "Fourier series representation of the sun," Search, vol. 2, p. 172, 1971. From 6db356bd053c2b4d35c7d0d2bb6274a8fb50de15 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 14:34:14 -0600 Subject: [PATCH 10/19] long url --- pvlib/irradiance.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 6d68cc1cc9..92bc8e6784 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -77,8 +77,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, Thermal Processes, 2nd edn. J. Wiley and Sons, New York. .. [3] "Solar Radiation Basics". University of Oregon. Accessed: 04 April, - 2025. [Online.] Available + 2025. [Online.] Available https://web.archive.org/web/20240424224453/http://solardata.uoregon.edu/SolarRadiationBasics.html #noqa: E501 .. [4] J. W. Spencer, "Fourier series representation of the sun," Search, vol. 2, p. 172, 1971. From dd947079b2a6d25ebcf3a17c5bfd0b7143fc8429 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 14:39:07 -0600 Subject: [PATCH 11/19] # noqa: E501 --- pvlib/irradiance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 92bc8e6784..203217a977 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -31,7 +31,7 @@ def __getattr__(attr): def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, - method='spencer', epoch_year=2014, **kwargs): + method='spencer', epoch_year=2014, **kwargs): # noqa: E501 """ Determine extraterrestrial radiation from day of year. Specific references for each method of caclulating the earth-sun distance are cited in the @@ -77,7 +77,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, Thermal Processes, 2nd edn. J. Wiley and Sons, New York. .. [3] "Solar Radiation Basics". University of Oregon. Accessed: 04 April, - 2025. [Online.] Available https://web.archive.org/web/20240424224453/http://solardata.uoregon.edu/SolarRadiationBasics.html #noqa: E501 + 2025. [Online.] Available https://web.archive.org/web/20240424224453/http://solardata.uoregon.edu/SolarRadiationBasics.html .. [4] J. W. Spencer, "Fourier series representation of the sun," Search, vol. 2, p. 172, 1971. From 592f8f45ff53403b0187b608fbbb5e3ecf0c53a0 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 14:43:22 -0600 Subject: [PATCH 12/19] # noqa: E501 --- pvlib/irradiance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 203217a977..74a99832d5 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -31,7 +31,7 @@ def __getattr__(attr): def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, - method='spencer', epoch_year=2014, **kwargs): # noqa: E501 + method='spencer', epoch_year=2014, **kwargs): """ Determine extraterrestrial radiation from day of year. Specific references for each method of caclulating the earth-sun distance are cited in the @@ -90,7 +90,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, .. [6] I. Reda, A. Andreas, "Solar position algorithm for solar radiation applications" NREL Golden, USA. NREL/TP-560- 34302, 2008. - """ + """ # noqa: E501 to_doy, to_datetimeindex, to_output = \ _handle_extra_radiation_types(datetime_or_doy, epoch_year) From d8fbffbeef202de3f644a16c172083f2455b98ac Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 14:47:21 -0600 Subject: [PATCH 13/19] two spaces --- pvlib/irradiance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 74a99832d5..52a93daebf 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -90,7 +90,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, .. [6] I. Reda, A. Andreas, "Solar position algorithm for solar radiation applications" NREL Golden, USA. NREL/TP-560- 34302, 2008. - """ # noqa: E501 + """ # noqa: E501 to_doy, to_datetimeindex, to_output = \ _handle_extra_radiation_types(datetime_or_doy, epoch_year) From 78d1be74f1b2af1e9b8ee09678025515630a3ec5 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 15:04:45 -0600 Subject: [PATCH 14/19] formatting --- pvlib/irradiance.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 52a93daebf..0b240c8ef3 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -46,14 +46,14 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, solar_constant : float, default 1366.1 The solar constant. [Wm⁻²] - method : string, default 'spencer' + method : string, default `spencer` The method by which the extraterrestrial radiation should be - calculated. Options include: 'pyephem', 'spencer' [4]_, 'asce' [5]_, + calculated. Options include: `pyephem`, `spencer` [4]_, `asce` [5]_, 'nrel' [6]_. epoch_year : int, default 2014 The year in which a day of year input will be calculated. Only - applies to day of year input used with the 'pyephem' or 'nrel' + applies to day of year input used with the `pyephem` or `nrel` methods. kwargs : From 196e0eb70a22b833ac1a085fa4b1016f7f53ba8c Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 15:08:20 -0600 Subject: [PATCH 15/19] beckman reference --- pvlib/irradiance.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 0b240c8ef3..3db1fdfe22 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -73,8 +73,9 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, Clear Sky Models: Implementation and Analysis", Sandia National Laboratories, SAND2012-2389, 2012. - .. [2] Duffie, J. A. and Beckman, W. A. 1991. Solar Engineering of - Thermal Processes, 2nd edn. J. Wiley and Sons, New York. + .. [2] J. A. Duffie and W. A. Beckman, "Solar Radiation" in Solar + Engineering of Thermal Processes, 5th ed, New York, USA, J. Wiley + and Sons, 2020. .. [3] "Solar Radiation Basics". University of Oregon. Accessed: 04 April, 2025. [Online.] Available https://web.archive.org/web/20240424224453/http://solardata.uoregon.edu/SolarRadiationBasics.html From 96485d238f177da417288b26a0aa763e24fea524 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 14 Apr 2025 15:10:42 -0600 Subject: [PATCH 16/19] Update v0.12.1.rst --- docs/sphinx/source/whatsnew/v0.12.1.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/sphinx/source/whatsnew/v0.12.1.rst b/docs/sphinx/source/whatsnew/v0.12.1.rst index 8c8c5d8452..1b1aeb3284 100644 --- a/docs/sphinx/source/whatsnew/v0.12.1.rst +++ b/docs/sphinx/source/whatsnew/v0.12.1.rst @@ -23,6 +23,8 @@ Documentation * Add a supporting reference to :py:func:`pvlib.atmosphere.get_relative_airmass` (:issue:`2390`, :pull:`2424`) * Documented how `np.nan` values are handled by :py:func:`~pvlib.spectrum.average_photon_energy` (:issue:`2423`, :pull:`2426`) +* Update references in :py:func`~pvlib.irradiance.get_extra_radiation` + (:issue:`2333`, :pull:`2347`) Testing ~~~~~~~ From 1d59f93e731003d53749329f35aa80d7be5e466b Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 21 Apr 2025 09:36:35 -0600 Subject: [PATCH 17/19] Update irradiance.py --- pvlib/irradiance.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 3db1fdfe22..8a1b7b0cb4 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -33,10 +33,11 @@ def __getattr__(attr): def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, method='spencer', epoch_year=2014, **kwargs): """ - Determine extraterrestrial radiation from day of year. Specific references - for each method of caclulating the earth-sun distance are cited in the - parameter descriptions below, while a more general discussion of the - different models may also be found in [1]_, [2]_, and [3]_. + Determine extraterrestrial radiation from day of year. + + Specific references for each method of caclulating the earth-sun distance + are cited in the parameter descriptions below, while a more general + discussion of the different models may also be found in [1]_ and [2]_. Parameters ---------- @@ -48,7 +49,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, method : string, default `spencer` The method by which the extraterrestrial radiation should be - calculated. Options include: `pyephem`, `spencer` [4]_, `asce` [5]_, + calculated. Options include: `pyephem`, `spencer` [3]_, `asce` [4]_, 'nrel' [6]_. epoch_year : int, default 2014 @@ -72,26 +73,25 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, .. [1] M. Reno, C. Hansen, and J. Stein, "Global Horizontal Irradiance Clear Sky Models: Implementation and Analysis", Sandia National Laboratories, SAND2012-2389, 2012. + :doi:`10.2172/1039404` - .. [2] J. A. Duffie and W. A. Beckman, "Solar Radiation" in Solar - Engineering of Thermal Processes, 5th ed, New York, USA, J. Wiley - and Sons, 2020. + .. [2] J. A. Duffie, W. A. Beckman, N. Blair, "Solar Radiation", in Solar + Engineering of Thermal Processes, Photovoltaics and Wind, 5th ed, + New York, USA: J. Wiley and Sons, 2020, pp. 3-44. + :doi:`10.1002/9781119540328` - .. [3] "Solar Radiation Basics". University of Oregon. Accessed: 04 April, - 2025. [Online.] Available https://web.archive.org/web/20240424224453/http://solardata.uoregon.edu/SolarRadiationBasics.html - - .. [4] J. W. Spencer, "Fourier series representation of the sun," Search, + .. [3] J. W. Spencer, "Fourier series representation of the sun," Search, vol. 2, p. 172, 1971. - .. [5] R. G. Allen, Environmental, and E. Water Resources institute. Task + .. [4] R. G. Allen, Environmental, and E. Water Resources institute. Task Committee on Standardization of Reference, The ASCE standardized reference evapotranspiration equation. Reston, Va.: American Society of - Civil Engineers, 2005 + Civil Engineers, 2005. :doi:`10.1061/9780784408056` .. [6] I. Reda, A. Andreas, "Solar position algorithm for solar - radiation applications" NREL Golden, USA. NREL/TP-560- 34302, 2008. - - """ # noqa: E501 + radiation applications" NREL Golden, USA. NREL/TP-560-34302, + Revised 2008. :doi:`10.2172/15003974` + """ to_doy, to_datetimeindex, to_output = \ _handle_extra_radiation_types(datetime_or_doy, epoch_year) From 616ccfcb6c7e4c20081a3d88bf2028edb573e82f Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 21 Apr 2025 10:24:33 -0600 Subject: [PATCH 18/19] update rg allen reference + linter --- pvlib/irradiance.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 8a1b7b0cb4..c8d51380be 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -34,7 +34,7 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, method='spencer', epoch_year=2014, **kwargs): """ Determine extraterrestrial radiation from day of year. - + Specific references for each method of caclulating the earth-sun distance are cited in the parameter descriptions below, while a more general discussion of the different models may also be found in [1]_ and [2]_. @@ -83,10 +83,9 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, .. [3] J. W. Spencer, "Fourier series representation of the sun," Search, vol. 2, p. 172, 1971. - .. [4] R. G. Allen, Environmental, and E. Water Resources institute. Task - Committee on Standardization of Reference, The ASCE standardized - reference evapotranspiration equation. Reston, Va.: American Society of - Civil Engineers, 2005. :doi:`10.1061/9780784408056` + .. [4] R. G. Allen et al., Eds. The ASCE standardized reference + evapotranspiration equation. Reston, Va.: American Society of Civil + Engineers, 2005. :doi:`10.1061/9780784408056` .. [6] I. Reda, A. Andreas, "Solar position algorithm for solar radiation applications" NREL Golden, USA. NREL/TP-560-34302, From 9f084c4a04317fda21c762a23c0231e3ede0e884 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Mon, 21 Apr 2025 13:55:53 -0600 Subject: [PATCH 19/19] rephrase description --- pvlib/irradiance.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index c8d51380be..ade2a303fb 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -35,9 +35,9 @@ def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, """ Determine extraterrestrial radiation from day of year. - Specific references for each method of caclulating the earth-sun distance - are cited in the parameter descriptions below, while a more general - discussion of the different models may also be found in [1]_ and [2]_. + Specific references for each method are cited in the parameter descriptions + below, while a more general discussion of the different models may also be + found in [1]_ and [2]_. Parameters ----------