Merge pull request #28 from statnett/tkap-320-cigre207

Implement CIGRE 207
statnett · Jun 10, 2024 · 322af2b · 322af2b
2 parents 93cd92d + 31a81ac
commit 322af2b
Show file tree

Hide file tree

Showing 35 changed files with 2,160 additions and 1,138 deletions.
diff --git a/docs/api/equations/cigre207/convective_cooling.rst b/docs/api/equations/cigre207/convective_cooling.rst
@@ -0,0 +1,5 @@
+Convective cooling in CIGRE207
+------------------------------
+
+.. automodule:: linerate.equations.cigre207.convective_cooling
+    :members:
diff --git a/docs/api/equations/cigre207/solar_heating.rst b/docs/api/equations/cigre207/solar_heating.rst
@@ -0,0 +1,5 @@
+Solar heating in CIGRE207
+-------------------------
+
+.. automodule:: linerate.equations.cigre207.solar_heating
+    :members:
diff --git a/docs/api/equations/convective_cooling.rst b/docs/api/equations/convective_cooling.rst
@@ -0,0 +1,5 @@
+Convective cooling
+------------------
+
+.. automodule:: linerate.equations.convective_cooling
+    :members:
diff --git a/docs/api/equations/dimensionless.rst b/docs/api/equations/dimensionless.rst
@@ -0,0 +1,5 @@
+Dimensionless numbers
+---------------------
+
+.. automodule:: linerate.equations.dimensionless
+    :members:
diff --git a/docs/api/equations/index.rst b/docs/api/equations/index.rst
@@ -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
 ^^^^^^^^^

diff --git a/docs/api/equations/math.rst b/docs/api/equations/math.rst
@@ -1,5 +1,5 @@
 Mathematical utilities
 ----------------------
 
-.. automodule:: linerate.equations.cigre601.joule_heating
+.. automodule:: linerate.equations.math
     :members:
diff --git a/docs/api/equations/solar_heating.rst b/docs/api/equations/solar_heating.rst
@@ -0,0 +1,5 @@
+Solar heating
+-------------
+
+.. automodule:: linerate.equations.solar_heating
+    :members:
diff --git a/docs/api/model.rst b/docs/api/model.rst
@@ -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:
diff --git a/docs/refs.bib b/docs/refs.bib
@@ -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},

diff --git a/linerate/equations/cigre207/__init__.py b/linerate/equations/cigre207/__init__.py
@@ -0,0 +1,5 @@
+"""
+This submodule contains implementations of equations listed in :cite:p:`cigre207`.
+"""
+
+from . import convective_cooling, solar_heating  # noqa
diff --git a/linerate/equations/cigre207/ac_resistance.py b/linerate/equations/cigre207/ac_resistance.py
@@ -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?