Commit f9d6423c authored by Cristiano Malossi's avatar Cristiano Malossi
Browse files

New modular strategy for the Multiscale module.

parent dd2f0d58
......@@ -18,12 +18,27 @@ TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION()
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
SET(HEADERS "")
SET(SOURCES "")
ADD_SUBDIRECTORY(solver)
SET(HEADERS ${HEADERS} ${solver_HEADERS})
SET(SOURCES ${SOURCES} ${solver_SOURCES})
ADD_SUBDIRECTORY(framework)
SET(HEADERS ${HEADERS} ${framework_HEADERS})
SET(SOURCES ${SOURCES} ${framework_SOURCES})
ADD_SUBDIRECTORY(algorithms)
SET(HEADERS ${HEADERS} ${algorithms_HEADERS})
SET(SOURCES ${SOURCES} ${algorithms_SOURCES})
ADD_SUBDIRECTORY(models)
SET(HEADERS ${HEADERS} ${models_HEADERS})
SET(SOURCES ${SOURCES} ${models_SOURCES})
ADD_SUBDIRECTORY(couplings)
SET(HEADERS ${HEADERS} ${couplings_HEADERS})
SET(SOURCES ${SOURCES} ${couplings_SOURCES})
TRIBITS_EXCLUDE_AUTOTOOLS_FILES()
# This is the list of files excluded from the tarball
......
SET(algorithms_HEADERS
algorithms/MultiscaleAlgorithm.hpp
algorithms/MultiscaleAlgorithmAitken.hpp
algorithms/MultiscaleAlgorithmExplicit.hpp
algorithms/MultiscaleAlgorithmNewton.hpp
algorithms/MultiscaleAlgorithmBroyden.hpp
CACHE INTERNAL "")
SET(algorithms_SOURCES
algorithms/MultiscaleAlgorithm.cpp
algorithms/MultiscaleAlgorithmAitken.cpp
algorithms/MultiscaleAlgorithmExplicit.cpp
algorithms/MultiscaleAlgorithmNewton.cpp
algorithms/MultiscaleAlgorithmBroyden.cpp
CACHE INTERNAL "")
SET(LOCAL_HEADERS)
FOREACH(INC ${algorithms_HEADERS})
STRING(REPLACE "algorithms/" "" LOCAL_INC ${INC})
SET(LOCAL_HEADERS ${LOCAL_HEADERS} ${LOCAL_INC})
ENDFOREACH()
INSTALL(
FILES ${LOCAL_HEADERS}
DESTINATION "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/lifev/multiscale/algorithms"
COMPONENT ${PACKAGE_NAME}
)
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleAlgorithm.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithm.hpp>
namespace LifeV
{
......
......@@ -37,8 +37,8 @@
#ifndef MultiscaleAlgorithm_H
#define MultiscaleAlgorithm_H 1
#include <lifev/multiscale/solver/MultiscaleDefinitions.hpp>
#include <lifev/multiscale/solver/MultiscaleModelMultiscale.hpp>
#include <lifev/multiscale/framework/MultiscaleDefinitions.hpp>
#include <lifev/multiscale/models/MultiscaleModelMultiscale.hpp>
namespace LifeV
{
......
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleAlgorithmAitken.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithmAitken.hpp>
namespace LifeV
{
......
......@@ -39,7 +39,7 @@
#include <lifev/core/algorithm/NonLinearAitken.hpp>
#include <lifev/multiscale/solver/MultiscaleAlgorithm.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithm.hpp>
namespace LifeV
{
......
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleAlgorithmBroyden.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithmBroyden.hpp>
namespace LifeV
{
......
......@@ -43,7 +43,7 @@
#include <lifev/core/algorithm/LinearSolver.hpp>
#include <lifev/multiscale/solver/MultiscaleAlgorithm.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithm.hpp>
namespace LifeV
{
......
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleAlgorithmExplicit.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithmExplicit.hpp>
namespace LifeV
{
......
......@@ -37,7 +37,7 @@
#ifndef MultiscaleAlgorithmExplicit_H
#define MultiscaleAlgorithmExplicit_H 1
#include <lifev/multiscale/solver/MultiscaleAlgorithm.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithm.hpp>
namespace LifeV
{
......
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleAlgorithmNewton.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithmNewton.hpp>
namespace LifeV
{
......
......@@ -39,7 +39,7 @@
#include <lifev/core/algorithm/LinearSolver.hpp>
#include <lifev/multiscale/solver/MultiscaleAlgorithm.hpp>
#include <lifev/multiscale/algorithms/MultiscaleAlgorithm.hpp>
namespace LifeV
{
......
SET(couplings_HEADERS
couplings/MultiscaleCoupling.hpp
couplings/MultiscaleCouplingBoundaryCondition.hpp
couplings/MultiscaleCouplingMeanNormalStress.hpp
couplings/MultiscaleCouplingMeanNormalStressValve.hpp
couplings/MultiscaleCouplingMeanTotalNormalStress.hpp
CACHE INTERNAL "")
SET(couplings_SOURCES
couplings/MultiscaleCoupling.cpp
couplings/MultiscaleCouplingBoundaryCondition.cpp
couplings/MultiscaleCouplingMeanNormalStress.cpp
couplings/MultiscaleCouplingMeanNormalStressValve.cpp
couplings/MultiscaleCouplingMeanTotalNormalStress.cpp
CACHE INTERNAL "")
SET(couplingsArea_HEADERS "")
SET(couplingsArea_SOURCES "")
IF (LIFEV_HAS_FSI)
IF (LIFEV_HAS_ONEDFSI)
SET(couplingsArea_HEADERS
couplings/MultiscaleCouplingMeanNormalStressArea.hpp
couplings/MultiscaleCouplingMeanTotalNormalStressArea.hpp
CACHE INTERNAL "")
SET(couplingsArea_SOURCES
couplings/MultiscaleCouplingMeanNormalStressArea.cpp
couplings/MultiscaleCouplingMeanTotalNormalStressArea.cpp
CACHE INTERNAL "")
ENDIF()
ENDIF()
SET(couplings_HEADERS ${couplings_HEADERS} ${couplingsArea_HEADERS} CACHE INTERNAL "")
SET(couplings_SOURCES ${couplings_SOURCES} ${couplingsArea_SOURCES} CACHE INTERNAL "")
SET(LOCAL_HEADERS)
FOREACH(INC ${couplings_HEADERS})
STRING(REPLACE "couplings/" "" LOCAL_INC ${INC})
SET(LOCAL_HEADERS ${LOCAL_HEADERS} ${LOCAL_INC})
ENDFOREACH()
INSTALL(
FILES ${LOCAL_HEADERS}
DESTINATION "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/lifev/multiscale/couplings"
COMPONENT ${PACKAGE_NAME}
)
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleCoupling.hpp>
#include <lifev/multiscale/couplings/MultiscaleCoupling.hpp>
namespace LifeV
{
......
......@@ -37,11 +37,11 @@
#ifndef MultiscaleCoupling_H
#define MultiscaleCoupling_H 1
#include <lifev/multiscale/solver/MultiscaleDefinitions.hpp>
#include <lifev/multiscale/solver/MultiscaleGlobalData.hpp>
#include <lifev/multiscale/solver/MultiscaleModel.hpp>
#include <lifev/multiscale/framework/MultiscaleDefinitions.hpp>
#include <lifev/multiscale/framework/MultiscaleGlobalData.hpp>
#include <lifev/multiscale/models/MultiscaleModel.hpp>
#include <lifev/multiscale/solver/MultiscaleInterface.hpp> // This should not be here
#include <lifev/multiscale/framework/MultiscaleInterface.hpp> // This should not be here
namespace LifeV
{
......
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleCouplingBoundaryCondition.hpp>
#include <lifev/multiscale/couplings/MultiscaleCouplingBoundaryCondition.hpp>
namespace LifeV
{
......
......@@ -49,23 +49,23 @@
#include <lifev/bc_interface/3D/bc/BCInterface3D.hpp>
#endif
#include <lifev/multiscale/solver/MultiscaleCoupling.hpp>
#include <lifev/multiscale/couplings/MultiscaleCoupling.hpp>
#if defined(LIFEV_HAS_ZERODIMENSIONAL)
#include <lifev/multiscale/solver/MultiscaleModelWindkessel0D.hpp>
#include <lifev/multiscale/solver/MultiscaleModel0D.hpp>
#include <lifev/multiscale/models/MultiscaleModelWindkessel0D.hpp>
#include <lifev/multiscale/models/MultiscaleModel0D.hpp>
#endif
#if defined(LIFEV_HAS_ONEDFSI)
#include <lifev/multiscale/solver/MultiscaleModelFSI1D.hpp>
#include <lifev/multiscale/models/MultiscaleModelFSI1D.hpp>
#endif
#if defined(LIFEV_HAS_NAVIERSTOKES)
#include <lifev/multiscale/solver/MultiscaleModelFluid3D.hpp>
#include <lifev/multiscale/models/MultiscaleModelFluid3D.hpp>
#endif
#if defined(LIFEV_HAS_FSI)
#include <lifev/multiscale/solver/MultiscaleModelFSI3D.hpp>
#include <lifev/multiscale/models/MultiscaleModelFSI3D.hpp>
#endif
namespace LifeV
......
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleCouplingMeanNormalStress.hpp>
#include <lifev/multiscale/couplings/MultiscaleCouplingMeanNormalStress.hpp>
namespace LifeV
{
......
......@@ -37,23 +37,23 @@
#ifndef MultiscaleCouplingMeanNormalStress_H
#define MultiscaleCouplingMeanNormalStress_H 1
#include <lifev/multiscale/solver/MultiscaleCoupling.hpp>
#include <lifev/multiscale/couplings/MultiscaleCoupling.hpp>
#if defined(LIFEV_HAS_ZERODIMENSIONAL)
#include <lifev/multiscale/solver/MultiscaleModelWindkessel0D.hpp>
#include <lifev/multiscale/solver/MultiscaleModel0D.hpp>
#include <lifev/multiscale/models/MultiscaleModelWindkessel0D.hpp>
#include <lifev/multiscale/models/MultiscaleModel0D.hpp>
#endif
#if defined(LIFEV_HAS_ONEDFSI)
#include <lifev/multiscale/solver/MultiscaleModelFSI1D.hpp>
#include <lifev/multiscale/models/MultiscaleModelFSI1D.hpp>
#endif
#if defined(LIFEV_HAS_NAVIERSTOKES)
#include <lifev/multiscale/solver/MultiscaleModelFluid3D.hpp>
#include <lifev/multiscale/models/MultiscaleModelFluid3D.hpp>
#endif
#if defined(LIFEV_HAS_FSI)
#include <lifev/multiscale/solver/MultiscaleModelFSI3D.hpp>
#include <lifev/multiscale/models/MultiscaleModelFSI3D.hpp>
#endif
namespace LifeV
......
......@@ -34,7 +34,7 @@
* @maintainer Cristiano Malossi <cristiano.malossi@epfl.ch>
*/
#include <lifev/multiscale/solver/MultiscaleCouplingMeanNormalStressArea.hpp>
#include <lifev/multiscale/couplings/MultiscaleCouplingMeanNormalStressArea.hpp>
namespace LifeV
{
......
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