diff --git a/src/cpu/pythonbindings/src/submodules/simulationconfig.cpp b/src/cpu/pythonbindings/src/submodules/simulationconfig.cpp index 1f33c9471d6fedef2e7d0733c32080f17d998e61..a525691bdf8dd9a4a0a3994b607816fba509c7a5 100644 --- a/src/cpu/pythonbindings/src/submodules/simulationconfig.cpp +++ b/src/cpu/pythonbindings/src/submodules/simulationconfig.cpp @@ -5,18 +5,14 @@ namespace py = pybind11; void makeSimulationModule(py::module_ &parentModule) { - using namespace pybind11::literals; - py::class_<Simulation, std::shared_ptr<Simulation>>(parentModule, "Simulation") .def(py::init()) - .def("set_writer", &Simulation::setWriterConfig) + .def("set_writer", &Simulation::setWriterConfiguration) .def("set_grid_parameters", &Simulation::setGridParameters) .def("set_physical_parameters", &Simulation::setPhysicalParameters) - .def("set_simulation_parameters", &Simulation::setSimulationParameters) - .def("set_kernel_config", &Simulation::setKernelConfig) + .def("set_runtime_parameters", &Simulation::setRuntimeParameters) + .def("set_kernel_config", &Simulation::setKernelConfiguration) .def("add_object", &Simulation::addObject) .def("add_bc_adapter", &Simulation::addBCAdapter) .def("run_simulation", &Simulation::run); - - } \ No newline at end of file diff --git a/src/cpu/simulationconfig/include/simulationconfig/Simulation.h b/src/cpu/simulationconfig/include/simulationconfig/Simulation.h index df2b436e812fbebd9882517921b47167e35318b5..d7ad06c84d9618f32974333a81665d40f9488319 100644 --- a/src/cpu/simulationconfig/include/simulationconfig/Simulation.h +++ b/src/cpu/simulationconfig/include/simulationconfig/Simulation.h @@ -45,15 +45,15 @@ public: WriterConfiguration &getWriterConfig(); - void setWriterConfig(const WriterConfiguration &config); + void setWriterConfiguration(const WriterConfiguration &config); void setGridParameters(std::shared_ptr<GridParameters> parameters); void setPhysicalParameters(std::shared_ptr<PhysicalParameters> parameters); - void setSimulationParameters(std::shared_ptr<RuntimeParameters> parameters); + void setRuntimeParameters(std::shared_ptr<RuntimeParameters> parameters); - void setKernelConfig(const std::shared_ptr<LBMKernelConfiguration> &kernel); + void setKernelConfiguration(const std::shared_ptr<LBMKernelConfiguration> &kernel); void addObject(const std::shared_ptr<GbObject3D> &object, const std::shared_ptr<BCAdapter> &bcAdapter, int state, const std::string &folderPath); diff --git a/src/cpu/simulationconfig/src/Simulation.cpp b/src/cpu/simulationconfig/src/Simulation.cpp index a92b0050de0b546a577f16265600fac7d13dfcae..558f6d3c2de6dad409cc729725cd2d025c950c78 100644 --- a/src/cpu/simulationconfig/src/Simulation.cpp +++ b/src/cpu/simulationconfig/src/Simulation.cpp @@ -52,7 +52,7 @@ void Simulation::setPhysicalParameters(std::shared_ptr<PhysicalParameters> param this->physicalParameters = std::move(parameters); } -void Simulation::setSimulationParameters(std::shared_ptr<RuntimeParameters> parameters) +void Simulation::setRuntimeParameters(std::shared_ptr<RuntimeParameters> parameters) { this->simulationParameters = std::move(parameters); } @@ -73,14 +73,14 @@ void Simulation::addBCAdapter(const std::shared_ptr<BCAdapter> &bcAdapter) this->bcVisitor.addBC(bcAdapter); } -void Simulation::setKernelConfig(const std::shared_ptr<LBMKernelConfiguration> &kernel) +void Simulation::setKernelConfiguration(const std::shared_ptr<LBMKernelConfiguration> &kernel) { this->kernelConfig = kernel; this->lbmKernel = kernelFactory.makeKernel(kernel->kernelType); this->lbmSystem = kernelFactory.makeLBMSystem(kernel->kernelType); } -void Simulation::setWriterConfig(const WriterConfiguration &config) +void Simulation::setWriterConfiguration(const WriterConfiguration &config) { this->writerConfig = config; }