Commit 1aff4a61 authored by Cristiano Malossi's avatar Cristiano Malossi
Browse files

Final improvements to CMake files.

parent f9d6423c
......@@ -16,11 +16,9 @@ TRIBITS_EXCLUDE_AUTOTOOLS_FILES()
TRIBITS_EXCLUDE_FILES()
# Add library target
IF (LIFEV_HAS_ZERODIMENSIONAL)
TRIBITS_ADD_LIBRARY(
lifevbcinterface0D
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEPLIBS lifevbcinterfacecore
)
ENDIF()
\ No newline at end of file
......@@ -16,11 +16,9 @@ TRIBITS_EXCLUDE_AUTOTOOLS_FILES()
TRIBITS_EXCLUDE_FILES()
# Add library target
IF (LIFEV_HAS_ONEDFSI)
TRIBITS_ADD_LIBRARY(
lifevbcinterface1D
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEPLIBS lifevbcinterfacecore
)
ENDIF()
\ No newline at end of file
......@@ -20,5 +20,4 @@ TRIBITS_ADD_LIBRARY(
DEPLIBS lifevbcinterfacecore
)
ADD_SUBDIRECTORY(function)
ADD_SUBDIRECTORY(function)
\ No newline at end of file
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
IF (LifeV_ENABLE_NavierStokes)
SET(HEADERS "")
SET(SOURCES "")
......@@ -13,7 +15,6 @@ TRIBITS_EXCLUDE_AUTOTOOLS_FILES()
TRIBITS_EXCLUDE_FILES()
# Add library target
IF (LIFEV_HAS_NAVIERSTOKES)
TRIBITS_ADD_LIBRARY(
lifevbcinterface3Dfluid
HEADERS ${HEADERS}
......@@ -22,6 +23,7 @@ TRIBITS_ADD_LIBRARY(
)
ENDIF()
IF (LifeV_ENABLE_FSI)
SET(HEADERS "")
SET(SOURCES "")
......@@ -34,13 +36,11 @@ TRIBITS_EXCLUDE_AUTOTOOLS_FILES()
# This is the list of files excluded from the tarball
TRIBITS_EXCLUDE_FILES()
# Add library target
IF (LIFEV_HAS_FSI)
TRIBITS_ADD_LIBRARY(
lifevbcinterface3Dfsi
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEPLIBS lifevbcinterface3D
)
ENDIF()
ENDIF()
\ No newline at end of file
......@@ -22,9 +22,16 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(3D)
ADD_SUBDIRECTORY(1D)
IF (LifeV_ENABLE_ZeroDimensional)
ADD_SUBDIRECTORY(0D)
ENDIF ()
IF (LifeV_ENABLE_OneDFSI)
ADD_SUBDIRECTORY(1D)
ENDIF ()
ADD_SUBDIRECTORY(3D)
#
# Do standard postprocessing
......
......@@ -40,6 +40,16 @@
#include <lifev/multiscale/framework/MultiscaleDefinitions.hpp>
#include <lifev/multiscale/models/MultiscaleModelMultiscale.hpp>
// Tell the compiler to ignore specific kind of warnings:
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <Teuchos_XMLParameterListHelpers.hpp>
// Tell the compiler to restore the warning previously silented
#pragma GCC diagnostic warning "-Wunused-variable"
#pragma GCC diagnostic warning "-Wunused-parameter"
namespace LifeV
{
namespace Multiscale
......
......@@ -21,9 +21,9 @@ CACHE INTERNAL "")
SET(couplingsArea_HEADERS "")
SET(couplingsArea_SOURCES "")
IF (LIFEV_HAS_FSI)
IF (LifeV_ENABLE_FSI)
IF (LIFEV_HAS_ONEDFSI)
IF (LifeV_ENABLE_OneDFSI)
SET(couplingsArea_HEADERS
couplings/MultiscaleCouplingMeanNormalStressArea.hpp
......
......@@ -12,7 +12,7 @@ CACHE INTERNAL "")
IF (LIFEV_HAS_ZERODIMENSIONAL)
IF (LifeV_ENABLE_ZeroDimensional)
SET(models0D_HEADERS
models/MultiscaleModel0D.hpp
......@@ -35,7 +35,7 @@ ENDIF()
IF (LIFEV_HAS_ONEDFSI)
IF (LifeV_ENABLE_OneDFSI)
SET(models1D_HEADERS
models/MultiscaleModelFSI1D.hpp
......@@ -56,7 +56,7 @@ ENDIF()
IF (LIFEV_HAS_NAVIERSTOKES)
IF (LifeV_ENABLE_NavierStokes)
SET(modelsFluid3D_HEADERS
models/MultiscaleModelFluid3D.hpp
......@@ -77,7 +77,7 @@ ENDIF()
IF (LIFEV_HAS_FSI)
IF (LifeV_ENABLE_FSI)
SET(modelsFSI3D_HEADERS
models/MultiscaleModelFSI3D.hpp
......
......@@ -2,7 +2,8 @@
INCLUDE(TribitsAddExecutableAndTest)
INCLUDE(AddSubdirectories)
ADD_SUBDIRECTORIES(
multiscale
onedmodel
)
ADD_SUBDIRECTORY(multiscale)
IF (LifeV_ENABLE_OneDFSI)
ADD_SUBDIRECTORY(onedmodel)
ENDIF ()
\ No newline at end of file
INCLUDE(TribitsAddExecutableAndTest)
INCLUDE(TribitsCopyFilesToBinaryDir)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
......@@ -9,17 +10,58 @@ TRIBITS_ADD_EXECUTABLE(
SOURCES main.cpp
)
IF (LifeV_ENABLE_NavierStokes)
TRIBITS_ADD_TEST(
Framework
POSTFIX_AND_ARGS_0 Fluid3D_MTNS -s 1 -f MultiscaleDatabase/Test_Fluid3D.dat -c 267617.11076637130 -o Test_1
NUM_MPI_PROCS 4
COMM mpi
)
ENDIF ()
IF (LifeV_ENABLE_FSI)
TRIBITS_ADD_TEST(
Framework
POSTFIX_AND_ARGS_0 FSI3D_MTNS -s 1 -f MultiscaleDatabase/Test_FSI3D.dat -c 69.503547600977484 -o Test_3
NUM_MPI_PROCS 4
COMM mpi
)
ENDIF ()
IF (LifeV_ENABLE_OneDFSI)
TRIBITS_ADD_TEST(
Framework
POSTFIX_AND_ARGS_0 FSI1D_MNS -s 1 -f MultiscaleDatabase/Test_FSI1D.dat -c 1281.4882585623886 -o Test_2
NUM_MPI_PROCS 4
COMM mpi
)
IF (LifeV_ENABLE_ZeroDimensional)
TRIBITS_ADD_TEST(
Framework
POSTFIX_AND_ARGS_0 Windkessel0D -s 1 -f MultiscaleDatabase/Test_Windkessel0D.dat -c 105330.10083689842 -o Test_0
POSTFIX_AND_ARGS_1 Fluid3D_MTNS -s 1 -f MultiscaleDatabase/Test_Fluid3D.dat -c 267617.11076637130 -o Test_1
POSTFIX_AND_ARGS_2 FSI1D_MNS -s 1 -f MultiscaleDatabase/Test_FSI1D.dat -c 1281.4882585623886 -o Test_2
POSTFIX_AND_ARGS_3 FSI3D_MTNS -s 1 -f MultiscaleDatabase/Test_FSI3D.dat -c 69.503547600977484 -o Test_3
POSTFIX_AND_ARGS_4 1D-FSI3D-1D_MNSA -s 1 -f MultiscaleDatabase/Test_FSI1D-FSI3D-FSI1D.dat -c 1278.3958233134831 -o Test_4
POSTFIX_AND_ARGS_5 Restart -s 1 -f MultiscaleDatabase/Test_FSI1D-FSI3D-FSI1D_Restart.dat -c 506.64046128381432 -o Test_4
NUM_MPI_PROCS 4
COMM mpi
)
ENDIF ()
IF (LifeV_ENABLE_FSI)
TRIBITS_ADD_TEST(
Framework
POSTFIX_AND_ARGS_0 1D-FSI3D-1D_MNSA -s 1 -f MultiscaleDatabase/Test_FSI1D-FSI3D-FSI1D.dat -c 1278.3958233134831 -o Test_4
POSTFIX_AND_ARGS_1 Restart -s 1 -f MultiscaleDatabase/Test_FSI1D-FSI3D-FSI1D_Restart.dat -c 506.64046128381432 -o Test_4
NUM_MPI_PROCS 4
COMM mpi
)
ENDIF ()
ENDIF ()
TRIBITS_COPY_FILES_TO_BINARY_DIR(MS_mesh
CREATE_SYMLINK
......@@ -32,5 +74,4 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(MS_functions_database
CREATE_SYMLINK
SOURCE_FILES FunctionsDatabase MultiscaleDatabase
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../data
)
)
\ No newline at end of file
INCLUDE(TribitsAddExecutableAndTest)
INCLUDE(TribitsCopyFilesToBinaryDir)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment