Skip to content
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
3 changes: 2 additions & 1 deletion docs/source/whatsnew/releases/v0.7.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Breaking Changes

Enhancements
------------

- Add module-level constant R_GAS = 0.0083144626 in :py:mod:`pvdeg.diffusion` to avoid
magic numbers in code. (:pull:`313`)

Deprecations
-------------
Expand Down
18 changes: 10 additions & 8 deletions pvdeg/diffusion.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
from pvdeg import DATA_DIR
import numpy as np

R_GAS = 0.0083144626 # [kJ/mol-K]


def esdiffusion(
temperature,
Expand Down Expand Up @@ -156,28 +158,28 @@ def _get_value(d, key, default=None):
if Dos is None:
Dos = _get_value(esp, "Do")
if Eads is None:
Eads = _get_value(esp, "Ead") / 0.0083144626
Eads = _get_value(esp, "Ead") / R_GAS
else:
Eads = Eads / 0.0083144626
Eads = Eads / R_GAS
if Sos is None:
Sos = _get_value(esp, "So") * press
if Eass is None:
Eass = _get_value(esp, "Eas") / 0.0083144626
Eass = _get_value(esp, "Eas") / R_GAS
else:
Eass = Eass / 0.0083144626
Eass = Eass / R_GAS
# These are the encapsulant oxygen permeaiton parameters
if Doe is None:
Doe = _get_value(encp, "Do")
if Eade is None:
Eade = _get_value(encp, "Ead") / 0.0083144626
Eade = _get_value(encp, "Ead") / R_GAS
else:
Eade = Eade / 0.0083144626
Eade = Eade / R_GAS
if Soe is None:
Soe = _get_value(encp, "So") * press
if Ease is None:
Ease = _get_value(encp, "Eas") / 0.0083144626
Ease = _get_value(encp, "Eas") / R_GAS
else:
Ease = Ease / 0.0083144626
Ease = Ease / R_GAS

so = Sos / Soe
eas = Eass - Ease
Expand Down