Commit cba8ed7b authored by Thomas Trummer's avatar Thomas Trummer
Browse files

Replace NULL with nullptr when adding kernel arguments

This ensures that the correct argument size is used when calling clSetKernelArg.
parent fb830f9d
...@@ -6957,7 +6957,7 @@ void CommonIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context ...@@ -6957,7 +6957,7 @@ void CommonIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context
if (cc.getUseMixedPrecision()) if (cc.getUseMixedPrecision())
kernel->addArg(cc.getPosqCorrection()); kernel->addArg(cc.getPosqCorrection());
else else
kernel->addArg(NULL); kernel->addArg(nullptr);
kernel->addArg(integration.getPosDelta()); kernel->addArg(integration.getPosDelta());
kernel->addArg(cc.getVelm()); kernel->addArg(cc.getVelm());
kernel->addArg(cc.getLongForceBuffer()); kernel->addArg(cc.getLongForceBuffer());
...@@ -6992,7 +6992,7 @@ void CommonIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context ...@@ -6992,7 +6992,7 @@ void CommonIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context
if (cc.getUseMixedPrecision()) if (cc.getUseMixedPrecision())
kernel->addArg(cc.getPosqCorrection()); kernel->addArg(cc.getPosqCorrection());
else else
kernel->addArg(NULL); kernel->addArg(nullptr);
kernel->addArg(integration.getPosDelta()); kernel->addArg(integration.getPosDelta());
} }
} }
...@@ -7048,7 +7048,7 @@ void CommonIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context ...@@ -7048,7 +7048,7 @@ void CommonIntegrateCustomStepKernel::prepareForComputation(ContextImpl& context
if (cc.getUseMixedPrecision()) if (cc.getUseMixedPrecision())
kineticEnergyKernel->addArg(cc.getPosqCorrection()); kineticEnergyKernel->addArg(cc.getPosqCorrection());
else else
kineticEnergyKernel->addArg(NULL); kineticEnergyKernel->addArg(nullptr);
kineticEnergyKernel->addArg(integration.getPosDelta()); kineticEnergyKernel->addArg(integration.getPosDelta());
kineticEnergyKernel->addArg(cc.getVelm()); kineticEnergyKernel->addArg(cc.getVelm());
kineticEnergyKernel->addArg(cc.getLongForceBuffer()); kineticEnergyKernel->addArg(cc.getLongForceBuffer());
......
...@@ -549,7 +549,7 @@ IntegrationUtilities::IntegrationUtilities(ComputeContext& context, const System ...@@ -549,7 +549,7 @@ IntegrationUtilities::IntegrationUtilities(ComputeContext& context, const System
if (context.getUseMixedPrecision()) if (context.getUseMixedPrecision())
vsitePositionKernel->addArg(context.getPosqCorrection()); vsitePositionKernel->addArg(context.getPosqCorrection());
else else
vsitePositionKernel->addArg(NULL); vsitePositionKernel->addArg(nullptr);
vsitePositionKernel->addArg(vsite2AvgAtoms); vsitePositionKernel->addArg(vsite2AvgAtoms);
vsitePositionKernel->addArg(vsite2AvgWeights); vsitePositionKernel->addArg(vsite2AvgWeights);
vsitePositionKernel->addArg(vsite3AvgAtoms); vsitePositionKernel->addArg(vsite3AvgAtoms);
...@@ -565,7 +565,7 @@ IntegrationUtilities::IntegrationUtilities(ComputeContext& context, const System ...@@ -565,7 +565,7 @@ IntegrationUtilities::IntegrationUtilities(ComputeContext& context, const System
if (context.getUseMixedPrecision()) if (context.getUseMixedPrecision())
vsiteForceKernel->addArg(context.getPosqCorrection()); vsiteForceKernel->addArg(context.getPosqCorrection());
else else
vsiteForceKernel->addArg(NULL); vsiteForceKernel->addArg(nullptr);
vsiteForceKernel->addArg(); // Skip argument 2: the force array hasn't been created yet. vsiteForceKernel->addArg(); // Skip argument 2: the force array hasn't been created yet.
vsiteForceKernel->addArg(vsite2AvgAtoms); vsiteForceKernel->addArg(vsite2AvgAtoms);
vsiteForceKernel->addArg(vsite2AvgWeights); vsiteForceKernel->addArg(vsite2AvgWeights);
......
...@@ -282,7 +282,7 @@ void CommonIntegrateDrudeLangevinStepKernel::execute(ContextImpl& context, const ...@@ -282,7 +282,7 @@ void CommonIntegrateDrudeLangevinStepKernel::execute(ContextImpl& context, const
if (cc.getUseMixedPrecision()) if (cc.getUseMixedPrecision())
kernel2->addArg(cc.getPosqCorrection()); kernel2->addArg(cc.getPosqCorrection());
else else
kernel2->addArg(NULL); kernel2->addArg(nullptr);
kernel2->addArg(integration.getPosDelta()); kernel2->addArg(integration.getPosDelta());
kernel2->addArg(cc.getVelm()); kernel2->addArg(cc.getVelm());
kernel2->addArg(integration.getStepSize()); kernel2->addArg(integration.getStepSize());
...@@ -290,7 +290,7 @@ void CommonIntegrateDrudeLangevinStepKernel::execute(ContextImpl& context, const ...@@ -290,7 +290,7 @@ void CommonIntegrateDrudeLangevinStepKernel::execute(ContextImpl& context, const
if (cc.getUseMixedPrecision()) if (cc.getUseMixedPrecision())
hardwallKernel->addArg(cc.getPosqCorrection()); hardwallKernel->addArg(cc.getPosqCorrection());
else else
hardwallKernel->addArg(NULL); hardwallKernel->addArg(nullptr);
hardwallKernel->addArg(cc.getVelm()); hardwallKernel->addArg(cc.getVelm());
hardwallKernel->addArg(pairParticles); hardwallKernel->addArg(pairParticles);
hardwallKernel->addArg(integration.getStepSize()); hardwallKernel->addArg(integration.getStepSize());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment