Skip to content
Snippets Groups Projects
Commit 429f57a3 authored by Soeren Peters's avatar Soeren Peters
Browse files

Fix bindings once more.

parent 4f18dcea
No related branches found
No related tags found
1 merge request!298[CPU] Clean CPU core
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
#include "BCStrategy.h" #include "BCStrategy.h"
#include <pybind11/pybind11.h> #include <pybind11/pybind11.h>
#include <pybind11/stl.h> #include <pybind11/stl.h>
#include <BoundaryConditions/DensityBC.h> #include <BoundaryConditions/PressureNonEquilibrium.h>
#include <BoundaryConditions/NonReflectingOutflowBCStrategy.h> #include <BoundaryConditions/OutflowNonReflecting.h>
#include <BoundaryConditions/BC.h> #include <BoundaryConditions/BC.h>
#include <BoundaryConditions/NoSlipBC.h> #include <BoundaryConditions/NoSlipBC.h>
#include <BoundaryConditions/VelocityBC.h> #include <BoundaryConditions/VelocityBC.h>
#include <BoundaryConditions/NoSlipBCStrategy.h> #include <BoundaryConditions/PressureBC.h>
#include <BoundaryConditions/VelocityBCStrategy.h> #include <BoundaryConditions/NoSlipInterpolated.h>
#include <BoundaryConditions/HighViscosityNoSlipBCStrategy.h> #include <BoundaryConditions/VelocityInterpolated.h>
namespace boundaryconditions namespace boundaryconditions
{ {
...@@ -70,13 +70,10 @@ namespace boundaryconditions ...@@ -70,13 +70,10 @@ namespace boundaryconditions
auto _ = py::class_<BC, std::shared_ptr<BC>>(bcModule, "BC"); auto _ = py::class_<BC, std::shared_ptr<BC>>(bcModule, "BC");
bc_class<NoSlipBC, NoSlipBCStrategy>(bcModule, "NoSlipBoundaryCondition") bc_class<NoSlipBC, NoSlipInterpolated>(bcModule, "NoSlipBoundaryCondition")
.def(py::init()); .def(py::init());
bc_class<NoSlipBC, HighViscosityNoSlipBCStrategy>(bcModule, "HighViscosityNoSlipBoundaryCondition") bc_class<VelocityBC, VelocityInterpolated>(bcModule, "VelocityBoundaryCondition")
.def(py::init());
bc_class<VelocityBC, VelocityBCStrategy>(bcModule, "VelocityBoundaryCondition")
.def(py::init()) .def(py::init())
.def(py::init<bool &, bool &, bool &, mu::Parser &, real &, real &>(), .def(py::init<bool &, bool &, bool &, mu::Parser &, real &, real &>(),
"vx1"_a, "vx2"_a, "vx3"_a, "vx1"_a, "vx2"_a, "vx3"_a,
...@@ -90,7 +87,7 @@ namespace boundaryconditions ...@@ -90,7 +87,7 @@ namespace boundaryconditions
"vx2"_a, "vx2_start_time"_a, "vx2_end_time"_a, "vx2"_a, "vx2_start_time"_a, "vx2_end_time"_a,
"vx3"_a, "vx3_start_time"_a, "vx3_end_time"_a); "vx3"_a, "vx3_start_time"_a, "vx3_end_time"_a);
bc_class<DensityBC, NonReflectingOutflowBCStrategy>(bcModule, "NonReflectingOutflow") bc_class<PressureBC, OutflowNonReflecting>(bcModule, "NonReflectingOutflow")
.def(py::init()); .def(py::init());
} }
......
#include <LBM/LBMKernel.h> #include <LBM/LBMKernel.h>
#include <LBM/K17CompressibleNavierStokes.h> #include <LBM/K17CompressibleNavierStokes.h>
#include <LBM/BGKLBMKernel.h> #include <LBM/B92IncompressibleNavierStokes.h>
#include <simulationconfig/D3Q27LBMSystem.h> #include <simulationconfig/D3Q27LBMSystem.h>
#include "simulationconfig/KernelFactory.h" #include "simulationconfig/KernelFactory.h"
...@@ -8,7 +8,7 @@ std::shared_ptr<LBMKernel> KernelFactory::makeKernel(KernelType kernelType) ...@@ -8,7 +8,7 @@ std::shared_ptr<LBMKernel> KernelFactory::makeKernel(KernelType kernelType)
{ {
switch (kernelType) { switch (kernelType) {
case BGK: case BGK:
return std::shared_ptr<LBMKernel>(new BGKLBMKernel()); return std::shared_ptr<LBMKernel>(new B92IncompressibleNavierStokes());
case COMPRESSIBLE_CUMULANT_4TH_ORDER_VISCOSITY: case COMPRESSIBLE_CUMULANT_4TH_ORDER_VISCOSITY:
return std::shared_ptr<LBMKernel>(new K17CompressibleNavierStokes()); return std::shared_ptr<LBMKernel>(new K17CompressibleNavierStokes());
default: default:
......
...@@ -77,7 +77,6 @@ void CPUSimulation::addObject(const std::shared_ptr<GbObject3D> &object, const s ...@@ -77,7 +77,6 @@ void CPUSimulation::addObject(const std::shared_ptr<GbObject3D> &object, const s
void CPUSimulation::addBCAdapter(const std::shared_ptr<BC> &bcAdapter) void CPUSimulation::addBCAdapter(const std::shared_ptr<BC> &bcAdapter)
{ {
registeredAdapters.insert(bcAdapter); registeredAdapters.insert(bcAdapter);
this->bcVisitor.addBC(bcAdapter);
} }
void CPUSimulation::setKernelConfiguration(const std::shared_ptr<LBMKernelConfiguration> &kernel) void CPUSimulation::setKernelConfiguration(const std::shared_ptr<LBMKernelConfiguration> &kernel)
......
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