Transition to cmake build system (added dbns and minor changes)

This commit is contained in:
Robert Keser 2017-03-07 14:27:31 +01:00 committed by Henrik Rusche
parent 48d70c8bd1
commit 0affdbfe19
156 changed files with 301 additions and 194 deletions

View file

@ -72,13 +72,24 @@ set_property(TARGET mpi PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${MPI_C_INCLUDE_P
set_property(TARGET mpi PROPERTY IMPORTED_LOCATION ${MPI_LIBRARY}) set_property(TARGET mpi PROPERTY IMPORTED_LOCATION ${MPI_LIBRARY})
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(FLEX REQUIRED) find_package(FLEX REQUIRED)
find_package(Git REQUIRED) find_package(Git REQUIRED)
# Path to ParaViewConfig.cmake
set(ParaView_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/packages/ParaView-4.4.0/platforms/linux64GccDPOpt/lib/cmake/paraview-4.4)
find_package(ParaView REQUIRED) find_package(ParaView REQUIRED)
# Clean the cache variable
set(MGRIDGEN_LIBRARY MGRIDGEN_LIBRARY-NOTFOUND)
# Find libMGridGen.so
find_library(MGRIDGEN_LIBRARY MGridGen ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/packages/ParMGridGen-1.0/platforms/linux64GccDPOpt/lib)
set(MGRIDGEN_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/packages/ParMGridGen-1.0/platforms/linux64GccDPOpt/include)
# #
# Recurse into the source # Recurse into the source
# #
@ -102,14 +113,14 @@ if(NOT CMAKE_BUILD_TYPE)
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
FORCE) FORCE)
endif() endif()
# #
# Definitions inherited by all targets # Definitions inherited by all targets
# #
# Single/Double precision # Single/Double precision
set(FOAM_PRECISION "double" CACHE STRING "Numerical precision") set(FOAM_PRECISION "double" CACHE STRING "Numerical precision")
set_property(CACHE FOAM_PRECISION PROPERTY STRINGS single double) set_property(CACHE FOAM_PRECISION PROPERTY STRINGS single double)
if(FOAM_PRECISION EQUAL "single") if(FOAM_PRECISION EQUAL "single")
target_compile_definitions(OSspecific PUBLIC WM_SP) target_compile_definitions(OSspecific PUBLIC WM_SP)
else() else()

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org
@ -30,4 +31,4 @@
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
add_subdirectory(utilities) add_subdirectory(utilities)
add_subdirectory(solvers) add_subdirectory(solvers)

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(XiFoam add_foam_executable(XiFoam
DEPENDS reactionThermophysicalModels engine compressibleTurbulenceModel DEPENDS engine compressibleTurbulenceModel laminarFlameSpeedModels
DEPENDS laminarFlameSpeedModels
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,8 +41,7 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(engineFoam add_foam_executable(engineFoam
DEPENDS reactionThermophysicalModels engine compressibleTurbulenceModel DEPENDS engine compressibleTurbulenceModel laminarFlameSpeedModels
DEPENDS laminarFlameSpeedModels
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -39,11 +39,4 @@ list(APPEND SOURCES
add_foam_library(combustionModels SHARED ${SOURCES}) add_foam_library(combustionModels SHARED ${SOURCES})
target_link_libraries(combustionModels finiteVolume) target_link_libraries(combustionModels PUBLIC reactionThermophysicalModels compressibleTurbulenceModel)
target_include_directories(combustionModels PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/basic/lnInclude>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/reactionThermo/lnInclude>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/thermophysicalModels/specie/lnInclude>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/turbulenceModels/compressible/turbulenceModel>
)

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org
@ -40,11 +41,11 @@ add_subdirectory(rhoPorousMRFPimpleFoam)
add_subdirectory(rhopSonicFoam) add_subdirectory(rhopSonicFoam)
add_subdirectory(rhoPisoFoam) add_subdirectory(rhoPisoFoam)
add_subdirectory(steadyCompressibleFoam) add_subdirectory(steadyCompressibleFoam)
#add_subdirectory(dbnsFoam) add_subdirectory(dbnsFoam)
add_subdirectory(steadyUniversalFoam) add_subdirectory(steadyUniversalFoam)
add_subdirectory(steadyCompressibleMRFFoam) add_subdirectory(steadyCompressibleMRFFoam)
add_subdirectory(rhoSimpleFoam) add_subdirectory(rhoSimpleFoam)
add_subdirectory(sonicLiquidFoam) add_subdirectory(sonicLiquidFoam)
add_subdirectory(rhoCentralFoam) add_subdirectory(rhoCentralFoam)
add_subdirectory(rhoPorousSimpleFoam) add_subdirectory(rhoPorousSimpleFoam)
#add_subdirectory(dbnsTurbFoam) add_subdirectory(dbnsTurbFoam)

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(dbnsFoam add_foam_executable(dbnsFoam
DEPENDS basicThermophysicalModels dbns DEPENDS dbns
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(dbnsTurbFoam add_foam_executable(dbnsTurbFoam
# DEPENDS finiteVolume DEPENDS dbns
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -44,7 +44,3 @@ add_foam_executable(rhoPorousSimpleFoam
DEPENDS compressibleRASModels DEPENDS compressibleRASModels
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )
target_include_directories(rhoPorousSimpleFoam PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/finiteVolume/cfdTools>
)

View file

@ -44,7 +44,3 @@ add_foam_executable(rhoSimpleFoam
DEPENDS compressibleRASModels DEPENDS compressibleRASModels
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )
target_include_directories(rhoSimpleFoam PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/finiteVolume/cfdTools>
)

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(sonicTurbDyMEngineFoam add_foam_executable(sonicTurbDyMEngineFoam
DEPENDS basicThermophysicalModels compressibleTurbulenceModel engine DEPENDS compressibleTurbulenceModel engine
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(coalChemistryFoam add_foam_executable(coalChemistryFoam
DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate DEPENDS lagrangianIntermediate coalCombustion chemistryModel
DEPENDS chemistryModel coalCombustion
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(porousExplicitSourceReactingParcelFoam add_foam_executable(porousExplicitSourceReactingParcelFoam
DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate DEPENDS lagrangianIntermediate chemistryModel
DEPENDS chemistryModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(reactingParcelFoam add_foam_executable(reactingParcelFoam
DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate DEPENDS lagrangianIntermediate chemistryModel
DEPENDS chemistryModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(uncoupledKinematicParcelFoam add_foam_executable(uncoupledKinematicParcelFoam
DEPENDS finiteVolume compressibleTurbulenceModel lagrangianIntermediate DEPENDS lagrangianIntermediate
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -44,7 +44,3 @@ add_foam_executable(multiSolverDemo
DEPENDS finiteVolume multiSolverLib DEPENDS finiteVolume multiSolverLib
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )
target_include_directories(multiSolverDemo PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/multiSolver/lnInclude>
)

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org
@ -43,4 +44,4 @@ add_subdirectory(compressibleInterDyMFoam)
add_subdirectory(interFoam) add_subdirectory(interFoam)
add_subdirectory(settlingFoam) add_subdirectory(settlingFoam)
add_subdirectory(porousInterFoam) add_subdirectory(porousInterFoam)
add_subdirectory(cavitatingFoam) add_subdirectory(cavitatingFoam)

View file

@ -41,7 +41,7 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(MRFInterFoam add_foam_executable(MRFInterFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(cavitatingFoam add_foam_executable(cavitatingFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS incompressibleTurbulenceModel barotropicCompressibilityModel
DEPENDS barotropicCompressibilityModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,7 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(compressibleInterDyMFoam add_foam_executable(compressibleInterDyMFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel dynamicFvMesh
DEPENDS dynamicFvMesh
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(compressibleInterFoam add_foam_executable(compressibleInterFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,12 +41,10 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(interDyMFoam add_foam_executable(interDyMFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel dynamicFvMesh
DEPENDS dynamicFvMesh
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )
target_include_directories(interDyMFoam PUBLIC target_include_directories(interDyMFoam PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
) )

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(interFoam add_foam_executable(interFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -43,7 +43,7 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(interMixingFoam add_foam_executable(interMixingFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -46,7 +46,7 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(interPhaseChangeFoam add_foam_executable(interPhaseChangeFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -44,7 +44,7 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(multiphaseInterFoam add_foam_executable(multiphaseInterFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -41,11 +41,10 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(porousInterFoam add_foam_executable(porousInterFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )
target_include_directories(porousInterFoam PUBLIC target_include_directories(porousInterFoam PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interFoam>
) )

View file

@ -41,6 +41,6 @@ if(NOT FOAM_FOUND)
endif() endif()
add_foam_executable(twoLiquidMixingFoam add_foam_executable(twoLiquidMixingFoam
DEPENDS finiteVolume interfaceProperties incompressibleTurbulenceModel DEPENDS interfaceProperties incompressibleTurbulenceModel
SOURCES ${SOURCES} SOURCES ${SOURCES}
) )

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -44,8 +44,4 @@ list(APPEND SOURCES
add_foam_library(EulerianInterfacialModels SHARED ${SOURCES}) add_foam_library(EulerianInterfacialModels SHARED ${SOURCES})
target_link_libraries(EulerianInterfacialModels PUBLIC finiteVolume phaseModel) target_link_libraries(EulerianInterfacialModels PUBLIC phaseModel)
target_include_directories(EulerianInterfacialModels PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../phaseModel>
)

View file

@ -61,10 +61,8 @@ list(APPEND SOURCES
add_foam_library(kineticTheoryModel SHARED ${SOURCES}) add_foam_library(kineticTheoryModel SHARED ${SOURCES})
target_link_libraries(kineticTheoryModel PUBLIC finiteVolume phaseModel) target_link_libraries(kineticTheoryModel PUBLIC phaseModel)
target_include_directories(kineticTheoryModel PUBLIC target_include_directories(kineticTheoryModel PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interfacialModels>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interfacialModels/dragModels/dragModel> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../interfacialModels/dragModels/dragModel>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../phaseModel>
) )

View file

@ -36,4 +36,4 @@ list(APPEND SOURCES
add_foam_library(phaseModel SHARED ${SOURCES}) add_foam_library(phaseModel SHARED ${SOURCES})
target_link_libraries(phaseModel PUBLIC finiteVolume incompressibleTransportModels) target_link_libraries(phaseModel PUBLIC incompressibleTransportModels)

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -47,5 +47,4 @@ add_foam_executable(bubbleInterTrackFoam
target_include_directories(bubbleInterTrackFoam PUBLIC target_include_directories(bubbleInterTrackFoam PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../freeSurface/lnInclude>
) )

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org
@ -60,4 +61,4 @@ add_subdirectory(fvAgglomerationMethods)
add_subdirectory(meshTools) add_subdirectory(meshTools)
add_subdirectory(dynamicMesh) add_subdirectory(dynamicMesh)
add_subdirectory(thermophysicalModels) add_subdirectory(thermophysicalModels)
#add_subdirectory(dbns) add_subdirectory(dbns)

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

View file

@ -43,4 +43,4 @@ list(APPEND SOURCES
add_foam_library(cudaSolvers SHARED ${SOURCES}) add_foam_library(cudaSolvers SHARED ${SOURCES})
#target_link_libraries(cudaSolvers finiteVolume) target_link_libraries(cudaSolvers finiteVolume)

View file

@ -52,4 +52,10 @@ list(APPEND SOURCES
add_foam_library(dbns SHARED ${SOURCES}) add_foam_library(dbns SHARED ${SOURCES})
target_link_libraries(dbns PUBLIC finiteVolume meshTools basicThermophysicalModels) target_link_libraries(dbns ${MGRIDGEN_LIBRARY} compressibleTurbulenceModel)
target_include_directories(dbns PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dbnsFlux/hllcFlux>
$<BUILD_INTERFACE:${MGRIDGEN_INCLUDES}/Lib>
$<BUILD_INTERFACE:${MGRIDGEN_INCLUDES}/IMlib>
)

View file

@ -1,4 +1,5 @@
# --------------------------------------------------------------------------# ======== | # --------------------------------------------------------------------------
# ======== |
# \ / F ield | foam-extend: Open Source CFD # \ / F ield | foam-extend: Open Source CFD
# \ / O peration | Version: 4.1 # \ / O peration | Version: 4.1
# \ / A nd | Web: http://www.foam-extend.org # \ / A nd | Web: http://www.foam-extend.org

Some files were not shown because too many files have changed in this diff Show more