From 9b3c4f83b9532876c83ce5146fef47eeb9c5ccda Mon Sep 17 00:00:00 2001 From: HRN Date: Fri, 14 Feb 2025 20:39:37 +0330 Subject: [PATCH] edits --- solvers/sphereGranFlow/sphereGranFlow.cpp | 18 +++++++++++------- src/Particles/globalDamping/globalDamping.cpp | 12 ++++++++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/solvers/sphereGranFlow/sphereGranFlow.cpp b/solvers/sphereGranFlow/sphereGranFlow.cpp index d854b417..b8518253 100755 --- a/solvers/sphereGranFlow/sphereGranFlow.cpp +++ b/solvers/sphereGranFlow/sphereGranFlow.cpp @@ -74,7 +74,7 @@ pFlow::initialize_pFlowProcessors(); do { - + //Ping; if(! sphInsertion.insertParticles( Control.time().currentIter(), Control.time().currentTime(), @@ -84,27 +84,31 @@ pFlow::initialize_pFlowProcessors(); "particle insertion failed in sphereDFlow solver.\n"; return 1; } - + // set force to zero surfGeometry.beforeIteration(); // set force to zero, predict, particle deletion and etc. sphParticles.beforeIteration(); - + //Ping; sphInteraction.beforeIteration(); - sphInteraction.iterate(); - + sphInteraction.iterate(); + surfGeometry.iterate(); + //Ping; sphParticles.iterate(); - + + //Ping; sphInteraction.afterIteration(); + //Ping; surfGeometry.afterIteration(); + //Ping; sphParticles.afterIteration(); - + //Ping; }while(Control++); diff --git a/src/Particles/globalDamping/globalDamping.cpp b/src/Particles/globalDamping/globalDamping.cpp index f277beec..040030cc 100644 --- a/src/Particles/globalDamping/globalDamping.cpp +++ b/src/Particles/globalDamping/globalDamping.cpp @@ -35,10 +35,14 @@ pFlow::globalDamping::globalDamping(const systemControl& control) performDamping_ = !equal(dampingFactor_, static_cast(1.0)); if( performDamping_ ) - REPORT(2)<<"Global damping "<