From 211cb975409fde28cdb4447b2f1a83d3109fd262 Mon Sep 17 00:00:00 2001
From: changfly <changfly@postech.ac.kr>
Date: Thu, 25 Jan 2018 22:28:08 +0900
Subject: [PATCH] modify ThemoMPPICFoam

---
 .../lagrangian/ThermoMPPICFoam/Make/files     |  2 +-
 .../lagrangian/ThermoMPPICFoam/Make/options   | 23 ++++++++-----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/applications/solvers/lagrangian/ThermoMPPICFoam/Make/files b/applications/solvers/lagrangian/ThermoMPPICFoam/Make/files
index dcdf1f14b..731bdb100 100644
--- a/applications/solvers/lagrangian/ThermoMPPICFoam/Make/files
+++ b/applications/solvers/lagrangian/ThermoMPPICFoam/Make/files
@@ -1,3 +1,3 @@
 ThermoMPPICFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/ThermoMPPICFoam
+EXE = $(FOAM_APPBIN)/ThermoMPPICFoam
diff --git a/applications/solvers/lagrangian/ThermoMPPICFoam/Make/options b/applications/solvers/lagrangian/ThermoMPPICFoam/Make/options
index 8596ce3bb..f39888db2 100644
--- a/applications/solvers/lagrangian/ThermoMPPICFoam/Make/options
+++ b/applications/solvers/lagrangian/ThermoMPPICFoam/Make/options
@@ -1,5 +1,3 @@
-DEV_PATH=../../libs
-
 EXE_INC = \
     -I. \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -7,6 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -19,15 +18,14 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -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$(FOAM_SOLVERS)/combustion/reactingFoam \
-    -I$(DEV_PATH)/combustionModels_POSTECH/lnInclude \
-    -I$(DEV_PATH)/chemistryModel_POSTECH/lnInclude \
-    -I$(DEV_PATH)/radiationModels_POSTECH/lnInclude \
-    -I$(DEV_PATH)/intermediate_POSTECH/lnInclude
+    -I$(FOAM_SOLVERS)/combustion/reactingFoam
 
 
 EXE_LIBS = \
@@ -36,6 +34,7 @@ EXE_LIBS = \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
     -llagrangian \
+    -llagrangianIntermediate \
     -llagrangianTurbulence \
     -lspecie \
     -lcompressibleTransportModels \
@@ -47,13 +46,11 @@ EXE_LIBS = \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
+    -lchemistryModel \
+    -lradiationModels \
     -lODE \
     -lregionModels \
     -lsurfaceFilmModels \
+    -lcombustionModels \
     -lfvOptions \
-    -lsampling \
-    -L$(FOAM_USER_LIBBIN)\
-     -lcombustionModels_POSTECH \
-     -llagrangianIntermediate_POSTECH \
-     -lchemistryModel_POSTECH \
-     -lradiationModels_POSTECH
+    -lsampling