From c6ddf00d7b698e3c5c00b18ad34ff5689cc7578c Mon Sep 17 00:00:00 2001 From: hamidrezanorouzi Date: Wed, 15 Mar 2023 06:52:15 +0330 Subject: [PATCH] remove set to zero for fluid force --- DEMSystems/sphereDEMSystem/sphereFluidParticles.cpp | 5 ++--- src/phasicFlow/Timer/Timers.hpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/DEMSystems/sphereDEMSystem/sphereFluidParticles.cpp b/DEMSystems/sphereDEMSystem/sphereFluidParticles.cpp index 9b3a44b0..839bfdc3 100644 --- a/DEMSystems/sphereDEMSystem/sphereFluidParticles.cpp +++ b/DEMSystems/sphereDEMSystem/sphereFluidParticles.cpp @@ -56,9 +56,8 @@ pFlow::sphereFluidParticles::sphereFluidParticles( bool pFlow::sphereFluidParticles::beforeIteration() { - sphereParticles::beforeIteration(); - zeroFluidForce_H(); - zeroFluidTorque_H(); + return sphereParticles::beforeIteration(); + return true; } diff --git a/src/phasicFlow/Timer/Timers.hpp b/src/phasicFlow/Timer/Timers.hpp index 087b37ea..41aa5ab8 100644 --- a/src/phasicFlow/Timer/Timers.hpp +++ b/src/phasicFlow/Timer/Timers.hpp @@ -18,8 +18,8 @@ Licence: -----------------------------------------------------------------------------*/ -#ifndef __Timers_hpp__ -#define __Timers_hpp__ +#ifndef __Timerss_hpp__ +#define __Timerss_hpp__ #include "Timer.hpp" @@ -34,7 +34,7 @@ class Timers { protected: - List timers_; + List timers_; int32 level_ = 0;