Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement CIGRE 207 #28

Merged
merged 18 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/api/equations/cigre207/convective_cooling.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Convective cooling in CIGRE207
------------------------------

.. automodule:: linerate.equations.cigre207.convective_cooling
:members:
5 changes: 5 additions & 0 deletions docs/api/equations/cigre207/solar_heating.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Solar heating in CIGRE207
-------------------------

.. automodule:: linerate.equations.cigre207.solar_heating
:members:
5 changes: 5 additions & 0 deletions docs/api/equations/convective_cooling.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Convective cooling
------------------

.. automodule:: linerate.equations.convective_cooling
:members:
5 changes: 5 additions & 0 deletions docs/api/equations/dimensionless.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Dimensionless numbers
---------------------

.. automodule:: linerate.equations.dimensionless
:members:
14 changes: 14 additions & 0 deletions docs/api/equations/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,23 @@ Shared functionality
:maxdepth: 1

joule_heating
convective_cooling
radiative_cooling
solar_angles
solar_heating
math
dimensionless

Cigre 207
^^^^^^^^^

.. automodule:: linerate.equations.cigre207

.. toctree::
:maxdepth: 1

cigre207/convective_cooling
cigre207/solar_heating

Cigre 601
^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion docs/api/equations/math.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Mathematical utilities
----------------------

.. automodule:: linerate.equations.cigre601.joule_heating
.. automodule:: linerate.equations.math
:members:
5 changes: 5 additions & 0 deletions docs/api/equations/solar_heating.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Solar heating
-------------

.. automodule:: linerate.equations.solar_heating
:members:
6 changes: 6 additions & 0 deletions docs/api/model.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ The ``model`` module

.. autoclass:: linerate.model.Cigre601
:inherited-members:

.. autoclass:: linerate.model.IEEE738
:inherited-members:

.. autoclass:: linerate.model.Cigre207
:inherited-members:
9 changes: 9 additions & 0 deletions docs/refs.bib
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ @techreport{cigre207
year = {2002}
}

@book{incropera2007,
address = {New York City, New York},
author = {Incropera, Frank P. and DeWitt, David P. and Bergman, Theodore L. and Lavine, Adrienne S.},
edition = {6th Edition},
publisher = {John Wiley & Sons, Inc.},
title = {Fundamentals of Heat and Mass Transfer},
year = 2007
}

@ARTICLE{ieee.acsr.taskforce,
author={Rathbun, L.S. and Douglass, D.A. and Kirkpatrick, L.A.},
journal={IEEE Transactions on Power Apparatus and Systems},
Expand Down
5 changes: 5 additions & 0 deletions linerate/equations/cigre207/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""
This submodule contains implementations of equations listed in :cite:p:`cigre207`.
"""

from . import convective_cooling, solar_heating # noqa
25 changes: 25 additions & 0 deletions linerate/equations/cigre207/ac_resistance.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
from linerate.units import OhmPerMeter


def correct_resistance_for_skin_effect(
dc_resistance: OhmPerMeter,
) -> OhmPerMeter:
r"""
Return resistance with constant correction for skin effect, using simple method from
Cigre 207, see section 2.1.1.

Parameters
----------
dc_resistance:
:math:`R~\left[\Omega\right]`. The DC resistance of the conductor.

Returns
-------
Union[float, float64, ndarray[Any, dtype[float64]]]
:math:`R_\text{corrected}~\left[\Omega\right]`. The resistance of the conductor after
taking skin effect into account.
"""
return 1.0123 * dc_resistance


# TODO: Implement section 2.1.2?
Loading