Compare commits

..

No commits in common. "b703f1ee20576dcc899df67824586662f0e4a29e" and "689b3176cc4fc666f2f2b011a0fb9ceb21f4437b" have entirely different histories.

3개의 변경된 파일21개의 추가작업 그리고 21개의 파일을 삭제

파일 보기

@ -1,5 +1,5 @@
from .simulation import Simulation, type_to_C from .simulation import Simulation, type_to_C
__author__ = 'Jan Petykiewicz' __author__ = 'Jan Petykiewicz'
__version__ = '0.4' __vesion__ = '0.4'
version = __version__ version = __version__

파일 보기

@ -2,7 +2,7 @@
Class for constructing and holding the basic FDTD operations and fields Class for constructing and holding the basic FDTD operations and fields
""" """
from typing import Callable, Type, Sequence from typing import List, Dict, Callable, Type, Union, Optional, Sequence
from collections import OrderedDict from collections import OrderedDict
import numpy import numpy
from numpy.typing import NDArray from numpy.typing import NDArray
@ -23,7 +23,7 @@ __author__ = 'Jan Petykiewicz'
jinja_env = jinja2.Environment(loader=jinja2.PackageLoader(__name__.split('.')[0], 'kernels')) jinja_env = jinja2.Environment(loader=jinja2.PackageLoader(__name__.split('.')[0], 'kernels'))
class Simulation: class Simulation(object):
r""" r"""
Constructs and holds the basic FDTD operations and related fields Constructs and holds the basic FDTD operations and related fields
@ -62,29 +62,29 @@ class Simulation:
S: pyopencl.array.Array S: pyopencl.array.Array
eps: pyopencl.array.Array eps: pyopencl.array.Array
dt: float dt: float
inv_dxes: list[pyopencl.array.Array] inv_dxes: List[pyopencl.array.Array]
arg_type: Type arg_type: Type
context: pyopencl.Context context: pyopencl.Context
queue: pyopencl.CommandQueue queue: pyopencl.CommandQueue
update_E: Callable[[list[pyopencl.Event]], pyopencl.Event] update_E: Callable[[List[pyopencl.Event]], pyopencl.Event]
update_H: Callable[[list[pyopencl.Event]], pyopencl.Event] update_H: Callable[[List[pyopencl.Event]], pyopencl.Event]
update_S: Callable[[list[pyopencl.Event]], pyopencl.Event] update_S: Callable[[List[pyopencl.Event]], pyopencl.Event]
update_J: Callable[[list[pyopencl.Event]], pyopencl.Event] update_J: Callable[[List[pyopencl.Event]], pyopencl.Event]
sources: dict[str, str] sources: Dict[str, str]
def __init__( def __init__(
self, self,
epsilon: NDArray, epsilon: NDArray,
pmls: Sequence[dict[str, float]], pmls: Sequence[Dict[str, float]],
bloch_boundaries: Sequence[dict[str, float]] = (), bloch_boundaries: Sequence[Dict[str, float]] = (),
dxes: list[list[NDArray]] | float | None = None, dxes: Union[List[List[NDArray]], float, None] = None,
dt: float | None = None, dt: Optional[float] = None,
initial_fields: dict[str, NDArray] | None = None, initial_fields: Optional[Dict[str, NDArray]] = None,
context: pyopencl.Context | None = None, context: Optional[pyopencl.Context] = None,
queue: pyopencl.CommandQueue | None = None, queue: Optional[pyopencl.CommandQueue] = None,
float_type: Type = numpy.float32, float_type: Type = numpy.float32,
do_poynting: bool = True, do_poynting: bool = True,
do_fieldsrc: bool = False, do_fieldsrc: bool = False,
@ -331,8 +331,8 @@ class Simulation:
def _create_context( def _create_context(
self, self,
context: pyopencl.Context | None = None, context: Optional[pyopencl.Context] = None,
queue: pyopencl.CommandQueue | None = None, queue: Optional[pyopencl.CommandQueue] = None,
) -> None: ) -> None:
if context is None: if context is None:
self.context = pyopencl.create_some_context() self.context = pyopencl.create_some_context()
@ -353,7 +353,7 @@ class Simulation:
raise Exception(f'Epsilon shape mismatch. Expected {self.shape}, got {epsilon[0].shape}') raise Exception(f'Epsilon shape mismatch. Expected {self.shape}, got {epsilon[0].shape}')
self.eps = pyopencl.array.to_device(self.queue, vec(epsilon).astype(self.arg_type)) self.eps = pyopencl.array.to_device(self.queue, vec(epsilon).astype(self.arg_type))
def _create_field(self, initial_value: NDArray | None = None) -> pyopencl.array.Array: def _create_field(self, initial_value: Optional[NDArray] = None) -> pyopencl.array.Array:
if initial_value is None: if initial_value is None:
return pyopencl.array.zeros_like(self.eps) return pyopencl.array.zeros_like(self.eps)
else: else: