From 57569aa5437ee0e98e7a242290e4f7bbbf423c06 Mon Sep 17 00:00:00 2001
From: maorz1998 <maorz1998@stu.pku.edu.cn>
Date: Thu, 30 Mar 2023 16:11:33 +0800
Subject: [PATCH] modify CMakeLists for compiling binary

---
 applications/solvers/df0DFoam/CMakeLists.txt  |   2 +-
 .../solvers/dfHighSpeedFoam/CMakeLists.txt    | 133 +++++---------
 .../solvers/dfLowMachFoam/CMakeLists.txt      | 154 ++++++----------
 .../solvers/dfSprayFoam/CMakeLists.txt        | 167 ++++++------------
 4 files changed, 158 insertions(+), 298 deletions(-)

diff --git a/applications/solvers/df0DFoam/CMakeLists.txt b/applications/solvers/df0DFoam/CMakeLists.txt
index 4425642c..c89a6835 100644
--- a/applications/solvers/df0DFoam/CMakeLists.txt
+++ b/applications/solvers/df0DFoam/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 project(df0DFoam LANGUAGES CXX)
 FIND_PACKAGE(MPI REQUIRED)
 
-# Check valid OpenFOAM
+# Check valid thirdParty
 if(DEFINED ENV{WM_PROJECT_DIR})
 	MESSAGE(STATUS "OpenFOAM: " $ENV{WM_PROJECT_DIR})
 else()
diff --git a/applications/solvers/dfHighSpeedFoam/CMakeLists.txt b/applications/solvers/dfHighSpeedFoam/CMakeLists.txt
index 55bef5bd..6f61e211 100644
--- a/applications/solvers/dfHighSpeedFoam/CMakeLists.txt
+++ b/applications/solvers/dfHighSpeedFoam/CMakeLists.txt
@@ -2,26 +2,42 @@ cmake_minimum_required(VERSION 3.5)
 project(dfHighSpeedFoam LANGUAGES CXX)
 FIND_PACKAGE(MPI REQUIRED)
 
-message(STATUS "MPI include path is " ${MPI_INCLUDE_PATH})
-message(STATUS "MPI libraries " ${MPI_LIBRARIES})
-
-
-# Check valid OpenFOAM
+# Check valid thirdParty
 if(DEFINED ENV{WM_PROJECT_DIR})
 	MESSAGE(STATUS "OpenFOAM: " $ENV{WM_PROJECT_DIR})
 else()
 	message(FATAL_ERROR "OpenFOAM is not sourced")
 endif(DEFINED ENV{WM_PROJECT_DIR})
-set(OpenFOAM_VERSION $ENV{WM_PROJECT_VERSION}) 
-set(OpenFOAM_DIR $ENV{WM_PROJECT_DIR})
-set(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
-set(OpenFOAM_SRC $ENV{FOAM_SRC})
 
-set(DF_ROOT $ENV{DF_ROOT})
-set(DF_SRC ${DF_ROOT}/src)
-set(SRC_ORIG ${DF_ROOT}/src_orig)
+if(DEFINED ENV{CANTERA_ROOT})
+	MESSAGE(STATUS "libcantera: " $ENV{CANTERA_ROOT})
+  SET(CANTERA_ROOT $ENV{CANTERA_ROOT})
+else()
+	message(FATAL_ERROR "libcantera directory is not specified")
+endif(DEFINED ENV{CANTERA_ROOT}) 
+
+# define variables
+SET(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
+SET(OpenFOAM_SRC $ENV{FOAM_SRC})
 
+SET(DF_ROOT $ENV{DF_ROOT})
+SET(DF_SRC $ENV{DF_SRC})
+SET(SRC_ORIG $ENV{SRC_ORIG})
+
+# set compilation options
+SET(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-needed")
+
+SET(CMAKE_C_COMPILER g++)
+SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
+SET(EXE_COMPILE_OPTION "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
+-DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
+-Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
+-DNoRepository -ftemplate-depth-100 -std=c++14 
+-Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
+-pthread -fPIC")
+add_definitions("${EXE_COMPILE_OPTION}")
 
+# add header files
 FUNCTION(R_SEARCH search_path return_list)
     FILE(GLOB_RECURSE new_list ${search_path}/*.H)
     SET(dir_list "")
@@ -33,9 +49,6 @@ FUNCTION(R_SEARCH search_path return_list)
     SET(${return_list} ${dir_list} PARENT_SCOPE)
 ENDFUNCTION(R_SEARCH)
 
-
-       
-
 R_SEARCH(${DF_SRC}/dfCombustionModels dfcombustion_inc)
 R_SEARCH(${DF_SRC}/dfCanteraMixture dfcantera_inc)
 R_SEARCH(${DF_SRC}/lagrangian/intermediate dflagrangianinter_inc)
@@ -50,53 +63,10 @@ R_SEARCH(${DF_SRC}/TurbulenceModels dfturbulence_inc)
 R_SEARCH(${DF_SRC}/dynamicMesh dfnewdynamic_inc)
 R_SEARCH(${DF_SRC}/dynamicFvMesh dffvdynamic_inc)
 
-
-# Check valid libcantera
-if(DEFINED ENV{CANTERA_ROOT})
-	MESSAGE(STATUS "libcantera: " $ENV{CANTERA_ROOT})
-  set(CANTERA_ROOT $ENV{CANTERA_ROOT})
-else()
-	message(FATAL_ERROR "libcantera directory is not specified")
-endif(DEFINED ENV{CANTERA_ROOT}) 
-
-
-
-include_directories(
-                    ${OpenFOAM_SRC}/finiteVolume/lnInclude
-                   
-                    ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
-                    ${OpenFOAM_SRC}/OpenFOAM/lnInclude
-                    )
-
-
-link_directories(${OpenFOAM_LIB_DIR} ${OpenFOAM_LIB_DIR}/dummy )
-
-set(CMAKE_INSTALL_PREFIX ${DF_ROOT})
-
-#set the options for the shared library
-set(LINK_FLAGS  "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-needed")
-
-#set the link options
-set(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${LINK_FLAGS}")
-
-
-SET(CMAKE_C_COMPILER g++)
-set(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-set(DEFINITIONS_COMPILE "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
--DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
--Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
--DNoRepository -ftemplate-depth-100 -std=c++14 
--Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
--pthread -fPIC")
-
-
-# Compiling configure
-add_definitions("${DEFINITIONS_COMPILE}")
-
-FIND_PACKAGE(MPI REQUIRED)
-
 include_directories(
+    ${OpenFOAM_SRC}/finiteVolume/lnInclude
+    ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
+    ${OpenFOAM_SRC}/OpenFOAM/lnInclude
     $ENV{FOAM_APP}/solvers/compressible/rhoCentralFoam/BCs/lnInclude 
     ${OpenFOAM_SRC}/finiteVolume/cfdTools 
     ${OpenFOAM_SRC}/finiteVolume/lnInclude 
@@ -116,9 +86,21 @@ include_directories(
     ${PROJECT_SOURCE_DIR}
 )
 
-
+# add execution
 add_executable(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/dfHighSpeedFoam.C)
 
+target_link_libraries(${PROJECT_NAME} 
+    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so 
+    libturbulenceModels.so libsampling.so libOpenFOAM.so libdynamicFvMesh.so libtopoChangerFvMesh.so
+    ${CANTERA_ROOT}/lib/libcantera_shared.so.2
+    ${DF_ROOT}/lib/libdfChemistryModel.so
+    ${DF_ROOT}/lib/libdfCanteraMixture.so
+    ${DF_ROOT}/lib/libdfFluidThermophysicalModels.so
+    ${DF_ROOT}/lib/libdfCombustionModels.so
+    $ENV{FOAM_LIBBIN}/openmpi-system/libPstream.so
+    ${MPI_LIBRARIES}
+)
+
 if(DEFINED ENV{PYTHON_INC_DIR})
   add_definitions(-DUSE_PYTORCH)
   find_package (Python REQUIRED COMPONENTS Interpreter Development)
@@ -131,29 +113,6 @@ if(DEFINED ENV{PYTHON_INC_DIR})
   message(STATUS "pybind libraries" ${Python_LIBRARIES})
 endif()
 
-target_link_libraries(${PROJECT_NAME} $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so libturbulenceModels.so libsampling.so libOpenFOAM.so libdynamicFvMesh.so libtopoChangerFvMesh.so)
-
-target_link_libraries(${PROJECT_NAME} ${CANTERA_ROOT}/lib/libcantera_shared.so.2)
-
-target_link_libraries(${PROJECT_NAME} 
-  dfCanteraMixture
-  dfChemistryModel
-  dfFluidThermophysicalModels
-  dfCombustionModels
-)
-link_directories(${OpenFOAM_LIB_DIR} ${OpenFOAM_LIB_DIR}/dummy)
-
-
-target_link_libraries(${PROJECT_NAME} 
-$ENV{FOAM_LIBBIN}/openmpi-system/libPstream.so
-${MPI_LIBRARIES}
-)
-
-
-#set_target_properties(${PROJECT_NAME}
-#     PROPERTIES
-#     LINK_OPTIONS "-Xlinker --add-needed -Xlinker --no-as-needed"
-#     )
-
-
+# install
+set(CMAKE_INSTALL_PREFIX ${DF_ROOT})
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/applications/solvers/dfLowMachFoam/CMakeLists.txt b/applications/solvers/dfLowMachFoam/CMakeLists.txt
index 6cd6e3e6..3c489e08 100644
--- a/applications/solvers/dfLowMachFoam/CMakeLists.txt
+++ b/applications/solvers/dfLowMachFoam/CMakeLists.txt
@@ -2,26 +2,42 @@ cmake_minimum_required(VERSION 3.5)
 project(dfLowMachFoam LANGUAGES CXX)
 FIND_PACKAGE(MPI REQUIRED)
 
-message(STATUS "MPI include path is " ${MPI_INCLUDE_PATH})
-message(STATUS "MPI libraries " ${MPI_LIBRARIES})
-
-
-# Check valid OpenFOAM
+# Check valid thirdParty
 if(DEFINED ENV{WM_PROJECT_DIR})
 	MESSAGE(STATUS "OpenFOAM: " $ENV{WM_PROJECT_DIR})
 else()
 	message(FATAL_ERROR "OpenFOAM is not sourced")
 endif(DEFINED ENV{WM_PROJECT_DIR})
-set(OpenFOAM_VERSION $ENV{WM_PROJECT_VERSION}) 
-set(OpenFOAM_DIR $ENV{WM_PROJECT_DIR})
-set(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
-set(OpenFOAM_SRC $ENV{FOAM_SRC})
 
-set(DF_ROOT $ENV{DF_ROOT})
-set(DF_SRC ${DF_ROOT}/src)
-set(SRC_ORIG ${DF_ROOT}/src_orig)
+if(DEFINED ENV{CANTERA_ROOT})
+	MESSAGE(STATUS "libcantera: " $ENV{CANTERA_ROOT})
+  SET(CANTERA_ROOT $ENV{CANTERA_ROOT})
+else()
+	message(FATAL_ERROR "libcantera directory is not specified")
+endif(DEFINED ENV{CANTERA_ROOT}) 
+
+# define variables
+SET(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
+SET(OpenFOAM_SRC $ENV{FOAM_SRC})
 
+SET(DF_ROOT $ENV{DF_ROOT})
+SET(DF_SRC $ENV{DF_SRC})
+SET(SRC_ORIG $ENV{SRC_ORIG})
+
+# set compilation options
+SET(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-needed")
+
+SET(CMAKE_C_COMPILER g++)
+SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
+SET(EXE_COMPILE_OPTION "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
+-DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
+-Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
+-DNoRepository -ftemplate-depth-100 -std=c++14 
+-Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
+-pthread -fPIC")
+add_definitions("${EXE_COMPILE_OPTION}")
 
+# add header files
 FUNCTION(R_SEARCH search_path return_list)
     FILE(GLOB_RECURSE new_list ${search_path}/*.H)
     SET(dir_list "")
@@ -33,9 +49,6 @@ FUNCTION(R_SEARCH search_path return_list)
     SET(${return_list} ${dir_list} PARENT_SCOPE)
 ENDFUNCTION(R_SEARCH)
 
-
-       
-
 R_SEARCH(${DF_SRC}/dfCombustionModels dfcombustion_inc)
 R_SEARCH(${DF_SRC}/dfCanteraMixture dfcantera_inc)
 R_SEARCH(${DF_SRC}/lagrangian/intermediate dflagrangianinter_inc)
@@ -50,61 +63,10 @@ R_SEARCH(${DF_SRC}/TurbulenceModels dfturbulence_inc)
 R_SEARCH(${DF_SRC}/dynamicMesh dfnewdynamic_inc)
 R_SEARCH(${DF_SRC}/dynamicFvMesh dffvdynamic_inc)
 
-
-# Check valid libcantera
-if(DEFINED ENV{CANTERA_ROOT})
-	MESSAGE(STATUS "libcantera: " $ENV{CANTERA_ROOT})
-  set(CANTERA_ROOT $ENV{CANTERA_ROOT})
-else()
-	message(FATAL_ERROR "libcantera directory is not specified")
-endif(DEFINED ENV{CANTERA_ROOT}) 
-
-
-# Check valid Torch
-#if(DEFINED $ENV{PYTHON_INC_DIR)})
-#	MESSAGE(STATUS "Torch: " $ENV{CANTERA_ROOT})
-#else()
-#	message(FATAL_ERROR "no torch used")
-#endif(DEFINED ENV{PYTHON_INC_DIR}) 
-
-
-
-include_directories(
-                    ${OpenFOAM_SRC}/finiteVolume/lnInclude
-                   
-                    ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
-                    ${OpenFOAM_SRC}/OpenFOAM/lnInclude
-                    )
-
-message(STATUS "dummydir:" ${OpenFOAM_LIB_DIR}/dummy)
-link_directories(${OpenFOAM_LIB_DIR} ${OpenFOAM_LIB_DIR}/dummy )
-
-set(CMAKE_INSTALL_PREFIX ${DF_ROOT})
-
-#set the options for the shared library
-set(LINK_FLAGS  "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-needed")
-
-#set the link options
-set(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${LINK_FLAGS}")
-
-
-SET(CMAKE_C_COMPILER g++)
-set(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-set(DEFINITIONS_COMPILE "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
--DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
--Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
--DNoRepository -ftemplate-depth-100 -std=c++14 
--Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
--pthread -fPIC")
-
-
-# Compiling configure
-add_definitions("${DEFINITIONS_COMPILE}")
-
-FIND_PACKAGE(MPI REQUIRED)
-
 include_directories(
+    ${OpenFOAM_SRC}/finiteVolume/lnInclude
+    ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
+    ${OpenFOAM_SRC}/OpenFOAM/lnInclude
     ${OpenFOAM_SRC}/transportModels/compressible/lnInclude 
     ${OpenFOAM_SRC}/thermophysicalModels/basic/lnInclude 
     ${OpenFOAM_SRC}/TurbulenceModels/turbulenceModels/lnInclude 
@@ -123,42 +85,32 @@ include_directories(
     ${PROJECT_SOURCE_DIR}
 )
 
-
+# add execution
 add_executable(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/dfLowMachFoam.C)
 
-if(DEFINED ENV{PYTHON_INC_DIR})
-  add_definitions(-DUSE_PYTORCH)
-  find_package (Python REQUIRED COMPONENTS Interpreter Development)
-  find_package(pybind11)
-  include_directories(
-  ${Python_INCLUDE_DIRS}
-  ${pybind11_INCLUDE_DIR}/pybind11
-  )
-  target_link_libraries(${PROJECT_NAME} ${Python_LIBRARIES})
-endif()
-
-target_link_libraries(${PROJECT_NAME} $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so libturbulenceModels.so libsampling.so libOpenFOAM.so )
-
-target_link_libraries(${PROJECT_NAME} ${CANTERA_ROOT}/lib/libcantera_shared.so.2)
-
 target_link_libraries(${PROJECT_NAME} 
-  dfCanteraMixture
-  dfChemistryModel
-  dfFluidThermophysicalModels
-  dfCombustionModels
+    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so 
+    libturbulenceModels.so libsampling.so libOpenFOAM.so 
+    ${CANTERA_ROOT}/lib/libcantera_shared.so.2
+    ${DF_ROOT}/lib/libdfChemistryModel.so
+    ${DF_ROOT}/lib/libdfCanteraMixture.so
+    ${DF_ROOT}/lib/libdfFluidThermophysicalModels.so
+    ${DF_ROOT}/lib/libdfCombustionModels.so
+    $ENV{FOAM_LIBBIN}/openmpi-system/libPstream.so
+    ${MPI_LIBRARIES}
 )
-link_directories(${OpenFOAM_LIB_DIR} ${OpenFOAM_LIB_DIR}/dummy)
-
-
-target_link_libraries(${PROJECT_NAME} 
-${MPI_LIBRARIES}
-)
-
-
-#set_target_properties(${PROJECT_NAME}
-#     PROPERTIES
-#     LINK_OPTIONS "-Xlinker --add-needed -Xlinker --no-as-needed"
-#     )
 
+if(DEFINED ENV{PYTHON_INC_DIR})
+    add_definitions(-DUSE_PYTORCH)
+    find_package (Python REQUIRED COMPONENTS Interpreter Development)
+    find_package(pybind11)
+    include_directories(
+    ${Python_INCLUDE_DIRS}
+    ${pybind11_INCLUDE_DIR}/pybind11
+    )
+    target_link_libraries(${PROJECT_NAME} ${Python_LIBRARIES})
+endif()
 
+# install
+set(CMAKE_INSTALL_PREFIX ${DF_ROOT})
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/applications/solvers/dfSprayFoam/CMakeLists.txt b/applications/solvers/dfSprayFoam/CMakeLists.txt
index 13ad8cff..7108e858 100644
--- a/applications/solvers/dfSprayFoam/CMakeLists.txt
+++ b/applications/solvers/dfSprayFoam/CMakeLists.txt
@@ -2,26 +2,42 @@ cmake_minimum_required(VERSION 3.5)
 project(dfSprayFoam LANGUAGES CXX)
 FIND_PACKAGE(MPI REQUIRED)
 
-message(STATUS "MPI include path is " ${MPI_INCLUDE_PATH})
-message(STATUS "MPI libraries " ${MPI_LIBRARIES})
-
-
-# Check valid OpenFOAM
+# Check valid thirdParty
 if(DEFINED ENV{WM_PROJECT_DIR})
 	MESSAGE(STATUS "OpenFOAM: " $ENV{WM_PROJECT_DIR})
 else()
 	message(FATAL_ERROR "OpenFOAM is not sourced")
 endif(DEFINED ENV{WM_PROJECT_DIR})
-set(OpenFOAM_VERSION $ENV{WM_PROJECT_VERSION}) 
-set(OpenFOAM_DIR $ENV{WM_PROJECT_DIR})
-set(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
-set(OpenFOAM_SRC $ENV{FOAM_SRC})
 
-set(DF_ROOT $ENV{DF_ROOT})
-set(DF_SRC ${DF_ROOT}/src)
-set(SRC_ORIG ${DF_ROOT}/src_orig)
+if(DEFINED ENV{CANTERA_ROOT})
+	MESSAGE(STATUS "libcantera: " $ENV{CANTERA_ROOT})
+  SET(CANTERA_ROOT $ENV{CANTERA_ROOT})
+else()
+	message(FATAL_ERROR "libcantera directory is not specified")
+endif(DEFINED ENV{CANTERA_ROOT}) 
+
+# define variables
+SET(OpenFOAM_LIB_DIR $ENV{FOAM_LIBBIN})
+SET(OpenFOAM_SRC $ENV{FOAM_SRC})
 
+SET(DF_ROOT $ENV{DF_ROOT})
+SET(DF_SRC $ENV{DF_SRC})
+SET(SRC_ORIG $ENV{SRC_ORIG})
+
+# set compilation options
+SET(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-needed")
+
+SET(CMAKE_C_COMPILER g++)
+SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
+SET(EXE_COMPILE_OPTION "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
+-DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
+-Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
+-DNoRepository -ftemplate-depth-100 -std=c++14 
+-Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
+-pthread -fPIC")
+add_definitions("${EXE_COMPILE_OPTION}")
 
+# add header files
 FUNCTION(R_SEARCH search_path return_list)
     FILE(GLOB_RECURSE new_list ${search_path}/*.H)
     SET(dir_list "")
@@ -33,9 +49,6 @@ FUNCTION(R_SEARCH search_path return_list)
     SET(${return_list} ${dir_list} PARENT_SCOPE)
 ENDFUNCTION(R_SEARCH)
 
-
-       
-
 R_SEARCH(${DF_SRC}/dfCombustionModels dfcombustion_inc)
 R_SEARCH(${DF_SRC}/dfCanteraMixture dfcantera_inc)
 R_SEARCH(${DF_SRC}/lagrangian/intermediate dflagrangianinter_inc)
@@ -49,56 +62,10 @@ R_SEARCH(${DF_SRC}/TurbulenceModels dfturbulence_inc)
 R_SEARCH(${DF_SRC}/dynamicMesh dfnewdynamic_inc)
 R_SEARCH(${DF_SRC}/dynamicFvMesh dffvdynamic_inc)
 
-
-
-
-# Check valid libcantera
-if(DEFINED ENV{CANTERA_ROOT})
-	MESSAGE(STATUS "libcantera: " $ENV{CANTERA_ROOT})
-  set(CANTERA_ROOT $ENV{CANTERA_ROOT})
-else()
-	message(FATAL_ERROR "libcantera directory is not specified")
-endif(DEFINED ENV{CANTERA_ROOT}) 
-
-
-
-include_directories(
-                    ${OpenFOAM_SRC}/finiteVolume/lnInclude
-                    ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
-                    ${OpenFOAM_SRC}/OpenFOAM/lnInclude
-                    )
-
-
-link_directories(${OpenFOAM_LIB_DIR} ${OpenFOAM_LIB_DIR}/dummy )
-
-set(CMAKE_INSTALL_PREFIX ${DF_ROOT})
-
-#set the options for the shared library
-set(LINK_FLAGS  "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-needed")
-
-#set the link options
-set(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS}")
-set(CMAKE_EXE_LINKER_FLAGS "${LINK_FLAGS}")
-
-
-SET(CMAKE_C_COMPILER g++)
-set(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-set(DEFINITIONS_COMPILE "-std=c++11 -m64 -Dlinux64 -DWM_ARCH_OPTION=64 
--DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor 
--Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3  
--DNoRepository -ftemplate-depth-100 -std=c++14 
--Wno-unused-variable -Wno-unused-but-set-variable -Wno-old-style-cast -DOMPI_SKIP_MPICXX  
--pthread -fPIC")
-
-
-# Compiling configure
-add_definitions("${DEFINITIONS_COMPILE}")
-
-FIND_PACKAGE(MPI REQUIRED)
-
 include_directories(
-    #${OpenFOAM_APP}/solvers/lagrangian/reactingParcelFoam 
-    #$ENV{FOAM_APP}/solvers/compressible/rhoPimpleFoam
+    ${OpenFOAM_SRC}/finiteVolume/lnInclude
+    ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
+    ${OpenFOAM_SRC}/OpenFOAM/lnInclude
     ${OpenFOAM_SRC}/finiteVolume/lnInclude 
     ${OpenFOAM_SRC}/meshTools/lnInclude 
     ${OpenFOAM_SRC}/sampling/lnInclude 
@@ -110,10 +77,8 @@ include_directories(
     ${OpenFOAM_SRC}/meshTools/lnInclude 
     ${OpenFOAM_SRC}/lagrangian/basic/lnInclude 
     ${dflagrangianinter_inc}
-    #${DF_SRC}/lagrangian/intermediate/lnInclude 
     ${OpenFOAM_SRC}/lagrangian/intermediate/lnInclude 
     ${dflagrangianspray_inc} 
-    #${DF_SRC}/lagrangian/spray/lnInclude
     ${OpenFOAM_SRC}/lagrangian/spray/lnInclude 
     ${OpenFOAM_SRC}/lagrangian/distributionModels/lnInclude 
     ${OpenFOAM_SRC}/transportModels/compressible/lnInclude 
@@ -130,53 +95,37 @@ include_directories(
     ${PROJECT_SOURCE_DIR}
 )
 
-
+# add execution
 add_executable(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/dfSprayFoam.C)
 
-if(DEFINED ENV{PYTHON_INC_DIR})
-  add_definitions(-DUSE_PYTORCH)
-  find_package (Python REQUIRED COMPONENTS Interpreter Development)
-  find_package(pybind11)
-  include_directories(
-  ${Python_INCLUDE_DIRS}
-  ${pybind11_INCLUDE_DIR}/pybind11
-  )
-  target_link_libraries(${PROJECT_NAME} ${Python_LIBRARIES})
-endif()
-
-target_link_libraries(${PROJECT_NAME} $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so libturbulenceModels.so libsampling.so libOpenFOAM.so libdynamicFvMesh.so liblagrangian.so libregionModels.so)
-
-target_link_libraries(${PROJECT_NAME} ${CANTERA_ROOT}/lib/libcantera_shared.so.2)
-
 target_link_libraries(${PROJECT_NAME}
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfChemistryModel.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfCanteraMixture.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfFluidThermophysicalModels.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfCombustionModels.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfLagrangianIntermediate.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfLagrangianTurbulence.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfLagrangianSpray.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfThermophysicalProperties.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfCompressibleTurbulenceModels.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfSLGThermo.so
-  ${CMAKE_INSTALL_PREFIX}/lib/libdfSurfaceFilmModels.so
-)
-
-link_directories(${OpenFOAM_LIB_DIR} ${OpenFOAM_LIB_DIR}/$ENV{FOAM_MPI} $ENV{WM_THIRD_PARTY_DIR}/platforms/linux64GccDPInt32/lib/openmpi-system)
-
-
-target_link_libraries(${PROJECT_NAME} 
-${OpenFOAM_LIB_DIR}/$ENV{FOAM_MPI}/libPstream.so
-${MPI_LIBRARIES}
-$ENV{WM_THIRD_PARTY_DIR}/platforms/linux64GccDPInt32/lib/openmpi-system/libptscotch.so
-$ENV{WM_THIRD_PARTY_DIR}/platforms/linux64GccDPInt32/lib/openmpi-system/libscotch.so
+    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so libturbulenceModels.so 
+    libsampling.so libOpenFOAM.so libdynamicFvMesh.so liblagrangian.so libregionModels.so
+    ${CANTERA_ROOT}/lib/libcantera_shared.so.2
+    ${DF_ROOT}/lib/libdfChemistryModel.so
+    ${DF_ROOT}/lib/libdfCanteraMixture.so
+    ${DF_ROOT}/lib/libdfFluidThermophysicalModels.so
+    ${DF_ROOT}/lib/libdfCombustionModels.so
+    ${DF_ROOT}/lib/libdfLagrangianIntermediate.so
+    ${DF_ROOT}/lib/libdfLagrangianTurbulence.so
+    ${DF_ROOT}/lib/libdfLagrangianSpray.so
+    ${DF_ROOT}/lib/libdfThermophysicalProperties.so
+    ${DF_ROOT}/lib/libdfCompressibleTurbulenceModels.so
+    ${DF_ROOT}/lib/libdfSLGThermo.so
+    ${DF_ROOT}/lib/libdfSurfaceFilmModels.so
 )
 
+if(DEFINED ENV{PYTHON_INC_DIR})
+    add_definitions(-DUSE_PYTORCH)
+    find_package (Python REQUIRED COMPONENTS Interpreter Development)
+    find_package(pybind11)
+    include_directories(
+    ${Python_INCLUDE_DIRS}
+    ${pybind11_INCLUDE_DIR}/pybind11
+    )
+    target_link_libraries(${PROJECT_NAME} ${Python_LIBRARIES})
+endif()
 
-#set_target_properties(${PROJECT_NAME}
-#     PROPERTIES
-#     LINK_OPTIONS "-Xlinker --add-needed -Xlinker --no-as-needed"
-#     )
-
-
+# install
+set(CMAKE_INSTALL_PREFIX ${DF_ROOT})
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)