Skip to content

GitLab

Commit ec417ee9 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1292 Laplacian is now also working with Xtensor.

parent 29b70c57
Hide whitespace changes
Inline Side-by-side
MoReFEM.xcodeproj/project.pbxproj
View file @ ec417ee9
......@@ -1298,9 +1298,6 @@
BEACCC3D1E11D05600CBA4F2 /* InitialCondition.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC251E11D05600CBA4F2 /* InitialCondition.hxx */; };
BEACCC3E1E11D05600CBA4F2 /* InitScalarInitialCondition.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC261E11D05600CBA4F2 /* InitScalarInitialCondition.hpp */; };
BEACCC3F1E11D05600CBA4F2 /* InitScalarInitialCondition.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC271E11D05600CBA4F2 /* InitScalarInitialCondition.hxx */; };
BEACCC401E11D05600CBA4F2 /* InitThreeDimensionalInitialCondition.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC281E11D05600CBA4F2 /* InitThreeDimensionalInitialCondition.hpp */; };
BEACCC411E11D05600CBA4F2 /* InitThreeDimensionalInitialCondition.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC291E11D05600CBA4F2 /* InitThreeDimensionalInitialCondition.hxx */; };
BEACCC431E11D05600CBA4F2 /* ThreeDimensionalInitialCondition.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC2C1E11D05600CBA4F2 /* ThreeDimensionalInitialCondition.hpp */; };
BEACCC491E11D05600CBA4F2 /* GlobalMatrixStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEACCC341E11D05600CBA4F2 /* GlobalMatrixStorage.cpp */; };
BEACCC4A1E11D05600CBA4F2 /* GlobalMatrixStorage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC351E11D05600CBA4F2 /* GlobalMatrixStorage.hpp */; };
BEACCC4B1E11D05600CBA4F2 /* GlobalMatrixStorage.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC361E11D05600CBA4F2 /* GlobalMatrixStorage.hxx */; };
......@@ -1464,6 +1461,13 @@
BEE31B921D99723F006B1DE7 /* main_ensight_output.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEE31B911D99723F006B1DE7 /* main_ensight_output.cpp */; };
BEE31B941D997302006B1DE7 /* main_ensight_output.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEE31B931D997302006B1DE7 /* main_ensight_output.cpp */; };
BEE45BF923574CCF00E0AB7C /* FreeFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE0486851CCAC1A900CB6A3A /* FreeFunctions.cpp */; };
BEE45BFA23576FA100E0AB7C /* GradPhiGradPhi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE8C36581DB50FB400919468 /* GradPhiGradPhi.cpp */; };
BEE45BFB23576FA600E0AB7C /* GradPhiGradPhi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE8C364B1DB50FB400919468 /* GradPhiGradPhi.cpp */; };
BEE45BFE23576FD000E0AB7C /* InitThreeDimensionalInitialCondition.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC281E11D05600CBA4F2 /* InitThreeDimensionalInitialCondition.hpp */; };
BEE45BFF23576FD000E0AB7C /* InitThreeDimensionalInitialCondition.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC291E11D05600CBA4F2 /* InitThreeDimensionalInitialCondition.hxx */; };
BEE45C0023576FD000E0AB7C /* ThreeDimensionalInitialCondition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEACCC2B1E11D05600CBA4F2 /* ThreeDimensionalInitialCondition.cpp */; };
BEE45C0123576FD000E0AB7C /* ThreeDimensionalInitialCondition.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC2C1E11D05600CBA4F2 /* ThreeDimensionalInitialCondition.hpp */; };
BEE45C0223576FD000E0AB7C /* ThreeDimensionalInitialCondition.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEACCC2D1E11D05600CBA4F2 /* ThreeDimensionalInitialCondition.hxx */; };
BEE934791CFD8B4F00158440 /* MatrixConversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEE934761CFD8B4F00158440 /* MatrixConversion.cpp */; };
BEE9347A1CFD8B4F00158440 /* MatrixConversion.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEE934771CFD8B4F00158440 /* MatrixConversion.hpp */; };
BEE9347B1CFD8B4F00158440 /* MatrixConversion.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEE934781CFD8B4F00158440 /* MatrixConversion.hxx */; };
......@@ -11541,20 +11545,20 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
BEE45C0223576FD000E0AB7C /* ThreeDimensionalInitialCondition.hxx in Headers */,
BEE45C0123576FD000E0AB7C /* ThreeDimensionalInitialCondition.hpp in Headers */,
BE8553AD1BBD77BF00DB109E /* None.hpp in Headers */,
BEACCC3E1E11D05600CBA4F2 /* InitScalarInitialCondition.hpp in Headers */,
BEACCC4D1E11D05600CBA4F2 /* GlobalVectorStorage.hpp in Headers */,
BEACCC3D1E11D05600CBA4F2 /* InitialCondition.hxx in Headers */,
BED13354206519C800A3B0AA /* Penalization.hpp in Headers */,
BED793B11D1AD75900492784 /* HyperelasticLaw.hpp in Headers */,
BEACCC401E11D05600CBA4F2 /* InitThreeDimensionalInitialCondition.hpp in Headers */,
BEACCC4A1E11D05600CBA4F2 /* GlobalMatrixStorage.hpp in Headers */,
BEE45BFE23576FD000E0AB7C /* InitThreeDimensionalInitialCondition.hpp in Headers */,
BE16026F210B16D8009CEE98 /* LuaFunction.hpp in Headers */,
BE8553AA1BBD77BF00DB109E /* DofSource.hpp in Headers */,
BEACCC4E1E11D05600CBA4F2 /* GlobalVectorStorage.hxx in Headers */,
BE8553AB1BBD77BF00DB109E /* DofSource.hxx in Headers */,
BEACCC431E11D05600CBA4F2 /* ThreeDimensionalInitialCondition.hpp in Headers */,
BEACCC411E11D05600CBA4F2 /* InitThreeDimensionalInitialCondition.hxx in Headers */,
BEACCC3A1E11D05600CBA4F2 /* InitialConditionInstance.hpp in Headers */,
BE16026D210B16D8009CEE98 /* Constant.hpp in Headers */,
BE160270210B16D8009CEE98 /* LuaFunction.hxx in Headers */,
......@@ -11565,6 +11569,7 @@
BED793B21D1AD75900492784 /* HyperelasticLaw.hxx in Headers */,
BEACCC4B1E11D05600CBA4F2 /* GlobalMatrixStorage.hxx in Headers */,
BED13353206519C800A3B0AA /* Penalization.hxx in Headers */,
BEE45BFF23576FD000E0AB7C /* InitThreeDimensionalInitialCondition.hxx in Headers */,
BEACCC3F1E11D05600CBA4F2 /* InitScalarInitialCondition.hxx in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -12586,6 +12591,7 @@
BE7C94721F604ED7003D2C52 /* FitzHughNagumo.cpp in Sources */,
1380F7941FCEFDF800E69537 /* GradOnGradientBasedElasticityTensor.cpp in Sources */,
BE8C37221DB50FB500919468 /* None.cpp in Sources */,
BEE45BFB23576FA600E0AB7C /* GradPhiGradPhi.cpp in Sources */,
BE8C37291DB50FB500919468 /* None.cpp in Sources */,
BE494104224250E800157863 /* FiberDensityJ1J4J6.cpp in Sources */,
13DE260B1F83D5EF00AEED6A /* MooneyRivlin.cpp in Sources */,
......@@ -12599,6 +12605,7 @@
BE8C36E61DB50FB500919468 /* Mass.cpp in Sources */,
135F59FD1F851EB300655154 /* ExponentialJ1J4.cpp in Sources */,
BE8C36F41DB50FB500919468 /* Mass.cpp in Sources */,
BEE45BFA23576FA100E0AB7C /* GradPhiGradPhi.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -12811,6 +12818,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BEE45C0023576FD000E0AB7C /* ThreeDimensionalInitialCondition.cpp in Sources */,
BE8553A91BBD77BF00DB109E /* DofSource.cpp in Sources */,
BE8553AC1BBD77BF00DB109E /* None.cpp in Sources */,
BEACCC491E11D05600CBA4F2 /* GlobalMatrixStorage.cpp in Sources */,
Sources/FormulationSolver/Internal/InitialCondition/Instances/ThreeDimensionalInitialCondition.cpp
View file @ ec417ee9
......@@ -38,7 +38,7 @@ namespace MoReFEM
assert(GetMesh() == GetScalarInitialConditionY().GetMesh());
assert(GetMesh() == GetScalarInitialConditionZ().GetMesh());
content_.Resize(3);
content_.resize({3});
if (IsConstant())
{
......
Sources/FormulationSolver/Internal/SourceList.cmake
View file @ ec417ee9
......@@ -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)
Sources/FormulationSolver/VariationalFormulation.hxx
View file @ ec417ee9
......@@ -696,7 +696,7 @@ namespace MoReFEM
const unsigned int mesh_dimension = felt_space.GetMeshDimension();
const int Ncomponent_int = static_cast<int>(Ncomponent(unknown, mesh_dimension));
const auto Ncomponent_local = static_cast<std::size_t>(Ncomponent(unknown, mesh_dimension));
SpatialPoint node_coords;
......@@ -736,11 +736,11 @@ namespace MoReFEM
std::size_t dof_index = i_node;
assert(initial_condition_value.GetSize() >= Ncomponent_int);
assert(initial_condition_value.size() >= Ncomponent_local);
if (local_2_global[i_node] < Nprocessor_wise_dof)
{
for (int component = 0; component < Ncomponent_int; ++component, dof_index += Nlocal_node)
for (auto component = 0ul; component < Ncomponent_local; ++component, dof_index += Nlocal_node)
{
const unsigned int dof_index_int = static_cast<unsigned int>(local_2_global[dof_index]);
local_array[dof_index_int] = initial_condition_value(component);
......
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