From 6d4e72dc3ff8d433f206d7696ccfe15e3cdac032 Mon Sep 17 00:00:00 2001
From: Sergio Ferraris <s.ferraris@opencfd.co.uk>
Date: Fri, 28 Aug 2020 08:49:58 -0700
Subject: [PATCH] ENH: Using basicKinematicCloud for MPPICFoam and MPPICDyMFoam

---
 .../solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C |  4 ++--
 applications/solvers/lagrangian/DPMFoam/DPMFoam.C      | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
index f1d7b1777bd..f010b2c5aa2 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
@@ -42,8 +42,8 @@ Description
 #include "CorrectPhi.H"
 
 #ifdef MPPIC
-    #include "basicKinematicMPPICCloud.H"
-    #define basicKinematicTypeCloud basicKinematicMPPICCloud
+    #include "basicKinematicCloud.H"
+    #define basicKinematicTypeCloud basicKinematicCloud
 #else
     #include "basicKinematicCollidingCloud.H"
     #define basicKinematicTypeCloud basicKinematicCollidingCloud
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index 5c5bc0f5a57..4cf685ac882 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -43,8 +43,8 @@ Description
 #include "pimpleControl.H"
 
 #ifdef MPPIC
-    #include "basicKinematicMPPICCloud.H"
-    #define basicKinematicTypeCloud basicKinematicMPPICCloud
+    #include "basicKinematicCloud.H"
+    #define basicKinematicTypeCloud basicKinematicCloud
 #else
     #include "basicKinematicCollidingCloud.H"
     #define basicKinematicTypeCloud basicKinematicCollidingCloud
@@ -118,6 +118,12 @@ int main(int argc, char *argv[])
         cloudVolSUSu.correctBoundaryConditions();
         cloudSU.source() = Zero;
 
+//         cloudVolSUSu.primitiveFieldRef() =
+//             (cloudSU.diag()*Uc() - cloudSU.source())/mesh.V();
+//         cloudVolSUSu.correctBoundaryConditions();
+//         cloudSU.source() = cloudSU.diag()*Uc();
+
+
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
         {
-- 
GitLab