From d7211725361e837746bfc92e30440c8771045e17 Mon Sep 17 00:00:00 2001 From: Henry <henry.korb@geo.uu.se> Date: Tue, 25 Jan 2022 17:28:03 +0100 Subject: [PATCH] adapt pyfluids cpu to new structure --- Python/SlurmTests/poiseuille/settings.py | 4 ++-- Python/SlurmTests/poiseuille/simulation_runner.py | 2 +- Python/acousticscaling.py | 4 ++-- Python/cubeflow/simulation.py | 12 ++++++------ Python/poiseuille/poiseuille_hpc.py | 2 +- Python/poiseuille/simulation.py | 12 ++++++------ Python/poiseuille/test_poiseuille_l2.py | 4 ++-- Python/tests/test_acousticscaling.py | 4 ++-- Python/tests/test_boundaryconditions.py | 2 +- Python/tests/test_geometry.py | 2 +- Python/tests/test_kernel.py | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Python/SlurmTests/poiseuille/settings.py b/Python/SlurmTests/poiseuille/settings.py index f75c2b1d7..4b4a1e4e9 100644 --- a/Python/SlurmTests/poiseuille/settings.py +++ b/Python/SlurmTests/poiseuille/settings.py @@ -1,7 +1,7 @@ import os from acousticscaling import OneDirectionalAcousticScaling -from pyfluids.kernel import LBMKernel, KernelType -from pyfluids.parameters import RuntimeParameters, GridParameters, PhysicalParameters +from pyfluids.cpu.kernel import LBMKernel, KernelType +from pyfluids.cpu.parameters import RuntimeParameters, GridParameters, PhysicalParameters grid_params = GridParameters() diff --git a/Python/SlurmTests/poiseuille/simulation_runner.py b/Python/SlurmTests/poiseuille/simulation_runner.py index 0b75de40b..03fb24be7 100644 --- a/Python/SlurmTests/poiseuille/simulation_runner.py +++ b/Python/SlurmTests/poiseuille/simulation_runner.py @@ -2,7 +2,7 @@ import os from SlurmTests.poiseuille.settings import Scaling from poiseuille.simulation import run_simulation -from pyfluids.writer import Writer, OutputFormat +from pyfluids.cpu.writer import Writer, OutputFormat scale_level = int(os.environ["PYFLUIDS_SCALE_LEVEL"]) diff --git a/Python/acousticscaling.py b/Python/acousticscaling.py index 6622685a9..a664b8e92 100644 --- a/Python/acousticscaling.py +++ b/Python/acousticscaling.py @@ -1,5 +1,5 @@ -from pyfluids.kernel import LBMKernel -from pyfluids.parameters import GridParameters, PhysicalParameters, RuntimeParameters +from pyfluids.cpu.kernel import LBMKernel +from pyfluids.cpu.parameters import GridParameters, PhysicalParameters, RuntimeParameters class OneDirectionalAcousticScaling: diff --git a/Python/cubeflow/simulation.py b/Python/cubeflow/simulation.py index c8c145fdc..9e77e8d74 100644 --- a/Python/cubeflow/simulation.py +++ b/Python/cubeflow/simulation.py @@ -1,9 +1,9 @@ -from pyfluids import Simulation -from pyfluids.boundaryconditions import NoSlipBoundaryCondition, VelocityBoundaryCondition, DensityBoundaryCondition -from pyfluids.geometry import GbCuboid3D -from pyfluids.kernel import LBMKernel, KernelType -from pyfluids.parameters import PhysicalParameters, RuntimeParameters, GridParameters -from pyfluids.writer import Writer, OutputFormat +from pyfluids.cpu import Simulation +from pyfluids.cpu.boundaryconditions import NoSlipBoundaryCondition, VelocityBoundaryCondition, DensityBoundaryCondition +from pyfluids.cpu.geometry import GbCuboid3D +from pyfluids.cpu.kernel import LBMKernel, KernelType +from pyfluids.cpu.parameters import PhysicalParameters, RuntimeParameters, GridParameters +from pyfluids.cpu.writer import Writer, OutputFormat from pymuparser import Parser import os diff --git a/Python/poiseuille/poiseuille_hpc.py b/Python/poiseuille/poiseuille_hpc.py index b9bf67531..f5f5a1387 100644 --- a/Python/poiseuille/poiseuille_hpc.py +++ b/Python/poiseuille/poiseuille_hpc.py @@ -1,5 +1,5 @@ from poiseuille.simulation import run_simulation -from pyfluids.parameters import * +from pyfluids.cpu.parameters import * grid_parameters = GridParameters() grid_parameters.number_of_nodes_per_direction = [64, 64, 512] diff --git a/Python/poiseuille/simulation.py b/Python/poiseuille/simulation.py index 31ceb1ab9..d107801fa 100644 --- a/Python/poiseuille/simulation.py +++ b/Python/poiseuille/simulation.py @@ -1,9 +1,9 @@ -from pyfluids import Simulation -from pyfluids.boundaryconditions import NoSlipBoundaryCondition -from pyfluids.geometry import GbCuboid3D, State -from pyfluids.kernel import LBMKernel, KernelType -from pyfluids.parameters import RuntimeParameters, GridParameters, PhysicalParameters -from pyfluids.writer import Writer, OutputFormat +from pyfluids.cpu import Simulation +from pyfluids.cpu.boundaryconditions import NoSlipBoundaryCondition +from pyfluids.cpu.geometry import GbCuboid3D, State +from pyfluids.cpu.kernel import LBMKernel, KernelType +from pyfluids.cpu.parameters import RuntimeParameters, GridParameters, PhysicalParameters +from pyfluids.cpu.writer import Writer, OutputFormat default_grid_params = GridParameters() default_grid_params.node_distance = 10 / 32 diff --git a/Python/poiseuille/test_poiseuille_l2.py b/Python/poiseuille/test_poiseuille_l2.py index 39c8b6dff..93aa2600d 100644 --- a/Python/poiseuille/test_poiseuille_l2.py +++ b/Python/poiseuille/test_poiseuille_l2.py @@ -5,8 +5,8 @@ import unittest import matplotlib.pyplot as plt import numpy as np import pyvista as pv -from pyfluids.kernel import LBMKernel, KernelType -from pyfluids.parameters import GridParameters, PhysicalParameters, RuntimeParameters +from pyfluids.cpu.kernel import LBMKernel, KernelType +from pyfluids.cpu.parameters import GridParameters, PhysicalParameters, RuntimeParameters from scipy import stats from errors import normalized_l2_error diff --git a/Python/tests/test_acousticscaling.py b/Python/tests/test_acousticscaling.py index 2da531452..6413123a8 100644 --- a/Python/tests/test_acousticscaling.py +++ b/Python/tests/test_acousticscaling.py @@ -1,8 +1,8 @@ import unittest from typing import List -from pyfluids.kernel import LBMKernel, KernelType -from pyfluids.parameters import GridParameters, PhysicalParameters, RuntimeParameters +from pyfluids.cpu.kernel import LBMKernel, KernelType +from pyfluids.cpu.parameters import GridParameters, PhysicalParameters, RuntimeParameters from acousticscaling import OneDirectionalAcousticScaling diff --git a/Python/tests/test_boundaryconditions.py b/Python/tests/test_boundaryconditions.py index 5a7d61f36..e004ddfa2 100644 --- a/Python/tests/test_boundaryconditions.py +++ b/Python/tests/test_boundaryconditions.py @@ -1,5 +1,5 @@ import unittest -from pyfluids.boundaryconditions import * +from pyfluids.cpu.boundaryconditions import * class BoundaryConditionsTest(unittest.TestCase): diff --git a/Python/tests/test_geometry.py b/Python/tests/test_geometry.py index 5e953f58b..5bb89eb24 100644 --- a/Python/tests/test_geometry.py +++ b/Python/tests/test_geometry.py @@ -1,6 +1,6 @@ import unittest -from pyfluids.geometry import * +from pyfluids.cpu.geometry import * class TestGeometry(unittest.TestCase): diff --git a/Python/tests/test_kernel.py b/Python/tests/test_kernel.py index b1016f153..8f58a1c86 100644 --- a/Python/tests/test_kernel.py +++ b/Python/tests/test_kernel.py @@ -1,6 +1,6 @@ import unittest -from pyfluids.kernel import LBMKernel, KernelType +from pyfluids.cpu.kernel import LBMKernel, KernelType class TestLBMKernel(unittest.TestCase): -- GitLab