Skip to content

Commit

Permalink
Merge branch 'development' into pipeline_run_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mdeceglie authored Jan 22, 2025
2 parents d692c01 + bd86075 commit 924bdb3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions docs/sphinx/source/changelog/v3.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ Deprecations

Bug fixes
---------
* Set marker linewidth to zero in `rdtools.plotting.degradation_summary_plots` (:pull:`433`)
* Set marker linewidth to zero in `rdtools.plotting.degradation_summary_plots` (:issue:`408`, :pull:`433`)
* Fix :py:func:`~rdtools.normalization.energy_from_power` returns incorrect index for shifted hourly data (:issue:`370`, :pull:`437`)
* Add warning to clearsky workflow when ``power_expected`` is passed by user (:pull:`439`)
* Add warning to clearsky workflow when ``power_expected`` is passed by user (:issue:`271`, :pull:`439`)
* Fix different results with Nan's and Zeros in power series (:issue:`313`, :pull:`442`)
* Fix pandas deprecation warnings in tests (:pull:`444`)
* Fix typos in citation section of the readme file (:issue:`414`, :pull:`421`)
Expand Down
20 changes: 10 additions & 10 deletions docs/sphinx/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ Degradation

The preferred method for degradation rate estimation is the year-on-year
(YOY) approach (Jordan 2018), available in :py:func:`.degradation.degradation_year_on_year`.
The YOY calculation yields in a distribution of degradation rates, the
The YOY calculation yields a distribution of degradation rates, the
central tendency of which is the most representative of the true
degradation. We note that the workflow described above and implimented in
degradation. We note that the workflow described above and implemented in
:py:class:`.analysis_chains.TrendAnalysis` provides an estimate of degradation rate,
not performance loss rate (PLR). PLR includes losses that are explicitly filtered
out by the primary workflow (Deceglie 2023).
Expand All @@ -74,10 +74,10 @@ a 'clear-sky' workflow is also available in RdTools. This workflow is based on m
temperature and irradiance. Note that site irradiance data is still required to identify
clear-sky conditions to be analyzed.

Satellite and clear-sky analysis tends to provide less stable results than sensor-based
Satellite and clear-sky analyses tend to provide less stable results than sensor-based
analysis when details such as filtering are changed. We generally recommend
that the these be used only as a check on the sensor-based results,
rather than as a stand-alone analysis.
rather than as stand-alone analyses.

Soiling
^^^^^^^
Expand Down Expand Up @@ -145,7 +145,7 @@ Alternatively it can be installed manually using the command line:
2. Navigate to the repository: ``cd rdtools``
3. Install via pip: ``pip install .``

On some systems installation with ``pip`` can fail due to problems
On some systems, installation with ``pip`` can fail due to problems
installing requirements. If this occurs, the requirements specified in
``setup.py`` may need to be separately installed (for example by using
``conda``) before installing ``rdtools``.
Expand Down Expand Up @@ -183,11 +183,11 @@ Citing RdTools
To cite RdTools, please use the following along with the version number
and the specific DOI coresponding to that version from `Zenodo <https://doi.org/10.5281/zenodo.1210316>`_:

- Michael G. Deceglie, Ambarish Nag, Adam Shinn, Gregory Kimball,
Daniel Ruth, Dirk Jordan, Jiyang Yan, Kevin Anderson, Kirsten Perry,
Mark Mikofski, Matthew Muller, Will Vining, and Chris Deline
RdTools, version {insert version}, Compuer Software,
https://github.com/NREL/rdtools. DOI:{insert DOI}
- Michael G. Deceglie, Kevin Anderson, Adam Shinn, Ambarish Nag, Mark Mikofski,
Martin Springer, Jiyang Yan, Kirsten Perry, Sandra Villamar, Will Vining,
Gregory Kimball, Daniel Ruth, Noah Moyer, Quyen Nguyen, Dirk Jordan,
Matthew Muller, and Chris Deline, RdTools, version {insert version},
Compuer Software, https://github.com/NREL/rdtools. DOI:{insert DOI}

The underlying workflow of RdTools has been published in several places.
If you use RdTools in a published work, you may also wish to cite the following as
Expand Down
4 changes: 2 additions & 2 deletions rdtools/analysis_chains.py
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@ def _pvwatts_norm(self, poa_global, temperature_cell):

if self.gamma_pdc is None:
warnings.warn(
"Temperature coefficient not passed in to TrendAnalysis"
". No temperature correction will be conducted."
"Temperature coefficient not passed in to TrendAnalysis. "
"No temperature correction will be conducted."
)
pvwatts_kws = {
"poa_global": poa_global,
Expand Down
2 changes: 1 addition & 1 deletion rdtools/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def _make_time_series_bootstrap_samples(
decomposition_type='multiplicative', bootstrap_seed=None
):
'''
Generate bootstrap samples based a time series signal and its model fit
Generate bootstrap samples based on a time series signal and its model fit
using circular block bootstrapping.
Parameters
Expand Down

0 comments on commit 924bdb3

Please sign in to comment.