Skip to content

Commit

Permalink
type hinting openmc.deplete.abc.py (#2866)
Browse files Browse the repository at this point in the history
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
  • Loading branch information
shimwell and paulromano committed Feb 15, 2024
1 parent 33c910d commit 5005c3c
Showing 1 changed file with 57 additions and 19 deletions.
76 changes: 57 additions & 19 deletions openmc/deplete/abc.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
This module contains Abstract Base Classes for implementing operator, integrator, depletion system solver, and operator helper classes
"""

from __future__ import annotations
from abc import ABC, abstractmethod
from collections import namedtuple, defaultdict
from collections.abc import Iterable, Callable
Expand All @@ -13,17 +14,20 @@
import os
from pathlib import Path
import time
from typing import Optional, Union, Sequence
from warnings import warn

from numpy import nonzero, empty, asarray
import numpy as np
from uncertainties import ufloat

from openmc.checkvalue import check_type, check_greater_than, PathLike
from openmc.mpi import comm
from openmc import Material
from .stepresult import StepResult
from .chain import Chain
from .results import Results
from .pool import deplete
from .reaction_rates import ReactionRates
from .transfer_rates import TransferRates


Expand Down Expand Up @@ -176,7 +180,7 @@ def finalize(self):
pass

@abstractmethod
def write_bos_data(self, step):
def write_bos_data(self, step: int):
"""Document beginning of step data for a given step
Called at the beginning of a depletion step and at
Expand Down Expand Up @@ -215,7 +219,7 @@ class ReactionRateHelper(ABC):

def __init__(self, n_nucs, n_react):
self._nuclides = None
self._results_cache = empty((n_nucs, n_react))
self._results_cache = np.empty((n_nucs, n_react))

@abstractmethod
def generate_tallies(self, materials, scores):
Expand All @@ -232,7 +236,12 @@ def nuclides(self, nuclides):
self._nuclides = nuclides

@abstractmethod
def get_material_rates(self, mat_id, nuc_index, react_index):
def get_material_rates(
self,
mat_id: int,
nuc_index: Sequence[str],
react_index: Sequence[str]
):
"""Return 2D array of [nuclide, reaction] reaction rates
Parameters
Expand All @@ -245,7 +254,7 @@ def get_material_rates(self, mat_id, nuc_index, react_index):
Ordering of reactions
"""

def divide_by_atoms(self, number):
def divide_by_atoms(self, number: Sequence[float]):
"""Normalize reaction rates by number of atoms
Acts on the current material examined by :meth:`get_material_rates`
Expand All @@ -262,7 +271,7 @@ def divide_by_atoms(self, number):
normalized by the number of nuclides
"""

mask = nonzero(number)
mask = np.nonzero(number)
results = self._results_cache
for col in range(results.shape[1]):
results[mask, col] /= number[mask]
Expand Down Expand Up @@ -294,7 +303,7 @@ def reset(self):
"""Reset state for normalization"""

@abstractmethod
def prepare(self, chain_nucs, rate_index):
def prepare(self, chain_nucs: Sequence[str], rate_index: dict):
"""Perform work needed to obtain energy produced
This method is called prior to calculating the reaction rates
Expand Down Expand Up @@ -333,7 +342,7 @@ def nuclides(self, nuclides):
self._nuclides = nuclides

@abstractmethod
def factor(self, source_rate):
def factor(self, source_rate: float):
"""Return normalization factor
Parameters
Expand Down Expand Up @@ -436,7 +445,7 @@ def generate_tallies(materials, mat_indexes):
in parallel mode.
"""

def update_tally_nuclides(self, nuclides):
def update_tally_nuclides(self, nuclides: Sequence[str]) -> list:
"""Return nuclides with non-zero densities and yield data
Parameters
Expand Down Expand Up @@ -559,8 +568,16 @@ class Integrator(ABC):
"""

def __init__(self, operator, timesteps, power=None, power_density=None,
source_rates=None, timestep_units='s', solver="cram48"):
def __init__(
self,
operator: TransportOperator,
timesteps: Sequence[float],
power: Optional[Union[float, Sequence[float]]] = None,
power_density: Optional[Union[float, Sequence[float]]] = None,
source_rates: Optional[Sequence[float]] = None,
timestep_units: str = 's',
solver: str = "cram48"
):
# Check number of stages previously used
if operator.prev_res is not None:
res = operator.prev_res[-1]
Expand Down Expand Up @@ -632,8 +649,8 @@ def __init__(self, operator, timesteps, power=None, power_density=None,
else:
raise ValueError("Invalid timestep unit '{}'".format(unit))

self.timesteps = asarray(seconds)
self.source_rates = asarray(source_rates)
self.timesteps = np.asarray(seconds)
self.source_rates = np.asarray(source_rates)

self.transfer_rates = None

Expand Down Expand Up @@ -692,7 +709,14 @@ def _timed_deplete(self, n, rates, dt, matrix_func=None):
return time.time() - start, results

@abstractmethod
def __call__(self, n, rates, dt, source_rate, i):
def __call__(
self,
n: Sequence[np.ndarray],
rates: ReactionRates,
dt: float,
source_rate: float,
i: int
):
"""Perform the integration across one time step
Parameters
Expand Down Expand Up @@ -829,8 +853,14 @@ def integrate(

self.operator.finalize()

def add_transfer_rate(self, material, components, transfer_rate,
transfer_rate_units='1/s', destination_material=None):
def add_transfer_rate(
self,
material: Union[str, int, Material],
components: Sequence[str],
transfer_rate: float,
transfer_rate_units: str = '1/s',
destination_material: Optional[Union[str, int, Material]] = None
):
"""Add transfer rates to depletable material.
Parameters
Expand Down Expand Up @@ -943,9 +973,17 @@ class SIIntegrator(Integrator):
"""

def __init__(self, operator, timesteps, power=None, power_density=None,
source_rates=None, timestep_units='s', n_steps=10,
solver="cram48"):
def __init__(
self,
operator: TransportOperator,
timesteps: Sequence[float],
power: Optional[Union[float, Sequence[float]]] = None,
power_density: Optional[Union[float, Sequence[float]]] = None,
source_rates: Optional[Sequence[float]] = None,
timestep_units: str = 's',
n_steps: int = 10,
solver: str = "cram48"
):
check_type("n_steps", n_steps, Integral)
check_greater_than("n_steps", n_steps, 0)
super().__init__(
Expand Down

0 comments on commit 5005c3c

Please sign in to comment.