diff --git a/apps/showcases/ParticlePacking/Evaluation.h b/apps/showcases/ParticlePacking/Evaluation.h index 76acf3caffd2369eac6dcbdba3009d33d065d560..f31d613d9969c3fd659fe33ce1a33736f1d7e4cb 100644 --- a/apps/showcases/ParticlePacking/Evaluation.h +++ b/apps/showcases/ParticlePacking/Evaluation.h @@ -59,7 +59,7 @@ struct ParticleInfo walberla::mpi::allReduceInplace(sumReduceVec, walberla::mpi::SUM); walberla::mpi::allReduceInplace(maxReduceVec, walberla::mpi::MAX); - numParticles = int(sumReduceVec[0]); + numParticles = uint_c(sumReduceVec[0]); averageVelocity = sumReduceVec[1]; particleVolume = sumReduceVec[2]; heightOfMass = sumReduceVec[3]; diff --git a/apps/showcases/ParticlePacking/ParticlePacking.cpp b/apps/showcases/ParticlePacking/ParticlePacking.cpp index af405c4665141d5031213efe16d413fd060732c6..7b6f5bca3b400cc825c00c5466242755ad374c6c 100644 --- a/apps/showcases/ParticlePacking/ParticlePacking.cpp +++ b/apps/showcases/ParticlePacking/ParticlePacking.cpp @@ -1298,9 +1298,9 @@ int main(int argc, char **argv) { [damping_forceDampingCoefficient, dt](size_t idx, data::ParticleAccessorWithBaseShape &ac){ auto force = ac.getForce(idx); auto velEstimated = ac.getLinearVelocity(idx) + force * ac.getInvMass(idx) * dt; // = velocity integration in SemiImplicitEuler, might need to be changed for other integrator - Vec3 dampingForce(mesa_pd::sgn(force[0] * velEstimated[0]) * force[0], - mesa_pd::sgn(force[1] * velEstimated[1]) * force[1], - mesa_pd::sgn(force[2] * velEstimated[2]) * force[2]); + Vec3 dampingForce(real_c(mesa_pd::sgn(force[0] * velEstimated[0])) * force[0], + real_c(mesa_pd::sgn(force[1] * velEstimated[1])) * force[1], + real_c(mesa_pd::sgn(force[2] * velEstimated[2])) * force[2]); dampingForce *= -damping_forceDampingCoefficient; ac.getForceRef(idx) += dampingForce; }, particleAccessor);