diff --git a/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/PSMSweepCollection.h b/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/PSMSweepCollection.h index 07feccf1c693f4fb98eb7d6455d0a0f114220440..bdc2c076673ab56b8631e6ef63f4aa34a7c76fc3 100644 --- a/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/PSMSweepCollection.h +++ b/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/PSMSweepCollection.h @@ -72,6 +72,25 @@ class PSMSweepCollection SetParticleTemperaturesSweep< ParticleAccessor_T, ParticleSelector_T, Weighting_T >setParticleTemperaturesSweep; }; +template< typename SweepCollection, typename PSMSweepFluid,typename PSMSweepTemperature > +void addThermalPSMSweepToTimeloop(SweepTimeloop& timeloop, SweepCollection& psmSweepCollection, PSMSweepFluid& psmFluidSweep,PSMSweepTemperature& psmTempSweep) +{ + timeloop.add() << Sweep(deviceSyncWrapper(psmSweepCollection.particleMappingSweep), "Particle mapping"); + timeloop.add() << Sweep(deviceSyncWrapper(psmSweepCollection.setParticleVelocitiesSweep), + "Set particle velocities"); + timeloop.add() << Sweep(deviceSyncWrapper(psmFluidSweep), "PSM Fluid sweep"); + timeloop.add() << Sweep(deviceSyncWrapper(psmSweepCollection.setParticleTemperaturesSweep), + "Set particle temperatures"); + timeloop.add() << Sweep(deviceSyncWrapper(psmTempSweep), "PSM Concentration sweep"); + + // after both the sweeps, reduce the particle forces. + timeloop.add() << Sweep(deviceSyncWrapper(psmSweepCollection.reduceParticleForcesSweep), + "Reduce particle forces"); +} + + + + template< typename SweepCollection, typename PSMSweep > void addPSMSweepsToTimeloop(SweepTimeloop& timeloop, SweepCollection& psmSweepCollection, PSMSweep& psmSweep, bool synchronize = true) diff --git a/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/PSMWrapperSweepsCPU.h b/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/PSMWrapperSweepsCPU.h index 56b26f6ae993f9ca72e8bcd4cee4c77fdc13cc9d..7c9188e745341f0562e817d393bee897e59ac2f6 100644 --- a/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/PSMWrapperSweepsCPU.h +++ b/src/lbm_mesapd_coupling/partially_saturated_cells_method/codegen/PSMWrapperSweepsCPU.h @@ -89,7 +89,6 @@ class SetParticleTemperaturesSweep if (mappingParticleSelector_(idx, *ac_)) { temperatures[idxMapped] = ac_->getTemperature(idx); - WALBERLA_LOG_INFO("temperature from accessor is " << ac_->getTemperature(idx)); idxMapped++; } }