Commit f1f52fc2 authored by Simone Rossi's avatar Simone Rossi
Browse files

restructuring EM module

parent 2a493e22
......@@ -25,8 +25,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
ADD_SUBDIRECTORY(solver)
SET(HEADERS ${HEADERS} ${solver_HEADERS})
SET(SOURCES ${SOURCES} ${solver_SOURCES})
SET(HEADERS ${HEADERS} ${solver_HEADERS} ${solver_electrophysiology_HEADERS} ${solver_mechanics_HEADERS})
SET(SOURCES ${SOURCES} ${solver_SOURCES} ${solver_electrophysiology_SOURCES} ${solver_mechanics_SOURCES})
ADD_SUBDIRECTORY(util)
SET(HEADERS ${HEADERS} ${util_HEADERS})
......
......@@ -14,8 +14,8 @@ ADD_SUBDIRECTORIES(
# example_CalciumDependentActivation
# example_laplacian
# linearizedGHO
linearizedGHObiventricle
# linearizedGHObiventricle
# linearizedGHOrotation
linearizedGHOventricle
prestress
# linearizedGHOventricle
# prestress
)
......@@ -115,7 +115,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -174,7 +174,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -153,7 +153,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -142,7 +142,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -174,7 +174,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -159,7 +159,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -153,7 +153,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -174,7 +174,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -102,7 +102,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -66,7 +66,7 @@ int main (int argc, char** argv)
typedef IonicGoldbeter ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -418,7 +418,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr<ionicModel_Type> ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver<mesh_Type, ionicModel_Type> monodomainSolver_Type;
typedef EMMonodomainSolver<mesh_Type, ionicModel_Type> monodomainSolver_Type;
typedef boost::shared_ptr<monodomainSolver_Type> monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -174,7 +174,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -395,7 +395,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -174,7 +174,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -451,7 +451,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr< ionicModel_Type > ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
typedef boost::shared_ptr<vector_Type> vectorPtr_Type;
......
......@@ -136,7 +136,7 @@ int main (int argc, char** argv)
typedef IonicMinimalModel ionicModel_Type;
typedef boost::shared_ptr<ionicModel_Type> ionicModelPtr_Type;
typedef ElectroETAMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef EMMonodomainSolver< mesh_Type, ionicModel_Type > monodomainSolver_Type;
typedef boost::shared_ptr< monodomainSolver_Type > monodomainSolverPtr_Type;
typedef VectorEpetra vector_Type;
......
ADD_SUBDIRECTORIES(
electrophysiology
Mechanics
)
SET(solver_HEADERS
solver/EMActiveStrainSolver.hpp
solver/EMEvaluate.hpp
# solver/EMActiveStrainSolver.hpp
# solver/EMEvaluate.hpp
solver/EMSolver.hpp
solver/EMETAFunctors.hpp
solver/EMGeneralizedActiveHolzapfelOgdenMaterial.hpp
solver/EMActiveStructuralConstitutiveLaw.hpp
solver/EMNeoHookeanActivatedMaterial.hpp
solver/EMHolzapfelOgdenMaterial.hpp
# solver/EMETAFunctors.hpp
# solver/EMGeneralizedActiveHolzapfelOgdenMaterial.hpp
# solver/EMActiveStructuralConstitutiveLaw.hpp
# solver/EMNeoHookeanActivatedMaterial.hpp
# solver/EMHolzapfelOgdenMaterial.hpp
CACHE INTERNAL "")
SET(solver_SOURCES
......
This diff is collapsed.
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