diff --git a/applications/solvers/DNS/dnsFoam/Make/options b/applications/solvers/DNS/dnsFoam/Make/options
index ca6ebb8c803d23009e1946a8c36703540511ecdb..497e272a3ae1f1199634b3ca29233e69ae70ed98 100644
--- a/applications/solvers/DNS/dnsFoam/Make/options
+++ b/applications/solvers/DNS/dnsFoam/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
- -I$(LIB_SRC)/randomProcesses/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/randomProcesses/lnInclude
EXE_LIBS = \
- -lrandomProcesses \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lrandomProcesses
diff --git a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/Make/options b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/Make/options
index 149f9694b6daaa40691d95b746292c859b348034..de06a175b419b5401345cf29ace62cf321d0b83b 100644
--- a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/Make/options
+++ b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/Make/options
@@ -1,8 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/overset/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -ldynamicFvMesh \
-loverset
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/Make/options b/applications/solvers/basic/potentialFoam/overPotentialFoam/Make/options
index 155894029a879400d586b83e5b53191cd9952837..33210a14d372758c54e109584950b91bdd61cc75 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/Make/options
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/Make/options
@@ -1,12 +1,13 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/overset/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/overset/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
+ -ldynamicFvMesh \
-lsampling \
-loverset
diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index 58dfadafd4fb47074d79b59e2a953e1c997e024d..def8d609c2a7aa18c6f0f14028d62c7647db3c79 100644
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -4,6 +4,9 @@ EXE_INC = \
-IXiModels/XiGModels/XiGModel \
-IPDRModels/dragModels/PDRDragModel \
-IlaminarFlameSpeed/SCOPE \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -12,15 +15,14 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
- -lengine \
+ -lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
+ -lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lcompressibleTransportModels \
@@ -28,6 +30,4 @@ EXE_LIBS = \
-lreactionThermophysicalModels \
-lspecie \
-llaminarFlameSpeedModels \
- -lfiniteVolume \
- -ldynamicFvMesh \
- -lfvOptions
+ -ldynamicFvMesh
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index f659b4dcbee7317cd8fc93c85c2eeeb8dc4db373..056ed94388407d2e297fe10c5355a02074e604cc 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -1,4 +1,7 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -6,12 +9,13 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
@@ -19,8 +23,4 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie \
- -llaminarFlameSpeedModels \
- -lfiniteVolume \
- -lfvOptions \
- -lsampling \
- -lmeshTools
+ -llaminarFlameSpeedModels
diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
index a726de69b3fdce6dede41fa82f0c4b21ff4b094a..1e090ba60d10d160720bf9678a39d5df2413f5b7 100644
--- a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
@@ -2,9 +2,9 @@ EXE_INC = \
-I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fvOptions/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -18,10 +18,10 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
+ -lmeshTools \
+ -ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh \
- -lmeshTools \
-lsampling \
-lengine \
-lturbulenceModels \
diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
index 957735be5e3ded3b1c447caf9a8be06c3b8c33db..c44d3f5dd14ff205ed100a2d7d8466cdfa04fe7d 100644
--- a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
@@ -1,8 +1,8 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -15,8 +15,8 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
- -lsampling \
-lmeshTools \
+ -lsampling \
-lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options
index 176ec9fd9cb79c5a2ab559cd51430ca4fbc3fdaf..ac20d1f9ff2f83ad876e41a2b357d87255486e32 100644
--- a/applications/solvers/combustion/chemFoam/Make/options
+++ b/applications/solvers/combustion/chemFoam/Make/options
@@ -1,14 +1,16 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/ODE/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/ODE/lnInclude\
- -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude
EXE_LIBS = \
- -lchemistryModel \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lfluidThermophysicalModels \
+ -lreactionThermophysicalModels \
+ -lchemistryModel
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index 1e267e19ed6438a78b76687b4fe2a41687b5d050..85522284aae4e27a4c860868dd149fb5262293c7 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -3,24 +3,24 @@ EXE_INC = \
-I../XiFoam/XiEngineFoam \
-I../XiFoam \
-I../../compressible/rhoPimpleFoam \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lengine \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
- -lspecie \
- -lfiniteVolume \
- -lmeshTools \
- -lfvOptions
+ -lspecie
diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index 869c315f4cfddb64670e55484beefee60f0789aa..26b7482fb7032029188dd8d70769df63f3e2c5dd 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -35,6 +35,7 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
+ -lthermophysicalProperties \
-lreactionThermophysicalModels \
-lSLGThermo \
-lchemistryModel \
@@ -46,6 +47,7 @@ EXE_LIBS = \
-lsurfaceFilmDerivedFvPatchFields \
-lpyrolysisModels \
-lregionCoupling \
+ -llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
-lODE
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
index b403a0268ebee13d32687ddd31a105678db41042..b9a9e3284f468989abecdbc10ca6be5f9264b780 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
@@ -14,7 +14,6 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude
-
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
index b403a0268ebee13d32687ddd31a105678db41042..b9a9e3284f468989abecdbc10ca6be5f9264b780 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
@@ -14,7 +14,6 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude
-
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
index 98566f524cf86e9db7ac99d6801fdd7b2710b59a..c44cd81b02fad354077975adb102b5009a5259f0 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
@@ -9,4 +9,3 @@ LIB_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie
-
diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index 24fc2d966e4684ecaccff7f3c61d379183144dca..b18659e4c8f7308d66086fb9c5348bdd5fedae00 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -1,21 +1,21 @@
EXE_INC = \
-IBCs/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lrhoCentralFoam \
-lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lmeshTools
+ -lcompressibleTurbulenceModels
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
index 29b8a6faa45cad648d6daca80f3172eb0c91dcda..1489edb1b5be032e279bc99afa9e343c701a7ce4 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
@@ -2,18 +2,19 @@ EXE_INC = \
-I.. \
-I../BCs/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
@@ -22,5 +23,4 @@ EXE_LIBS = \
-lcompressibleTurbulenceModels \
-ldynamicMesh \
-ldynamicFvMesh \
- -ltopoChangerFvMesh \
- -lmeshTools
+ -ltopoChangerFvMesh
diff --git a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
index 0bf2d5dee74108e56caaa10d787394c06dc092cb..775d63a111f00c93264b9d6af1b186b37664898e 100644
--- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
@@ -1,20 +1,20 @@
EXE_INC = \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lmeshTools \
- -lsampling \
- -lfvOptions
+ -lcompressibleTurbulenceModels
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index 958a2d2fc81ec0b0592684960e205992e30298bf..2118219cfedb2db6300524c2b95e99bce09e215b 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -1,26 +1,26 @@
EXE_INC = \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lmeshTools \
- -lsampling \
- -lfvOptions \
+ -ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh \
+ -lsampling \
-latmosphericModels
diff --git a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
index ca5b141675bbf9556f0af66ee616e40b4b917800..74c9dc95385500e15ba76461b498c65f5c3dbcd9 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
@@ -1,25 +1,26 @@
EXE_INC = \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/cfdTools \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/cfdTools \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/overset/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/overset/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -loverset \
- -lfvOptions \
-ldynamicFvMesh \
- -ltopoChangerFvMesh
+ -ltopoChangerFvMesh \
+ -loverset
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index d3514cf84d7d2853f09c6bd4a6981fe4135ee377..806154972b40e2e0f8132a43ec092ca23a9bc326 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -1,21 +1,21 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/cfdTools \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/cfdTools \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lsampling \
- -lmeshTools \
- -lfvOptions \
-latmosphericModels
diff --git a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
index e027221b0cf327ec4f7f34a67420aa122725a2ac..9bb800efbd2a5f3457d970cb48cfb67006267a49 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
@@ -1,27 +1,27 @@
EXE_INC = \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/cfdTools \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/cfdTools \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/overset/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lsampling \
- -lmeshTools \
- -lfvOptions \
- -loverset \
-ldynamicFvMesh \
- -ltopoChangerFvMesh
+ -ltopoChangerFvMesh \
+ -lsampling \
+ -loverset
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
index 02ddee5132b7c6be88081684dc0470fdc877e43c..f63742a0b297e006f8a77f90e95181325734a3e6 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
@@ -1,22 +1,22 @@
EXE_INC = \
-I. \
-I.. \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lsampling \
- -lmeshTools \
- -lfvOptions
+ -lcompressibleTurbulenceModels
diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options
index 35d223f265cfefe3cce4947c315e08088779c24f..eed2e95cbe0ad02f2c5dff4362a0837765fa30f4 100644
--- a/applications/solvers/compressible/sonicFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/Make/options
@@ -1,19 +1,19 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lmeshTools \
- -lsampling \
- -lfvOptions \
- -lfiniteVolume
+ -lcompressibleTurbulenceModels
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
index fdca074204bbf507cb63a385aee172f1ee09e9e4..b157cc8553b33859e623924ab253de5cdd169881 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
@@ -1,28 +1,27 @@
EXE_INC = \
-I.. \
-I../../rhoPimpleFoam \
+ -I$(LIB_SRC)/finiteVolume/cfdTools \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/cfdTools \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lmeshTools \
- -lsampling \
- -lfvOptions \
+ -ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh \
- -lmeshTools
+ -lsampling
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
index 767fc60e5b610cd0c616755e8eae89dd36f0767b..88f5b10fa1b34aed45256844c3a03d24d725ab32 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
@@ -1,22 +1,22 @@
EXE_INC = \
-I. \
-I../buoyantBoussinesqSimpleFoam \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lradiationModels \
- -lfiniteVolume \
- -lfvOptions \
- -lsampling \
- -lmeshTools \
-latmosphericModels
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
index e805213895fe662bc0365a094038a78a9784310d..c700ac1f69feb72b44d90172b4cda1c6502afa1c 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
@@ -1,20 +1,20 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lradiationModels \
- -lfiniteVolume \
- -lsampling \
- -lmeshTools \
- -lfvOptions \
-latmosphericModels
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
index cc85f5e8ccb08b016ac5d0d80135258377b02e84..519e80ffe203fb43f849053b715fe529d7d06318 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -10,9 +10,9 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lsampling \
- -lmeshTools \
-lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lradiationModels \
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index c5694b8e518192c62aa3e19ebfef3f2522f0cef5..40ada6b54aa5bd65082cf6faa00060fed61311a1 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -11,13 +11,12 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
- -lsampling \
-lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lradiationModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lmeshTools \
-latmosphericModels
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index deef74acce9cb3fd9b2fc19bf48c8b61a87d0690..39a0f84850034028f85d8f8df9242dbb78650a77 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -5,9 +5,9 @@ EXE_INC = \
-I./porousFluid \
-I./porousSolid \
-I./include \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -21,8 +21,11 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude
-
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
@@ -33,9 +36,5 @@ EXE_LIBS = \
-lcombustionModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lmeshTools \
- -lfiniteVolume \
-lradiationModels \
- -lfvOptions \
- -lregionModels \
- -lsampling
+ -lregionModels
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
index 78fc5be02cb1270b92bf69f214578c2b367158f3..b79bb86475cd6895f1105a31f4185a26ef424809 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@@ -4,9 +4,10 @@ EXE_INC = \
-Ifluid \
-Isolid \
-I../solid \
+ -I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/cfdTools \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -14,11 +15,13 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lsolidThermo \
@@ -26,6 +29,4 @@ EXE_LIBS = \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lradiationModels \
- -lfvOptions \
- -lregionModels \
- -lsampling
+ -lregionModels
diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options
index 934083f2bbac3a18838a67b5b16d3a64acdcd41f..948d35898108f5b6b0163caa04f2c2caa548a78d 100644
--- a/applications/solvers/heatTransfer/thermoFoam/Make/options
+++ b/applications/solvers/heatTransfer/thermoFoam/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -10,9 +10,9 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lsampling \
- -lmeshTools \
-lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lradiationModels \
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
index 48a0b023a7ddeeb3b522d5be09dfa0f168ac4db4..51294f3eab0eee6b3ea1104e3accfb2193601486 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
@@ -1,16 +1,16 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
- -lfvOptions
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels
diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options
index 9af500124c942b27a375386bad981c907b491648..515baa7dab6e3e49eba7d870dfc785a68e6f08bf 100644
--- a/applications/solvers/incompressible/boundaryFoam/Make/options
+++ b/applications/solvers/incompressible/boundaryFoam/Make/options
@@ -1,17 +1,17 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
- -lmeshTools \
-lfvOptions \
- -lsampling
+ -lmeshTools \
+ -lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels
diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options
index dc33faebf8d8ce50be9fca659411adceb71ee81c..584c27112d3b73aa78e32ab6b41ac67d13d5ff78 100644
--- a/applications/solvers/incompressible/pimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/Make/options
@@ -1,23 +1,23 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
-lfvOptions \
+ -lmeshTools \
-lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels \
+ -ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh \
- -lmeshTools \
-latmosphericModels
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
index 4c2a78fa5a16bd1979b4aa2f553b45a32e4cf026..4d54ba8bb0a24942631555456d02020e44fdf1c8 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
@@ -1,19 +1,19 @@
EXE_INC = \
-I. \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
- -lmeshTools \
-lfvOptions \
- -lsampling
+ -lmeshTools \
+ -lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels
diff --git a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/Make/options
index c538a99b574db3b5ab061afad109aa71e92ef351..467d7e757b10c569696decfc3576519a0f587a6d 100644
--- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/Make/options
@@ -1,24 +1,24 @@
EXE_INC = \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/overset/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/overset/lnInclude
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
-lfvOptions \
-lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels \
+ -ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh \
-loverset
diff --git a/applications/solvers/incompressible/pisoFoam/Make/options b/applications/solvers/incompressible/pisoFoam/Make/options
index 9af500124c942b27a375386bad981c907b491648..515baa7dab6e3e49eba7d870dfc785a68e6f08bf 100644
--- a/applications/solvers/incompressible/pisoFoam/Make/options
+++ b/applications/solvers/incompressible/pisoFoam/Make/options
@@ -1,17 +1,17 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
- -lmeshTools \
-lfvOptions \
- -lsampling
+ -lmeshTools \
+ -lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels
diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options
index 13060603d19fa1c31d15699b6a2c090eb3ab2813..67583ec12278132619da348f0c3ce81fbfb6deda 100644
--- a/applications/solvers/incompressible/simpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/Make/options
@@ -1,19 +1,18 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
-
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
- -lmeshTools \
-lfvOptions \
+ -lmeshTools \
-lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels \
-latmosphericModels
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
index 90df6010799a997018209ccd6bb688a4d0076f35..37cb3a60f8ff1bf5980b4b1a5c5c4f5cce2141ff 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
@@ -1,19 +1,18 @@
EXE_INC = \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
-
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
- -lmeshTools \
-lfvOptions \
- -lsampling
+ -lmeshTools \
+ -lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels
diff --git a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options
index 639b94132a05ab874dae5c55cedc4582fff0d9c2..99ae8b275c85948fa3c27bbd20e9e32fc24d6492 100644
--- a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/Make/options
@@ -1,25 +1,25 @@
EXE_INC = \
-I. \
-I$(FOAM_SOLVERS)/incompressible/pimpleFoam/overPimpleDyMFoam \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/overset/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/overset/lnInclude
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
-lfvOptions \
-lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels \
+ -ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh \
-loverset
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
index 90df6010799a997018209ccd6bb688a4d0076f35..37cb3a60f8ff1bf5980b4b1a5c5c4f5cce2141ff 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
@@ -1,19 +1,18 @@
EXE_INC = \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
-
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
- -lmeshTools \
-lfvOptions \
- -lsampling
+ -lmeshTools \
+ -lsampling \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options
index 8b16d20d0611dc78af3e806394db524628c0f493..6890e83b4d7ee81c18139682cc7ab9b9657b4168 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/MPPICDyMFoam/Make/options
@@ -36,7 +36,7 @@ EXE_LIBS = \
-lDPMTurbulenceModels \
-lregionModels \
-lsurfaceFilmModels \
- -lsampling \
+ -ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh
+ -lsampling
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options
index a4c0fcc139cffdbf6e35a46ac67b6090531f2e72..6ba7e679813e53848d9ec3233d0be58a0eeb6b00 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/Make/options
@@ -1,6 +1,8 @@
EXE_INC = \
-I.. \
-I../DPMTurbulenceModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -15,12 +17,13 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
@@ -32,10 +35,7 @@ EXE_LIBS = \
-lDPMTurbulenceModels \
-lregionModels \
-lsurfaceFilmModels \
- -lsampling \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
+ -ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh
+ -lsampling
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
index 902afe59e4f2e3d14c15180e41b3820174b4a584..0cc0d379ed22af10b4b3f1fdd2f0b37787ec6131 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels \
@@ -6,5 +8,11 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+
+LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lcompressibleTransportModels \
+ -lincompressibleTransportModels \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels
diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options
index b1f295e2947b41d4061922b3a75f13871eaeaa2a..2d60c135cf4ceedaa0f2694413d279fb34b552ef 100644
--- a/applications/solvers/lagrangian/DPMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/Make/options
@@ -1,5 +1,7 @@
EXE_INC = \
-I./DPMTurbulenceModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -13,11 +15,12 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
- -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
@@ -29,7 +32,4 @@ EXE_LIBS = \
-lDPMTurbulenceModels \
-lregionModels \
-lsurfaceFilmModels \
- -lsampling \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools
+ -lsampling
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 7e4d2dccfcf1af3c9d4163d60c14ff11025fdbd4..b6acd13ba46488fbfe28ad8126dd8fa9e2cc44c1 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -25,6 +25,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
@@ -35,8 +36,8 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
- -lthermophysicalProperties \
-lreactionThermophysicalModels \
+ -lthermophysicalProperties \
-lSLGThermo \
-lchemistryModel \
-lradiationModels \
@@ -44,5 +45,4 @@ EXE_LIBS = \
-lsurfaceFilmModels \
-lODE \
-lcombustionModels \
- -lfvOptions \
-lsampling
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index aebc4519bb8964c6314caf434809542302f07937..96f149372627e9910949cf7672fd4dcf43bd69da 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -10,12 +12,13 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
@@ -26,8 +29,5 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
-lregionModels \
-lsurfaceFilmModels
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
index 76fa725a3abde5aedd70b36f63f52d01aff60010..61823c498cad71493c3623dc0e49ccd1efc723e8 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -1,5 +1,7 @@
EXE_INC = \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -11,15 +13,15 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude
-
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
@@ -30,9 +32,6 @@ EXE_LIBS = \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
-lregionModels \
-lsurfaceFilmModels \
-ldynamicMesh \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index ca89bd0c014b46716597211f199383edd03b4798..400a8318ca6efb3e7ac675bef289aec5e4b8a8c1 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -2,8 +2,8 @@ EXE_INC = \
-I. \
-I../reactingParcelFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I${LIB_SRC}/sampling/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
+ -I${LIB_SRC}/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@@ -27,14 +27,15 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
- -lsampling \
-lmeshTools \
+ -lsampling \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
+ -lthermophysicalProperties \
-lSLGThermo \
-lchemistryModel \
-lregionModels \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
index 803834700611d015a9fd0e4fbbe2798f36add1c6..db2dee99f27bca32083eeea0b41f363a860568f5 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
-I. \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -21,12 +22,11 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(FOAM_SOLVERS)/combustion/reactingFoam
-
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
@@ -36,8 +36,8 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
- -lthermophysicalProperties \
-lreactionThermophysicalModels \
+ -lthermophysicalProperties \
-lSLGThermo \
-lchemistryModel \
-lradiationModels \
@@ -45,5 +45,4 @@ EXE_LIBS = \
-lregionModels \
-lsurfaceFilmModels \
-lcombustionModels \
- -lfvOptions \
-lsampling
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
index 433d27ec0712279f9697df75306eaf726c80d593..3e4b3518b85dfd5db53830f37edbdf4e2ec39ad2 100644
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
@@ -1,5 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fvOptions/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
@@ -20,12 +21,11 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude \
- -I$(LIB_SRC)/fvOptions/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
-
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
@@ -35,6 +35,7 @@ EXE_LIBS = \
-lspecie \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
+ -lthermophysicalProperties \
-lSLGThermo \
-lchemistryModel \
-lradiationModels \
@@ -42,7 +43,5 @@ EXE_LIBS = \
-lregionModels \
-lsurfaceFilmModels \
-lcombustionModels \
- -lfvOptions \
-lsampling \
-lcoalCombustion
-
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 75f471f27093107093bc4f5005ac91d0de62b89c..a5e46f6f20a75f8b5783c75caadefb73e1552fa5 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -25,6 +25,9 @@ EXE_INC = \
-I$(LIB_SRC)/combustionModels/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-llagrangian \
@@ -34,8 +37,8 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
- -lthermophysicalProperties \
-lreactionThermophysicalModels \
+ -lthermophysicalProperties \
-lSLGThermo \
-lchemistryModel \
-lradiationModels \
@@ -43,7 +46,4 @@ EXE_LIBS = \
-lregionModels \
-lsurfaceFilmModels \
-lcombustionModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
-lsampling
diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
index fe32be8cfe6c81676dece3fb3aa2343cb1e7de0c..066274b18d03a36d67b3b9174097e1a08c8fc8d8 100644
--- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
@@ -27,9 +27,9 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude
-
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lsampling \
-lturbulenceModels \
@@ -50,5 +50,4 @@ EXE_LIBS = \
-lengine \
-lregionModels \
-lsurfaceFilmModels \
- -lfvOptions \
-lcombustionModels
diff --git a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
index 53e421d646fc22af0af1d3e005bfc24e2f5c29b2..1c377730375959e64f8e33db7e6909919db492b2 100644
--- a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
-I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam/simpleReactingParcelFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -20,12 +21,11 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
- -I$(LIB_SRC)/combustionModels/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
-
+ -I$(LIB_SRC)/combustionModels/lnInclude
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
@@ -45,5 +45,4 @@ EXE_LIBS = \
-lregionModels \
-lsurfaceFilmModels \
-lcombustionModels \
- -lfvOptions \
-lsampling
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
index 6cc08254817bbad8314b59c17d2404eeb9fb84e7..80e88ee8f79cbfc8db5aa23e902e39668d13bcc8 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
@@ -29,6 +29,9 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-llagrangian \
@@ -47,9 +50,6 @@ EXE_LIBS = \
-lregionModels \
-lsurfaceFilmModels \
-lcombustionModels \
- -lfiniteVolume \
- -lfvOptions \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh \
- -lmeshTools
+ -ldynamicMesh
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index 639909b38e0ca08ad74075404d22946835d03522..1bab76259cceaef4f808ce6d5ca7d095fc01bb29 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -8,12 +10,13 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
@@ -23,8 +26,5 @@ EXE_LIBS = \
-lradiationModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
-lregionModels \
-lsurfaceFilmModels
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
index 2d385f9853cb5a2bd407b6ac79fc743395f9334f..f41d858bf783ad4d90eec48da2c900dd5cd47882 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
@@ -1,5 +1,7 @@
EXE_INC = \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -9,14 +11,15 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
@@ -26,9 +29,6 @@ EXE_LIBS = \
-lradiationModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
-lregionModels \
-lsurfaceFilmModels \
-ldynamicMesh \
diff --git a/applications/solvers/multiphase/MPPICInterFoam/Make/options b/applications/solvers/multiphase/MPPICInterFoam/Make/options
index 0ad31d6975c01583c8f4eba520a8518038bf5453..4cfc4eb15c396b839d3476fc7c59d60fe0e13c7e 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/Make/options
+++ b/applications/solvers/multiphase/MPPICInterFoam/Make/options
@@ -26,9 +26,9 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
-
EXE_LIBS = \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-llagrangian \
-llagrangianIntermediate \
@@ -40,5 +40,4 @@ EXE_LIBS = \
-lsampling \
-lregionModels \
-lsurfaceFilmModels \
- -lfvOptions \
-lCompressibleTwoPhaseMixtureTurbulenceModels
diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options
index 02d5a1cc3eeb62c1e84aa01c5d3f071d5ccb92ad..1fa237ac257676e7da1560227873e0e0b1265ed0 100644
--- a/applications/solvers/multiphase/cavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/Make/options
@@ -1,18 +1,18 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude
EXE_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lbarotropicCompressibilityModel \
-lfiniteVolume \
-lfvOptions \
- -lmeshTools
+ -lmeshTools \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lbarotropicCompressibilityModel
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
index b5d7b2cdfac8e3fde3afd685e547095f71409d4f..e155941dc9dfb14103eedb35cf81b6665ac6fb35 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
@@ -1,6 +1,7 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
@@ -9,15 +10,14 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lbarotropicCompressibilityModel \
- -lfiniteVolume \
- -lfvOptions \
-ldynamicMesh \
- -ldynamicFvMesh \
- -lmeshTools
+ -ldynamicFvMesh
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index ef1fd258acdf43ef6d242a92361546c5f3633b23..995fd38e75da62aadab95d074e512bf768c08179 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -2,6 +2,8 @@ EXE_INC = \
-I. \
-I../VoF \
-ItwoPhaseMixtureThermo \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
@@ -9,11 +11,12 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -IVoFphaseCompressibleTurbulenceModels/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -IVoFphaseCompressibleTurbulenceModels/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-ltwoPhaseMixtureThermo \
-ltwoPhaseSurfaceTension \
-lcompressibleTransportModels \
@@ -23,7 +26,4 @@ EXE_LIBS = \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lVoFphaseCompressibleTurbulenceModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools
+ -lVoFphaseCompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
index 07052af6d95f544ba0f65c2fb888138324f7e245..dd4418a547cf2d98a68c447c70f728a810368cac 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -4,6 +4,8 @@ EXE_INC = \
-I../../VoF \
-I../twoPhaseMixtureThermo \
-I../VoFphaseCompressibleTurbulenceModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
@@ -12,11 +14,12 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-ltwoPhaseMixtureThermo \
-ltwoPhaseSurfaceTension \
-lcompressibleTransportModels \
@@ -28,7 +31,4 @@ EXE_LIBS = \
-lcompressibleTurbulenceModels \
-lVoFphaseCompressibleTurbulenceModels \
-ldynamicMesh \
- -lmeshTools \
- -ldynamicFvMesh \
- -lfiniteVolume \
- -lfvOptions
+ -ldynamicFvMesh
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
index c4a8a69a9ce2f7fba9c5552a58c9686e1a1dae12..a1fb85d4d60d31860a7ca94c00d5c195a7e9d869 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
@@ -4,8 +4,10 @@ EXE_INC = \
-I../../VoF \
-I../twoPhaseMixtureThermo \
-I../VoFphaseCompressibleTurbulenceModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fvOptions/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@@ -15,17 +17,17 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/fvOptions/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-ltwoPhaseMixtureThermo \
-ltwoPhaseSurfaceTension \
-lcompressibleTransportModels \
@@ -40,7 +42,4 @@ EXE_LIBS = \
-lsurfaceFilmModels \
-lsurfaceFilmDerivedFvPatchFields \
-ldynamicMesh \
- -lmeshTools \
- -ldynamicFvMesh \
- -lfiniteVolume \
- -lfvOptions
+ -ldynamicFvMesh
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
index 9df3add9e22497c1bdb24393900f4d56004d9997..5c32e325cacdd2ab140b079a912686a13fe0fc8c 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
@@ -3,23 +3,23 @@ EXE_INC = \
-I../VoF \
-I../interFoam \
-ImultiphaseMixtureThermo/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lmultiphaseMixtureThermo \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-linterfaceProperties \
-lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools
+ -lcompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options
index a92f599820799ab725d73ff8d83a24270bc85345..5822f754aae1e568825f7b35a05fa98ff791e6f2 100644
--- a/applications/solvers/multiphase/driftFluxFoam/Make/options
+++ b/applications/solvers/multiphase/driftFluxFoam/Make/options
@@ -12,12 +12,12 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \
- -ldriftFluxTransportModels \
- -ldriftFluxRelativeVelocityModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lsampling \
- -lfvOptions \
+ -ldriftFluxTransportModels \
+ -ldriftFluxRelativeVelocityModels \
-lcompressibleTransportModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
index 798a4dd7dc61552144e3a868f0db0c0ad5978205..c96f1eac956238166e519769fb0ac4ac4e135fe5 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
@@ -1,15 +1,14 @@
-
EXE_INC = \
-I./phasesSystem/lnInclude \
-I./CompressibleMultiPhaseTurbulenceModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fvOptions/lnInclude\
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/fvOptions/lnInclude\
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -17,13 +16,13 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude
EXE_LIBS = \
- -lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lcompressibleTransportModels \
-lfiniteVolume \
- -lmeshTools \
-lfvOptions \
+ -lmeshTools \
-lsampling \
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels \
+ -lcompressibleTransportModels \
-lradiationModels \
-lfluidThermophysicalModels \
-lIncompressibleMultiphaseSystems \
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options
index 363605027eae152fad3cdefa74659683a8b4b00d..eb4da264f6fa14761e097af90a93c72e7b0d25b2 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options
@@ -4,27 +4,27 @@ EXE_INC = \
-I. \
-ItemperaturePhaseChangeTwoPhaseMixtures/lnInclude \
-I$(interPhaseChangePath) \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fvOptions/lnInclude\
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/fvOptions/lnInclude\
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lphaseTemperatureChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -lfiniteVolume \
- -lmeshTools \
- -lfvOptions \
- -lsampling \
-lfluidThermophysicalModels
diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options
index 842297a693f6105a842d2ece7550c193229f6955..c2ffc6980c71dd51a01be5fbaed91db205e23adc 100644
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@@ -1,24 +1,24 @@
EXE_INC = \
-I../VoF \
- -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude
EXE_LIBS = \
- -limmiscibleIncompressibleTwoPhaseMixture \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
-lfiniteVolume \
- -ldynamicFvMesh \
-lfvOptions \
-lmeshTools \
-lsampling \
+ -ldynamicFvMesh \
+ -limmiscibleIncompressibleTwoPhaseMixture \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
-lwaveModels
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
index cad354904e233b7a583f5ccd70eefb1d1b692108..59ebe3cc9f58f514d6113b9980fea1b97cce39e5 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
@@ -6,24 +6,24 @@ EXE_INC = \
-IimmiscibleIncompressibleThreePhaseMixture \
-IincompressibleThreePhaseMixture \
-IthreePhaseInterfaceProperties \
- -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-ltwoPhaseMixture \
-linterfaceProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -lfiniteVolume \
-ldynamicFvMesh \
- -lmeshTools \
- -lfvOptions \
- -lsampling \
-lwaveModels
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options
index 3b8ac67af5d0d74981d38b2d6124f36803f4f5e1..1306fae1cbe3a77d69d54f3c12b6d66a00b54d4e 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options
@@ -2,6 +2,9 @@ EXE_INC = \
-I. \
-I.. \
-I../../VoF \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
@@ -9,23 +12,20 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(FOAM_SOLVERS)/incompressible/pimpleFoam/overPimpleDyMFoam \
- -I$(LIB_SRC)/overset/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/overset/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lsampling \
-limmiscibleIncompressibleTwoPhaseMixture \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -lfiniteVolume \
-ldynamicMesh \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
-loverset \
- -lfvOptions \
- -lsampling \
-lwaveModels
diff --git a/applications/solvers/multiphase/interIsoFoam/Make/options b/applications/solvers/multiphase/interIsoFoam/Make/options
index 6d6417f7a0419d033e82aaa8a82c60da26f922a0..14db7f98ed14edb8ed68ff053506c31915420854 100644
--- a/applications/solvers/multiphase/interIsoFoam/Make/options
+++ b/applications/solvers/multiphase/interIsoFoam/Make/options
@@ -1,23 +1,23 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude
EXE_LIBS = \
- -limmiscibleIncompressibleTwoPhaseMixture \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
-lfiniteVolume \
- -ldynamicFvMesh \
-lfvOptions \
-lmeshTools \
-lsampling \
+ -limmiscibleIncompressibleTwoPhaseMixture \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -ldynamicFvMesh \
-lwaveModels
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
index 04f187da357204cc356c8b7227d48ec436253cd4..3a8113d1893b6d3a74e504102443b21834c49c23 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options
@@ -1,23 +1,23 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -IphaseChangeTwoPhaseMixtures/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -IphaseChangeTwoPhaseMixtures/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lphaseChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lfiniteVolume \
- -lmeshTools \
- -lfvOptions \
- -lsampling
+ -lincompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
index 209a251ccee5f9a82d8b5b124dce21cf4db23057..6e5522bc5e876ad2d523465cc473c1765707580d 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
@@ -1,29 +1,29 @@
EXE_INC = \
-I.. \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I../phaseChangeTwoPhaseMixtures/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I../phaseChangeTwoPhaseMixtures/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lphaseChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -lfiniteVolume \
-ldynamicMesh \
-ldynamicFvMesh \
- -ltopoChangerFvMesh \
- -lmeshTools \
- -lfvOptions \
- -lsampling
+ -ltopoChangerFvMesh
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
index a0fdb53c8ceacec2c77036852f616f0d50f1ee7d..83b37671ec1aba630f072cf56e8822efbf6d7e8c 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options
@@ -2,24 +2,23 @@ EXE_INC = \
-ImultiphaseSystem/lnInclude \
-ImultiphaseFixedFluxPressure \
-IinterfacialModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
-
+ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lmultiphaseSystem \
-linterfaceProperties \
-lincompressibleTransportModels \
-lcompressibleMultiphaseEulerianInterfacialModels \
-lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools
+ -lincompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
index 3b41b5a13b29cccb890839f5c985ebcabe0610bb..2f1c209dc61dbb23af6cef3b967f6563e5cd1190 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
@@ -3,24 +3,24 @@ EXE_INC = \
-I../VoF \
-I../interFoam \
-ImultiphaseMixture/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lmultiphaseInterFoam \
-linterfaceProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -lfiniteVolume \
- -ldynamicFvMesh \
- -lfvOptions \
- -lmeshTools \
- -lsampling
+ -ldynamicFvMesh
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
index 2026e36fb6d8c638ad0b96e54ef3e17591367710..88e8d087c0f6be5f62178f6c1e97955715460d89 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options
@@ -1,18 +1,17 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
-
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
- -lincompressibleTransportModels \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
-lfiniteVolume \
- -lmeshTools \
-lfvOptions \
- -lsampling
+ -lmeshTools \
+ -lsampling \
+ -lincompressibleTransportModels \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
index eca0dd4fcc3adfd1a3d21700ab03c2109e68f128..758ac74ffa914397e2949a26ffa6076c4c4da9a6 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options
@@ -1,25 +1,24 @@
EXE_INC = \
-I.. \
-I../../interFoam \
- -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
-
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -lfiniteVolume \
-ldynamicMesh \
-ldynamicFvMesh \
- -ltopoChangerFvMesh \
- -lmeshTools \
- -lfvOptions \
- -lsampling
+ -ltopoChangerFvMesh
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
index 656a9941a61c98fe5e9fbead2902f9699f62caf6..e49d1e409bd924f79848f5501f8557f12f9c463e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
@@ -3,22 +3,22 @@ EXE_INC = \
-I../phaseSystems/lnInclude \
-I../interfacialModels/lnInclude \
-I../interfacialCompositionModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lreactingPhaseSystem \
-lreactingMultiphaseSystem \
-lreactingEulerianInterfacialModels \
-lreactingEulerianInterfacialCompositionModels \
- -lmultiphaseReactingTurbulenceModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
- -lsampling
+ -lmultiphaseReactingTurbulenceModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
index 1d4880f1baf416026509809bee48639d05be215b..b0d5064c76609e94d49a71d46e9ac64ba6dd4218 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
@@ -2,21 +2,21 @@ EXE_INC = \
-I../multiphaseSystem/lnInclude \
-I../../phaseSystems/lnInclude \
-I../../interfacialModels/lnInclude\
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lcompressibleTurbulenceModels \
-lreactingPhaseSystem \
-lreactingMultiphaseSystem \
-lreactingEulerianInterfacialModels \
- -lreactingEulerianInterfacialCompositionModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools
+ -lreactingEulerianInterfacialCompositionModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
index 5216efaa9c603cfef603c058b70812fd3b0a650b..6aef4dd2f7a52d15d951e65326a7e34a69bbca1f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
@@ -4,22 +4,22 @@ EXE_INC = \
-I../interfacialModels/lnInclude \
-I../interfacialCompositionModels/lnInclude \
-ItwoPhaseCompressibleTurbulenceModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lreactingPhaseSystem \
-lreactingTwoPhaseSystem \
-lreactingEulerianInterfacialModels \
-lreactingEulerianInterfacialCompositionModels \
- -ltwoPhaseReactingTurbulenceModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
- -lsampling
+ -ltwoPhaseReactingTurbulenceModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
index 85b6bc50d03ded881c446cdd3b1800928c3f1b88..37c92b4a70b9ab48c41ef635fb8739f5ab31dc25 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
@@ -3,21 +3,21 @@ EXE_INC = \
-I../../phaseSystems/lnInclude \
-I../../interfacialModels/lnInclude\
-I../../interfacialCompositionModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lcompressibleTurbulenceModels \
-lreactingPhaseSystem \
-lreactingTwoPhaseSystem \
-lreactingEulerianInterfacialModels \
- -lreactingEulerianInterfacialCompositionModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools
+ -lreactingEulerianInterfacialCompositionModels
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
index e9549744cea30e721d7f48650648dfb2e3ae70c5..fc80a171e56d786da865f67065b5fe37fa9ccb4e 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
@@ -1,19 +1,19 @@
EXE_INC = \
-I. \
-I../VoF \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
EXE_LIBS = \
- -ltwoPhaseMixture \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
-lfiniteVolume \
-lfvOptions \
- -lmeshTools
+ -lmeshTools \
+ -ltwoPhaseMixture \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
index f5255ec17bca98194fe2bb7f2f4b5105a79e104a..10c9111d823a8d387e1236fc820831153397d6f3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
@@ -1,4 +1,7 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
@@ -8,11 +11,12 @@ EXE_INC = \
-IphaseCompressibleTurbulenceModels/lnInclude \
-IinterfacialModels/lnInclude \
-ItwoPhaseSystem/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
@@ -21,8 +25,4 @@ EXE_LIBS = \
-lphaseCompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lcompressibleTwoPhaseSystem \
- -lcompressibleEulerianInterfacialModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools \
- -lsampling
+ -lcompressibleEulerianInterfacialModels
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
index e18f6a8fdc2216d39783976220cfe8c22fc9ce02..0fcb6d1eec8cc5a9b0ebc471ed2e4325f67a71b6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
@@ -1,16 +1,19 @@
EXE_INC = \
-I../twoPhaseSystem/lnInclude \
-I../interfacialModels/lnInclude\
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
@@ -18,7 +21,4 @@ LIB_LIBS = \
-lcompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lcompressibleTwoPhaseSystem \
- -lcompressibleEulerianInterfacialModels \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools
+ -lcompressibleEulerianInterfacialModels
diff --git a/applications/test/surfaceIntersection/Make/options b/applications/test/surfaceIntersection/Make/options
index b7fa8b232619a602472e7499ba549f7370276433..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/test/surfaceIntersection/Make/options
+++ b/applications/test/surfaceIntersection/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/triSurface/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/finiteArea/checkFaMesh/Make/options b/applications/utilities/finiteArea/checkFaMesh/Make/options
index 7ab09dc4b6e00bb5c4a20fc377572e899036f61f..20ef292d272f750be1487dc73278797387694375 100644
--- a/applications/utilities/finiteArea/checkFaMesh/Make/options
+++ b/applications/utilities/finiteArea/checkFaMesh/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
EXE_LIBS = \
+ -lfiniteArea \
-lfiniteVolume \
-lmeshTools \
- -lfiniteArea
diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options
index 4e7c20058c0cf479a6cb6cc8c5da6a96b667268d..619a76c7a91906c1bb476d02772cdd3558da344c 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/Make/options
+++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options
@@ -1,14 +1,14 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -ldynamicMesh \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lcompressibleTransportModels \
- -lfluidThermophysicalModels \
- -lmeshTools \
- -ldynamicMesh \
- -lfiniteVolume \
- -lfvOptions
+ -lfluidThermophysicalModels
diff --git a/applications/utilities/mesh/advanced/collapseEdges/Make/options b/applications/utilities/mesh/advanced/collapseEdges/Make/options
index 987eae5ed7dda8023ae8cdbe78624b50cbdb42bc..792a51bf7fce4e4db070d172f67aac88e26b0fc4 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/Make/options
+++ b/applications/utilities/mesh/advanced/collapseEdges/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
+ -lfiniteVolume \
-lmeshTools \
- -lfiniteVolume
+ -ldynamicMesh
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
index ff070635902bbced7cd4946eda7cd24b1318e9e8..20c061589fc7d5828844fb945a5509ba91980306 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
@@ -1,11 +1,12 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
-lfiniteVolume \
- -lreconstruct \
- -ldynamicMesh
+ -lmeshTools \
+ -ldynamicMesh \
+ -lreconstruct
diff --git a/applications/utilities/mesh/advanced/modifyMesh/Make/options b/applications/utilities/mesh/advanced/modifyMesh/Make/options
index 4e67ae71f11d230e82849784e71ff1aaa9e24481..7e20b40fd5be92c83495017e449675ba3fb2747a 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/Make/options
+++ b/applications/utilities/mesh/advanced/modifyMesh/Make/options
@@ -1,10 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
-lmeshTools \
- -lreconstruct \
- -ldynamicMesh
+ -ldynamicMesh \
+ -lreconstruct
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/Make/options b/applications/utilities/mesh/advanced/refineHexMesh/Make/options
index 554d59b25d64feec8cbf6ce14d64c58ac00a1823..eacd1890866c6c8420d4167c007db28c82346ed0 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/Make/options
+++ b/applications/utilities/mesh/advanced/refineHexMesh/Make/options
@@ -1,10 +1,12 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
- -lreconstruct \
+ -lfiniteVolume \
+ -lmeshTools \
-ldynamicMesh \
+ -lreconstruct \
-lgenericPatchFields
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/Make/options b/applications/utilities/mesh/advanced/refineWallLayer/Make/options
index 19716ca4eca2a372fcd7b594a4a8e0c5126495e8..5c88275eedd2df7f8ec50112ced5d04c3017ea10 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/Make/options
+++ b/applications/utilities/mesh/advanced/refineWallLayer/Make/options
@@ -1,10 +1,11 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-ldynamicMesh \
- -lreconstruct \
- -lmeshTools
+ -lreconstruct
diff --git a/applications/utilities/mesh/advanced/removeFaces/Make/options b/applications/utilities/mesh/advanced/removeFaces/Make/options
index b23c26cceb6bda74df4c93403ee4ab27459b2fbb..82f9728f6896c6cbbdb881f7f09e185ecc1711b3 100644
--- a/applications/utilities/mesh/advanced/removeFaces/Make/options
+++ b/applications/utilities/mesh/advanced/removeFaces/Make/options
@@ -1,12 +1,12 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
-lmeshTools \
-ldynamicMesh \
- -lfiniteVolume \
-lreconstruct \
-lgenericPatchFields
diff --git a/applications/utilities/mesh/advanced/selectCells/Make/options b/applications/utilities/mesh/advanced/selectCells/Make/options
index 18a53a8f5e5cf4e8f14b38af4ffed5a3bd3ee0b7..8f22afa1b69a9adc244f0b796570f02b180fa03e 100644
--- a/applications/utilities/mesh/advanced/selectCells/Make/options
+++ b/applications/utilities/mesh/advanced/selectCells/Make/options
@@ -5,6 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools \
-ldynamicMesh \
-llagrangian
diff --git a/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options
index 7abac6e3a5e3f99244d58146162683c207de44c1..8f22afa1b69a9adc244f0b796570f02b180fa03e 100644
--- a/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options
+++ b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options
@@ -1,10 +1,11 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
+ -lsurfMesh \
-lmeshTools \
+ -ldynamicMesh \
-llagrangian
diff --git a/applications/utilities/mesh/advanced/splitCells/Make/options b/applications/utilities/mesh/advanced/splitCells/Make/options
index 7349856cabeb9aeedca94d459c4a1a022c72d996..70c838b774c8b2609363d066e78b1a19b9306ccd 100644
--- a/applications/utilities/mesh/advanced/splitCells/Make/options
+++ b/applications/utilities/mesh/advanced/splitCells/Make/options
@@ -3,5 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
index c34e494c474d7a0da3fbf718ac1d12a110063436..c8ce655c3d56cf30480b7f83f2502870b5f51a86 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@@ -1,14 +1,14 @@
EXE_INC = \
- -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude
EXE_LIBS = \
- -lsurfMesh \
-lfiniteVolume \
+ -lsurfMesh \
-lmeshTools \
-ldynamicMesh \
-lreconstruct \
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Make/options b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
index afc245ed1da0bc561a82338527ac50a1625e48ff..a6934e82e7d58a04756f047da15510d18dacbcab 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
@@ -1,14 +1,15 @@
EXE_INC = \
+ -Iextrude2DMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -Iextrude2DMesh/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude
EXE_LIBS = \
-lsurfMesh \
+ -lmeshTools \
-ldynamicMesh \
-lreconstruct \
-lextrude2DMesh \
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
index fe1283a73ae78fc7d2e4a354aafb19bae9ba3232..8ffdd74daa70cc6de7cf8c92bf1c6d95eefe9033 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
@@ -1,12 +1,13 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lsurfMesh \
-lmeshTools \
-ldynamicMesh \
- -lsurfMesh \
- -lfiniteVolume
+ -lextrudeModel
diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
index 703a72fcc0fbc9a05a1980647a460d4b1fcc851c..cf60a29d5eaccdd748fddf7149e9e6c492a2ed31 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
@@ -16,7 +16,6 @@ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I../conformalVoronoiMesh/lnInclude
@@ -26,7 +25,6 @@ EXE_LIBS = \
-lconformalVoronoiMesh \
-lfiniteVolume \
-lmeshTools \
- -lsampling \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy \
-lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
index 772de8d78a407a4ae2a62eac24ac84a8940a7d5f..cfef4dc46ec81ce1a23b94f5fda95b46bc5c8002 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
@@ -18,7 +18,6 @@ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
@@ -28,7 +27,6 @@ EXE_LIBS = \
${CGAL_LIBS} \
-lconformalVoronoiMesh \
-lmeshTools \
- -lsampling \
-ldecompositionMethods \
-ldecompose \
-L$(FOAM_LIBBIN)/dummy \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
index ed15cdf94e31e764f44b6eae0b564f8e23ffb734..86692371c13175a6d107ce3072664e307884a6f3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
@@ -16,7 +16,6 @@ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude
@@ -28,7 +27,6 @@ EXE_LIBS = \
-lcv2DMesh \
-lconformalVoronoiMesh \
-lmeshTools \
- -lsampling \
-ldynamicMesh \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy \
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index b705e36409b79a29737648d5e1ea3be7d4a58fde..1ada957a535b4d608147d7cd0973c294daed53b0 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -3,23 +3,25 @@
*/
EXE_INC = \
- -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
- -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lfiniteVolume \
+ -lfileFormats \
+ -lsurfMesh \
+ -lmeshTools \
+ -ldynamicMesh \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy \
-lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
- -lmeshTools \
- -ldynamicMesh \
-ldecompose \
-lreconstruct \
-lsnappyHexMesh
diff --git a/applications/utilities/mesh/manipulation/autoPatch/Make/options b/applications/utilities/mesh/manipulation/autoPatch/Make/options
index 7349856cabeb9aeedca94d459c4a1a022c72d996..70c838b774c8b2609363d066e78b1a19b9306ccd 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/Make/options
+++ b/applications/utilities/mesh/manipulation/autoPatch/Make/options
@@ -3,5 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/checkMesh/Make/options b/applications/utilities/mesh/manipulation/checkMesh/Make/options
index 5d3dac934f252f42f27253552d7492fe1e4db6dc..9073e5a17c814b06ed2f0bd17667057fdf2ff32b 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/checkMesh/Make/options
@@ -1,12 +1,13 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfileFormats \
+ -lsurfMesh \
-lmeshTools \
- -lsampling \
-ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/createBaffles/Make/options b/applications/utilities/mesh/manipulation/createBaffles/Make/options
index e0ff9c1f821bbec612cacb60cde355fffc9303f9..40f9bc4b6245c93ad7900c896c2fc477ec152b6e 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/Make/options
+++ b/applications/utilities/mesh/manipulation/createBaffles/Make/options
@@ -1,13 +1,13 @@
EXE_INC = \
-IfaceSelection \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
- -lmeshTools \
-lfiniteVolume \
+ -lmeshTools \
+ -ldynamicMesh \
-lreconstruct \
-lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/createPatch/Make/options b/applications/utilities/mesh/manipulation/createPatch/Make/options
index 3d7ac99ffec7121e2c9fa3323b10a5e950149244..be41010b2c601a92d09d7fb8c0174c0b851a4496 100644
--- a/applications/utilities/mesh/manipulation/createPatch/Make/options
+++ b/applications/utilities/mesh/manipulation/createPatch/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lmeshTools \
-ldynamicMesh \
- -lreconstruct \
- -lmeshTools
+ -lreconstruct
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/Make/options b/applications/utilities/mesh/manipulation/deformedGeom/Make/options
index dea7843ffdf83f2b3e23984445fdfdae8764773f..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/Make/options
+++ b/applications/utilities/mesh/manipulation/deformedGeom/Make/options
@@ -2,6 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lfiniteVolume \
- \
- -lmeshTools
+ -lfiniteVolume
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/Make/options b/applications/utilities/mesh/manipulation/flattenMesh/Make/options
index 73f34b0f85f190348d7b3b89bc9b39acd5ce761f..70c838b774c8b2609363d066e78b1a19b9306ccd 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/flattenMesh/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/insideCells/Make/options b/applications/utilities/mesh/manipulation/insideCells/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/mesh/manipulation/insideCells/Make/options
+++ b/applications/utilities/mesh/manipulation/insideCells/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/Make/options b/applications/utilities/mesh/manipulation/mergeMeshes/Make/options
index 74135665e25e3fb4930f25256d438bb27c8e037b..228b7246267c3e31e1a14e011a3fa3ee858ac37d 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/Make/options
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/Make/options
@@ -1,9 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
+ -lmeshTools \
-ldynamicMesh \
-lreconstruct
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
index 6a553ef8daa7894f86e54d8dac1d0016f4a673eb..eacd1890866c6c8420d4167c007db28c82346ed0 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
@@ -1,10 +1,12 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
- -lgenericPatchFields \
+ -lfiniteVolume \
+ -lmeshTools \
+ -ldynamicMesh \
-lreconstruct \
- -ldynamicMesh
+ -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/Make/options b/applications/utilities/mesh/manipulation/mirrorMesh/Make/options
index ac6ecd8333e2147074898438ef1a81cb5d14fe4a..17aacef7a8467ece4bd7397580f03cb3fcf942c3 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
- -lfiniteVolume
+ -lfiniteVolume \
+ -ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/Make/options b/applications/utilities/mesh/manipulation/moveDynamicMesh/Make/options
index 51b2faebcfd558521d3cd3dad954fa3930a6185a..00783fd1ec10e99fe7964d835286636f8ec5aebd 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/Make/options
@@ -1,10 +1,12 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
EXE_LIBS = \
- -ldynamicFvMesh \
+ -lfiniteVolume \
+ -lfileFormats \
-lmeshTools \
- -ldynamicMesh
+ -ldynamicMesh \
+ -ldynamicFvMesh
diff --git a/applications/utilities/mesh/manipulation/moveEngineMesh/Make/options b/applications/utilities/mesh/manipulation/moveEngineMesh/Make/options
index a82119ff7493f1fa3ac82e709320c01aef63ac5b..c047adcbfc393d905ddbf9b9718150e8f22d1451 100644
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/engine/lnInclude
EXE_LIBS = \
- -lengine \
- -ldynamicMesh \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicMesh \
+ -lengine
diff --git a/applications/utilities/mesh/manipulation/moveMesh/Make/options b/applications/utilities/mesh/manipulation/moveMesh/Make/options
index 9b8c3dea8c859ed322ebac8c35158abedbc625f4..792a51bf7fce4e4db070d172f67aac88e26b0fc4 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/moveMesh/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
-lfiniteVolume \
- -ldynamicMesh \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/objToVTK/Make/options b/applications/utilities/mesh/manipulation/objToVTK/Make/options
index 79a9626b5500c171eaa6dbeef1681e91f922e9dc..4c3dd783cb4170feefb3f5385510a83257b43b18 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/Make/options
+++ b/applications/utilities/mesh/manipulation/objToVTK/Make/options
@@ -1 +1,3 @@
-/* */
+EXE_INC =
+
+EXE_LIBS =
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/Make/options b/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
index 50005005415338bebc2fd299cf07fbad913f522e..eacd1890866c6c8420d4167c007db28c82346ed0 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
@@ -1,12 +1,12 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
-lfiniteVolume \
- -lgenericPatchFields \
+ -lmeshTools \
-ldynamicMesh \
-lreconstruct \
- -lmeshTools
+ -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/refineMesh/Make/options b/applications/utilities/mesh/manipulation/refineMesh/Make/options
index 73f34b0f85f190348d7b3b89bc9b39acd5ce761f..70c838b774c8b2609363d066e78b1a19b9306ccd 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/refineMesh/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
index d1432ae98ca36791e816ab1fb77e62a121db024f..7956e8e8dc2e1674bce2e701b5f30ccfbb1c20c5 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@@ -4,18 +4,18 @@
EXE_INC = \
${COMP_FLAGS} \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/renumber/renumberMethods/lnInclude \
-I$(LIB_SRC)/renumber/zoltanRenumber/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
-lmeshTools \
-ldynamicMesh \
- -lfiniteVolume \
-lgenericPatchFields \
-lrenumberMethods \
-lreconstruct \
diff --git a/applications/utilities/mesh/manipulation/setsToZones/Make/options b/applications/utilities/mesh/manipulation/setsToZones/Make/options
index ec38e1cbdb1b325739635bd6690d5e060fc069e7..54c035b8f55d183c1ad02bc372398feceaf31718 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/Make/options
+++ b/applications/utilities/mesh/manipulation/setsToZones/Make/options
@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lmeshTools \
- -lsampling
+ -lmeshTools
diff --git a/applications/utilities/mesh/manipulation/singleCellMesh/Make/options b/applications/utilities/mesh/manipulation/singleCellMesh/Make/options
index 193ad0e7b2b7a18b4bdf79dddd7ae442d438e4b8..16eb624becb6894353d6c74bb8bab5de37551b56 100644
--- a/applications/utilities/mesh/manipulation/singleCellMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/singleCellMesh/Make/options
@@ -2,6 +2,5 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lgenericPatchFields \
- -lfiniteVolume
-
+ -lfiniteVolume \
+ -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/splitMesh/Make/options b/applications/utilities/mesh/manipulation/splitMesh/Make/options
index 3d7ac99ffec7121e2c9fa3323b10a5e950149244..228b7246267c3e31e1a14e011a3fa3ee858ac37d 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/splitMesh/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
+ -lmeshTools \
-ldynamicMesh \
- -lreconstruct \
- -lmeshTools
+ -lreconstruct
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options b/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
index 554d59b25d64feec8cbf6ce14d64c58ac00a1823..eacd1890866c6c8420d4167c007db28c82346ed0 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
@@ -1,10 +1,12 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
- -lreconstruct \
+ -lfiniteVolume \
+ -lmeshTools \
-ldynamicMesh \
+ -lreconstruct \
-lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/Make/options b/applications/utilities/mesh/manipulation/stitchMesh/Make/options
index ac523b8282d2edac3839731ad187509ea9240706..f90eb976eb3b4fc7d5964fed266f52d320bd2fd2 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/stitchMesh/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
- -lmeshTools \
-lfiniteVolume \
+ -lmeshTools \
+ -ldynamicMesh \
-lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/Make/options b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
index a6ea0aba6c8c372acc367bab20fcfb6f28bd4d1b..eacd1890866c6c8420d4167c007db28c82346ed0 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
@@ -1,10 +1,12 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-ldynamicMesh \
-lreconstruct \
-lgenericPatchFields
diff --git a/applications/utilities/miscellaneous/foamDictionary/Make/options b/applications/utilities/miscellaneous/foamDictionary/Make/options
index 41306609f208806f0c6f42a2426867d3e10d4897..4c3dd783cb4170feefb3f5385510a83257b43b18 100644
--- a/applications/utilities/miscellaneous/foamDictionary/Make/options
+++ b/applications/utilities/miscellaneous/foamDictionary/Make/options
@@ -1 +1,3 @@
EXE_INC =
+
+EXE_LIBS =
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/Make/options b/applications/utilities/miscellaneous/foamFormatConvert/Make/options
index b2bc2047e317f0b08416aaecdfe3b19c083cf7f8..91b570783ccbf07136076fff6eaf1ce35eaea8e7 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/Make/options
+++ b/applications/utilities/miscellaneous/foamFormatConvert/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
- -lmeshTools \
-lfiniteVolume \
- -lgenericPatchFields \
- -llagrangian
+ -lmeshTools \
+ -llagrangian \
+ -lgenericPatchFields
diff --git a/applications/utilities/miscellaneous/foamListTimes/Make/options b/applications/utilities/miscellaneous/foamListTimes/Make/options
index 18e6fe47afacb902cddccf82632772447704fd88..4c3dd783cb4170feefb3f5385510a83257b43b18 100644
--- a/applications/utilities/miscellaneous/foamListTimes/Make/options
+++ b/applications/utilities/miscellaneous/foamListTimes/Make/options
@@ -1,2 +1,3 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
+EXE_INC =
+
+EXE_LIBS =
diff --git a/applications/utilities/miscellaneous/foamRestoreFields/Make/options b/applications/utilities/miscellaneous/foamRestoreFields/Make/options
index 18e6fe47afacb902cddccf82632772447704fd88..4c3dd783cb4170feefb3f5385510a83257b43b18 100644
--- a/applications/utilities/miscellaneous/foamRestoreFields/Make/options
+++ b/applications/utilities/miscellaneous/foamRestoreFields/Make/options
@@ -1,2 +1,3 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
+EXE_INC =
+
+EXE_LIBS =
diff --git a/applications/utilities/miscellaneous/patchSummary/Make/options b/applications/utilities/miscellaneous/patchSummary/Make/options
index 318e1be8f4db9fb03aa149e620e74d560ddd241d..969020c4afaf5d784299462b9e1af282040ba6b4 100644
--- a/applications/utilities/miscellaneous/patchSummary/Make/options
+++ b/applications/utilities/miscellaneous/patchSummary/Make/options
@@ -3,6 +3,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lgenericPatchFields \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lgenericPatchFields
diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options
index aef073e17af5513f91a8c0b0804bd0eb4842b6bf..0340a9d941df5a22fc9e171ee9ef3031ba059049 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/options
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/options
@@ -1,20 +1,22 @@
EXE_INC = \
- -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
- -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/finiteArea/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/regionModels/regionModel/lnInclude
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
EXE_LIBS = \
+ -lfiniteArea \
+ -lfiniteVolume \
+ -lmeshTools \
+ -llagrangian \
-ldynamicMesh \
- -ldecompose \
+ -lregionModels \
-lgenericPatchFields \
+ -ldecompose \
-ldecompositionMethods \
-L$(FOAM_LIBBIN)/dummy \
- -lkahipDecomp -lmetisDecomp -lscotchDecomp \
- -llagrangian \
- -ldynamicMesh \
- -lregionModels
+ -lkahipDecomp -lmetisDecomp -lscotchDecomp
diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options
index 5a1936655b3b55405890afe075d393711c5e5d29..447a3e320821ef0867a82954b0c5dc94196ef0da 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructPar/Make/options
@@ -1,17 +1,18 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/finiteArea/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude
EXE_LIBS = \
+ -lfiniteArea \
-lfiniteVolume \
- -lgenericPatchFields \
+ -lmeshTools \
-llagrangian \
+ -lgenericPatchFields \
-ldynamicMesh \
- -lmeshTools \
-lreconstruct \
-lregionModels
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
index f9b5424edde58b0ab5f2b0524e4fe1071db0547f..792a51bf7fce4e4db070d172f67aac88e26b0fc4 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options
@@ -1,8 +1,9 @@
EXE_INC = \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
- -lmeshTools
+ -lfiniteVolume \
+ -lmeshTools \
+ -ldynamicMesh
diff --git a/applications/utilities/parallelProcessing/redistributePar/Make/options b/applications/utilities/parallelProcessing/redistributePar/Make/options
index cbfc82794dd076c7eb87f268ce9b312d35c39ba2..6ca9819a3e3c832d2f3126807451d86a485c4eac 100644
--- a/applications/utilities/parallelProcessing/redistributePar/Make/options
+++ b/applications/utilities/parallelProcessing/redistributePar/Make/options
@@ -1,23 +1,23 @@
EXE_INC = \
- -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
- -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude
+ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
+ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
EXE_LIBS = \
-lfiniteVolume \
- -lgenericPatchFields \
- -ldecompositionMethods \
- -L$(FOAM_LIBBIN)/dummy \
- -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
- -ldecompose \
-lmeshTools \
-llagrangian \
-ldynamicMesh \
+ -lsnappyHexMesh \
-lregionModels \
- -lsnappyHexMesh
+ -lgenericPatchFields \
+ -ldecompose \
+ -ldecompositionMethods \
+ -L$(FOAM_LIBBIN)/dummy \
+ -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
index 318e1be8f4db9fb03aa149e620e74d560ddd241d..969020c4afaf5d784299462b9e1af282040ba6b4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
@@ -3,6 +3,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lgenericPatchFields \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
index 2ca27b9fbcebacdfdccad0a5a331d81b0f4a25c7..49c30cf77507fa9fc5f39cad3cbc68057bf5ce86 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options
@@ -7,7 +7,9 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfileFormats \
-ldynamicMesh \
- -lgenericPatchFields \
+ -lconversion \
-llagrangianIntermediate \
- -lconversion
+ -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options
index 2ca27b9fbcebacdfdccad0a5a331d81b0f4a25c7..91f83bb8b005533ae993457c8988eaf64e49611a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options
@@ -7,7 +7,9 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfileFormats \
+ -lconversion \
-ldynamicMesh \
- -lgenericPatchFields \
-llagrangianIntermediate \
- -lconversion
+ -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options
index 87b432481021cc47b9d9dcbbbfc4be342bd1ac53..23cd381a0db4b0f75208aac6186a7dab43297a40 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options
@@ -9,5 +9,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
- -lgenericPatchFields \
- -llagrangian
+ -llagrangian \
+ -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
index bae30bd5d502855b3c827547bf69a72f87f9ec0c..3875bcdf5afd93b883f959df96f812f278263877 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
@@ -1,18 +1,21 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteArea/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/finiteArea/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude
EXE_LIBS = \
+ -lfiniteArea \
+ -lfiniteVolume \
+ -lfileFormats \
+ -lmeshTools \
-lconversion \
-ldynamicMesh \
- -lfiniteArea \
-llagrangianIntermediate \
-lregionModels \
-lgenericPatchFields
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/Make/options b/applications/utilities/postProcessing/dataConversion/smapToFoam/Make/options
index 318e1be8f4db9fb03aa149e620e74d560ddd241d..969020c4afaf5d784299462b9e1af282040ba6b4 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/Make/options
@@ -3,6 +3,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lgenericPatchFields \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
index 806956cf5f13921e10d190655ac67b47c40b868f..16ed952f3e9998c240821ad88ff6013ac11ee186 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
+ -lfileFormats \
-lmeshTools \
- -lgenericPatchFields \
- -llagrangian
+ -llagrangian \
+ -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/Make/options
index 6898c7800d9047ca992caa070b69b84a8c02f243..efc379bfca6e8394c5dd5c524d23ef1f51905eda 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/Make/options
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/Make/options
@@ -1,10 +1,11 @@
EXE_INC = \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
- -llagrangian \
+ -lfiniteVolume \
+ -lfileFormats \
-lmeshTools \
- -lfiniteVolume
+ -llagrangian
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointForces/Make/options b/applications/utilities/postProcessing/lumped/lumpedPointForces/Make/options
index 684551e19296172d9e3d8941bf41515eb124506e..5821a660d0dd8ddb21091d8898f190d0ac1ccc02 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointForces/Make/options
+++ b/applications/utilities/postProcessing/lumped/lumpedPointForces/Make/options
@@ -5,6 +5,6 @@ EXE_INC = \
-I$(LIB_SRC)/lumpedPointMotion/lnInclude
EXE_LIBS = \
- -lmeshTools \
-lfiniteVolume \
+ -lmeshTools \
-llumpedPointMotion
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointMovement/Make/options b/applications/utilities/postProcessing/lumped/lumpedPointMovement/Make/options
index 684551e19296172d9e3d8941bf41515eb124506e..5821a660d0dd8ddb21091d8898f190d0ac1ccc02 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointMovement/Make/options
+++ b/applications/utilities/postProcessing/lumped/lumpedPointMovement/Make/options
@@ -5,6 +5,6 @@ EXE_INC = \
-I$(LIB_SRC)/lumpedPointMotion/lnInclude
EXE_LIBS = \
- -lmeshTools \
-lfiniteVolume \
+ -lmeshTools \
-llumpedPointMotion
diff --git a/applications/utilities/postProcessing/lumped/lumpedPointZones/Make/options b/applications/utilities/postProcessing/lumped/lumpedPointZones/Make/options
index 684551e19296172d9e3d8941bf41515eb124506e..5821a660d0dd8ddb21091d8898f190d0ac1ccc02 100644
--- a/applications/utilities/postProcessing/lumped/lumpedPointZones/Make/options
+++ b/applications/utilities/postProcessing/lumped/lumpedPointZones/Make/options
@@ -5,6 +5,6 @@ EXE_INC = \
-I$(LIB_SRC)/lumpedPointMotion/lnInclude
EXE_LIBS = \
- -lmeshTools \
-lfiniteVolume \
+ -lmeshTools \
-llumpedPointMotion
diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/Make/options b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/Make/options
index fc10ba7a6f32c4f1f314cbb9ccbbb15262fc1b5f..c047adcbfc393d905ddbf9b9718150e8f22d1451 100644
--- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/engine/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/engine/lnInclude
EXE_LIBS = \
- -lengine \
- -ldynamicMesh \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicMesh \
+ -lengine
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options b/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
index 65359ddbf40c1e103b51d9820dd7412003c82494..ae9c322de729e19fc98808c305c527428bfa111c 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
@@ -1,11 +1,11 @@
EXE_INC = \
- -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude
EXE_LIBS = \
- -ldistributionModels \
- -lsampling \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lsampling \
+ -ldistributionModels
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options b/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
index c5e4b6238bbfb3acfee55acaee28fddb6f013c01..9561168684195d7175ec61792ddcf0bf885a86d3 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
- -lmeshTools \
-lfiniteVolume \
- -lgenericPatchFields \
- -lsampling
+ -lmeshTools \
+ -lsampling \
+ -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/Make/options b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/Make/options
index 89e52b6d520dc088e6516df08f0f521f188a6353..fa15f124528ebfcaf279a88a73a0d7954f2e9dc1 100644
--- a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/Make/options
@@ -3,4 +3,3 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume
-
diff --git a/applications/utilities/postProcessing/noise/Make/options b/applications/utilities/postProcessing/noise/Make/options
index 2fc476e7419aac049558489d7c1cf86e69f36933..dfbcbf240370ef39cdf9c1e390106a98ee253bdf 100644
--- a/applications/utilities/postProcessing/noise/Make/options
+++ b/applications/utilities/postProcessing/noise/Make/options
@@ -1,8 +1,8 @@
EXE_INC = \
- -I$(LIB_SRC)/randomProcesses/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude
+ -I$(LIB_SRC)/randomProcesses/lnInclude
EXE_LIBS = \
- -lrandomProcesses \
- -lsampling
+ -lsampling \
+ -lrandomProcesses
diff --git a/applications/utilities/postProcessing/postProcess/Make/options b/applications/utilities/postProcessing/postProcess/Make/options
index d3bb9a2b6d02e0e92d82a4adc1c2068497cf819a..c2019e8d8c0d8f3bcc3c618aebb3981185ed2bd7 100644
--- a/applications/utilities/postProcessing/postProcess/Make/options
+++ b/applications/utilities/postProcessing/postProcess/Make/options
@@ -1,17 +1,21 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fvOptions/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/fvOptions/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
@@ -19,8 +23,4 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
- -lfiniteVolume \
- -lfvOptions \
- -lgenericPatchFields \
- -lmeshTools \
- -lsampling
+ -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
index 9de89cd9ae802e9936365a28b514c8605028a75c..a887778b7bae95e5993d365cdede2359c8d0717d 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
@@ -1,21 +1,22 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
EXE_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
+ -lfluidThermophysicalModels \
-lincompressibleTransportModels \
-lcompressibleTransportModels \
- -lgenericPatchFields \
- -lfiniteVolume \
- -lmeshTools \
- -lfvOptions
+ -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/boxTurb/Make/options b/applications/utilities/preProcessing/boxTurb/Make/options
index ca6ebb8c803d23009e1946a8c36703540511ecdb..497e272a3ae1f1199634b3ca29233e69ae70ed98 100644
--- a/applications/utilities/preProcessing/boxTurb/Make/options
+++ b/applications/utilities/preProcessing/boxTurb/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
- -I$(LIB_SRC)/randomProcesses/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/randomProcesses/lnInclude
EXE_LIBS = \
- -lrandomProcesses \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lrandomProcesses
diff --git a/applications/utilities/preProcessing/changeDictionary/Make/options b/applications/utilities/preProcessing/changeDictionary/Make/options
index 9b8c3dea8c859ed322ebac8c35158abedbc625f4..792a51bf7fce4e4db070d172f67aac88e26b0fc4 100644
--- a/applications/utilities/preProcessing/changeDictionary/Make/options
+++ b/applications/utilities/preProcessing/changeDictionary/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
EXE_LIBS = \
-lfiniteVolume \
- -ldynamicMesh \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicMesh
diff --git a/applications/utilities/preProcessing/createBoxTurb/Make/options b/applications/utilities/preProcessing/createBoxTurb/Make/options
index 8e62b99f630123b8f5b810a8b31c34bfbe83f7c9..ee2350859828c152ccc22b8f940c61545a8d6f0d 100644
--- a/applications/utilities/preProcessing/createBoxTurb/Make/options
+++ b/applications/utilities/preProcessing/createBoxTurb/Make/options
@@ -1,12 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
- -I$(LIB_SRC)/fileFormats/lnInclude
-
+ -I$(LIB_SRC)/mesh/blockMesh/lnInclude
EXE_LIBS = \
-lfiniteVolume \
+ -lfileFormats \
-lmeshTools \
- -lblockMesh \
- -lfileFormats
+ -lblockMesh
diff --git a/applications/utilities/preProcessing/createZeroDirectory/Make/options b/applications/utilities/preProcessing/createZeroDirectory/Make/options
index b6e5516b596507d96f86c1bc0bb5228b863bebcd..5b44326e23aecb02bec7a0c769270911d8547d82 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/Make/options
+++ b/applications/utilities/preProcessing/createZeroDirectory/Make/options
@@ -1,11 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude
EXE_LIBS = \
-lfiniteVolume \
- -ldynamicMesh \
-lmeshTools \
+ -ldynamicMesh \
-lregionModels
diff --git a/applications/utilities/preProcessing/dsmcInitialise/Make/options b/applications/utilities/preProcessing/dsmcInitialise/Make/options
index fa35b0bbd0622873507f1c6d2667929aa0a12fc3..8b1d051349b8efe21cae62aaba434d9e71ea007d 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/Make/options
+++ b/applications/utilities/preProcessing/dsmcInitialise/Make/options
@@ -1,11 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/lagrangian/DSMC/lnInclude
EXE_LIBS = \
- -lmeshTools \
-lfiniteVolume \
+ -lmeshTools \
-llagrangian \
-lDSMC
diff --git a/applications/utilities/preProcessing/engineSwirl/Make/options b/applications/utilities/preProcessing/engineSwirl/Make/options
index 318e1be8f4db9fb03aa149e620e74d560ddd241d..969020c4afaf5d784299462b9e1af282040ba6b4 100644
--- a/applications/utilities/preProcessing/engineSwirl/Make/options
+++ b/applications/utilities/preProcessing/engineSwirl/Make/options
@@ -3,6 +3,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lgenericPatchFields \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/faceAgglomerate/Make/options b/applications/utilities/preProcessing/faceAgglomerate/Make/options
index df6e1ebb3be4140ed3063ea6163f894d6fbbdbba..3d9b744f2be38c0ffff980c37acd401cb50ced51 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/Make/options
+++ b/applications/utilities/preProcessing/faceAgglomerate/Make/options
@@ -1,6 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/OpenFOAM/lnInclude \
-I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude
EXE_LIBS = \
diff --git a/applications/utilities/preProcessing/mapFields/Make/options b/applications/utilities/preProcessing/mapFields/Make/options
index 383ac3c12c66d86a5d14ea1f9cfcaf0f7e39164a..f5e72207f4106bed89fcef2ae385ac53db31a108 100644
--- a/applications/utilities/preProcessing/mapFields/Make/options
+++ b/applications/utilities/preProcessing/mapFields/Make/options
@@ -1,15 +1,16 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
- -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
EXE_LIBS = \
- -lsampling \
+ -lfiniteVolume \
-lmeshTools \
+ -lsampling \
-llagrangian \
- -lfiniteVolume \
-ldecompose \
+ -ldecompositionMethods \
-lgenericPatchFields
diff --git a/applications/utilities/preProcessing/mapFieldsPar/Make/options b/applications/utilities/preProcessing/mapFieldsPar/Make/options
index 7bd964094e47227f22d57a6b880ef940b5579b16..5a2daae6b887214c76159fc960aa927ee6fa72d9 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/Make/options
+++ b/applications/utilities/preProcessing/mapFieldsPar/Make/options
@@ -1,12 +1,12 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
- -lsampling \
+ -lfiniteVolume \
-lmeshTools \
+ -lsampling \
-llagrangian \
- -lfiniteVolume \
-lgenericPatchFields
diff --git a/applications/utilities/preProcessing/mdInitialise/Make/options b/applications/utilities/preProcessing/mdInitialise/Make/options
index 289c0990a22367e355db674ce067d1cf28ca6a2e..b0ae24f71454ddd43022e29a2e7b6231be411854 100644
--- a/applications/utilities/preProcessing/mdInitialise/Make/options
+++ b/applications/utilities/preProcessing/mdInitialise/Make/options
@@ -1,18 +1,17 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/molecularDynamics/molecule/lnInclude \
-I$(LIB_SRC)/lagrangian/molecularDynamics/potential/lnInclude \
- -I$(LIB_SRC)/lagrangian/molecularDynamics/molecularMeasurements/lnInclude \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/lagrangian/molecularDynamics/molecularMeasurements/lnInclude
EXE_LIBS = \
+ -lfiniteVolume \
-lmeshTools \
-ldynamicMesh \
- -lfiniteVolume \
-llagrangian \
-lmolecule \
-lpotential \
-lmolecularMeasurements
-
diff --git a/applications/utilities/preProcessing/setFields/Make/options b/applications/utilities/preProcessing/setFields/Make/options
index 06d42b6c3c9c5642799cda141c957280418d00b0..969020c4afaf5d784299462b9e1af282040ba6b4 100644
--- a/applications/utilities/preProcessing/setFields/Make/options
+++ b/applications/utilities/preProcessing/setFields/Make/options
@@ -4,5 +4,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
- -lgenericPatchFields \
- -lmeshTools
+ -lmeshTools \
+ -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/viewFactorsGen/Make/options b/applications/utilities/preProcessing/viewFactorsGen/Make/options
index 1eeef409c21ac5581b2653af0dccdd79034a967a..1a9826a229ce5cbe4b55e2ccd1bda80fcbeec3c2 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/Make/options
+++ b/applications/utilities/preProcessing/viewFactorsGen/Make/options
@@ -1,11 +1,12 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/distributed/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lfiniteVolume \
+ -lsurfMesh \
-lmeshTools \
-ldistributed \
-lradiationModels
diff --git a/applications/utilities/preProcessing/wallFunctionTable/Make/options b/applications/utilities/preProcessing/wallFunctionTable/Make/options
index 0390944a0e05061d14095bd3f4830ce7ecf3ea03..da954710ea7dcb1580ecd63a5abee28bc9183a3b 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/Make/options
+++ b/applications/utilities/preProcessing/wallFunctionTable/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
-I./tabulatedWallFunction/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude
EXE_LIBS = \
- -ltabulatedWallFunctions \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -ltabulatedWallFunctions
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/options b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/options
index cc5bf25a93e183eff1054ae71ded26852e5ef8fd..719de886ca66aa4bd18f710d223fdc66719cf471 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/options
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/Make/options
@@ -1,4 +1,3 @@
-
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
index 7a1c792e54d36e3f2a5c8f37185c38b78aeb8633..92d2dd6b7b5056e8abbd27275f2efef5d54fe036 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
@@ -18,5 +18,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools \
$(LINK_FLAGS)
diff --git a/applications/utilities/surface/surfaceCheck/Make/options b/applications/utilities/surface/surfaceCheck/Make/options
index 65185bc7f28fd61738c426d4e809c41a62834c6f..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceCheck/Make/options
+++ b/applications/utilities/surface/surfaceCheck/Make/options
@@ -1,8 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lmeshTools \
- -lsampling
+ -lsurfMesh \
+ -lmeshTools
diff --git a/applications/utilities/surface/surfaceClean/Make/options b/applications/utilities/surface/surfaceClean/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceClean/Make/options
+++ b/applications/utilities/surface/surfaceClean/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceFeatureExtract/Make/options b/applications/utilities/surface/surfaceFeatureExtract/Make/options
index dc149a902deb7ed9c6817b5c999fd5ab070b613a..1d1f5acb030381a8d9bcf715d26c7ac405a622bf 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/Make/options
+++ b/applications/utilities/surface/surfaceFeatureExtract/Make/options
@@ -1,9 +1,11 @@
EXE_INC = \
-IextractionMethod/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lsurfaceFeatureExtract \
- -lmeshTools
+ -lfileFormats \
+ -lsurfMesh \
+ -lmeshTools \
+ -lsurfaceFeatureExtract
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/Make/options b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/Make/options
index a5976d53f84a0c0c47012d4f0dfa4ba80c3af152..ea559e279e199195b07ebc53fb1bbf3708e04670 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/Make/options
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceFind/Make/options b/applications/utilities/surface/surfaceFind/Make/options
index 946b16a9ad7a1cb602df9752d7c7b5c62e375c2c..a504dd8617bfa4ff4d8fc1075d5d68d6db66db89 100644
--- a/applications/utilities/surface/surfaceFind/Make/options
+++ b/applications/utilities/surface/surfaceFind/Make/options
@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude
EXE_LIBS = \
- -lmeshTools \
-lsurfMesh
diff --git a/applications/utilities/surface/surfaceHookUp/Make/options b/applications/utilities/surface/surfaceHookUp/Make/options
index edc787aeae9f09fd0325d3b7c2a694c32c01d9c8..43f93c64394dcf13970a86d3eeac8de16a2298a3 100644
--- a/applications/utilities/surface/surfaceHookUp/Make/options
+++ b/applications/utilities/surface/surfaceHookUp/Make/options
@@ -1,7 +1,8 @@
EXE_INC = \
- -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceInertia/Make/options b/applications/utilities/surface/surfaceInertia/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceInertia/Make/options
+++ b/applications/utilities/surface/surfaceInertia/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceInflate/Make/options b/applications/utilities/surface/surfaceInflate/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceInflate/Make/options
+++ b/applications/utilities/surface/surfaceInflate/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceMeshConvert/Make/options b/applications/utilities/surface/surfaceMeshConvert/Make/options
index 42b30c86523f83efafbd2dbe5d52cc7487ec4101..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceMeshConvert/Make/options
+++ b/applications/utilities/surface/surfaceMeshConvert/Make/options
@@ -1,5 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
-EXE_LIBS = -lmeshTools -lsurfMesh
+EXE_LIBS = \
+ -lsurfMesh \
+ -lmeshTools
diff --git a/applications/utilities/surface/surfaceMeshExport/Make/options b/applications/utilities/surface/surfaceMeshExport/Make/options
index 42b30c86523f83efafbd2dbe5d52cc7487ec4101..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceMeshExport/Make/options
+++ b/applications/utilities/surface/surfaceMeshExport/Make/options
@@ -1,5 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
-EXE_LIBS = -lmeshTools -lsurfMesh
+EXE_LIBS = \
+ -lsurfMesh \
+ -lmeshTools
diff --git a/applications/utilities/surface/surfaceMeshExtract/Make/options b/applications/utilities/surface/surfaceMeshExtract/Make/options
index 02c293ceedb24499f009c1874d6cd6aa18dabd1f..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceMeshExtract/Make/options
+++ b/applications/utilities/surface/surfaceMeshExtract/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -lmeshTools \
- -lsurfMesh
+ -lsurfMesh \
+ -lmeshTools
diff --git a/applications/utilities/surface/surfaceMeshImport/Make/options b/applications/utilities/surface/surfaceMeshImport/Make/options
index 42b30c86523f83efafbd2dbe5d52cc7487ec4101..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceMeshImport/Make/options
+++ b/applications/utilities/surface/surfaceMeshImport/Make/options
@@ -1,5 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
-EXE_LIBS = -lmeshTools -lsurfMesh
+EXE_LIBS = \
+ -lsurfMesh \
+ -lmeshTools
diff --git a/applications/utilities/surface/surfaceMeshInfo/Make/options b/applications/utilities/surface/surfaceMeshInfo/Make/options
index 42b30c86523f83efafbd2dbe5d52cc7487ec4101..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceMeshInfo/Make/options
+++ b/applications/utilities/surface/surfaceMeshInfo/Make/options
@@ -1,5 +1,7 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude
-EXE_LIBS = -lmeshTools -lsurfMesh
+EXE_LIBS = \
+ -lsurfMesh \
+ -lmeshTools
diff --git a/applications/utilities/surface/surfaceOrient/Make/options b/applications/utilities/surface/surfaceOrient/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceOrient/Make/options
+++ b/applications/utilities/surface/surfaceOrient/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfacePatch/Make/options b/applications/utilities/surface/surfacePatch/Make/options
index 5319623bf1969c33d72a41f278f25e7fc439e6fa..b307b6fbb7affc301b7a8be63a593f28db687393 100644
--- a/applications/utilities/surface/surfacePatch/Make/options
+++ b/applications/utilities/surface/surfacePatch/Make/options
@@ -5,4 +5,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfacePointMerge/Make/options b/applications/utilities/surface/surfacePointMerge/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfacePointMerge/Make/options
+++ b/applications/utilities/surface/surfacePointMerge/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceRedistributePar/Make/options b/applications/utilities/surface/surfaceRedistributePar/Make/options
index 452e1e204fe91deef602dcf38962b6e8ad006f23..4ab7d227d5cf2683f18517e335bfe62024781e82 100644
--- a/applications/utilities/surface/surfaceRedistributePar/Make/options
+++ b/applications/utilities/surface/surfaceRedistributePar/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/parallel/distributed/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools \
-ldistributed \
-ldecompose
diff --git a/applications/utilities/surface/surfaceRefineRedGreen/Make/options b/applications/utilities/surface/surfaceRefineRedGreen/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceRefineRedGreen/Make/options
+++ b/applications/utilities/surface/surfaceRefineRedGreen/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/Make/options b/applications/utilities/surface/surfaceSplitNonManifolds/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/Make/options
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceSubset/Make/options b/applications/utilities/surface/surfaceSubset/Make/options
index d5ff5b3e40787cf8ae9a0246db862fcd133b2116..5ae72ebd31bdf7500846ee0dca7a4c123ff4fb43 100644
--- a/applications/utilities/surface/surfaceSubset/Make/options
+++ b/applications/utilities/surface/surfaceSubset/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/applications/utilities/surface/surfaceToPatch/Make/options b/applications/utilities/surface/surfaceToPatch/Make/options
index 87038840ec65f5265753abf9f6eedef8cbd28a69..70c838b774c8b2609363d066e78b1a19b9306ccd 100644
--- a/applications/utilities/surface/surfaceToPatch/Make/options
+++ b/applications/utilities/surface/surfaceToPatch/Make/options
@@ -1,5 +1,4 @@
EXE_INC = \
- -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Make/options b/applications/utilities/thermophysical/adiabaticFlameT/Make/options
index 6be7b16bd2460432d084900728f4729bef049fa7..98bf79aaa43cfb1f965a7c6477a54d0db7c645a4 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/Make/options
+++ b/applications/utilities/thermophysical/adiabaticFlameT/Make/options
@@ -1,2 +1,5 @@
-EXE_INC = -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
-EXE_LIBS = -lspecie
+EXE_INC = \
+ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
+
+EXE_LIBS = \
+ -lspecie
diff --git a/applications/utilities/thermophysical/equilibriumCO/Make/options b/applications/utilities/thermophysical/equilibriumCO/Make/options
index 6be7b16bd2460432d084900728f4729bef049fa7..98bf79aaa43cfb1f965a7c6477a54d0db7c645a4 100644
--- a/applications/utilities/thermophysical/equilibriumCO/Make/options
+++ b/applications/utilities/thermophysical/equilibriumCO/Make/options
@@ -1,2 +1,5 @@
-EXE_INC = -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
-EXE_LIBS = -lspecie
+EXE_INC = \
+ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
+
+EXE_LIBS = \
+ -lspecie
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/Make/options b/applications/utilities/thermophysical/equilibriumFlameT/Make/options
index 6be7b16bd2460432d084900728f4729bef049fa7..98bf79aaa43cfb1f965a7c6477a54d0db7c645a4 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/Make/options
+++ b/applications/utilities/thermophysical/equilibriumFlameT/Make/options
@@ -1,2 +1,5 @@
-EXE_INC = -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
-EXE_LIBS = -lspecie
+EXE_INC = \
+ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
+
+EXE_LIBS = \
+ -lspecie
diff --git a/src/Allwmake b/src/Allwmake
index 3b1b1cb5b0c047a1fd28da30b62d4c67dac51dcb..30f3ab83862cb4b4fa349b9b5a8ad020e87b2d82 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -15,42 +15,44 @@ cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR/src" 2>/dev/null || {
#------------------------------------------------------------------------------
-# Trigger update of version strings as required
-wmakeBuildInfo -check || wrmo OpenFOAM/global/global.o 2>/dev/null
-
wmakeLnInclude -u OpenFOAM
wmakeLnInclude -u OSspecific/"${WM_OSTYPE:-POSIX}"
+
OSspecific/"${WM_OSTYPE:-POSIX}"/Allwmake $targetType $*
Pstream/Allwmake $targetType $*
+# Trigger update of version info (as required)
+wmakeBuildInfo -check || wrmo OpenFOAM/global/global.o 2>/dev/null
wmake $targetType OpenFOAM
+
wmake $targetType fileFormats
wmake $targetType surfMesh
wmake $targetType meshTools
-# Decomposition methods needed by dummyThirdParty
-# (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
+wmake $targetType finiteArea
+wmake $targetType finiteVolume
+wmake $targetType genericPatchFields
+wmake $targetType mesh/extrudeModel
+wmake $targetType dynamicMesh
+
+wmake $targetType parallel/decompose/decompositionMethods
+
+# Make dummy decomposition methods (dummyThirdParty)
parallel/decompose/AllwmakeLnInclude
dummyThirdParty/Allwmake $targetType $*
wmakeLnInclude -u fvOptions
-wmake $targetType finiteVolume
wmake $targetType lagrangian/basic
wmake $targetType lagrangian/distributionModels
-wmake $targetType finiteArea
-wmake $targetType genericPatchFields
-conversion/Allwmake $targetType $*
-wmake $targetType mesh/extrudeModel
-wmake $targetType dynamicMesh
+parallel/Allwmake $targetType $*
+
wmake $targetType dynamicFvMesh
-wmake $targetType sampling
wmake $targetType topoChangerFvMesh
-# Compile scotchDecomp, metisDecomp etc.
-parallel/Allwmake $targetType $*
+wmake $targetType sampling
randomProcesses/Allwmake $targetType $*
wmake $targetType ODE
@@ -65,7 +67,7 @@ lagrangian/Allwmake $targetType $*
wmake $targetType fvOptions
wmake $targetType fvMotionSolver
-# Make sure we have block.H accessible before building overset
+# Ensure we have block.H accessible before building overset
wmake $targetType mesh/blockMesh
wmake $targetType overset
@@ -78,6 +80,7 @@ wmake $targetType waveModels
wmake $targetType engine
wmake $targetType regionCoupled
+conversion/Allwmake $targetType $*
functionObjects/Allwmake $targetType $*
wmake $targetType lumpedPointMotion
diff --git a/src/ODE/Make/options b/src/ODE/Make/options
index 18e6fe47afacb902cddccf82632772447704fd88..4c3dd783cb4170feefb3f5385510a83257b43b18 100644
--- a/src/ODE/Make/options
+++ b/src/ODE/Make/options
@@ -1,2 +1,3 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
+EXE_INC =
+
+EXE_LIBS =
diff --git a/src/OpenFOAM/Make/options b/src/OpenFOAM/Make/options
index ce477b7f08b720f026cfbd28381deaabe06f604e..a91a22e5c0a92bf99d4280bd29fe8acd008ec74b 100644
--- a/src/OpenFOAM/Make/options
+++ b/src/OpenFOAM/Make/options
@@ -1,12 +1,11 @@
-/* Preclude any possible issues if WM_PROJECT == OpenFOAM */
-ifeq ($(WM_PROJECT),OpenFOAM)
- PROJECT_LIBS =
-endif
+/* Never self-link with WM_PROJECT == OpenFOAM */
+PROJECT_LIBS =
EXE_INC = \
-I$(OBJECTS_DIR)
LIB_LIBS = \
$(FOAM_LIBBIN)/libOSspecific.o \
- -L$(FOAM_LIBBIN)/dummy -lPstream \
-lz
+
+LIB_LIBS += -L$(FOAM_LIBBIN)/dummy -lPstream
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index 647d646aeb1488bdf15b3b07cad6bcccd94fde03..77f2c9659b937fe1e889145c19de0c45aeeebdc1 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -29,7 +29,7 @@ echo "wmake $targetType dummy (mpi=$WM_MPLIB)"
wmake $targetType dummy
case "$WM_MPLIB" in
-*MPI*)
+(*MPI*)
wmakeMpiLib mpi
;;
esac
diff --git a/src/Pstream/dummy/Make/options b/src/Pstream/dummy/Make/options
index 654417564decb48a533199f948135c3d650e2f62..27ce45328ebe7f1b65af9419629d14b370558805 100644
--- a/src/Pstream/dummy/Make/options
+++ b/src/Pstream/dummy/Make/options
@@ -1 +1,5 @@
+EXE_INC =
+
LIB_LIBS =
+
+PROJECT_LIBS = -L$(FOAM_LIBBIN) -lOpenFOAM
diff --git a/src/Pstream/mpi/Make/options b/src/Pstream/mpi/Make/options
index 8fcb7016f81a290e860556bfe163cac4d36838bd..e255c81d10091470a9700f4db9b6ae16d5096fd7 100644
--- a/src/Pstream/mpi/Make/options
+++ b/src/Pstream/mpi/Make/options
@@ -2,4 +2,7 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
EXE_INC = $(PFLAGS) $(PINC) $(c++LESSWARN)
+
LIB_LIBS = $(PLIBS)
+
+PROJECT_LIBS = -L$(FOAM_LIBBIN) -lOpenFOAM
diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options
index f7ebff8f5ce8e80f64867e24e8ee3b3a373031f1..84a090e9214bbaf069cc15a32467816cf0b9c134 100644
--- a/src/TurbulenceModels/compressible/Make/options
+++ b/src/TurbulenceModels/compressible/Make/options
@@ -1,21 +1,21 @@
EXE_INC = \
-I../turbulenceModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude
LIB_LIBS = \
-lcompressibleTransportModels \
+ -lfiniteVolume \
+ -lmeshTools \
-lradiationModels \
-lfluidThermophysicalModels \
-lsolidThermo \
-lsolidSpecie \
-lturbulenceModels \
- -lspecie \
- -lfiniteVolume \
- -lmeshTools
+ -lspecie
diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/TurbulenceModels/incompressible/Make/options
index c44e9ae61c9cc89f7984bcebd9cef0318f44de8e..c897810641b2406e3c79ada81167bfba58685d59 100644
--- a/src/TurbulenceModels/incompressible/Make/options
+++ b/src/TurbulenceModels/incompressible/Make/options
@@ -1,11 +1,11 @@
EXE_INC = \
-I../turbulenceModels/lnInclude \
- -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/transportModels
LIB_LIBS = \
- -lincompressibleTransportModels \
-lturbulenceModels \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lincompressibleTransportModels
diff --git a/src/TurbulenceModels/schemes/Make/options b/src/TurbulenceModels/schemes/Make/options
index 26b3200f19a9851def97a79db99062baf5286398..9fad3f2dcb6a4149b287bc9a68792450fe0e3292 100644
--- a/src/TurbulenceModels/schemes/Make/options
+++ b/src/TurbulenceModels/schemes/Make/options
@@ -1,19 +1,19 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lcompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lcompressibleTurbulenceModels \
- -lfluidThermophysicalModels \
- -lfiniteVolume \
- -lmeshTools
+ -lfluidThermophysicalModels
diff --git a/src/atmosphericModels/Make/options b/src/atmosphericModels/Make/options
index 93f257f6ee145f420546223302f46ea60b8afd83..644c9096216a5077154d890f4e58e9baff92fa99 100644
--- a/src/atmosphericModels/Make/options
+++ b/src/atmosphericModels/Make/options
@@ -1,18 +1,18 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/fvOptions/lnInclude
LIB_LIBS = \
- -lturbulenceModels \
- -lincompressibleTurbulenceModels \
- -lincompressibleTransportModels \
-lfiniteVolume \
+ -lfvOptions \
-lmeshTools \
-lsurfMesh \
- -lfvOptions
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lincompressibleTransportModels
diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options
index e660ccd9f6163b86cd418aada44cdc8dd9d3dde1..584c634dcbb5fa6a417684281c1800c6b6fff93d 100644
--- a/src/combustionModels/Make/options
+++ b/src/combustionModels/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -6,13 +8,14 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lcompressibleTransportModels \
- -lturbulenceModels \
- -lcompressibleTurbulenceModels \
+ -lspecie \
+ -lfluidThermophysicalModels \
+ -lreactionThermophysicalModels \
-lchemistryModel \
- -lfiniteVolume \
- -lmeshTools
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels
diff --git a/src/conversion/Make/options b/src/conversion/Make/options
index 0e0829fd6188ab3b6fc92d9bb32445e5d8606aad..203ba90ba1af910d908791d0c2224a7950ae48e0 100644
--- a/src/conversion/Make/options
+++ b/src/conversion/Make/options
@@ -7,4 +7,5 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
-lfiniteArea \
+ -lfileFormats \
-lmeshTools
diff --git a/src/conversion/ccm/Make/options b/src/conversion/ccm/Make/options
index cf88c1aa63b56bb550be96a568c3d901c68016fc..767a440c20fa6ce0c124053683ebb21b2223a4d8 100644
--- a/src/conversion/ccm/Make/options
+++ b/src/conversion/ccm/Make/options
@@ -7,11 +7,11 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \
-I$(CCMIO_INC_DIR)
LIB_LIBS = \
-lfiniteVolume \
+ -lfileFormats \
-lconversion \
-L$(CCMIO_LIB_DIR) -lccmio
diff --git a/src/dummyThirdParty/MGridGen/Make/options b/src/dummyThirdParty/MGridGen/Make/options
index 18e6fe47afacb902cddccf82632772447704fd88..4c3dd783cb4170feefb3f5385510a83257b43b18 100644
--- a/src/dummyThirdParty/MGridGen/Make/options
+++ b/src/dummyThirdParty/MGridGen/Make/options
@@ -1,2 +1,3 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
+EXE_INC =
+
+EXE_LIBS =
diff --git a/src/dummyThirdParty/kahipDecomp/Make/options b/src/dummyThirdParty/kahipDecomp/Make/options
index 0aad6a146fa63c9bc92a594d13d34ef9a43a2d95..c8651b326ca2a475f51a500503bbef7279ce598d 100644
--- a/src/dummyThirdParty/kahipDecomp/Make/options
+++ b/src/dummyThirdParty/kahipDecomp/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompose/kahipDecomp/lnInclude
-LIB_LIBS =
+LIB_LIBS = \
+ -ldecompositionMethods
diff --git a/src/dummyThirdParty/metisDecomp/Make/options b/src/dummyThirdParty/metisDecomp/Make/options
index 4acabef1b388229f92d4f5fcf7bc80ac8dce4f66..b69677715611f7942de0553d8de4114c5270e019 100644
--- a/src/dummyThirdParty/metisDecomp/Make/options
+++ b/src/dummyThirdParty/metisDecomp/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompose/metisDecomp/lnInclude
-LIB_LIBS =
+LIB_LIBS = \
+ -ldecompositionMethods
diff --git a/src/dummyThirdParty/ptscotchDecomp/Make/options b/src/dummyThirdParty/ptscotchDecomp/Make/options
index 481166164b7f72242102e4f730ce7db1729a703b..a993d5359eb7e9e8f02e0647fb4110e39c3248ab 100644
--- a/src/dummyThirdParty/ptscotchDecomp/Make/options
+++ b/src/dummyThirdParty/ptscotchDecomp/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompose/ptscotchDecomp/lnInclude
-LIB_LIBS =
+LIB_LIBS = \
+ -ldecompositionMethods
diff --git a/src/dummyThirdParty/scotchDecomp/Make/options b/src/dummyThirdParty/scotchDecomp/Make/options
index f3429e59e593402f69649cc073a39bc2adc23320..4a9e7c964c66bc7387282899160a9e9d2cae75e8 100644
--- a/src/dummyThirdParty/scotchDecomp/Make/options
+++ b/src/dummyThirdParty/scotchDecomp/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompose/scotchDecomp/lnInclude
-LIB_LIBS =
+LIB_LIBS = \
+ -ldecompositionMethods
diff --git a/src/dynamicFvMesh/Make/options b/src/dynamicFvMesh/Make/options
index 3540c13bfc8d77a85b5642874b6806561cfdacd8..a3458eaa3d0128ff57370fa3dcb78e65177594ed 100644
--- a/src/dynamicFvMesh/Make/options
+++ b/src/dynamicFvMesh/Make/options
@@ -1,10 +1,9 @@
EXE_INC = \
- -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
-lmeshTools \
- -ldynamicMesh \
- -lfiniteVolume
+ -ldynamicMesh
diff --git a/src/dynamicMesh/Make/options b/src/dynamicMesh/Make/options
index 45af15fb9c7c125f13cac614136a45aa14a41855..040f0b7fd1a07da246af3407477811c0fd61d8e5 100644
--- a/src/dynamicMesh/Make/options
+++ b/src/dynamicMesh/Make/options
@@ -7,4 +7,5 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
-lsurfMesh \
+ -lmeshTools \
-lextrudeModel
diff --git a/src/fileFormats/Make/options b/src/fileFormats/Make/options
index 18e6fe47afacb902cddccf82632772447704fd88..2dc5c77a2873e23b46179f07df283f1a93d63712 100644
--- a/src/fileFormats/Make/options
+++ b/src/fileFormats/Make/options
@@ -1,2 +1,4 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
+EXE_INC =
+
+LIB_LIBS = \
+ -lOpenFOAM
diff --git a/src/finiteArea/Make/options b/src/finiteArea/Make/options
index 4b2f0a059fbac055ee17d31b510b95445907d34c..bd8bff004470fe28000b31d01583bbf9368bf49c 100644
--- a/src/finiteArea/Make/options
+++ b/src/finiteArea/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
+ -lOpenFOAM \
-lmeshTools
diff --git a/src/finiteVolume/Make/options b/src/finiteVolume/Make/options
index d4fc619be072d3e8df06e9af9e393082d811215f..851f94b6b3910365ebdd5ad09a66903da978f118 100644
--- a/src/finiteVolume/Make/options
+++ b/src/finiteVolume/Make/options
@@ -5,4 +5,6 @@ EXE_INC = \
LIB_LIBS = \
-lOpenFOAM \
+ -lfileFormats \
+ -lsurfMesh \
-lmeshTools
diff --git a/src/functionObjects/field/Make/options b/src/functionObjects/field/Make/options
index 2372619dd32be16a846abf76cdabcb5a3550c9c1..57ea31c1cfb026a75c927836f43aed29ef24bf1d 100644
--- a/src/functionObjects/field/Make/options
+++ b/src/functionObjects/field/Make/options
@@ -1,11 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
- -I$(LIB_SRC)/fileFormats/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -18,19 +18,16 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude
LIB_LIBS = \
-lfiniteVolume \
+ -lfileFormats \
+ -lsurfMesh \
-lmeshTools \
+ -lsampling \
-llagrangian \
-ldistributionModels \
- -lsampling \
- -lsurfMesh \
-lfluidThermophysicalModels \
-lsolidThermo \
-lincompressibleTransportModels \
diff --git a/src/functionObjects/forces/Make/options b/src/functionObjects/forces/Make/options
index 219b130f9e21afc91d84f23702b0ea2aadd9c4f4..3be6e09cef0e1445fbaae41242a6ced56dc67970 100644
--- a/src/functionObjects/forces/Make/options
+++ b/src/functionObjects/forces/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -6,16 +7,15 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lfluidThermophysicalModels \
-lincompressibleTransportModels \
-lcompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
- -lspecie \
- -lfiniteVolume \
- -lmeshTools
+ -lspecie
diff --git a/src/functionObjects/graphics/runTimePostProcessing/dummy/Make/options b/src/functionObjects/graphics/runTimePostProcessing/dummy/Make/options
index 6b8588463d9782589e3443f8bb381f736ff3ddfa..79be6f3a7dd8fa81ba203d5ab8572c446c43a6c7 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/dummy/Make/options
+++ b/src/functionObjects/graphics/runTimePostProcessing/dummy/Make/options
@@ -1,2 +1,3 @@
-/* EXE_INC = */
-/* LIB_LIBS = */
+EXE_INC =
+
+LIB_LIBS =
diff --git a/src/functionObjects/lagrangian/Make/options b/src/functionObjects/lagrangian/Make/options
index e54a3f92866dec616395219507a5a4bd0ec7ed80..26e35a3df73e14e78aca28901840bca8e23b391e 100644
--- a/src/functionObjects/lagrangian/Make/options
+++ b/src/functionObjects/lagrangian/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/fileFormats/lnInclude \
- -I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/conversion/lnInclude \
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
@@ -13,9 +13,10 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
- -lincompressibleTransportModels \
- -lconversion \
+ -lfileFormats \
-lmeshTools \
+ -lconversion \
+ -lincompressibleTransportModels \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
diff --git a/src/functionObjects/randomProcesses/Make/options b/src/functionObjects/randomProcesses/Make/options
index 4c713c968a763f22cc0bbc61b22ea179f8b56466..8fb96c4ce2ef543100503a5992571861fb7b33cd 100644
--- a/src/functionObjects/randomProcesses/Make/options
+++ b/src/functionObjects/randomProcesses/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
- -I$(LIB_SRC)/randomProcesses/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/randomProcesses/lnInclude
LIB_LIBS = \
- -lrandomProcesses \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -lrandomProcesses
diff --git a/src/functionObjects/solvers/Make/options b/src/functionObjects/solvers/Make/options
index be705a6cbc7289c54f8106a6ef0b23769b62f09e..ad50bd19c80ac3f02189cd33d197949f190bf1f3 100644
--- a/src/functionObjects/solvers/Make/options
+++ b/src/functionObjects/solvers/Make/options
@@ -1,22 +1,22 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
-lfvOptions \
+ -lmeshTools \
-lfluidThermophysicalModels \
-lincompressibleTransportModels \
-lcompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \
- -lspecie \
- -lfiniteVolume \
- -lmeshTools
+ -lspecie
diff --git a/src/functionObjects/utilities/Make/options b/src/functionObjects/utilities/Make/options
index 5ba64ac1d682792bac27403a83afcd028d857d1e..c82dbfbdab98de46054f31b97adc6c9d04510bd4 100644
--- a/src/functionObjects/utilities/Make/options
+++ b/src/functionObjects/utilities/Make/options
@@ -2,11 +2,11 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/finiteArea/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude
@@ -14,11 +14,12 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
-lfiniteArea \
+ -lfileFormats \
+ -lsurfMesh \
-lmeshTools \
+ -ldynamicMesh \
-lconversion \
-lsampling \
- -lsurfMesh \
- -ldynamicMesh \
+ -lODE \
-lfluidThermophysicalModels \
- -lcompressibleTransportModels \
- -lODE
+ -lcompressibleTransportModels
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
index 93a7e01542e3a516c7ed5370f0f7b4b77b8e9544..82c725aa857e72211a8068f5bd3747e2a8655005 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options
@@ -1,9 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/OpenFOAM/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
- -lfiniteVolume \
-lOpenFOAM \
+ -lfiniteVolume \
-lmeshTools
diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options
index 291aefb75c3e10e58a86dbcd335947b64e43d4fb..e650af2c4fab70a8388b8e5f0b5570af2906f2f0 100644
--- a/src/fvMotionSolver/Make/options
+++ b/src/fvMotionSolver/Make/options
@@ -1,14 +1,14 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/functionObjects/forces/lnInclude \
LIB_LIBS = \
- -lmeshTools \
- -ldynamicMesh \
-lfiniteVolume \
- -lfvOptions
- /*-lforces include in controlDict if needed */
+ -lfvOptions \
+ -lmeshTools \
+ -ldynamicMesh
+ /* -lforces include in controlDict if needed */
diff --git a/src/fvOptions/Make/options b/src/fvOptions/Make/options
index 50b311988dc9d0f6f5fd9155662ff95f56bbee15..5da3ef931dca97c5d1b95e33c22807db9753eb10 100644
--- a/src/fvOptions/Make/options
+++ b/src/fvOptions/Make/options
@@ -2,20 +2,22 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
LIB_LIBS = \
-lfiniteVolume \
- -lsampling \
-lmeshTools \
+ -lsampling \
+ -lfluidThermophysicalModels \
+ -lsolidThermo \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels
diff --git a/src/lagrangian/DSMC/Make/options b/src/lagrangian/DSMC/Make/options
index 55865dfabcd9146aa4fe204e71d664b62e535b95..7a728f9dd7cf75800c9b44943a2964c781376576 100644
--- a/src/lagrangian/DSMC/Make/options
+++ b/src/lagrangian/DSMC/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude
LIB_LIBS = \
- -llagrangian \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -llagrangian
diff --git a/src/lagrangian/basic/Make/options b/src/lagrangian/basic/Make/options
index f7d9a36f3b6448a99c7aaf6aecdcaefd1a967f5b..4b2f0a059fbac055ee17d31b510b95445907d34c 100644
--- a/src/lagrangian/basic/Make/options
+++ b/src/lagrangian/basic/Make/options
@@ -1,6 +1,5 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
-lmeshTools
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index faa05e8bd21b0b6a6c88f0d2c3c509195ea3ce6c..25ee31bf7dfc939af4f6adaeb43280e93cc02261 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@@ -16,11 +18,11 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
@@ -39,6 +41,4 @@ LIB_LIBS = \
-lregionModels \
-lsurfaceFilmModels \
-ldynamicMesh \
- -ldynamicFvMesh \
- -lfiniteVolume \
- -lmeshTools
+ -ldynamicFvMesh
diff --git a/src/lagrangian/distributionModels/Make/options b/src/lagrangian/distributionModels/Make/options
index 41306609f208806f0c6f42a2426867d3e10d4897..79be6f3a7dd8fa81ba203d5ab8572c446c43a6c7 100644
--- a/src/lagrangian/distributionModels/Make/options
+++ b/src/lagrangian/distributionModels/Make/options
@@ -1 +1,3 @@
EXE_INC =
+
+LIB_LIBS =
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index c859546735be6ca725ecedb6346f1eaadd24c44d..d972d5b0345590520cdb943aa98de8f2c2e29f10 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -1,4 +1,8 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -12,14 +16,13 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/fileFormats/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lfileFormats \
+ -lsurfMesh \
+ -lmeshTools \
-llagrangian \
-ldistributionModels \
-lspecie \
@@ -33,8 +36,4 @@ LIB_LIBS = \
-lregionModels \
-lsurfaceFilmModels \
-ldynamicMesh \
- -ldynamicFvMesh \
- -lsampling \
- -lfiniteVolume \
- -lfileFormats \
- -lmeshTools
+ -ldynamicFvMesh
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/Make/options b/src/lagrangian/molecularDynamics/molecularMeasurements/Make/options
index 18e6fe47afacb902cddccf82632772447704fd88..79be6f3a7dd8fa81ba203d5ab8572c446c43a6c7 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/Make/options
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/Make/options
@@ -1,2 +1,3 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
+EXE_INC =
+
+LIB_LIBS =
diff --git a/src/lagrangian/solidParticle/Make/options b/src/lagrangian/solidParticle/Make/options
index 9fe79c9220b60af2b5c87cc7e9f6974096372b1a..7a728f9dd7cf75800c9b44943a2964c781376576 100644
--- a/src/lagrangian/solidParticle/Make/options
+++ b/src/lagrangian/solidParticle/Make/options
@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude
LIB_LIBS = \
- -llagrangian \
+ -lfiniteVolume \
-lmeshTools \
- -lfiniteVolume
+ -llagrangian
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 7fd4496c0613c523e61bfdd92f91427e1a455131..d595ada329b1a9965c39d7994b43dc7260be42f6 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -1,4 +1,7 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@@ -17,13 +20,12 @@ EXE_INC = \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lsurfMesh \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-llagrangianTurbulence \
@@ -42,7 +44,4 @@ LIB_LIBS = \
-lregionModels \
-lsurfaceFilmModels \
-ldynamicMesh \
- -ldynamicFvMesh \
- -lsampling \
- -lfiniteVolume \
- -lmeshTools
+ -ldynamicFvMesh
diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options
index 4a7f193503ef311793a5520b2197eafd68262fa5..ef0174becec11dc14999d5ea01985c697d0dc512 100644
--- a/src/lagrangian/turbulence/Make/options
+++ b/src/lagrangian/turbulence/Make/options
@@ -1,4 +1,7 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@@ -15,12 +18,12 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lsurfMesh \
+ -lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-ldistributionModels \
@@ -37,7 +40,4 @@ LIB_LIBS = \
-lincompressibleTransportModels \
-lregionModels \
-lsurfaceFilmModels \
- -ldynamicFvMesh \
- -lsampling \
- -lfiniteVolume \
- -lmeshTools
+ -ldynamicFvMesh
diff --git a/src/lumpedPointMotion/Make/options b/src/lumpedPointMotion/Make/options
index 9aa6ebf53d94a605e319632789cf0e828c638955..1490ace5fd71b2d50ac5992114f237ba21e1c07d 100644
--- a/src/lumpedPointMotion/Make/options
+++ b/src/lumpedPointMotion/Make/options
@@ -1,10 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
LIB_LIBS = \
-lfiniteVolume \
- -ldynamicMesh \
- -lmeshTools
+ -lfileFormats \
+ -lmeshTools \
+ -ldynamicMesh
diff --git a/src/mesh/blockMesh/Make/options b/src/mesh/blockMesh/Make/options
index 6f44ed691266a97c24a5f09b60a76f31237a6575..d4e05ad7cb7dc9a1363ff244fe5ff05ebaa26a1c 100644
--- a/src/mesh/blockMesh/Make/options
+++ b/src/mesh/blockMesh/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/src/mesh/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options
index 979289742c4824e1951b5884b1b7f70bf89e2732..ea559e279e199195b07ebc53fb1bbf3708e04670 100644
--- a/src/mesh/extrudeModel/Make/options
+++ b/src/mesh/extrudeModel/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
+ -lsurfMesh \
-lmeshTools
diff --git a/src/mesh/snappyHexMesh/Make/options b/src/mesh/snappyHexMesh/Make/options
index f76521cbc2cf604813ffe1a9f25313d1f9601cc4..519e861b82857f2bd109dc4c09258196d4b50403 100644
--- a/src/mesh/snappyHexMesh/Make/options
+++ b/src/mesh/snappyHexMesh/Make/options
@@ -1,19 +1,23 @@
EXE_INC = \
- -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/overset/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
LIB_LIBS = \
- -ldynamicMesh \
-lfiniteVolume \
- -llagrangian \
+ -lfileFormats \
+ -lsurfMesh \
-lmeshTools \
+ -ldynamicMesh \
+ -lsampling \
+ -llagrangian \
-lfvMotionSolvers \
-loverset \
- -ldistributed
+ -ldistributed \
+ -ldecompositionMethods
diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options
index 210c65589602fc5911b063e86e95879380069bc9..9ee5884e5908ccdb6b1ba3acf323b8c524ec996a 100644
--- a/src/meshTools/Make/options
+++ b/src/meshTools/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude
LIB_LIBS = \
+ -lfileFormats \
-lsurfMesh
diff --git a/src/overset/Make/options b/src/overset/Make/options
index fb7f46e24e001259f083f3f012c782a0b8db4446..427f266c203a19dead0754fb46b770187d50027a 100644
--- a/src/overset/Make/options
+++ b/src/overset/Make/options
@@ -3,18 +3,22 @@
*/
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
- -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lsurfMesh \
+ -lmeshTools \
+ -lblockMesh \
+ -ldynamicMesh \
-ldynamicFvMesh \
-lsampling \
- -lblockMesh \
-ldecompositionMethods
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index ddf560a4b140f141e7bf0a35eca9f533b1595191..4cf78f005e17c08dbd3d6ba958e8f87c32066d42 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
. $WM_PROJECT_DIR/wmake/scripts/have_kahip
. $WM_PROJECT_DIR/wmake/scripts/have_metis
@@ -10,11 +10,9 @@ cd ${0%/*} || exit 1 # Run from this directory
: ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH} # Extra safety?
export FOAM_EXT_LIBBIN
-#
# Define how to create an mpi-versioned library of $targetType
# compile into qualified directory
# use sentinel file(s) to handle version changes
-#
wmakeMpiLib()
{
local decompName="$1"
@@ -27,7 +25,7 @@ wmakeMpiLib()
objectsDir="$WM_PROJECT_DIR/build/$WM_OPTIONS/src/parallel/decompose/$libName"
whichmpi="$objectsDir/using:$FOAM_MPI"
whichdecomp="$objectsDir/using:$decompName"
- [ -e "$whichmpi" -a -e "$whichdecomp" ] || wclean $libName
+ [ -e "$whichmpi" ] && [ -e "$whichdecomp" ] || wclean $libName
echo "wmake $targetType $libName (mpi=$WM_MPLIB)"
wmake $targetType $libName
mkdir -p "$objectsDir"
@@ -36,16 +34,13 @@ wmakeMpiLib()
done
}
-wmakeLnInclude -u decompositionMethods
+wmake $targetType decompositionMethods
+wmake $targetType decompose
-if have_scotch
-then
- wmake $targetType scotchDecomp
- if have_ptscotch
- then
- wmakeMpiLib "$SCOTCH_VERSION" ptscotchDecomp
- fi
+if have_kahip
+then
+ wmake $targetType kahipDecomp
fi
if have_metis
@@ -53,13 +48,15 @@ then
wmake $targetType metisDecomp
fi
-if have_kahip
+if have_scotch
then
- wmake $targetType kahipDecomp
-fi
+ wmake $targetType scotchDecomp
-wmake $targetType decompositionMethods
-wmake $targetType decompose
+ if have_ptscotch
+ then
+ wmakeMpiLib "$SCOTCH_VERSION" ptscotchDecomp
+ fi
+fi
#------------------------------------------------------------------------------
diff --git a/src/parallel/decompose/decompositionMethods/Make/options b/src/parallel/decompose/decompositionMethods/Make/options
index 487f3df83ab3d20dacb6831e3b0493d398c3d35d..1490ace5fd71b2d50ac5992114f237ba21e1c07d 100644
--- a/src/parallel/decompose/decompositionMethods/Make/options
+++ b/src/parallel/decompose/decompositionMethods/Make/options
@@ -1,11 +1,11 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
-lfileFormats \
-lmeshTools \
- -ldynamicMesh \
- -lfiniteVolume
+ -ldynamicMesh
diff --git a/src/parallel/distributed/Make/options b/src/parallel/distributed/Make/options
index 6961bf298d27c1a032fd7057386cef5fc543f27d..5bc6c63b9f06157e5c91ffb42a47379054ffcaaf 100644
--- a/src/parallel/distributed/Make/options
+++ b/src/parallel/distributed/Make/options
@@ -1,9 +1,11 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lsurfMesh \
-lmeshTools \
-ldecompositionMethods
diff --git a/src/randomProcesses/Make/options b/src/randomProcesses/Make/options
index 6bb57027c0b7fc5d4202ceb3373cd6f907befef5..8455e1fba216c4a7e74c6b799d85d52c3fb4cfc1 100644
--- a/src/randomProcesses/Make/options
+++ b/src/randomProcesses/Make/options
@@ -1,10 +1,11 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(FFTW_INC_DIR)
LIB_LIBS = \
- -L$(FFTW_LIB_DIR) -lfftw3 \
-lfiniteVolume \
- -lsampling
+ -lsurfMesh \
+ -lsampling \
+ -L$(FFTW_LIB_DIR) -lfftw3
diff --git a/src/regionCoupled/Make/options b/src/regionCoupled/Make/options
index a9753c5115e98af376181d88ac517ec012762443..0f5c91432ff68185b02336f9eb9b7b177846d518 100644
--- a/src/regionCoupled/Make/options
+++ b/src/regionCoupled/Make/options
@@ -1,15 +1,15 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lmeshTools
+ -lcompressibleTurbulenceModels
diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options
index a5cab5feb112fbbe3b2aaa55615891754eba6bc1..20ef95036f5c93ff16e5b76d2d3d6068ac9f50de 100644
--- a/src/regionModels/regionCoupling/Make/options
+++ b/src/regionModels/regionCoupling/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -15,11 +17,11 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \
- -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lregionModels \
-lpyrolysisModels \
-lsurfaceFilmModels \
@@ -27,6 +29,4 @@ LIB_LIBS = \
-lreactionThermophysicalModels \
-lSLGThermo \
-lturbulenceModels \
- -lcompressibleTurbulenceModels \
- -lfiniteVolume \
- -lmeshTools
+ -lcompressibleTurbulenceModels
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options
index 566ec315e503a4101380392351f6c1a4256cfc62..71431c132774c653bd1903bb0bf11e3240ba0ccf 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/regionModels/surfaceFilmModels/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -6,11 +8,11 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
- -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/regionModels/regionModel/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
@@ -18,6 +20,4 @@ LIB_LIBS = \
-lreactionThermophysicalModels \
-lSLGThermo \
-ldistributionModels \
- -lregionModels \
- -lfiniteVolume \
- -lmeshTools
+ -lregionModels
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
index 9f799143bc58b74dfb2c422af5af3dcbbe363c7d..208904221c0833e55ce85ff6c4d91acccb35b539 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -8,11 +10,11 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
- -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude\
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
@@ -22,6 +24,4 @@ LIB_LIBS = \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lregionModels \
- -lsurfaceFilmModels \
- -lfiniteVolume \
- -lmeshTools
+ -lsurfaceFilmModels
diff --git a/src/regionModels/thermalBaffleModels/Make/options b/src/regionModels/thermalBaffleModels/Make/options
index 9bd7bb9207b4d78e5f3bfb249a77efe9d5dded93..7d6234a10f2e1a1ca0fbb16eabc23d38ab14b628 100644
--- a/src/regionModels/thermalBaffleModels/Make/options
+++ b/src/regionModels/thermalBaffleModels/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
@@ -8,17 +10,15 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lcompressibleTransportModels \
-lregionModels \
-lsolidThermo \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lradiationModels \
- -ldynamicMesh \
- -lfiniteVolume \
- -lmeshTools
+ -ldynamicMesh
diff --git a/src/renumber/renumberMethods/Make/options b/src/renumber/renumberMethods/Make/options
index a97467a3329785d833b648b1d0576772420c3f86..dcfea82205a9b6f30acc95e610dcdcfb74101c5d 100644
--- a/src/renumber/renumberMethods/Make/options
+++ b/src/renumber/renumberMethods/Make/options
@@ -1,9 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
LIB_LIBS = \
- -ldecompositionMethods \
- -ldynamicMesh
+ -lmeshTools \
+ -ldynamicMesh \
+ -ldecompositionMethods
diff --git a/src/rigidBodyMeshMotion/Make/options b/src/rigidBodyMeshMotion/Make/options
index dd66786acedd76e65cbdc0d5f2c8f628bda981c0..c7465dfa24791b9343c276990cb13e6cfcece1e2 100644
--- a/src/rigidBodyMeshMotion/Make/options
+++ b/src/rigidBodyMeshMotion/Make/options
@@ -1,13 +1,14 @@
EXE_INC = \
- -I$(LIB_SRC)/rigidBodyDynamics/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/rigidBodyDynamics/lnInclude \
-I$(LIB_SRC)/functionObjects/forces/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lrigidBodyDynamics \
-lforces \
- -lmeshTools \
-ldynamicMesh
diff --git a/src/sampling/Make/options b/src/sampling/Make/options
index 85fc47f4325ffcfe195b1aa534c7d6cc7ed30100..6a8180f0ff1f90ef461bb00f52dcf69a1440a4b7 100644
--- a/src/sampling/Make/options
+++ b/src/sampling/Make/options
@@ -8,6 +8,8 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
+ -lfileFormats \
+ -lsurfMesh \
-lmeshTools \
-ldynamicMesh \
-llagrangian
diff --git a/src/sixDoFRigidBodyMotion/Make/options b/src/sixDoFRigidBodyMotion/Make/options
index cad98a1c41930fd175a29dff9edf9a5422f5d308..cf00711a992a8756fab8c9adb770c5584e6b8fc7 100644
--- a/src/sixDoFRigidBodyMotion/Make/options
+++ b/src/sixDoFRigidBodyMotion/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
-lmeshTools \
-lforces \
-ldynamicMesh
diff --git a/src/sixDoFRigidBodyState/Make/options b/src/sixDoFRigidBodyState/Make/options
index 2d77c5dda4bc109d87429cbc1a072baa360ecf07..03d4c8ca418a4a53d861d94b0500de992415eaba 100644
--- a/src/sixDoFRigidBodyState/Make/options
+++ b/src/sixDoFRigidBodyState/Make/options
@@ -1,11 +1,12 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/sixDoFRigidBodyMotion/lnInclude \
- -I$(LIB_SRC)/OpenFOAM/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/sixDoFRigidBodyMotion/lnInclude
LIB_LIBS = \
-lfiniteVolume \
- -lmeshTools
+ -lmeshTools \
+ -ldynamicFvMesh \
+ -lsixDoFRigidBodyMotion
diff --git a/src/surfMesh/Make/options b/src/surfMesh/Make/options
index 7e207d0dbeaca258e5a72af8b4eb7bacefc0dee8..1119415abd5941f0154a20b0460add9131b4b98b 100644
--- a/src/surfMesh/Make/options
+++ b/src/surfMesh/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude
LIB_LIBS = \
+ -lOpenFOAM \
-lfileFormats
diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options
index 2c67a8d0e2bef06fa4417c0974c5f5808e352d6d..ab55a3063a02d797b658b55f25663d646a7894ed 100644
--- a/src/thermophysicalModels/SLGThermo/Make/options
+++ b/src/thermophysicalModels/SLGThermo/Make/options
@@ -1,12 +1,14 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
- -lfiniteVolume
+ -lthermophysicalProperties \
+ -lreactionThermophysicalModels
diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options
index cb12503892c2b870ddca4bc71b2447594b60d379..fdc6c1a59a9791b6034eddd835c3d6928262cba0 100644
--- a/src/thermophysicalModels/basic/Make/options
+++ b/src/thermophysicalModels/basic/Make/options
@@ -1,13 +1,13 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
-lcompressibleTransportModels \
-lspecie \
- -lthermophysicalProperties \
- -lfiniteVolume \
- -lmeshTools
+ -lthermophysicalProperties
diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options
index 9da89fb7b4d6adaa903b5ca44217b5f4d42938f2..1baece9a1300f1b509ebb7e0bee5accf6d434637 100644
--- a/src/thermophysicalModels/chemistryModel/Make/options
+++ b/src/thermophysicalModels/chemistryModel/Make/options
@@ -1,20 +1,20 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/functions/Polynomial \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/ODE/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lODE \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
- -lspecie \
- -lODE \
- -lfiniteVolume \
- -lmeshTools
+ -lspecie
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/options b/src/thermophysicalModels/laminarFlameSpeed/Make/options
index f97edb8458c3d408db331fb5aa10930eadd2fc73..39c23fe545ea33e58204c07ff2f1587d3bb514bc 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Make/options
+++ b/src/thermophysicalModels/laminarFlameSpeed/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
- -lcompressibleTransportModels \
- -lfiniteVolume
+ -lfiniteVolume \
+ -lcompressibleTransportModels
diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options
index f514104f33186c7c33683e84a11f40aacd16a9b1..72bf81ead476ec5ec91d1ee46048f685bcfda3f1 100644
--- a/src/thermophysicalModels/radiation/Make/options
+++ b/src/thermophysicalModels/radiation/Make/options
@@ -1,4 +1,7 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -6,18 +9,16 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/distributed/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lsurfMesh \
+ -lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lsolidThermo \
-lSLGThermo \
-lthermophysicalProperties \
- -lfiniteVolume \
- -lmeshTools \
-ldistributed
diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/reactionThermo/Make/options
index f59f44fc8d3a1d08df9534646ba44212a3034ba2..26ee649fb42ad834cfcc7da4e92e521fc56d57e7 100644
--- a/src/thermophysicalModels/reactionThermo/Make/options
+++ b/src/thermophysicalModels/reactionThermo/Make/options
@@ -1,13 +1,13 @@
EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
- -lsolidSpecie \
- -lfiniteVolume
+ -lsolidSpecie
diff --git a/src/thermophysicalModels/solidChemistryModel/Make/options b/src/thermophysicalModels/solidChemistryModel/Make/options
index aca9805106f52f7150c1b60637efece7bf414c6d..37b7a6dd782a5196707d306d10c4c8d7b555d188 100644
--- a/src/thermophysicalModels/solidChemistryModel/Make/options
+++ b/src/thermophysicalModels/solidChemistryModel/Make/options
@@ -1,8 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
- -I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
@@ -10,8 +10,11 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude
LIB_LIBS = \
- -lchemistryModel \
-lfiniteVolume \
- -lODE\
+ -lODE \
+ -lspecie \
+ -lchemistryModel \
+ -lfluidThermophysicalModels \
+ -lsolidThermo \
-lreactionThermophysicalModels \
-lcompressibleTransportModels
diff --git a/src/thermophysicalModels/solidThermo/Make/options b/src/thermophysicalModels/solidThermo/Make/options
index 5e0d5ad340a9f495f862c15afdd3e649d9ea0d4f..2bc4cf5f3683306d71b9573387434c23e15848d5 100644
--- a/src/thermophysicalModels/solidThermo/Make/options
+++ b/src/thermophysicalModels/solidThermo/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
@@ -8,8 +8,8 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude
LIB_LIBS = \
- -lmeshTools \
-lfiniteVolume \
+ -lmeshTools \
-lspecie \
-lsolidSpecie \
-lfluidThermophysicalModels \
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options
index f4e9dc8257a60199afa6f46321f5d88d4e508737..56de2e275bd4178ce0faf81e9064643ab06f474b 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options
@@ -1,11 +1,12 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
LIB_LIBS = \
-lfiniteVolume \
- -lcompressibleTurbulenceModels \
- -lthermophysicalProperties
+ -lmeshTools \
+ -lthermophysicalProperties \
+ -lcompressibleTurbulenceModels
diff --git a/src/topoChangerFvMesh/Make/options b/src/topoChangerFvMesh/Make/options
index 6477e3ff9d0056aa02286a0e84cc776072087a94..c1d3667b3204446c1378d5ebc40fd7cd02eef04f 100644
--- a/src/topoChangerFvMesh/Make/options
+++ b/src/topoChangerFvMesh/Make/options
@@ -1,13 +1,13 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude
LIB_LIBS = \
-lfiniteVolume \
- -ldynamicFvMesh \
- -ldynamicMesh \
+ -lsurfMesh \
-lmeshTools \
- -lsurfMesh
+ -ldynamicMesh \
+ -ldynamicFvMesh
diff --git a/wmake/scripts/have_mgridgen b/wmake/scripts/have_mgridgen
index c6dfe30a6f46eee6a97de55e1f07dad3329c14d9..faf15036c175808770ddf88a1b4a57ea776d009a 100644
--- a/wmake/scripts/have_mgridgen
+++ b/wmake/scripts/have_mgridgen
@@ -147,7 +147,7 @@ have_mgridgen()
;;
esac
case "$WM_PRECISION_OPTION:$scalar" in
- (SP:float | DP:double)
+ (SP:float | SPDP:float | DP:double)
good=true
;;