From d10f288ea17e9316c2fab8bd0aae74b0f7abfa7d Mon Sep 17 00:00:00 2001 From: Henry <henry.korb@geo.uu.se> Date: Wed, 7 Dec 2022 17:33:26 +0100 Subject: [PATCH] adapt name change to python bindings --- pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi | 6 +++--- pythonbindings/src/gpu/gpu.cpp | 4 ++-- .../{velocity_setter.cpp => transient_bc_setter.cpp} | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) rename pythonbindings/src/gpu/submodules/{velocity_setter.cpp => transient_bc_setter.cpp} (52%) diff --git a/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi b/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi index 947b2cd27..568a1c4ee 100644 --- a/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi +++ b/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi @@ -374,7 +374,7 @@ class TurbulenceModelFactory: def set_model_constant(self, model_constant: float) -> None: ... def set_turbulence_model(self, turbulence_model: TurbulenceModel) -> None: ... -class VTKFileCollection(VelocityFileCollection): +class VTKFileCollection(FileCollection): def __init__(self, prefix: str) -> None: ... class VelocityBC: @@ -396,7 +396,7 @@ class VelocityBC: @property def name(self) -> str: ... -class VelocityFileCollection: +class FileCollection: def __init__(self, *args, **kwargs) -> None: ... -def create_file_collection(prefix: str, type: FileType) -> VelocityFileCollection: ... +def create_file_collection(prefix: str, type: FileType) -> FileCollection: ... diff --git a/pythonbindings/src/gpu/gpu.cpp b/pythonbindings/src/gpu/gpu.cpp index bafce633f..b747b4996 100644 --- a/pythonbindings/src/gpu/gpu.cpp +++ b/pythonbindings/src/gpu/gpu.cpp @@ -10,7 +10,7 @@ #include "submodules/grid_provider.cpp" #include "submodules/grid_generator.cpp" #include "submodules/turbulence_models.cpp" -#include "submodules/velocity_setter.cpp" +#include "submodules/transient_bc_setter.cpp" #include "submodules/actuator_farm.cpp" #include "submodules/grid_scaling_factory.cpp" @@ -26,7 +26,7 @@ namespace gpu pre_collision_interactor::makeModule(gpuModule); actuator_farm::makeModule(gpuModule); boundary_conditions::makeModule(gpuModule); - velocity_setter::makeModule(gpuModule); + transient_bc_setter::makeModule(gpuModule); communicator::makeModule(gpuModule); cuda_memory_manager::makeModule(gpuModule); probes::makeModule(gpuModule); diff --git a/pythonbindings/src/gpu/submodules/velocity_setter.cpp b/pythonbindings/src/gpu/submodules/transient_bc_setter.cpp similarity index 52% rename from pythonbindings/src/gpu/submodules/velocity_setter.cpp rename to pythonbindings/src/gpu/submodules/transient_bc_setter.cpp index dccba55ef..293e311a4 100644 --- a/pythonbindings/src/gpu/submodules/velocity_setter.cpp +++ b/pythonbindings/src/gpu/submodules/transient_bc_setter.cpp @@ -1,7 +1,7 @@ #include <pybind11/pybind11.h> -#include <gpu/GridGenerator/VelocitySetter/VelocitySetter.h> +#include <gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h> -namespace velocity_setter +namespace transient_bc_setter { namespace py = pybind11; @@ -12,9 +12,9 @@ namespace velocity_setter parentModule.def("create_file_collection", &createFileCollection, py::arg("prefix"), py::arg("type")); - py::class_<VelocityFileCollection, std::shared_ptr<VelocityFileCollection>>(parentModule, "VelocityFileCollection"); + py::class_<FileCollection, std::shared_ptr<FileCollection>>(parentModule, "FileCollection"); - py::class_<VTKFileCollection, VelocityFileCollection, std::shared_ptr<VTKFileCollection>>(parentModule, "VTKFileCollection") + py::class_<VTKFileCollection, FileCollection, std::shared_ptr<VTKFileCollection>>(parentModule, "VTKFileCollection") .def(py::init <std::string>(), py::arg("prefix")); } } \ No newline at end of file -- GitLab