smyalygames/FiniteVolumeGPU
1
0
Fork 0
mirror of https://github.com/smyalygames/FiniteVolumeGPU.git synced 2025-10-31 20:17:41 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(simulator): circular import with BoundaryCondition

Browse Source
This commit is contained in:
Anthony Berg 2025-06-30 23:37:20 +02:00
parent 86b56741e2
commit a77c3786e5
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GPUSimulators/helpers/__init__.py
View File

@ -1,2 +1,2 @@
import initial_conditions as InitialConditions
import visualization as Visualization
from . import initial_conditions as InitialConditions
from . import visualization as Visualization

4
GPUSimulators/simulator/cuda_simulator.py
View File

@ -1,7 +1,7 @@
import pycuda.driver as cuda
from GPUSimulators.gpu import KernelContext
from . import simulator, BoundaryCondition
from . import simulator, boundary
class CudaSimulator(simulator.BaseSimulator):
@ -9,7 +9,7 @@ class CudaSimulator(simulator.BaseSimulator):
context: KernelContext,
nx: int, ny: int,
dx: int, dy: int,
boundary_conditions: BoundaryCondition,
boundary_conditions: boundary.BoundaryCondition,
cfl_scale: float,
num_substeps: int,
block_width: int, block_height: int):

4
GPUSimulators/simulator/hip_simulator.py
View File

@ -2,7 +2,7 @@ from hip import hip
from GPUSimulators.common import hip_check
from GPUSimulators.gpu import KernelContext
from . import simulator, BoundaryCondition
from . import simulator, boundary
class HIPSimulator(simulator.BaseSimulator):
@ -10,7 +10,7 @@ class HIPSimulator(simulator.BaseSimulator):
context: KernelContext,
nx: int, ny: int,
dx: int, dy: int,
boundary_conditions: BoundaryCondition,
boundary_conditions: boundary.BoundaryCondition,
cfl_scale: float,
num_substeps: int,
block_width: int, block_height: int):

14
GPUSimulators/simulator/simulator.py
View File

@ -2,16 +2,16 @@ import logging
import numpy as np
from . import BoundaryCondition
from . import boundary
from GPUSimulators.common import ProgressPrinter
from GPUSimulators.gpu import KernelContext
def get_types(bc):
types = {'north': BoundaryCondition.Type((bc >> 24) & 0x0000000F),
'south': BoundaryCondition.Type((bc >> 16) & 0x0000000F),
'east': BoundaryCondition.Type((bc >> 8) & 0x0000000F),
'west': BoundaryCondition.Type((bc >> 0) & 0x0000000F)}
types = {'north': boundary.BoundaryCondition.Type((bc >> 24) & 0x0000000F),
'south': boundary.BoundaryCondition.Type((bc >> 16) & 0x0000000F),
'east': boundary.BoundaryCondition.Type((bc >> 8) & 0x0000000F),
'west': boundary.BoundaryCondition.Type((bc >> 0) & 0x0000000F)}
return types
@ -21,7 +21,7 @@ class BaseSimulator(object):
context: KernelContext,
nx: int, ny: int,
dx: int, dy: int,
boundary_conditions: BoundaryCondition,
boundary_conditions: boundary.BoundaryCondition,
cfl_scale: float,
num_substeps: int,
block_width: int, block_height: int):
@ -160,7 +160,7 @@ class BaseSimulator(object):
self.boundary_conditions = boundary_conditions.as_coded_int()
def get_boundary_conditions(self):
return BoundaryCondition(get_types(self.boundary_conditions))
return boundary.BoundaryCondition(get_types(self.boundary_conditions))
def substep(self, dt, step_number):
"""