mirror of
https://github.com/openmc-dev/openmc.git
synced 2026-07-27 21:55:41 -04:00
added Julian years to Integrator
This commit is contained in:
parent
a92074282e
commit
5cdef2e964
1 changed files with 7 additions and 5 deletions
|
|
@ -12,7 +12,6 @@ from numbers import Real, Integral
|
|||
from contextlib import contextmanager
|
||||
import os
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import time
|
||||
from warnings import warn
|
||||
|
||||
|
|
@ -36,6 +35,7 @@ __all__ = [
|
|||
_SECONDS_PER_MINUTE = 60
|
||||
_SECONDS_PER_HOUR = 60*60
|
||||
_SECONDS_PER_DAY = 24*60*60
|
||||
_SECONDS_PER_JULIAN_YEAR = 365.25*24*60*60
|
||||
|
||||
OperatorResult = namedtuple('OperatorResult', ['k', 'rates'])
|
||||
OperatorResult.__doc__ = """\
|
||||
|
|
@ -531,11 +531,11 @@ class Integrator(ABC):
|
|||
each interval in :attr:`timesteps`
|
||||
|
||||
.. versionadded:: 0.12.1
|
||||
timestep_units : {'s', 'min', 'h', 'd', 'MWd/kg'}
|
||||
timestep_units : {'s', 'min', 'h', 'd', 'a', 'MWd/kg'}
|
||||
Units for values specified in the `timesteps` argument. 's' means
|
||||
seconds, 'min' means minutes, 'h' means hours, and 'MWd/kg' indicates
|
||||
that the values are given in burnup (MW-d of energy deposited per
|
||||
kilogram of initial heavy metal).
|
||||
seconds, 'min' means minutes, 'h' means hours, 'a' means Julian years
|
||||
and 'MWd/kg' indicates that the values are given in burnup (MW-d of
|
||||
energy deposited per kilogram of initial heavy metal).
|
||||
solver : str or callable, optional
|
||||
If a string, must be the name of the solver responsible for
|
||||
solving the Bateman equations. Current options are:
|
||||
|
|
@ -638,6 +638,8 @@ class Integrator(ABC):
|
|||
seconds.append(timestep*_SECONDS_PER_HOUR)
|
||||
elif unit in ('d', 'day'):
|
||||
seconds.append(timestep*_SECONDS_PER_DAY)
|
||||
elif unit in ('a', 'year'):
|
||||
seconds.append(timestep*_SECONDS_PER_JULIAN_YEAR)
|
||||
elif unit.lower() == 'mwd/kg':
|
||||
watt_days_per_kg = 1e6*timestep
|
||||
kilograms = 1e-3*operator.heavy_metal
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue