diff options
Diffstat (limited to 'extern/mantaflow/preprocessed/plugin/apic.cpp')
-rw-r--r-- | extern/mantaflow/preprocessed/plugin/apic.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/extern/mantaflow/preprocessed/plugin/apic.cpp b/extern/mantaflow/preprocessed/plugin/apic.cpp index 0312544c56b..9df6b597e05 100644 --- a/extern/mantaflow/preprocessed/plugin/apic.cpp +++ b/extern/mantaflow/preprocessed/plugin/apic.cpp @@ -271,8 +271,8 @@ void apicMapPartsToMAC(const FlagGrid &flags, const ParticleDataImpl<Vec3> &cpx, const ParticleDataImpl<Vec3> &cpy, const ParticleDataImpl<Vec3> &cpz, - MACGrid *mass = NULL, - const ParticleDataImpl<int> *ptype = NULL, + MACGrid *mass = nullptr, + const ParticleDataImpl<int> *ptype = nullptr, const int exclude = 0, const int boundaryWidth = 0) { @@ -297,7 +297,7 @@ static PyObject *_W_0(PyObject *_self, PyObject *_linargs, PyObject *_kwds) FluidSolver *parent = _args.obtainParent(); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); pbPreparePlugin(parent, "apicMapPartsToMAC", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; const FlagGrid &flags = *_args.getPtr<FlagGrid>("flags", 0, &_lock); @@ -308,9 +308,9 @@ static PyObject *_W_0(PyObject *_self, PyObject *_linargs, PyObject *_kwds) const ParticleDataImpl<Vec3> &cpx = *_args.getPtr<ParticleDataImpl<Vec3>>("cpx", 4, &_lock); const ParticleDataImpl<Vec3> &cpy = *_args.getPtr<ParticleDataImpl<Vec3>>("cpy", 5, &_lock); const ParticleDataImpl<Vec3> &cpz = *_args.getPtr<ParticleDataImpl<Vec3>>("cpz", 6, &_lock); - MACGrid *mass = _args.getPtrOpt<MACGrid>("mass", 7, NULL, &_lock); + MACGrid *mass = _args.getPtrOpt<MACGrid>("mass", 7, nullptr, &_lock); const ParticleDataImpl<int> *ptype = _args.getPtrOpt<ParticleDataImpl<int>>( - "ptype", 8, NULL, &_lock); + "ptype", 8, nullptr, &_lock); const int exclude = _args.getOpt<int>("exclude", 9, 0, &_lock); const int boundaryWidth = _args.getOpt<int>("boundaryWidth", 10, 0, &_lock); _retval = getPyNone(); @@ -544,7 +544,7 @@ void apicMapMACGridToParts(ParticleDataImpl<Vec3> &partVel, const BasicParticleSystem &parts, const MACGrid &vel, const FlagGrid &flags, - const ParticleDataImpl<int> *ptype = NULL, + const ParticleDataImpl<int> *ptype = nullptr, const int exclude = 0, const int boundaryWidth = 0) { @@ -558,7 +558,7 @@ static PyObject *_W_1(PyObject *_self, PyObject *_linargs, PyObject *_kwds) FluidSolver *parent = _args.obtainParent(); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); pbPreparePlugin(parent, "apicMapMACGridToParts", !noTiming); - PyObject *_retval = 0; + PyObject *_retval = nullptr; { ArgLocker _lock; ParticleDataImpl<Vec3> &partVel = *_args.getPtr<ParticleDataImpl<Vec3>>( @@ -570,7 +570,7 @@ static PyObject *_W_1(PyObject *_self, PyObject *_linargs, PyObject *_kwds) const MACGrid &vel = *_args.getPtr<MACGrid>("vel", 5, &_lock); const FlagGrid &flags = *_args.getPtr<FlagGrid>("flags", 6, &_lock); const ParticleDataImpl<int> *ptype = _args.getPtrOpt<ParticleDataImpl<int>>( - "ptype", 7, NULL, &_lock); + "ptype", 7, nullptr, &_lock); const int exclude = _args.getOpt<int>("exclude", 8, 0, &_lock); const int boundaryWidth = _args.getOpt<int>("boundaryWidth", 9, 0, &_lock); _retval = getPyNone(); |