From 59adfbe6ac2b59ef73d90101b7e81b31736945ed Mon Sep 17 00:00:00 2001
From: Richard Berger <richard.berger@jku.at>
Date: Sun, 1 Mar 2015 19:32:56 +0100
Subject: [PATCH 1/2] Changes system header includes from "" to <> syntax

This avoids irritating warnings of wmake about it not finding certain headers
(e.g. system headers). Similar things were necessary in some headers of the
LIGGGHTS code. While these did not cause compilation errors, they messed up
the compilation output with hundrets of false alarms. Not very helpful if
you're trying to find out what went wrong.

One special case is the change from RASModel.H to turbulenceModel.H in
cfdemCloud.H. Between major OpenFOAM versions there was a change of how
turbulence models were implemented. While the CFDEMcoupling code uses
preprocessors to allow compatibility, the wmkdepend utility is too simple
to understand this. It does not evaluate #ifdef constructs and just looks
for #include lines. Therefore it tries to access RASModel.H in newer
versions of OpenFOAM, which no longer exists.

To circumvent this issue, both includes were changed from "" to <> syntax.
This suppresses the warning and compiles, since the OpenFOAM header is in
the include path anyway.
---
 src/lagrangian/cfdemParticle/.gitignore                   | 1 +
 src/lagrangian/cfdemParticle/cfdTools/mathExtra.H         | 8 ++++----
 src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H      | 4 ++--
 .../cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C     | 2 +-
 .../cfdemParticle/derived/cfdemCloudMS/cfdemCloudMS.C     | 2 +-
 .../cfdemParticle/subModels/averagingModel/dense/dense.C  | 2 +-
 .../subModels/clockModel/clockModel/clockModel.C          | 2 +-
 .../subModels/dataExchangeModel/twoWayFiles/twoWayFiles.H | 2 +-
 .../subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H     | 4 ++--
 .../dataExchangeModel/twoWayMany2Many/library/error.cpp   | 4 ++--
 .../dataExchangeModel/twoWayMany2Many/library/error.h     | 2 +-
 .../dataExchangeModel/twoWayMany2Many/library/files.cpp   | 2 +-
 .../twoWayMany2Many/library/irregular.cpp                 | 2 +-
 .../dataExchangeModel/twoWayMany2Many/library/irregular.h | 2 +-
 .../twoWayMany2Many/library/lammps_data_write.h           | 2 +-
 .../twoWayMany2Many/library/many2many.cpp                 | 4 ++--
 .../dataExchangeModel/twoWayMany2Many/library/many2many.h | 2 +-
 .../twoWayMany2Many/library/many2one.cpp                  | 4 ++--
 .../dataExchangeModel/twoWayMany2Many/library/many2one.h  | 2 +-
 .../dataExchangeModel/twoWayMany2Many/library/memory.cpp  | 4 ++--
 .../dataExchangeModel/twoWayMany2Many/library/memory.h    | 2 +-
 .../twoWayMany2Many/library/one2many.cpp                  | 2 +-
 .../dataExchangeModel/twoWayMany2Many/library/one2many.h  | 2 +-
 .../twoWayMany2Many/library/send2one.cpp                  | 4 ++--
 .../dataExchangeModel/twoWayMany2Many/library/send2one.h  | 2 +-
 .../dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H   | 4 ++--
 .../subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C      | 2 +-
 .../subModels/forceModel/KochHillDrag/KochHillDrag.C      | 2 +-
 .../subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C  | 2 +-
 .../cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C  | 2 +-
 .../forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C  | 2 +-
 .../checkCouplingInterval/checkCouplingInterval.C         | 2 +-
 .../checkCouplingInterval/checkCouplingInterval.H         | 2 +-
 .../forceModel/particleCellVolume/particleCellVolume.C    | 2 +-
 .../forceModel/volWeightedAverage/volWeightedAverage.C    | 2 +-
 .../forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C          | 2 +-
 .../subModels/locateModel/engineSearchIB/engineSearchIB.C | 2 +-
 .../cfdemParticle/subModels/probeModel/noProbe/noProbe.C  | 2 +-
 .../subModels/probeModel/particleProbe/particleProbe.C    | 2 +-
 .../voidFractionModel/IBVoidFraction/IBVoidFraction.C     | 2 +-
 .../dividedVoidFraction/dividedVoidFraction.C             | 2 +-
 41 files changed, 52 insertions(+), 51 deletions(-)
 create mode 100644 src/lagrangian/cfdemParticle/.gitignore

diff --git a/src/lagrangian/cfdemParticle/.gitignore b/src/lagrangian/cfdemParticle/.gitignore
new file mode 100644
index 00000000..81397dd9
--- /dev/null
+++ b/src/lagrangian/cfdemParticle/.gitignore
@@ -0,0 +1 @@
+lnInclude
diff --git a/src/lagrangian/cfdemParticle/cfdTools/mathExtra.H b/src/lagrangian/cfdemParticle/cfdTools/mathExtra.H
index a7c6067d..c4d96386 100644
--- a/src/lagrangian/cfdemParticle/cfdTools/mathExtra.H
+++ b/src/lagrangian/cfdemParticle/cfdTools/mathExtra.H
@@ -37,10 +37,10 @@ Description
 
 #include <vector>
 //#include "math.h"
-#include "stdio.h"
-#include "string.h"
-#include "error.h"
-#include "ctype.h"
+#include <stdio.h>
+#include <string.h>
+#include <error.h>
+#include <ctype.h>
 
 #define TOLERANCE_ORTHO 1e-10
 
diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
index a9a35ba6..cf4e8d4d 100644
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
@@ -50,9 +50,9 @@ SourceFiles
 #include "IFstream.H"
 
 #if defined(version21) || defined(version16ext)
-    #include "turbulenceModel.H"
+    #include <turbulenceModel.H>
 #elif defined(version15)
-    #include "RASModel.H"
+    #include <RASModel.H>
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C b/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C
index 913881d2..94e9636b 100644
--- a/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C
+++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C
@@ -36,7 +36,7 @@ Description
 #include "locateModel.H"
 #include "dataExchangeModel.H"
 #include "IOModel.H"
-#include "mpi.h"
+#include <mpi.h>
 #include "IOmanip.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/derived/cfdemCloudMS/cfdemCloudMS.C b/src/lagrangian/cfdemParticle/derived/cfdemCloudMS/cfdemCloudMS.C
index 91057bd4..46af7b7d 100644
--- a/src/lagrangian/cfdemParticle/derived/cfdemCloudMS/cfdemCloudMS.C
+++ b/src/lagrangian/cfdemParticle/derived/cfdemCloudMS/cfdemCloudMS.C
@@ -35,7 +35,7 @@ Description
 #include "locateModel.H"
 #include "dataExchangeModel.H"
 
-//#include "mpi.h" // only for debug reason
+//#include <mpi.h> // only for debug reason
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/lagrangian/cfdemParticle/subModels/averagingModel/dense/dense.C b/src/lagrangian/cfdemParticle/subModels/averagingModel/dense/dense.C
index 77892444..33f54d86 100644
--- a/src/lagrangian/cfdemParticle/subModels/averagingModel/dense/dense.C
+++ b/src/lagrangian/cfdemParticle/subModels/averagingModel/dense/dense.C
@@ -35,7 +35,7 @@ Description
 #include "addToRunTimeSelectionTable.H"
 #include "voidFractionModel.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C b/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
index f910b0f7..0db24157 100644
--- a/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
-#include "mpi.h"
+#include <mpi.h>
 #include "clockModel.H"
 #include <unistd.h>
 
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayFiles/twoWayFiles.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayFiles/twoWayFiles.H
index ed6c72c0..63907449 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayFiles/twoWayFiles.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayFiles/twoWayFiles.H
@@ -43,7 +43,7 @@ SourceFiles
 
 #include "dataExchangeModel.H"
 #include "OFstream.H"
-#include "sys/stat.h"
+#include <sys/stat.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
index 3eb68a9c..48f01124 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
@@ -44,7 +44,7 @@ SourceFiles
 #include "dataExchangeModel.H"
 #include "liggghtsCommandModel.H"
 #include "OFstream.H"
-#include "sys/stat.h"
+#include <sys/stat.h>
 #include "pair.h"
 #include "force.h"
 #include "forceModel.H"
@@ -54,7 +54,7 @@ SourceFiles
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mpi.h"
+#include <mpi.h>
 #include <lammps.h>         // these are LAMMPS include files
 #include <input.h>
 #include <atom.h>
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/error.cpp b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/error.cpp
index c70ec26f..68002924 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/error.cpp
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/error.cpp
@@ -1,6 +1,6 @@
-#include "mpi.h"
+#include <mpi.h>
 #include "stdlib.h"
-#include "stdio.h"
+#include <stdio.h>
 #include "error.h"
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/error.h b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/error.h
index f62f6205..517ed2fb 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/error.h
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/error.h
@@ -1,7 +1,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include "mpi.h"
+#include <mpi.h>
 
 class Error {
  public:
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/files.cpp b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/files.cpp
index 83464deb..49dc1e5d 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/files.cpp
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/files.cpp
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 #include "string.h"
 #include "files.h"
 
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/irregular.cpp b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/irregular.cpp
index aea9b833..1f6077ae 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/irregular.cpp
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/irregular.cpp
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
 #include "stdlib.h"
 #include "string.h"
 #include "irregular.h"
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/irregular.h b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/irregular.h
index ea649533..13c4896b 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/irregular.h
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/irregular.h
@@ -1,7 +1,7 @@
 #ifndef IRREGULAR_H
 #define IRREGULAR_H
 
-#include "mpi.h"
+#include <mpi.h>
 
 class Irregular {
  public:
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/lammps_data_write.h b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/lammps_data_write.h
index 5eda0f40..e7a84219 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/lammps_data_write.h
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/lammps_data_write.h
@@ -2,7 +2,7 @@
 #define LAMMPS_DATA_WRITE_H
 
 #include "send2one.h"
-#include "stdio.h"
+#include <stdio.h>
 
 class LAMMPSDataWrite : public Send2One {
  public:
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2many.cpp b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2many.cpp
index 305d440e..95019f3d 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2many.cpp
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2many.cpp
@@ -1,5 +1,5 @@
-#include "mpi.h"
-#include "stdio.h"
+#include <mpi.h>
+#include <stdio.h>
 #include "many2many.h"
 #include "irregular.h"
 #include "memory.h"
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2many.h b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2many.h
index a0c4a2b4..d372dc82 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2many.h
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2many.h
@@ -1,7 +1,7 @@
 #ifndef MANY2MANY_H
 #define MANY2MANY_H
 
-#include "mpi.h"
+#include <mpi.h>
 
 class Many2Many {
  public:
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2one.cpp b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2one.cpp
index 5b5467aa..6974ff0b 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2one.cpp
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2one.cpp
@@ -1,5 +1,5 @@
-#include "mpi.h"
-#include "stdio.h"
+#include <mpi.h>
+#include <stdio.h>
 #include "stdlib.h"
 #include "many2one.h"
 #include "memory.h"
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2one.h b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2one.h
index 7e487ec4..36642b38 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2one.h
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/many2one.h
@@ -1,7 +1,7 @@
 #ifndef MANY2ONE_H
 #define MANY2ONE_H
 
-#include "mpi.h"
+#include <mpi.h>
 
 class Many2One {
  public:
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/memory.cpp b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/memory.cpp
index 7377fac7..362d6365 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/memory.cpp
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/memory.cpp
@@ -1,6 +1,6 @@
-#include "mpi.h"
+#include <mpi.h>
 #include "stdlib.h"
-#include "stdio.h"
+#include <stdio.h>
 #include "memory.h"
 #include "error.h"
 
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/memory.h b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/memory.h
index d6efa778..31ce31bd 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/memory.h
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/memory.h
@@ -1,7 +1,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "mpi.h"
+#include <mpi.h>
 
 class Memory {
  public:
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/one2many.cpp b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/one2many.cpp
index e26bf708..fcd985bf 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/one2many.cpp
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/one2many.cpp
@@ -1,4 +1,4 @@
-#include "mpi.h"
+#include <mpi.h>
 #include "one2many.h"
 #include "memory.h"
 
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/one2many.h b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/one2many.h
index 97978661..a854d783 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/one2many.h
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/one2many.h
@@ -1,7 +1,7 @@
 #ifndef ONE2MANY_H
 #define ONE2MANY_H
 
-#include "mpi.h"
+#include <mpi.h>
 
 #include <map>
 
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/send2one.cpp b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/send2one.cpp
index d969b467..e02da1a7 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/send2one.cpp
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/send2one.cpp
@@ -1,6 +1,6 @@
-#include "mpi.h"
+#include <mpi.h>
 #include "stdlib.h"
-#include "stdio.h"
+#include <stdio.h>
 #include "send2one.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/send2one.h b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/send2one.h
index df25b5fb..78af6259 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/send2one.h
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/send2one.h
@@ -1,7 +1,7 @@
 #ifndef SEND2ONE_H
 #define SEND2ONE_H
 
-#include "mpi.h"
+#include <mpi.h>
 
 class Send2One {
  public:
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H
index 65d11150..70aed0e7 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H
@@ -44,7 +44,7 @@ SourceFiles
 #include "dataExchangeModel.H"
 #include "liggghtsCommandModel.H"
 #include "OFstream.H"
-#include "sys/stat.h"
+#include <sys/stat.h>
 #include "pair.h"
 #include "force.h"
 #include "forceModel.H"
@@ -52,7 +52,7 @@ SourceFiles
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mpi.h"
+#include <mpi.h>
 #include <lammps.h>
 #include <input.h>
 #include <atom.h>
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C
index 57160c15..63aff6f6 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C
@@ -34,7 +34,7 @@ Description
 #include "DiFeliceDrag.H"
 #include "addToRunTimeSelectionTable.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C
index da0a465b..34bb2b8d 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.C
@@ -35,7 +35,7 @@ Description
 #include "addToRunTimeSelectionTable.H"
 #include "dataExchangeModel.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
index fe35fab4..228f2867 100755
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C
@@ -35,7 +35,7 @@ Description
 #include "addToRunTimeSelectionTable.H"
 #include "dataExchangeModel.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C b/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C
index cc745a4e..d8f688d6 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C
@@ -34,7 +34,7 @@ Description
 #include "MeiLift.H"
 #include "addToRunTimeSelectionTable.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C
index 6aa7f206..3fc632cd 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C
@@ -34,7 +34,7 @@ Description
 #include "SchillerNaumannDrag.H"
 #include "addToRunTimeSelectionTable.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/checkCouplingInterval/checkCouplingInterval.C b/src/lagrangian/cfdemParticle/subModels/forceModel/checkCouplingInterval/checkCouplingInterval.C
index a226d82b..0668017a 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/checkCouplingInterval/checkCouplingInterval.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/checkCouplingInterval/checkCouplingInterval.C
@@ -34,7 +34,7 @@ Description
 #include "checkCouplingInterval.H"
 #include "addToRunTimeSelectionTable.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/checkCouplingInterval/checkCouplingInterval.H b/src/lagrangian/cfdemParticle/subModels/forceModel/checkCouplingInterval/checkCouplingInterval.H
index 01d1943d..73ee3750 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/checkCouplingInterval/checkCouplingInterval.H
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/checkCouplingInterval/checkCouplingInterval.H
@@ -44,7 +44,7 @@ SourceFiles
 
 #include "forceModel.H"
 #include "dataExchangeModel.H"
-#include "mpi.h"
+#include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C b/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C
index 5ea98110..505e6ab0 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C
@@ -34,7 +34,7 @@ Description
 #include "particleCellVolume.H"
 #include "addToRunTimeSelectionTable.H"
 #include "dataExchangeModel.H"
-#include "mpi.h"
+#include <mpi.h>
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C b/src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C
index dee0a17d..fc39c0fa 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C
@@ -34,7 +34,7 @@ Description
 #include "volWeightedAverage.H"
 #include "addToRunTimeSelectionTable.H"
 #include "dataExchangeModel.H"
-#include "mpi.h"
+#include <mpi.h>
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C b/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C
index 35a0386d..27b4f278 100644
--- a/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C
+++ b/src/lagrangian/cfdemParticle/subModels/forceModelMS/DiFeliceDragMS/DiFeliceDragMS.C
@@ -34,7 +34,7 @@ Description
 #include "DiFeliceDragMS.H"
 #include "addToRunTimeSelectionTable.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C
index 64dd4cc6..00e709e9 100644
--- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C
+++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.C
@@ -36,7 +36,7 @@ Description
 #include "addToRunTimeSelectionTable.H"
 #include "mathematicalConstants.H"
 
-#include "mpi.h"
+#include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/probeModel/noProbe/noProbe.C b/src/lagrangian/cfdemParticle/subModels/probeModel/noProbe/noProbe.C
index b9542074..67db9a2d 100644
--- a/src/lagrangian/cfdemParticle/subModels/probeModel/noProbe/noProbe.C
+++ b/src/lagrangian/cfdemParticle/subModels/probeModel/noProbe/noProbe.C
@@ -33,7 +33,7 @@ Description
 
 #include "noProbe.H"
 #include "addToRunTimeSelectionTable.H"
-#include "mpi.h"
+#include <mpi.h>
 #include "IOmanip.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C b/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C
index 96affbed..b9ac5c96 100644
--- a/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C
+++ b/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C
@@ -33,7 +33,7 @@ Description
 
 #include "particleProbe.H"
 #include "addToRunTimeSelectionTable.H"
-#include "mpi.h"
+#include <mpi.h>
 #include "IOmanip.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C
index a5d327e2..1affe4e7 100755
--- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C
+++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C
@@ -36,7 +36,7 @@ Description
 #include "locateModel.H"
 #include "dataExchangeModel.H"
 
-#include "mpi.h"
+#include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C
index 88ba06a7..e0222614 100644
--- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C
+++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C
@@ -36,7 +36,7 @@ Description
 #include "locateModel.H"
 #include "dataExchangeModel.H"
 
-//#include "mpi.h"
+//#include <mpi.h>
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam

From ea0d7b0351f153993ca4793a9c9af4bd0e3d7edb Mon Sep 17 00:00:00 2001
From: Richard Berger <richard.berger@jku.at>
Date: Sun, 1 Mar 2015 21:41:43 +0100
Subject: [PATCH 2/2] Changed to CMake compilation of LIGGGHTS

The cfdemCompLIG utility has been updated to use of CMake to compile LIGGGHTS.
This will generate a liggghts binary and libliggghts.so shared library which
can be used by CFDEMcoupling.

Users need to add the new environment variable CFDEM_LIGGGHTS_BIN_DIR into
their bashrc file, e.g.:

export CFDEM_LIGGGHTS_SRC_DIR=$PFM_DIR/LIGGGHTS/src
export CFDEM_LIGGGHTS_BIN_DIR=$PFM_DIR/LIGGGHTS/src-build

Other bash utilities in etc/functions.sh have also been updated, including
parDEMrun and parCFDEMrun.
---
 src/lagrangian/cfdemParticle/Make/options     |  5 +++--
 src/lagrangian/cfdemParticle/etc/bashrc       |  3 ++-
 src/lagrangian/cfdemParticle/etc/functions.sh | 21 +++++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/Make/options b/src/lagrangian/cfdemParticle/Make/options
index 93a3e147..1f5e95e2 100644
--- a/src/lagrangian/cfdemParticle/Make/options
+++ b/src/lagrangian/cfdemParticle/Make/options
@@ -28,7 +28,8 @@ LIB_LIBS = \
     -lmeshTools \
     -llagrangian \
     -lmpi_cxx \
-    -L$(CFDEM_LIGGGHTS_SRC_DIR) \
-    -Wl,--whole-archive -l$(CFDEM_LIGGGHTS_LIB_NAME) -Wl,--no-whole-archive \
+    -Wl,-rpath,$(CFDEM_LIGGGHTS_BIN_DIR) \
+    -L$(CFDEM_LIGGGHTS_BIN_DIR) \
+    -lliggghts \
     -L$(CFDEM_Many2ManyLIB_PATH) \
     -lcoupleMany2Many
diff --git a/src/lagrangian/cfdemParticle/etc/bashrc b/src/lagrangian/cfdemParticle/etc/bashrc
index 48a0424b..391fe5cb 100755
--- a/src/lagrangian/cfdemParticle/etc/bashrc
+++ b/src/lagrangian/cfdemParticle/etc/bashrc
@@ -26,7 +26,8 @@
 #export CFDEM_PROJECT_USER_DIR=$HOME/CFDEM/$LOGNAME-$CFDEM_VERSION-$WM_PROJECT_VERSION
 #export CFDEM_bashrc=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/bashrc
 #export CFDEM_LIGGGHTS_SRC_DIR=$HOME/LIGGGHTS/LIGGGHTS-PUBLIC/src
-#export CFDEM_LIGGGHTS_MAKEFILE_NAME=fedora_fpic
+#export CFDEM_LIGGGHTS_BIN_DIR=$HOME/LIGGGHTS/LIGGGHTS-PUBLIC/src-build
+#export CFDEM_LIGGGHTS_MAKEFILE_NAME=fedora_fpic # obsolete with CMake
 #export CFDEM_LPP_DIR=$HOME/LIGGGHTS/mylpp/src
 #export CFDEM_PIZZA_DIR=$HOME/LIGGGHTS/PIZZA/gran_pizza_17Aug10/src
 #. $CFDEM_bashrc
diff --git a/src/lagrangian/cfdemParticle/etc/functions.sh b/src/lagrangian/cfdemParticle/etc/functions.sh
index e89fa54b..c719776b 100755
--- a/src/lagrangian/cfdemParticle/etc/functions.sh
+++ b/src/lagrangian/cfdemParticle/etc/functions.sh
@@ -161,7 +161,8 @@ compileLIGGGHTS()
     rm $logpath/$logfileName
 
     #- change path
-    cd $CFDEM_LIGGGHTS_SRC_DIR
+    mkdir -p $CFDEM_LIGGGHTS_BIN_DIR
+    cd $CFDEM_LIGGGHTS_BIN_DIR
 
     #- header
     echo 2>&1 | tee -a $logpath/$logfileName
@@ -176,20 +177,18 @@ compileLIGGGHTS()
     if [[ $clean == "false" ]]; then
         echo "not cleaning LIGGGHTS"
     else
-        rm $CFDEM_LIGGGHTS_SRC_DIR/"lmp_"$CFDEM_LIGGGHTS_MAKEFILE_NAME
-        rm $CFDEM_LIGGGHTS_SRC_DIR/"lib"$CFDEM_LIGGGHTS_LIB_NAME".a"
-        make clean-all 2>&1 | tee -a $logpath/$logfileName
+        make clean 2>&1 | tee -a $logpath/$logfileName
+        rm CMakeCache.txt 2>&1 | tee -a $logpath/$logfileName
         echo "cleaning LIGGGHTS"
     fi
+    cmake $CFDEM_LIGGGHTS_SRC_DIR
     if [[ $WM_NCOMPPROCS == "" ]]; then
         echo "compiling LIGGGHTS on one CPU"
-        make $CFDEM_LIGGGHTS_MAKEFILE_NAME 2>&1 | tee -a $logpath/$logfileName
+        make 2>&1 | tee -a $logpath/$logfileName
     else
         echo "compiling LIGGGHTS on $WM_NCOMPPROCS CPUs"
-        make $CFDEM_LIGGGHTS_MAKEFILE_NAME -j $WM_NCOMPPROCS  2>&1 | tee -a $logpath/$logfileName
+        make -j $WM_NCOMPPROCS  2>&1 | tee -a $logpath/$logfileName
     fi
-    make makelib 2>&1 | tee -a $logpath/$logfileName
-    make -f Makefile.lib $CFDEM_LIGGGHTS_MAKEFILE_NAME 2>&1 | tee -a $logpath/$logfileName
 }
 
 #==================================#
@@ -405,7 +404,7 @@ DEMrun()
     echo 2>&1 | tee -a $logpath/$logfileName
 
     #- run applictaion
-    $debugMode $CFDEM_LIGGGHTS_SRC_DIR/$CFDEM_LIGGGHTS_LIB_NAME < $solverName 2>&1 | tee -a $logpath/$logfileName
+    $debugMode $CFDEM_LIGGGHTS_BIN_DIR/liggghts -in $solverName 2>&1 | tee -a $logpath/$logfileName
 
     #- keep terminal open (if started in new terminal)
     #read
@@ -455,9 +454,9 @@ parDEMrun()
 
     #- run applictaion
     if [ $machineFileName == "none" ]; then
-        mpirun -np $nrProcs $debugMode $CFDEM_LIGGGHTS_SRC_DIR/$CFDEM_LIGGGHTS_LIB_NAME < $solverName 2>&1 | tee -a $logpath/$logfileName
+        mpirun -np $nrProcs $debugMode $CFDEM_LIGGGHTS_BIN_DIR/liggghts -in $solverName 2>&1 | tee -a $logpath/$logfileName
     else
-        mpirun -machinefile $machineFileName -np $nrProcs $debugMode $CFDEM_LIGGGHTS_SRC_DIR/$CFDEM_LIGGGHTS_LIB_NAME < $solverName 2>&1 | tee -a $logpath/$logfileName
+        mpirun -machinefile $machineFileName -np $nrProcs $debugMode $CFDEM_LIGGGHTS_BIN_DIR/liggghts -in $solverName 2>&1 | tee -a $logpath/$logfileName
     fi
 
     #- keep terminal open (if started in new terminal)