deepmodeling · JX278 · Mar 30, 2023 · Mar 30, 2023
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,20 +1,51 @@
 cmake_minimum_required(VERSION 3.5)
 project(deepflame LANGUAGES CXX)
+
+# find packages
 FIND_PACKAGE(MPI REQUIRED)
-# 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(SRC_ORIG ${CMAKE_CURRENT_SOURCE_DIR}/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(SRC_ORIG $ENV{SRC_ORIG})
+SET(DF_ROOT $ENV{DF_ROOT})
+SET(DF_SRC $ENV{DF_SRC})
+
+# set compilation options
+SET(CMAKE_SHARED_LINKER_FLAGS "-fuse-ld=bfd -shared -Xlinker --add-needed -Xlinker --no-as-needed")
+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")
+SET(SHARED_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 -c")
+
+# find header files
 FUNCTION(R_SEARCH search_path return_list)
     FILE(GLOB_RECURSE new_list ${search_path}/*.H)
     SET(dir_list "")
@@ -26,32 +57,6 @@ FUNCTION(R_SEARCH search_path return_list)
     SET(${return_list} ${dir_list} PARENT_SCOPE)
 ENDFUNCTION(R_SEARCH)
 
-set(DF_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-set(DF_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src)
-
-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}")
-
-
 R_SEARCH(${DF_SRC}/dfCombustionModels dfcombustion_inc)
 R_SEARCH(${DF_SRC}/dfCanteraMixture dfcantera_inc)
 R_SEARCH(${DF_SRC}/lagrangian/intermediate dflagrangianinter_inc)
@@ -66,37 +71,15 @@ 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})
-
+    ${OpenFOAM_SRC}/finiteVolume/lnInclude
+
+    ${OpenFOAM_SRC}/OSspecific/POSIX/lnInclude
+    ${OpenFOAM_SRC}/OpenFOAM/lnInclude
+)
+
+# add subdirectory
+SET(CMAKE_INSTALL_PREFIX ${DF_ROOT})
 add_subdirectory(${DF_SRC}/thermophysicalModels/thermophysicalProperties)
 add_subdirectory(${DF_SRC}/thermophysicalModels/basic)
 add_subdirectory(${DF_SRC}/functionObjects/field)
@@ -112,9 +95,3 @@ add_subdirectory(${DF_SRC}/lagrangian/intermediate)
 add_subdirectory(${DF_SRC}/dfCombustionModels)
 add_subdirectory(${DF_SRC}/dynamicMesh)
 add_subdirectory(${DF_SRC}/dynamicFvMesh)
-
-
-# add_subdirectory(${DF_ROOT}/applications/solvers/df0DFoam)
-#add_subdirectory(${DF_ROOT}/applications/solvers/dfLowMachFoam)
-# add_subdirectory(${DF_ROOT}/applications/solvers/dfHighSpeedFoam)
-# add_subdirectory(${DF_ROOT}/applications/solvers/dfSprayFoam)
diff --git a/applications/solvers/df0DFoam/CMakeLists.txt b/applications/solvers/df0DFoam/CMakeLists.txt
@@ -2,26 +2,42 @@ cmake_minimum_required(VERSION 3.5)
 project(df0DFoam LANGUAGES CXX)
 FIND_PACKAGE(MPI REQUIRED)
 
-message(STATUS "MPI include path is " ${MPI_INCLUDE_PATH})
-message(STATUS "MPI libraries " ${MPI_LIBRARIES})
-
-
 # Check valid OpenFOAM
 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 ${DF_ROOT}/src)
+SET(SRC_ORIG ${DF_ROOT}/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 "")
@@ -31,10 +47,7 @@ FUNCTION(R_SEARCH search_path return_list)
     ENDFOREACH()
     LIST(REMOVE_DUPLICATES dir_list)
     SET(${return_list} ${dir_list} PARENT_SCOPE)
-ENDFUNCTION(R_SEARCH)
-
-
-
+ENDFUNCTION(R_SEARCH)  
 
 R_SEARCH(${DF_SRC}/dfCombustionModels dfcombustion_inc)
 R_SEARCH(${DF_SRC}/dfCanteraMixture dfcantera_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
     ${OpenFOAM_SRC}/transportModels/compressible/lnInclude 
     ${OpenFOAM_SRC}/thermophysicalModels/basic/lnInclude 
     ${OpenFOAM_SRC}/TurbulenceModels/turbulenceModels/lnInclude 
@@ -115,9 +85,20 @@ include_directories(
     ${PROJECT_SOURCE_DIR}
 )
 
-
+# add execution
 add_executable(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/df0DFoam.C)
 
+target_link_libraries(${PROJECT_NAME} 
+    $ENV{FOAM_LIBBIN}/libfiniteVolume.so libmeshTools.so libcompressibleTransportModels.so 
+    libturbulenceModels.so libsampling.so libOpenFOAM.so libdynamicFvMesh.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)
@@ -131,30 +112,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)
-
-target_link_libraries(${PROJECT_NAME} ${CANTERA_ROOT}/lib/libcantera_shared.so.2)
-
-target_link_libraries(${PROJECT_NAME} ${DF_ROOT}/lib/libdfCanteraMixture.so
-${DF_ROOT}/lib/libdfChemistryModel.so
-${DF_ROOT}/lib/libdfCanteraMixture.so
-${DF_ROOT}/lib/libdfFluidThermophysicalModels.so
-${DF_ROOT}/lib/libdfCombustionModels.so
-)
-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/dfHighSpeedFoam/CMakeLists.txt b/applications/solvers/dfHighSpeedFoam/CMakeLists.txt
@@ -135,11 +135,11 @@ target_link_libraries(${PROJECT_NAME} $ENV{FOAM_LIBBIN}/libfiniteVolume.so libme
 
 target_link_libraries(${PROJECT_NAME} ${CANTERA_ROOT}/lib/libcantera_shared.so.2)
 
-target_link_libraries(${PROJECT_NAME} ${DF_ROOT}/lib/libdfCanteraMixture.so
-${DF_ROOT}/lib/libdfChemistryModel.so
-${DF_ROOT}/lib/libdfCanteraMixture.so
-${DF_ROOT}/lib/libdfFluidThermophysicalModels.so
-${DF_ROOT}/lib/libdfCombustionModels.so
+target_link_libraries(${PROJECT_NAME} 
+  dfCanteraMixture
+  dfChemistryModel
+  dfFluidThermophysicalModels
+  dfCombustionModels
 )
 link_directories(${OpenFOAM_LIB_DIR} ${OpenFOAM_LIB_DIR}/dummy)
 

diff --git a/applications/solvers/dfLowMachFoam/CMakeLists.txt b/applications/solvers/dfLowMachFoam/CMakeLists.txt
@@ -141,11 +141,11 @@ target_link_libraries(${PROJECT_NAME} $ENV{FOAM_LIBBIN}/libfiniteVolume.so libme
 
 target_link_libraries(${PROJECT_NAME} ${CANTERA_ROOT}/lib/libcantera_shared.so.2)
 
-target_link_libraries(${PROJECT_NAME} ${DF_ROOT}/lib/libdfCanteraMixture.so
-${DF_ROOT}/lib/libdfChemistryModel.so
-${DF_ROOT}/lib/libdfCanteraMixture.so
-${DF_ROOT}/lib/libdfFluidThermophysicalModels.so
-${DF_ROOT}/lib/libdfCombustionModels.so
+target_link_libraries(${PROJECT_NAME} 
+  dfCanteraMixture
+  dfChemistryModel
+  dfFluidThermophysicalModels
+  dfCombustionModels
 )
 link_directories(${OpenFOAM_LIB_DIR} ${OpenFOAM_LIB_DIR}/dummy)
 

diff --git a/applications/solvers/dfSprayFoam/CMakeLists.txt b/applications/solvers/dfSprayFoam/CMakeLists.txt
@@ -148,18 +148,18 @@ target_link_libraries(${PROJECT_NAME} $ENV{FOAM_LIBBIN}/libfiniteVolume.so libme
 
 target_link_libraries(${PROJECT_NAME} ${CANTERA_ROOT}/lib/libcantera_shared.so.2)
 
-target_link_libraries(${PROJECT_NAME} ${DF_ROOT}/lib/libdfCanteraMixture.so
-${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
+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)

diff --git a/src/dfCanteraMixture/CMakeLists.txt b/src/dfCanteraMixture/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(dfCanteraMixture SHARED
 )
 
 #set the options for the shared library
-set(LINK_FLAGS  "-fuse-ld=bfd -shared -Xlinker --add-needed -Xlinker --no-as-needed")
+set(CMAKE_SHARED_LINKER_FLAGS  "-fuse-ld=bfd -shared -Xlinker --add-needed -Xlinker --no-as-needed")
 
 #set the link options
 set(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS}")