From ed868e32063152ad084cb634e4dde4a47336a085 Mon Sep 17 00:00:00 2001
From: Markus Holzer <markus.holzer@fau.de>
Date: Wed, 19 Jul 2023 12:20:40 +0200
Subject: [PATCH] Better refactor
---
lbmpy/advanced_streaming/__init__.py | 3 +--
lbmpy/advanced_streaming/indexing.py | 2 +-
lbmpy/boundaries/boundaryconditions.py | 2 +-
lbmpy/{advanced_streaming => }/custom_code_nodes.py | 0
lbmpy/sparse/mapping.py | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
rename lbmpy/{advanced_streaming => }/custom_code_nodes.py (100%)
diff --git a/lbmpy/advanced_streaming/__init__.py b/lbmpy/advanced_streaming/__init__.py
index aeddb1f3..a7ae1481 100644
--- a/lbmpy/advanced_streaming/__init__.py
+++ b/lbmpy/advanced_streaming/__init__.py
@@ -1,10 +1,9 @@
-from .custom_code_nodes import NeighbourOffsetArrays, MirroredStencilDirections
from .indexing import BetweenTimestepsIndexing
from .communication import get_communication_slices, LBMPeriodicityHandling
from .utility import Timestep, get_accessor, is_inplace, get_timesteps, \
numeric_index, numeric_offsets, inverse_dir_index, AccessPdfValues
-__all__ = ['BetweenTimestepsIndexing', 'NeighbourOffsetArrays', 'MirroredStencilDirections',
+__all__ = ['BetweenTimestepsIndexing',
'get_communication_slices', 'LBMPeriodicityHandling',
'Timestep', 'get_accessor', 'is_inplace', 'get_timesteps',
'numeric_index', 'numeric_offsets', 'inverse_dir_index', 'AccessPdfValues']
diff --git a/lbmpy/advanced_streaming/indexing.py b/lbmpy/advanced_streaming/indexing.py
index af0af426..98ec6303 100644
--- a/lbmpy/advanced_streaming/indexing.py
+++ b/lbmpy/advanced_streaming/indexing.py
@@ -4,7 +4,7 @@ import pystencils as ps
from pystencils.typing import TypedSymbol, create_type
from lbmpy.advanced_streaming.utility import get_accessor, inverse_dir_index, is_inplace, Timestep
-from .custom_code_nodes import TranslationArraysNode
+from lbmpy.custom_code_nodes import TranslationArraysNode
from itertools import product
diff --git a/lbmpy/boundaries/boundaryconditions.py b/lbmpy/boundaries/boundaryconditions.py
index e894f1a1..a987af6a 100644
--- a/lbmpy/boundaries/boundaryconditions.py
+++ b/lbmpy/boundaries/boundaryconditions.py
@@ -7,7 +7,7 @@ from pystencils import Assignment, Field
from pystencils.typing import create_type
from pystencils.sympyextensions import get_symmetric_part
from lbmpy.simplificationfactory import create_simplification_strategy
-from lbmpy.advanced_streaming.custom_code_nodes import NeighbourOffsetArrays, MirroredStencilDirections, LbmWeightInfo
+from lbmpy.custom_code_nodes import NeighbourOffsetArrays, MirroredStencilDirections, LbmWeightInfo
from pystencils.stencil import offset_to_direction_string, direction_string_to_offset, inverse_direction
import sympy as sp
diff --git a/lbmpy/advanced_streaming/custom_code_nodes.py b/lbmpy/custom_code_nodes.py
similarity index 100%
rename from lbmpy/advanced_streaming/custom_code_nodes.py
rename to lbmpy/custom_code_nodes.py
diff --git a/lbmpy/sparse/mapping.py b/lbmpy/sparse/mapping.py
index 664907c7..fcb3e33b 100644
--- a/lbmpy/sparse/mapping.py
+++ b/lbmpy/sparse/mapping.py
@@ -3,7 +3,7 @@ from typing import Tuple
import numpy as np
import sympy as sp
-from lbmpy.advanced_streaming.custom_code_nodes import LbmWeightInfo
+from lbmpy.custom_code_nodes import LbmWeightInfo
from pystencils import Assignment, Field, TypedSymbol
from pystencils.boundaries.boundaryhandling import BoundaryOffsetInfo
from pystencils.boundaries.createindexlist import (
--
GitLab