Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
GILLES Sebastien
MoReFEM
Commits
71d7cb71
Commit
71d7cb71
authored
Oct 17, 2019
by
GILLES Sebastien
Browse files
#1292 Rename the third party wrappers from Seldon to Xtensor. Remove some unused functions
parent
4cad8acc
Changes
44
Hide whitespace changes
Inline
Side-by-side
MoReFEM.xcodeproj/project.pbxproj
View file @
71d7cb71
...
...
@@ -819,9 +819,6 @@
BE4D0D8B21A2E4F900E0D4E7 /* TimeManager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE4D0D0F21A2E4F900E0D4E7 /* TimeManager.hpp */; };
BE4D0D8C21A2E4F900E0D4E7 /* TimeManager.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE4D0D1021A2E4F900E0D4E7 /* TimeManager.hxx */; };
BE4D0D8D21A2E4F900E0D4E7 /* TimeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4D0D1121A2E4F900E0D4E7 /* TimeManager.cpp */; };
BE4ED31C1A2CBAC400DE374E /* MatrixOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4ED3191A2CBAC400DE374E /* MatrixOperations.cpp */; };
BE4ED31D1A2CBAC400DE374E /* MatrixOperations.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE4ED31A1A2CBAC400DE374E /* MatrixOperations.hpp */; };
BE4ED31E1A2CBAC400DE374E /* MatrixOperations.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE4ED31B1A2CBAC400DE374E /* MatrixOperations.hxx */; };
BE4F7D481D87DF5F00BDCF1A /* PrintAndAbort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4478701AA70A1300665010 /* PrintAndAbort.cpp */; };
BE501D041A2DC03900B92486 /* MatrixOrVector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE501D031A2DC03900B92486 /* MatrixOrVector.hpp */; };
BE5100061CCE3EB80034FE28 /* PerDegreeOfExactness.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE5100041CCE3EB80034FE28 /* PerDegreeOfExactness.hpp */; };
...
...
@@ -1220,9 +1217,6 @@
BE90E1B91A24929A00CCAFDE /* Print.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE9FE83418CE0A6900177F79 /* Print.hpp */; };
BE90E1BD1A24929A00CCAFDE /* Viewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE9FE83F18CE0A6900177F79 /* Viewer.cpp */; };
BE90E1BE1A24929A00CCAFDE /* Viewer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE9FE84018CE0A6900177F79 /* Viewer.hpp */; };
BE90E1C01A2492AA00CCAFDE /* SeldonFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE9FE84218CE0A6900177F79 /* SeldonFunctions.cpp */; };
BE90E1C11A2492AA00CCAFDE /* SeldonFunctions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BE9FE84318CE0A6900177F79 /* SeldonFunctions.hpp */; };
BE90E1C21A2492AA00CCAFDE /* SeldonFunctions.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BE9FE84418CE0A6900177F79 /* SeldonFunctions.hxx */; };
BE90E1C81A2492AA00CCAFDE /* Mpi.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEC1FC6918C470C500A4EB89 /* Mpi.hpp */; };
BE90E1CA1A2492AA00CCAFDE /* Parmetis.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEC1FC6D18C470C500A4EB89 /* Parmetis.hpp */; };
BE90E1CD1A2492AA00CCAFDE /* PetscMat.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEC1FC7118C470C500A4EB89 /* PetscMat.hpp */; };
...
...
@@ -1477,6 +1471,8 @@
BEE45C112357BBC900E0AB7C /* GradientDisplacementMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 135F21801E7ADBC000B9E633 /* GradientDisplacementMatrix.cpp */; };
BEE45C122357BBD500E0AB7C /* MixedSolidIncompressibility.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 37014786203B0B6700820FA4 /* MixedSolidIncompressibility.hxx */; };
BEE45C132357BBF700E0AB7C /* Helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE8C36A71DB50FB500919468 /* Helper.cpp */; };
BEE45C192358E2C300E0AB7C /* Functions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEE45C162358E2C300E0AB7C /* Functions.hpp */; };
BEE45C1A2358E2C300E0AB7C /* Functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEE45C172358E2C300E0AB7C /* Functions.cpp */; };
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 */; };
...
...
@@ -3704,9 +3700,6 @@
BE4D0D0F21A2E4F900E0D4E7 /* TimeManager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TimeManager.hpp; sourceTree = "<group>"; };
BE4D0D1021A2E4F900E0D4E7 /* TimeManager.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TimeManager.hxx; sourceTree = "<group>"; };
BE4D0D1121A2E4F900E0D4E7 /* TimeManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeManager.cpp; sourceTree = "<group>"; };
BE4ED3191A2CBAC400DE374E /* MatrixOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MatrixOperations.cpp; sourceTree = "<group>"; };
BE4ED31A1A2CBAC400DE374E /* MatrixOperations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MatrixOperations.hpp; sourceTree = "<group>"; };
BE4ED31B1A2CBAC400DE374E /* MatrixOperations.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MatrixOperations.hxx; sourceTree = "<group>"; };
BE4FC35A18F2AE87007B6DED /* QuadratureRuleList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QuadratureRuleList.cpp; sourceTree = "<group>"; };
BE4FC35B18F2AE87007B6DED /* QuadratureRuleList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = QuadratureRuleList.hpp; sourceTree = "<group>"; };
BE501D031A2DC03900B92486 /* MatrixOrVector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MatrixOrVector.hpp; sourceTree = "<group>"; };
...
...
@@ -4293,9 +4286,6 @@
BE9FE83418CE0A6900177F79 /* Print.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Print.hpp; sourceTree = "<group>"; };
BE9FE83F18CE0A6900177F79 /* Viewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Viewer.cpp; sourceTree = "<group>"; };
BE9FE84018CE0A6900177F79 /* Viewer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Viewer.hpp; sourceTree = "<group>"; };
BE9FE84218CE0A6900177F79 /* SeldonFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SeldonFunctions.cpp; sourceTree = "<group>"; };
BE9FE84318CE0A6900177F79 /* SeldonFunctions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SeldonFunctions.hpp; sourceTree = "<group>"; };
BE9FE84418CE0A6900177F79 /* SeldonFunctions.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SeldonFunctions.hxx; sourceTree = "<group>"; };
BEA105E31FD2B6B40064F5E1 /* Instantiations.doxygen */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Instantiations.doxygen; sourceTree = "<group>"; };
BEA197B81DDEFBF800B446C9 /* demo_vectorial_P1.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_vectorial_P1.lua; sourceTree = "<group>"; };
BEA197B91DDEFFA200B446C9 /* demo_scalar_P1.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_scalar_P1.lua; sourceTree = "<group>"; };
...
...
@@ -4647,6 +4637,9 @@
BEE31B931D997302006B1DE7 /* main_ensight_output.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main_ensight_output.cpp; path = RivlinCube/main_ensight_output.cpp; sourceTree = "<group>"; };
BEE3C6D31DB628CF001C34CA /* SnesInterface.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SnesInterface.hpp; path = Snes/SnesInterface.hpp; sourceTree = "<group>"; };
BEE3C6D41DB628CF001C34CA /* SnesInterface.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = SnesInterface.hxx; path = Snes/SnesInterface.hxx; sourceTree = "<group>"; };
BEE45C152358E2C300E0AB7C /* SourceList.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SourceList.cmake; sourceTree = "<group>"; };
BEE45C162358E2C300E0AB7C /* Functions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Functions.hpp; sourceTree = "<group>"; };
BEE45C172358E2C300E0AB7C /* Functions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Functions.cpp; sourceTree = "<group>"; };
BEE5435A1CBAE93600AD52FA /* VariationalFormulation.doxygen */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = VariationalFormulation.doxygen; sourceTree = "<group>"; };
BEE734D51F7550F7001D01A9 /* test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test.cpp; sourceTree = "<group>"; };
BEE79C6A2136F43000388FED /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
...
...
@@ -9270,7 +9263,7 @@
BE9FE81C18CE0A6900177F79 /* Parmetis */,
BE9FE82218CE0A6900177F79 /* Petsc */,
BE8B5F7620778CB100DC005E /* Tclap */,
BE
9FE84118CE0A6900177F79 /* Seldon
*/,
BE
E45C142358E2C300E0AB7C /* Xtensor
*/,
);
path = Wrappers;
sourceTree = "<group>";
...
...
@@ -9355,19 +9348,6 @@
path = Exceptions;
sourceTree = "<group>";
};
BE9FE84118CE0A6900177F79 /* Seldon */ = {
isa = PBXGroup;
children = (
BE9FE84218CE0A6900177F79 /* SeldonFunctions.cpp */,
BE9FE84318CE0A6900177F79 /* SeldonFunctions.hpp */,
BE9FE84418CE0A6900177F79 /* SeldonFunctions.hxx */,
BE4ED3191A2CBAC400DE374E /* MatrixOperations.cpp */,
BE4ED31A1A2CBAC400DE374E /* MatrixOperations.hpp */,
BE4ED31B1A2CBAC400DE374E /* MatrixOperations.hxx */,
);
path = Seldon;
sourceTree = "<group>";
};
BEA05F5A17E2164B0014DAED /* Exceptions */ = {
isa = PBXGroup;
children = (
...
...
@@ -10370,6 +10350,16 @@
name = Snes;
sourceTree = "<group>";
};
BEE45C142358E2C300E0AB7C /* Xtensor */ = {
isa = PBXGroup;
children = (
BEE45C152358E2C300E0AB7C /* SourceList.cmake */,
BEE45C172358E2C300E0AB7C /* Functions.cpp */,
BEE45C162358E2C300E0AB7C /* Functions.hpp */,
);
path = Xtensor;
sourceTree = "<group>";
};
BEE734CF1F75432D001D01A9 /* SendReceive */ = {
isa = PBXGroup;
children = (
...
...
@@ -11346,7 +11336,6 @@
BE90E1951A24929A00CCAFDE /* TimeKeep.hpp in Headers */,
BE53FC331E0D86B900C5D6F5 /* Subtuple.hxx in Headers */,
BEDEB9211C3C073100B1C71B /* Enum.hpp in Headers */,
BE4ED31E1A2CBAC400DE374E /* MatrixOperations.hxx in Headers */,
BE90E1671A24926E00CCAFDE /* Print.hpp in Headers */,
BEDEB9371C3C078A00B1C71B /* InputData.hxx in Headers */,
BE41A8CB1A24AA46004E4312 /* Mpi.hxx in Headers */,
...
...
@@ -11369,12 +11358,10 @@
BE110E911E11512100D2D2C8 /* Datatype.hpp in Headers */,
BEF795E022DDDE430054B192 /* BinaryOrAscii.hpp in Headers */,
BE53FC271E0D81A000C5D6F5 /* Traits.hxx in Headers */,
BE90E1C21A2492AA00CCAFDE /* SeldonFunctions.hxx in Headers */,
BE90E1A81A24929A00CCAFDE /* Parmetis.hpp in Headers */,
BEDE16BA204FFD7900DEFE08 /* Lua.hpp in Headers */,
BE90E1681A24926E00CCAFDE /* PointerComparison.hpp in Headers */,
BE90E1841A24929A00CCAFDE /* InputData.hxx in Headers */,
BE90E1C11A2492AA00CCAFDE /* SeldonFunctions.hpp in Headers */,
BE2CD3701CCFA8790040CA19 /* MatrixInfo.hxx in Headers */,
BEDE16A6204F365600DEFE08 /* LuaOptionFile.hpp in Headers */,
BE3FE9CB22C3D0D70093E95A /* LuaUtilityFunctions.hpp in Headers */,
...
...
@@ -11390,7 +11377,6 @@
BE44C05B1AA463DF0030FA26 /* Pragma.hpp in Headers */,
0A2CBE981D05B87A007262F2 /* Model.hpp in Headers */,
BEF9B616231EA652009A680D /* GetRankDirectory.hpp in Headers */,
BE4ED31D1A2CBAC400DE374E /* MatrixOperations.hpp in Headers */,
BECEF92D22DF5D5E00D0DDE7 /* Now.hpp in Headers */,
BE90E1B11A24929A00CCAFDE /* Vector.hxx in Headers */,
BE353BC822E87E4F00A06A8F /* Pointer.hxx in Headers */,
...
...
@@ -11429,6 +11415,7 @@
BE76F26A1D7D609E0061B50E /* GlobalVectorTemporary.hxx in Headers */,
BE90E1CE1A2492AA00CCAFDE /* PetscSnes.hpp in Headers */,
BE3D12C31D9B1FFB00F900F5 /* SnesConvergenceReason.hpp in Headers */,
BEE45C192358E2C300E0AB7C /* Functions.hpp in Headers */,
BE41A8D21A24AA83004E4312 /* Petsc.hpp in Headers */,
BE110EA21E11514200D2D2C8 /* CheckUpdateGhostManager.hxx in Headers */,
BE3FE9D622C500740093E95A /* HasMember.hpp in Headers */,
...
...
@@ -12770,12 +12757,12 @@
BE90E1631A24926E00CCAFDE /* Factory.cpp in Sources */,
BE90E19E1A24929A00CCAFDE /* Op.cpp in Sources */,
BE2195191DF813290014FE44 /* Libmesh.cpp in Sources */,
BE4ED31C1A2CBAC400DE374E /* MatrixOperations.cpp in Sources */,
BE90E1BD1A24929A00CCAFDE /* Viewer.cpp in Sources */,
BEDE16A7204F365600DEFE08 /* LuaOptionFile.cpp in Sources */,
BE90E1821A24929A00CCAFDE /* InputData.cpp in Sources */,
BE3D12BF1D9B1FFB00F900F5 /* KspConvergenceReason.cpp in Sources */,
BE964C39206E6F4C00B9ED1E /* ExpectedResults_P2P1.cpp in Sources */,
BEE45C1A2358E2C300E0AB7C /* Functions.cpp in Sources */,
BEDEB9221C3C073100B1C71B /* Gmres.cpp in Sources */,
BE41A8C91A24AA46004E4312 /* Mpi.cpp in Sources */,
BE110EA01E11514200D2D2C8 /* CheckUpdateGhostManager.cpp in Sources */,
...
...
@@ -12783,7 +12770,6 @@
BE2CD36E1CCFA8790040CA19 /* MatrixInfo.cpp in Sources */,
BE41A8CD1A24AA46004E4312 /* Mpi.cpp in Sources */,
BE90E17A1A24926E00CCAFDE /* Singleton.cpp in Sources */,
BE90E1C01A2492AA00CCAFDE /* SeldonFunctions.cpp in Sources */,
BE90E1A01A24929A00CCAFDE /* Comm.cpp in Sources */,
BE3FE9C922C3D0D70093E95A /* LuaUtilityFunctions.cpp in Sources */,
BE6E4EE11B2ABE8B0049BB2D /* AccessGhostContent.cpp in Sources */,
Sources/FiniteElement/FiniteElementSpace/FEltSpace.cpp
View file @
71d7cb71
...
...
@@ -12,7 +12,7 @@
*/
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "Core/LinearAlgebra/GlobalVector.hpp"
...
...
Sources/FiniteElement/RefFiniteElement/Advanced/RefFEltInLocalOperator.cpp
View file @
71d7cb71
...
...
@@ -12,8 +12,8 @@
*/
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/Seldon/MatrixOperations.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "FiniteElement/RefFiniteElement/Advanced/RefFEltInLocalOperator.hpp"
...
...
@@ -86,7 +86,7 @@ namespace MoReFEM
const
auto
ref_felt_space_dim
=
static_cast
<
std
::
size_t
>
(
ref_felt
.
GetFEltSpaceDimension
());
#ifndef NDEBUG
// \todo #1292 Wrappers::
Seldon
::AssertBlockRowValidity(full_matrix, row_range);
// \todo #1292 Wrappers::
Xtensor
::AssertBlockRowValidity(full_matrix, row_range);
#endif // NDEBUG
assert
(
ref_felt
.
Nnode
()
==
row_range
.
size
());
...
...
@@ -116,7 +116,7 @@ namespace MoReFEM
const
auto
&
row_range
=
ref_felt
.
GetLocalNodeIndexList
();
#ifndef NDEBUG
// \todo #1292 Wrappers::
Seldon
::AssertBlockValidity(full_vector, row_range);
// \todo #1292 Wrappers::
Xtensor
::AssertBlockValidity(full_vector, row_range);
#endif // NDEBUG
const
auto
Nrow
=
row_range
.
size
();
...
...
Sources/Geometry/GeometricElt/Advanced/FreeFunctions.cpp
View file @
71d7cb71
...
...
@@ -12,7 +12,7 @@
*/
#include "ThirdParty/Wrappers/Seldon/MatrixOperations.hpp"
#include "Utilities/Numeric/Numeric.hpp"
...
...
@@ -128,7 +128,7 @@ namespace MoReFEM
//
// decltype(auto) jacobian = compute_jacobian_helper.Compute(geometric_elt, current_guess);
//
// LocalMatrix inv_jacobian = Wrappers::
Seldon
::ComputeInverseSquareMatrix(jacobian, det);
// LocalMatrix inv_jacobian = Wrappers::
Xtensor
::ComputeInverseSquareMatrix(jacobian, det);
//
// error = 0.;
//
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/Bidomain.cpp
View file @
71d7cb71
...
...
@@ -14,7 +14,7 @@
#include "Utilities/Numeric/Numeric.hpp"
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "OperatorInstances/VariationalOperator/BilinearForm/Local/Bidomain.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/GradOnGradientBasedElasticityTensor.cpp
View file @
71d7cb71
...
...
@@ -12,7 +12,7 @@
*/
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "Parameters/InitParameterFromInputData/InitParameterFromInputData.hpp"
#include "ParameterInstances/GradientBasedElasticityTensor/GradientBasedElasticityTensor.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/GradPhiGradPhi.cpp
View file @
71d7cb71
...
...
@@ -12,7 +12,7 @@
*/
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "OperatorInstances/VariationalOperator/BilinearForm/Local/GradPhiGradPhi.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/GradPhiTauOrthoTauGradPhi.cpp
View file @
71d7cb71
...
...
@@ -13,8 +13,8 @@
#include "Utilities/Numeric/Numeric.hpp"
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/Seldon/MatrixOperations.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "OperatorInstances/VariationalOperator/BilinearForm/Local/GradPhiTauOrthoTauGradPhi.hpp"
...
...
@@ -329,7 +329,7 @@ namespace MoReFEM
double
determinant
=
0
;
Wrappers
::
Seldon
::
ComputeInverseSquareMatrix
(
covariant_metric_tensor
,
contravariant_metric_tensor
,
determinant
);
Wrappers
::
Xtensor
::
ComputeInverseSquareMatrix
(
covariant_metric_tensor
,
contravariant_metric_tensor
,
determinant
);
int
int_Ncomponent
=
static_cast
<
int
>
(
Ncomponent
);
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/GradPhiTauTauGradPhi.cpp
View file @
71d7cb71
...
...
@@ -14,7 +14,7 @@
#include "Utilities/Numeric/Numeric.hpp"
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "OperatorInstances/VariationalOperator/BilinearForm/Local/GradPhiTauTauGradPhi.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/Mass.cpp
View file @
71d7cb71
...
...
@@ -12,7 +12,7 @@
*/
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "OperatorInstances/VariationalOperator/BilinearForm/Local/Mass.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/ScalarDivVectorial.cpp
View file @
71d7cb71
...
...
@@ -12,7 +12,7 @@
*/
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "OperatorInstances/VariationalOperator/BilinearForm/Local/ScalarDivVectorial.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/Stokes.cpp
View file @
71d7cb71
...
...
@@ -12,7 +12,7 @@
*/
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "OperatorInstances/VariationalOperator/BilinearForm/Local/Stokes.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/SurfacicBidomain.cpp
View file @
71d7cb71
...
...
@@ -14,8 +14,8 @@
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/Seldon/MatrixOperations.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "Utilities/Numeric/Numeric.hpp"
...
...
@@ -454,7 +454,7 @@ namespace MoReFEM
double
determinant
=
0
;
Wrappers
::
Seldon
::
ComputeInverseSquareMatrix
(
covariant_metric_tensor
,
contravariant_metric_tensor
,
determinant
);
Wrappers
::
Xtensor
::
ComputeInverseSquareMatrix
(
covariant_metric_tensor
,
contravariant_metric_tensor
,
determinant
);
int
int_Ncomponent
=
static_cast
<
int
>
(
Ncomponent
);
...
...
Sources/OperatorInstances/VariationalOperator/BilinearForm/Local/VariableMass.hpp
View file @
71d7cb71
...
...
@@ -18,7 +18,7 @@
# include <memory>
# include <vector>
# include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
# include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
# include "Parameters/ParameterAtDof.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/NonlinearForm/Local/NonlinearMembrane.cpp
View file @
71d7cb71
...
...
@@ -14,8 +14,8 @@
#include "Utilities/Numeric/Numeric.hpp"
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/Seldon/MatrixOperations.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
#include "OperatorInstances/VariationalOperator/NonlinearForm/Local/NonlinearMembrane.hpp"
...
...
@@ -311,7 +311,7 @@ namespace MoReFEM::Advanced::LocalVariationalOperatorNS
xt
::
noalias
(
covariant_metric_tensor
)
=
xt
::
linalg
::
dot
(
transposed_covariant_basis
,
covariant_basis
);
Wrappers
::
Seldon
::
ComputeInverseSquareMatrix
(
covariant_metric_tensor
,
Wrappers
::
Xtensor
::
ComputeInverseSquareMatrix
(
covariant_metric_tensor
,
contravariant_metric_tensor
,
determinant
);
...
...
Sources/OperatorInstances/VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/HyperelasticityPolicy/Hyperelasticity.hpp
View file @
71d7cb71
...
...
@@ -20,8 +20,7 @@
# include "Utilities/Containers/EnumClass.hpp"
# include "ThirdParty/Wrappers/Seldon/SeldonFunctions.hpp"
# include "ThirdParty/Wrappers/Seldon/MatrixOperations.hpp"
# include "ThirdParty/Wrappers/Xtensor/Functions.hpp"
# include "Parameters/ParameterAtQuadraturePoint.hpp"
# include "ParameterInstances/Compound/Solid/Solid.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/HyperelasticityPolicy/Hyperelasticity.hxx
View file @
71d7cb71
...
...
@@ -109,7 +109,7 @@ namespace MoReFEM
const
auto
&
d2I3dCdC
=
invariant_holder
.
GetSecondDerivativeWrtCauchyGreen
(
invariant_holder_type
::
invariants_second_derivative_index
::
d2I3dCdC
);
{
assert
(
Wrappers
::
Seldon
::
IsZeroMatrix
(
d2W
));
assert
(
Wrappers
::
Xtensor
::
IsZeroMatrix
(
d2W
));
// d2I1dCdC = d2I4dCdC = 0
xt
::
noalias
(
d2W
)
+=
dWdI2
*
d2I2dCdC
;
xt
::
noalias
(
d2W
)
+=
dWdI3
*
d2I3dCdC
;
...
...
@@ -130,7 +130,7 @@ namespace MoReFEM
const
double
d2WdI2dI3
=
law
.
SecondDerivativeWSecondAndThirdInvariant
(
invariant_holder
,
quad_pt
,
geom_elt
);
using
namespace
Wrappers
::
Seldon
;
using
namespace
Wrappers
::
Xtensor
;
auto
&
outer_prod
=
GetNonCstWorkMatrixOuterProduct
();
...
...
@@ -239,7 +239,7 @@ namespace MoReFEM
{
assert
(
Wrappers
::
Seldon
::
IsZeroVector
(
dW
));
assert
(
Wrappers
::
Xtensor
::
IsZeroVector
(
dW
));
xt
::
noalias
(
dW
)
+=
dWdI1
*
dI1dC
;
xt
::
noalias
(
dW
)
+=
dWdI2
*
dI2dC
;
xt
::
noalias
(
dW
)
+=
dWdI3
*
dI3dC
;
...
...
Sources/OperatorInstances/VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/Internal/Helper.hpp
View file @
71d7cb71
...
...
@@ -15,7 +15,7 @@
#ifndef MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_x_HELPER_HPP_
# define MOREFEM_x_OPERATOR_INSTANCES_x_VARIATIONAL_OPERATOR_x_NONLINEAR_FORM_x_LOCAL_x_SECOND_PIOLA_KIRCHHOFF_STRESS_TENSOR_x_INTERNAL_x_HELPER_HPP_
# include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
# include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
# include "Core/Enum.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/InternalVariablePolicy/AnalyticalPrestress.hpp
View file @
71d7cb71
...
...
@@ -22,7 +22,7 @@
# include "Utilities/Numeric/Numeric.hpp"
# include "Utilities/LinearAlgebra/Storage/Local/LocalVectorStorage.hpp"
#include "ThirdParty/Wrappers/
Seldon/Seldon
Functions.hpp"
#include "ThirdParty/Wrappers/
Xtensor/
Functions.hpp"
# include "Core/TimeManager/TimeManager.hpp"
...
...
Sources/OperatorInstances/VariationalOperator/NonlinearForm/Local/SecondPiolaKirchhoffStressTensor/ViscoelasticityPolicy/Viscoelasticity.hpp
View file @
71d7cb71
...
...
@@ -22,8 +22,7 @@
# include "Utilities/Numeric/Numeric.hpp"
# include "Utilities/LinearAlgebra/Storage/Local/LocalVectorStorage.hpp"
# include "ThirdParty/Wrappers/Seldon/MatrixOperations.hpp"
# include "ThirdParty/Wrappers/Seldon/SeldonFunctions.hpp"
# include "ThirdParty/Wrappers/Xtensor/Functions.hpp"
# include "Core/TimeManager/TimeManager.hpp"
...
...
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment