fixe conflicts after merge of branch 'LIGGGHTS_coupling' into develop

apps/cpu/FallingSphere/FallingSphere.cpp

@@ -13,7 +13,7 @@ using namespace std;
 
 int main(int argc, char *argv[])
 {
-    SPtr<Communicator> comm = MPICommunicator::getInstance();
+    std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
     int myid                                        = comm->getProcessID();
 
 

apps/cpu/LiggghtsApp/LiggghtsApp.cpp

@@ -19,7 +19,7 @@ using namespace std;
 
 int main(int argc, char *argv[])
 {
-    SPtr<Communicator> comm = MPICommunicator::getInstance();
+    std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
     int myid                                        = comm->getProcessID();
 
 

apps/cpu/Nozzle/nozzle.cpp

@@ -13,7 +13,7 @@ using namespace std;
 
 int main(int argc, char *argv[])
 {
-    SPtr<Communicator> comm = MPICommunicator::getInstance();
+    std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
     int myid = comm->getProcessID();
 
 

src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.cpp

 #include "LiggghtsCouplingCoProcessor.h"
 #include "GbSphere3D.h"
-#include "MPICommunicator.h"
+#include "mpi/MPICommunicator.h"
 #include "CoProcessor.h"
 #include "LiggghtsCouplingWrapper.h"
 #include "Grid3D.h"
@@ -13,7 +13,9 @@
 #include "fix_lb_coupling_onetoone.h"
 
 LiggghtsCouplingCoProcessor::LiggghtsCouplingCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
-                                                         SPtr<Communicator> comm, LiggghtsCouplingWrapper &wrapper, int demSteps, SPtr<LBMUnitConverter> units)
+                                                         SPtr<vf::mpi::Communicator> comm,
+                                                         LiggghtsCouplingWrapper &wrapper, int demSteps,
+                                                         SPtr<LBMUnitConverter> units)
     : CoProcessor(grid, s), comm(comm), wrapper(wrapper), demSteps(demSteps), units(units)
 {
 

src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.h

@@ -46,7 +46,7 @@
 
 
 class CoProcessor;
-class Communicator;
+namespace vf::mpi {class Communicator;}
 class LiggghtsCouplingWrapper;
 class Grid3D;
 class Block3D;
@@ -61,7 +61,7 @@ struct ParticleData {
 class LiggghtsCouplingCoProcessor : public CoProcessor
 {
 public:
-    LiggghtsCouplingCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Communicator> comm,
+    LiggghtsCouplingCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<vf::mpi::Communicator> comm,
                                 LiggghtsCouplingWrapper &wrapper, int demSteps, SPtr<LBMUnitConverter> units);
     virtual ~LiggghtsCouplingCoProcessor();
 
@@ -88,7 +88,7 @@ protected:
     void addTorque(int const partId, int const coord, double const value, double *torque);
 
 private:
-    SPtr<Communicator> comm;
+    SPtr<vf::mpi::Communicator> comm;
     LiggghtsCouplingWrapper &wrapper;
     SPtr<LBMUnitConverter> units;
     int demSteps;

src/cpu/VirtualFluidsCore/CMakeLists.txt

@@ -24,13 +24,11 @@ if(BUILD_USE_OPENMP)
    list(APPEND VF_LIBRARIES OpenMP::OpenMP_CXX)
 endif()
 
-vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser ${VF_LIBRARIES} PRIVATE_LINK lbm mpi logger)
-
 IF(${USE_LIGGGHTS})
    list(APPEND VF_LIBRARIES optimized ${LIGGGHTS_RELEASE_LIBRARY} debug ${LIGGGHTS_DEBUG_LIBRARY})
 ENDIF()
 
-vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser MPI::MPI_CXX ${VF_LIBRARIES})
+vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser ${VF_LIBRARIES} PRIVATE_LINK lbm mpi logger)
 
 vf_get_library_name(library_name)
 

src/cpu/VirtualFluidsCore/Utilities/MemoryUtil.h

@@ -66,7 +66,6 @@
 #include <string>
 #include <vector>
 #include "Grid3D.h"
-#include "Communicator.h"
 
 //////////////////////////////////////////////////////////////////////////
 // MemoryUtil