Skip to content
Snippets Groups Projects
Commit 740e75f6 authored by Sven Marcus's avatar Sven Marcus
Browse files

More naming improvements

parent 3a6f46f6
No related branches found
No related tags found
1 merge request!6Proper Python simulation tests
......@@ -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
......@@ -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);
......
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment