Commit 0540b3a3 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1292 TMP The elastic model with only Xtensor passes all the tests.

parent 8e1a4506
......@@ -49,7 +49,6 @@ target_link_libraries(${MOREFEM_TEST_TOOLS}
include(Utilities/SourceList.cmake)
include(ThirdParty/SourceList.cmake)
include(ThirdParty/Source/CMakeLists.txt)
include(Core/SourceList.cmake)
......@@ -95,17 +94,13 @@ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/ DESTINATION ${MOREFEM_INSTALL_DIR_I
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/ DESTINATION ${MOREFEM_INSTALL_DIR_INCL}
FILES_MATCHING PATTERN "*.hxx")
# Only for Seldon...
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/ DESTINATION ${MOREFEM_INSTALL_DIR_INCL}
FILES_MATCHING PATTERN "*.cxx")
#
# #### Lifted and adapted from Xtl
#
add_library(morefem_cmake INTERFACE)
target_include_directories(morefem_cmake INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:${PROJECT_NAME}/include> ${OPEN_MPI_INCL_DIR} ${PETSC_INCL_DIR} ${PARMETIS_INCL_DIR} ${LUA_INCL_DIR} ${BOOST_INCL_DIR} ${LIBMESH_INCL_DIR} ${XTENSOR_INC_DIR} $<INSTALL_INTERFACE:${PROJECT_NAME}/include/ThirdParty/Source/Tclap/include> $<INSTALL_INTERFACE:${PROJECT_NAME}/include/ThirdParty/Source/Seldon>)
target_include_directories(morefem_cmake INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:${PROJECT_NAME}/include> ${OPEN_MPI_INCL_DIR} ${PETSC_INCL_DIR} ${PARMETIS_INCL_DIR} ${LUA_INCL_DIR} ${BOOST_INCL_DIR} ${LIBMESH_INCL_DIR} ${XTENSOR_INC_DIR} $<INSTALL_INTERFACE:${PROJECT_NAME}/include/ThirdParty/Source/Tclap/include>)
target_link_libraries(morefem_cmake INTERFACE ${MOREFEM_POST_PROCESSING} ${MOREFEM_TEST_TOOLS})
......@@ -121,7 +116,7 @@ set_property(TARGET morefem_cmake PROPERTY INTERFACE_COMPILE_DEFINITIONS ${MOREF
include(CMakePackageConfigHelpers)
install(TARGETS morefem_cmake ${MOREFEM_MAIN_LIBS} Seldon ${MOREFEM_POST_PROCESSING} ${MOREFEM_TEST_TOOLS}
install(TARGETS morefem_cmake ${MOREFEM_MAIN_LIBS} ${MOREFEM_POST_PROCESSING} ${MOREFEM_TEST_TOOLS}
EXPORT ${PROJECT_NAME}-targets
LIBRARY DESTINATION ${MOREFEM_INSTALL_DIR_LIB}
ARCHIVE DESTINATION ${MOREFEM_INSTALL_DIR_LIB}
......
......@@ -12,5 +12,5 @@ target_sources(${MOREFEM_FORMULATION_SOLVER}
PRIVATE
)
include(${CMAKE_CURRENT_LIST_DIR}/InitialCondition/SourceList.cmake)
#include(${CMAKE_CURRENT_LIST_DIR}/InitialCondition/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/Storage/SourceList.cmake)
......@@ -90,7 +90,7 @@ namespace MoReFEM
auto& block_matrix = GetLocalMatrix<EnumUnderlyingType(LocalMatrixIndex::block_matrix)>();
auto& matrix_result = elementary_data.GetNonCstMatrixResult();
matrix_result.Zero();
matrix_result.fill(0.);
auto& transposed_dphi = GetLocalMatrix<EnumUnderlyingType(LocalMatrixIndex::transposed_dphi)>();
......@@ -106,7 +106,7 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
block_matrix.Zero();
block_matrix.fill(0.);
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
......@@ -123,13 +123,11 @@ namespace MoReFEM
assert(dphi.shape(0) == Nnode_for_unknown);
assert(dphi_test.shape(0) == Nnode_for_test_unknown);
Wrappers::Seldon::Transpose(dphi, transposed_dphi);
Seldon::Mlt(factor,
dphi_test,
transposed_dphi,
block_matrix);
xt::noalias(transposed_dphi) = xt::transpose(dphi);
xt::noalias(block_matrix) = factor * xt::linalg::dot(dphi_test, transposed_dphi);
// Then report it into the elementary matrix.
for (int m = 0; m < Nnode_for_test_unknown; ++m)
......
......@@ -10,40 +10,40 @@
target_sources(${MOREFEM_OP_INSTANCES}
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/Ale.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Bidomain.cpp"
# "${CMAKE_CURRENT_LIST_DIR}/Ale.cpp"
# "${CMAKE_CURRENT_LIST_DIR}/Bidomain.cpp"
"${CMAKE_CURRENT_LIST_DIR}/GradOnGradientBasedElasticityTensor.cpp"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiGradPhi.cpp"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiTauOrthoTauGradPhi.cpp"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiTauTauGradPhi.cpp"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiGradPhi.cpp"
# "${CMAKE_CURRENT_LIST_DIR}/GradPhiTauOrthoTauGradPhi.cpp"
# "${CMAKE_CURRENT_LIST_DIR}/GradPhiTauTauGradPhi.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Mass.cpp"
"${CMAKE_CURRENT_LIST_DIR}/ScalarDivVectorial.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Stokes.cpp"
"${CMAKE_CURRENT_LIST_DIR}/SurfacicBidomain.cpp"
# "${CMAKE_CURRENT_LIST_DIR}/ScalarDivVectorial.cpp"
# "${CMAKE_CURRENT_LIST_DIR}/Stokes.cpp"
# "${CMAKE_CURRENT_LIST_DIR}/SurfacicBidomain.cpp"
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/Ale.hpp"
"${CMAKE_CURRENT_LIST_DIR}/Ale.hxx"
"${CMAKE_CURRENT_LIST_DIR}/Bidomain.hpp"
"${CMAKE_CURRENT_LIST_DIR}/Bidomain.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/Ale.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/Ale.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/Bidomain.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/Bidomain.hxx"
"${CMAKE_CURRENT_LIST_DIR}/GradOnGradientBasedElasticityTensor.hpp"
"${CMAKE_CURRENT_LIST_DIR}/GradOnGradientBasedElasticityTensor.hxx"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiGradPhi.hpp"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiGradPhi.hxx"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiTauOrthoTauGradPhi.hpp"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiTauOrthoTauGradPhi.hxx"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiTauTauGradPhi.hpp"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiTauTauGradPhi.hxx"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiGradPhi.hpp"
"${CMAKE_CURRENT_LIST_DIR}/GradPhiGradPhi.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/GradPhiTauOrthoTauGradPhi.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/GradPhiTauOrthoTauGradPhi.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/GradPhiTauTauGradPhi.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/GradPhiTauTauGradPhi.hxx"
"${CMAKE_CURRENT_LIST_DIR}/Mass.hpp"
"${CMAKE_CURRENT_LIST_DIR}/Mass.hxx"
"${CMAKE_CURRENT_LIST_DIR}/ScalarDivVectorial.hpp"
"${CMAKE_CURRENT_LIST_DIR}/ScalarDivVectorial.hxx"
"${CMAKE_CURRENT_LIST_DIR}/Stokes.hpp"
"${CMAKE_CURRENT_LIST_DIR}/Stokes.hxx"
"${CMAKE_CURRENT_LIST_DIR}/SurfacicBidomain.hpp"
"${CMAKE_CURRENT_LIST_DIR}/SurfacicBidomain.hxx"
"${CMAKE_CURRENT_LIST_DIR}/VariableMass.hpp"
"${CMAKE_CURRENT_LIST_DIR}/VariableMass.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/ScalarDivVectorial.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/ScalarDivVectorial.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/Stokes.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/Stokes.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/SurfacicBidomain.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/SurfacicBidomain.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/VariableMass.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/VariableMass.hxx"
)
include(${CMAKE_CURRENT_LIST_DIR}/Internal/SourceList.cmake)
......@@ -12,7 +12,7 @@ target_sources(${MOREFEM_OP}
PRIVATE
"${CMAKE_CURRENT_LIST_DIR}/ExtractGradientBasedBlock.cpp"
"${CMAKE_CURRENT_LIST_DIR}/GradientDisplacementMatrix.cpp"
"${CMAKE_CURRENT_LIST_DIR}/GreenLagrangeTensor.cpp"
# "${CMAKE_CURRENT_LIST_DIR}/GreenLagrangeTensor.cpp"
"${CMAKE_CURRENT_LIST_DIR}/InformationsAtQuadraturePoint.cpp"
PRIVATE
......@@ -22,8 +22,8 @@ target_sources(${MOREFEM_OP}
"${CMAKE_CURRENT_LIST_DIR}/ExtractGradientBasedBlock.hxx"
"${CMAKE_CURRENT_LIST_DIR}/GradientDisplacementMatrix.hpp"
"${CMAKE_CURRENT_LIST_DIR}/GradientDisplacementMatrix.hxx"
"${CMAKE_CURRENT_LIST_DIR}/GreenLagrangeTensor.hpp"
"${CMAKE_CURRENT_LIST_DIR}/GreenLagrangeTensor.hxx"
# "${CMAKE_CURRENT_LIST_DIR}/GreenLagrangeTensor.hpp"
# "${CMAKE_CURRENT_LIST_DIR}/GreenLagrangeTensor.hxx"
"${CMAKE_CURRENT_LIST_DIR}/InformationsAtQuadraturePoint.hpp"
"${CMAKE_CURRENT_LIST_DIR}/InformationsAtQuadraturePoint.hxx"
)
......
......@@ -23,4 +23,4 @@ target_sources(${MOREFEM_OP}
include(${CMAKE_CURRENT_LIST_DIR}/Advanced/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/Crtp/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/Internal/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/CauchyAndInvariant/SourceList.cmake)
#include(${CMAKE_CURRENT_LIST_DIR}/CauchyAndInvariant/SourceList.cmake)
......@@ -13,8 +13,8 @@ target_sources(${MOREFEM_OP}
"${CMAKE_CURRENT_LIST_DIR}/Enum.hpp"
)
include(${CMAKE_CURRENT_LIST_DIR}/ParameterOperator/SourceList.cmake)
#include(${CMAKE_CURRENT_LIST_DIR}/ParameterOperator/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/LocalVariationalOperator/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/Miscellaneous/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/GlobalVariationalOperator/SourceList.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/ConformInterpolator/SourceList.cmake)
#include(${CMAKE_CURRENT_LIST_DIR}/ConformInterpolator/SourceList.cmake)
......@@ -19,6 +19,8 @@ PRAGMA_DIAGNOSTIC(ignored "-Wcomma")
PRAGMA_DIAGNOSTIC(ignored "-Wswitch-enum")
PRAGMA_DIAGNOSTIC(ignored "-Wweak-vtables")
PRAGMA_DIAGNOSTIC(ignored "-Wunused-template")
PRAGMA_DIAGNOSTIC(ignored "-Wfloat-equal")
PRAGMA_DIAGNOSTIC(ignored "-Wnewline-eof")
# include "xtensor/xtensor.hpp"
# include "xtensor/xio.hpp"
......
include(${CMAKE_CURRENT_LIST_DIR}/Seldon/CMakeLists.txt)
......@@ -18,9 +18,5 @@ target_sources(${MOREFEM_UTILITIES}
"${CMAKE_CURRENT_LIST_DIR}/MatrixOperations.hxx"
"${CMAKE_CURRENT_LIST_DIR}/SeldonFunctions.hpp"
"${CMAKE_CURRENT_LIST_DIR}/SeldonFunctions.hxx"
"${CMAKE_CURRENT_LIST_DIR}/SubVector.hpp"
"${CMAKE_CURRENT_LIST_DIR}/SubVector.hxx"
"${CMAKE_CURRENT_LIST_DIR}/SubVector_Base.hpp"
"${CMAKE_CURRENT_LIST_DIR}/SubVector_Base.hxx"
)
Markdown is supported
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