Commit 0ad9cf57 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1189 Rename more properly the new classes.

parent a3eb438d
......@@ -1551,9 +1551,9 @@
BEF2829E1A850E3200857342 /* libGeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE05B4DD16D23573000E248D /* libGeometry.a */; };
BEF2829F1A850E3200857342 /* libUtilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEA8A379177AD4FE009436C9 /* libUtilities.a */; };
BEF282A21A850E3200857342 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC37E0617DDC0210021BFB7 /* Accelerate.framework */; };
BEF3B489212DB18000807965 /* ForUnknown.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEF3B486212DB17F00807965 /* ForUnknown.hpp */; };
BEF3B48A212DB18000807965 /* ForUnknown.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEF3B487212DB17F00807965 /* ForUnknown.hxx */; };
BEF3B48B212DB18000807965 /* ForUnknown.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF3B488212DB17F00807965 /* ForUnknown.cpp */; };
BEF3B489212DB18000807965 /* ForUnknownList.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEF3B486212DB17F00807965 /* ForUnknownList.hpp */; };
BEF3B48A212DB18000807965 /* ForUnknownList.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEF3B487212DB17F00807965 /* ForUnknownList.hxx */; };
BEF3B48B212DB18000807965 /* ForUnknownList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEF3B488212DB17F00807965 /* ForUnknownList.cpp */; };
BEFC32DF1CB53C3B00C8903C /* RefFEltInLocalOperator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEFC32DC1CB53C3B00C8903C /* RefFEltInLocalOperator.cpp */; };
BEFC32E01CB53C3B00C8903C /* RefFEltInLocalOperator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BEFC32DD1CB53C3B00C8903C /* RefFEltInLocalOperator.hpp */; };
BEFC32E11CB53C3B00C8903C /* RefFEltInLocalOperator.hxx in Headers */ = {isa = PBXBuildFile; fileRef = BEFC32DE1CB53C3B00C8903C /* RefFEltInLocalOperator.hxx */; };
......@@ -4862,9 +4862,9 @@
BEF2F0041C995B23005F1095 /* libSeldon.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSeldon.a; path = "../../../../../Users/sebastien/Library/Developer/Xcode/DerivedData/HappyHeart-dqmtrohnwfmlptcdglbypyuhxipw/Build/Products/Debug/libSeldon.a"; sourceTree = "<group>"; };
BEF3B482212D893000807965 /* Optional.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Optional.hpp; sourceTree = "<group>"; };
BEF3B483212D897F00807965 /* Optional.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Optional.hpp; sourceTree = "<group>"; };
BEF3B486212DB17F00807965 /* ForUnknown.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ForUnknown.hpp; sourceTree = "<group>"; };
BEF3B487212DB17F00807965 /* ForUnknown.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ForUnknown.hxx; sourceTree = "<group>"; };
BEF3B488212DB17F00807965 /* ForUnknown.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ForUnknown.cpp; sourceTree = "<group>"; };
BEF3B486212DB17F00807965 /* ForUnknownList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ForUnknownList.hpp; sourceTree = "<group>"; };
BEF3B487212DB17F00807965 /* ForUnknownList.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ForUnknownList.hxx; sourceTree = "<group>"; };
BEF3B488212DB17F00807965 /* ForUnknownList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ForUnknownList.cpp; sourceTree = "<group>"; };
BEF553162083963E00CA8A50 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BEF5531A2084C47C00CA8A50 /* test.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = test.cpp; sourceTree = "<group>"; };
BEF9835B180451CF00E7905D /* Factory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Factory.cpp; sourceTree = "<group>"; };
......@@ -10558,9 +10558,9 @@
BEF3B485212DB17F00807965 /* InformationsAtQuadraturePoint */ = {
isa = PBXGroup;
children = (
BEF3B488212DB17F00807965 /* ForUnknown.cpp */,
BEF3B486212DB17F00807965 /* ForUnknown.hpp */,
BEF3B487212DB17F00807965 /* ForUnknown.hxx */,
BEF3B488212DB17F00807965 /* ForUnknownList.cpp */,
BEF3B486212DB17F00807965 /* ForUnknownList.hpp */,
BEF3B487212DB17F00807965 /* ForUnknownList.hxx */,
);
path = InformationsAtQuadraturePoint;
sourceTree = "<group>";
......@@ -11561,7 +11561,7 @@
BE01DAD71E854DE300F3EAF7 /* InvariantComputation.hpp in Headers */,
BE01DAB91E854DB300F3EAF7 /* GlobalVariationalOperator.hxx in Headers */,
BE01DAF91E854E1200F3EAF7 /* LocalLagrangianInterpolator.hxx in Headers */,
BEF3B48A212DB18000807965 /* ForUnknown.hxx in Headers */,
BEF3B48A212DB18000807965 /* ForUnknownList.hxx in Headers */,
BE01DAC61E854DD600F3EAF7 /* DerivativeGreenLagrange.hpp in Headers */,
BE4521EF1DAFC69D00807035 /* MooneyRivlin.hxx in Headers */,
BE01DAE31E854DF100F3EAF7 /* SubMatrixForNumberingSubsetPair.hpp in Headers */,
......@@ -11570,7 +11570,7 @@
BE01DAE11E854DEC00F3EAF7 /* NumberingSubsetSubMatrix.hxx in Headers */,
BE7A388C1E8D3167009DFFC3 /* GreenLagrangeTensor.hpp in Headers */,
BE01DAC51E854DC600F3EAF7 /* NonlinearLocalVariationalOperator.hxx in Headers */,
BEF3B489212DB18000807965 /* ForUnknown.hpp in Headers */,
BEF3B489212DB18000807965 /* ForUnknownList.hpp in Headers */,
BE01DACA1E854DD600F3EAF7 /* ExtractGradientBasedBlock.hxx in Headers */,
BE01DADA1E854DE300F3EAF7 /* InvariantHolder.hpp in Headers */,
BE01DABB1E854DB300F3EAF7 /* Helper.hxx in Headers */,
......@@ -12834,7 +12834,7 @@
BE01DAED1E854E0100F3EAF7 /* SourceOrTargetData.cpp in Sources */,
BE01DACE1E854DD600F3EAF7 /* InformationsAtQuadraturePoint.cpp in Sources */,
13B511031FCD96980080E6F6 /* DetermineExtendedUnknownList.cpp in Sources */,
BEF3B48B212DB18000807965 /* ForUnknown.cpp in Sources */,
BEF3B48B212DB18000807965 /* ForUnknownList.cpp in Sources */,
BE01DAF21E854E0D00F3EAF7 /* ComputePatternHelper.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -102,12 +102,12 @@ namespace MoReFEM
{
const auto& quad_pt = infos_at_quad_pt.GetQuadraturePoint();
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
assert(increment_local_displacement.size()
== static_cast<std::size_t>(quad_pt_unknown_data.Nnode() * infos_at_quad_pt.GetMeshDimension()));
== static_cast<std::size_t>(quad_pt_unknown_list_data.Nnode() * infos_at_quad_pt.GetMeshDimension()));
Advanced::OperatorNS::ComputeGradientDisplacementMatrix(quad_pt_unknown_data,
Advanced::OperatorNS::ComputeGradientDisplacementMatrix(quad_pt_unknown_list_data,
ref_felt,
increment_local_displacement,
gradient_displacement);
......
......@@ -85,10 +85,10 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& phi = quad_pt_unknown_data.GetFEltPhi();
const auto& phi = quad_pt_unknown_list_data.GetFEltPhi();
const auto& phi_test = test_unknown_data.GetFEltPhi();
const auto& grad_phi_test = test_unknown_data.GetGradientFEltPhi();
......@@ -96,7 +96,7 @@ namespace MoReFEM
decltype(auto) quad_pt = infos_at_quad_pt.GetQuadraturePoint();
const double geometric_factor = quad_pt.GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant();
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant();
const double factor = geometric_factor * GetDensity().GetValue(quad_pt, geom_elt);
......
......@@ -136,14 +136,14 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
// First compute the content of the block matrix.
const auto& quad_pt = infos_at_quad_pt.GetQuadraturePoint();
const double factor = quad_pt.GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant();
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant();
const double factor1 = factor * intracellular_trans_diffusion_tensor.GetValue(quad_pt, geom_elt);
......@@ -153,7 +153,7 @@ namespace MoReFEM
const double factor4 = factor * extracellular_fiber_diffusion_tensor.GetValue(quad_pt, geom_elt);
const auto& grad_felt_phi_for_unknown = quad_pt_unknown_data.GetGradientFEltPhi();
const auto& grad_felt_phi_for_unknown = quad_pt_unknown_list_data.GetGradientFEltPhi();
const auto& dphi = ExtractSubMatrix(grad_felt_phi_for_unknown,
unknown1_ref_felt);
......
......@@ -110,15 +110,15 @@ namespace MoReFEM
{
const auto& quad_pt = infos_at_quad_pt.GetQuadraturePoint();
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& gradient_based_elasticity_tensor =
GetNonCstGradientBasedElasticityTensor().GetValue(quad_pt, geom_elt);
const double factor = quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant() * quad_pt.GetWeight();
const double factor = quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant() * quad_pt.GetWeight();
const LocalMatrix& dphi = quad_pt_unknown_data.GetGradientFEltPhi();
const LocalMatrix& dphi = quad_pt_unknown_list_data.GetGradientFEltPhi();
const auto& dphi_test = test_unknown_data.GetGradientFEltPhi();
......
......@@ -105,14 +105,14 @@ namespace MoReFEM
{
block_matrix.Zero();
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
// First compute the content of the block matrix.
const double factor = infos_at_quad_pt.GetQuadraturePoint().GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant();
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant();
const auto& dphi = ExtractSubMatrix(quad_pt_unknown_data.GetGradientFEltPhi(),
const auto& dphi = ExtractSubMatrix(quad_pt_unknown_list_data.GetGradientFEltPhi(),
ref_felt);
const auto& dphi_test = ExtractSubMatrix(test_unknown_data.GetGradientFEltPhi(),
......
......@@ -139,13 +139,13 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
ComputeContravariantBasis(quad_pt_unknown_data);
ComputeContravariantBasis(quad_pt_unknown_list_data);
const double factor = infos_at_quad_pt.GetQuadraturePoint().GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant();
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant();
const auto& quad_pt = infos_at_quad_pt.GetQuadraturePoint();
......@@ -153,7 +153,7 @@ namespace MoReFEM
const double factor2 = factor * fiber_diffusion_tensor.GetValue(quad_pt, geom_elt);
const auto& dphi = ExtractSubMatrix(quad_pt_unknown_data.GetGradientRefFEltPhi(),
const auto& dphi = ExtractSubMatrix(quad_pt_unknown_list_data.GetGradientRefFEltPhi(),
ref_felt);
const auto& dphi_test = ExtractSubMatrix(test_unknown_data.GetGradientRefFEltPhi(),
......@@ -252,7 +252,7 @@ namespace MoReFEM
void GradPhiTauOrthoTauGradPhi
::ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::AtQuadPointNS::ForUnknown& quad_pt_unknown_data)
::ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data)
{
auto& elementary_data = GetNonCstElementaryData();
......@@ -272,9 +272,9 @@ namespace MoReFEM
const auto& geom_elt = elementary_data.GetCurrentGeomElt();
const auto& dphi_geo = quad_pt_unknown_data.GetGradientRefGeometricPhi();
const auto& dphi_geo = quad_pt_unknown_list_data.GetGradientRefGeometricPhi();
const auto mesh_dimension = quad_pt_unknown_data.GetMeshDimension();
const auto mesh_dimension = quad_pt_unknown_list_data.GetMeshDimension();
const unsigned int Ncomponent = geom_elt.GetDimension();
const int int_mesh_dimension = static_cast<int>(mesh_dimension);
......
......@@ -125,9 +125,9 @@ namespace MoReFEM
/*!
* \brief Compute contravariant basis.
*
* \copydoc doxygen_hide_quad_pt_unknown_data_arg
* \copydoc doxygen_hide_quad_pt_unknown_list_data_arg
*/
void ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::AtQuadPointNS::ForUnknown& quad_pt_unknown_data);
void ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data);
private:
......
......@@ -112,19 +112,19 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& quad_pt = infos_at_quad_pt.GetQuadraturePoint();
// First compute the content of the block matrix.
const double factor = quad_pt.GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant();
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant();
const double factor1 = factor * transverse_diffusion_tensor.GetValue(quad_pt, geom_elt);
const double factor2 = factor * fiber_diffusion_tensor.GetValue(quad_pt, geom_elt);
const auto& dphi = ExtractSubMatrix(quad_pt_unknown_data.GetGradientFEltPhi(),
const auto& dphi = ExtractSubMatrix(quad_pt_unknown_list_data.GetGradientFEltPhi(),
ref_felt);
const auto& dphi_test = ExtractSubMatrix(test_unknown_data.GetGradientFEltPhi(),
......
......@@ -111,11 +111,11 @@ namespace MoReFEM
{
decltype(auto) quad_pt = infos_at_quad_pt.GetQuadraturePoint();
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& felt_phi = quad_pt_unknown_data.GetFEltPhi(); // on (v p)
const auto& gradient_felt_phi = quad_pt_unknown_data.GetGradientFEltPhi(); // on (v p)
const auto& felt_phi = quad_pt_unknown_list_data.GetFEltPhi(); // on (v p)
const auto& gradient_felt_phi = quad_pt_unknown_list_data.GetGradientFEltPhi(); // on (v p)
const auto& test_felt_phi = test_unknown_data.GetFEltPhi(); // on (v* p*)
const auto& test_gradient_felt_phi = test_unknown_data.GetGradientFEltPhi(); // on (v* p*)
......@@ -134,7 +134,7 @@ namespace MoReFEM
// vectorial_test_ref_felt); // only on v*
const double factor = quad_pt.GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant();
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant();
// Part in (v* p)
......
......@@ -127,22 +127,22 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& quad_pt = infos_at_quad_pt.GetQuadraturePoint();
const double factor = quad_pt.GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant()
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant()
* fluid_viscosity.GetValue(quad_pt, geom_elt);
// First the scalar div vectorial contribution, which should yield a result similar to operator
// ScalarDivVectorial.
{
const auto& felt_phi = quad_pt_unknown_data.GetFEltPhi();
const auto& felt_phi = quad_pt_unknown_list_data.GetFEltPhi();
const auto& test_felt_phi = test_unknown_data.GetFEltPhi();
const auto& gradient_felt_phi = quad_pt_unknown_data.GetGradientFEltPhi();
const auto& gradient_felt_phi = quad_pt_unknown_list_data.GetGradientFEltPhi();
const auto& test_gradient_felt_phi = test_unknown_data.GetGradientFEltPhi();
// Part in (v*, p)
......@@ -188,7 +188,7 @@ namespace MoReFEM
// Then here we perform grad-grad operator on the velocity-velocity block.
{
const auto& dphi_velocity = ExtractSubMatrix(quad_pt_unknown_data.GetGradientFEltPhi(),
const auto& dphi_velocity = ExtractSubMatrix(quad_pt_unknown_list_data.GetGradientFEltPhi(),
vectorial_ref_felt);
const auto& dphi_test_velocity = ExtractSubMatrix(test_unknown_data.GetGradientFEltPhi(),
......
......@@ -177,15 +177,15 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& quad_pt = infos_at_quad_pt.GetQuadraturePoint();
ComputeContravariantBasis(quad_pt_unknown_data);
ComputeContravariantBasis(quad_pt_unknown_list_data);
const double factor = quad_pt.GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant();
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant();
const double factor1 = factor * intracellular_trans_diffusion_tensor.GetValue(quad_pt, geom_elt);
......@@ -197,7 +197,7 @@ namespace MoReFEM
const double heterogeneous_conductivity_coefficient_at_quad = heterogeneous_conductivity_coefficient.GetValue(quad_pt, geom_elt);
const auto& grad_felt_phi_for_unknown = quad_pt_unknown_data.GetGradientRefFEltPhi();
const auto& grad_felt_phi_for_unknown = quad_pt_unknown_list_data.GetGradientRefFEltPhi();
const auto& dphi = ExtractSubMatrix(grad_felt_phi_for_unknown,
unknown1_ref_felt);
......@@ -405,11 +405,11 @@ namespace MoReFEM
void SurfacicBidomain
::ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::AtQuadPointNS::ForUnknown& quad_pt_unknown_data)
::ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data)
{
auto& elementary_data = GetNonCstElementaryData();
const auto mesh_dimension = quad_pt_unknown_data.GetMeshDimension();
const auto mesh_dimension = quad_pt_unknown_list_data.GetMeshDimension();
auto& covariant_basis = GetLocalMatrix<EnumUnderlyingType(LocalMatrixIndex::covariant_basis)>();
auto& transposed_covariant_basis = GetLocalMatrix<EnumUnderlyingType(LocalMatrixIndex::transposed_covariant_basis)>();
......@@ -427,7 +427,7 @@ namespace MoReFEM
const auto& geom_elt = elementary_data.GetCurrentGeomElt();
const auto& dphi_geo = quad_pt_unknown_data.GetGradientRefGeometricPhi();
const auto& dphi_geo = quad_pt_unknown_list_data.GetGradientRefGeometricPhi();
const unsigned int Ncomponent = geom_elt.GetDimension();
......
......@@ -131,9 +131,9 @@ namespace MoReFEM
/*!
* \brief Compute contravariant basis.
*
* \copydoc doxygen_hide_quad_pt_unknown_data_arg
* \copydoc doxygen_hide_quad_pt_unknown_list_data_arg
*/
void ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::AtQuadPointNS::ForUnknown& quad_pt_unknown_data);
void ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data);
private:
......
......@@ -72,19 +72,19 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& phi_unknown = quad_pt_unknown_data.GetRefFEltPhi();
const auto& phi_unknown = quad_pt_unknown_list_data.GetRefFEltPhi();
const auto& phi_test_unknown = test_unknown_data.GetRefFEltPhi();
const auto& quad_pt = infos_at_quad_pt.GetQuadraturePoint();
const double factor = quad_pt.GetWeight()
* quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant()
* quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant()
* parameter_factor.GetValue(quad_pt, geom_elt);
assert(NumericNS::AreEqual(quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant(),
assert(NumericNS::AreEqual(quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant(),
test_unknown_data.GetAbsoluteValueJacobianDeterminant()));
for (int m = 0; m < Nnode_for_test_unknown; ++m)
......
......@@ -75,11 +75,11 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& phi_test = test_unknown_data.GetRefFEltPhi();
const auto& phi = quad_pt_unknown_data.GetRefFEltPhi();
const auto& phi = quad_pt_unknown_list_data.GetRefFEltPhi();
const auto& quad_pt = test_unknown_data.GetQuadraturePoint();
......
......@@ -140,10 +140,10 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& dphi = quad_pt_unknown_data.GetGradientRefFEltPhi();
const auto& dphi = quad_pt_unknown_list_data.GetGradientRefFEltPhi();
const auto& phi_test = test_unknown_data.GetRefFEltPhi();
......
......@@ -137,10 +137,10 @@ namespace MoReFEM
for (const auto& infos_at_quad_pt : infos_at_quad_pt_list)
{
decltype(auto) quad_pt_unknown_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) quad_pt_unknown_list_data = infos_at_quad_pt.GetUnknownData();
decltype(auto) test_unknown_data = infos_at_quad_pt.GetTestUnknownData();
const auto& dphi = quad_pt_unknown_data.GetGradientRefFEltPhi();
const auto& dphi = quad_pt_unknown_list_data.GetGradientRefFEltPhi();
double determinant;
......@@ -150,15 +150,15 @@ namespace MoReFEM
const double poisson_ratio_value = poisson_ratio.GetValue(quad_pt, geom_elt);
const double thickness_value = thickness.GetValue(quad_pt, geom_elt);
ComputeContravariantBasis(quad_pt_unknown_data, determinant);
ComputeDisplacementGradient(quad_pt_unknown_data);
ComputeContravariantBasis(quad_pt_unknown_list_data, determinant);
ComputeDisplacementGradient(quad_pt_unknown_list_data);
ComputeGreenLagrange();
ComputeTangentTensor(youngs_modulus_value, poisson_ratio_value);
ComputeSecondPiolaKirchhoff();
ComputeDe();
ComputeTangentMatrixAndRightHandSide();
const auto weight_meas = quad_pt.GetWeight() * std::sqrt(determinant) * thickness_value; // * quad_pt_unknown_data.GetAbsoluteValueJacobianDeterminant();
const auto weight_meas = quad_pt.GetWeight() * std::sqrt(determinant) * thickness_value; // * quad_pt_unknown_list_data.GetAbsoluteValueJacobianDeterminant();
const auto& grad_felt_phi_test = test_unknown_data.GetGradientRefFEltPhi();
......@@ -264,7 +264,7 @@ namespace MoReFEM
void NonlinearMembrane
::ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::AtQuadPointNS::ForUnknown& quad_pt_unknown_data,
::ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data,
double& determinant)
{
auto& elementary_data = GetNonCstElementaryData();
......@@ -273,7 +273,7 @@ namespace MoReFEM
covariant_basis.Zero();
const auto& geom_elt = elementary_data.GetCurrentGeomElt();
const auto& dphi_geo = quad_pt_unknown_data.GetGradientRefGeometricPhi();
const auto& dphi_geo = quad_pt_unknown_list_data.GetGradientRefGeometricPhi();
constexpr auto Nsurface_comp = 2;
constexpr auto euclidean_dimension = 3;
......@@ -320,14 +320,14 @@ namespace MoReFEM
void NonlinearMembrane
::ComputeDisplacementGradient(const Advanced::LocalVariationalOperatorNS::AtQuadPointNS::ForUnknown& quad_pt_unknown_data)
::ComputeDisplacementGradient(const Advanced::LocalVariationalOperatorNS::InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data)
{
auto& displacement_gradient = GetLocalMatrix<EnumUnderlyingType(LocalMatrixIndex::displacement_gradient)>();
displacement_gradient.Zero();
auto& local_displacement = GetFormerLocalDisplacement();
const auto& dphi_geo = quad_pt_unknown_data.GetGradientRefGeometricPhi();
const auto& dphi_geo = quad_pt_unknown_list_data.GetGradientRefGeometricPhi();
constexpr auto Nsurface_comp = 2ul;
constexpr auto euclidean_dimension = 3ul;
......
......@@ -137,20 +137,20 @@ namespace MoReFEM
/*!
* \brief Compute contravariant basis.
*
* \copydoc doxygen_hide_quad_pt_unknown_data_arg
* \copydoc doxygen_hide_quad_pt_unknown_list_data_arg
* \param[out] determinant Determinant of the covariant metric tensor.
*
*/
void ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::AtQuadPointNS::ForUnknown& quad_pt_unknown_data,
void ComputeContravariantBasis(const Advanced::LocalVariationalOperatorNS::InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data,
double& determinant);
/*!
* \brief Compute displacement gradient.
*
* \copydoc doxygen_hide_quad_pt_unknown_data_arg
* \copydoc doxygen_hide_quad_pt_unknown_list_data_arg
*
*/
void ComputeDisplacementGradient(const Advanced::LocalVariationalOperatorNS::AtQuadPointNS::ForUnknown& quad_pt_unknown_data);
void ComputeDisplacementGradient(const Advanced::LocalVariationalOperatorNS::InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data);
/*!
* \brief Compute Green-Lagrange.
......
......@@ -238,7 +238,7 @@ namespace MoReFEM
* \brief Compute the derivates of W.
*
* \copydoc doxygen_hide_dW_d2W_derivates_arg
* \copydoc doxygen_hide_quad_pt_unknown_data_arg
* \copydoc doxygen_hide_quad_pt_unknown_list_data_arg
* Test unknowns aren't considered at this point.
* \param[in] ref_felt Reference finite element considered.
* \param[in] geom_elt \a GeometricElt for which the computation takes place.
......@@ -246,7 +246,7 @@ namespace MoReFEM
* \copydoc doxygen_hide_de_and_transpose_arg
*/
template<unsigned int DimensionT>
void ComputeWDerivates(const AtQuadPointNS::ForUnknown& quad_pt_unknown_data,
void ComputeWDerivates(const InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data,
const GeometricElt& geom_elt,
const Advanced::RefFEltInLocalOperator& ref_felt,
const LocalMatrix& gradient_displacement,
......@@ -258,14 +258,14 @@ namespace MoReFEM
/*!
* \brief Compute internal data such as invariants, De, Cauchy-Green tensor for current quadrature point.
*
* \copydoc doxygen_hide_quad_pt_unknown_data_arg
* \copydoc doxygen_hide_quad_pt_unknown_list_data_arg
* \param[in] mesh_dimension Dimension of the mesh.
* \param[in] local_displacement Local displacement in observed within the finite element at previous time
* iteration.
* \param[in] ref_felt Reference finite element considered.
* \param[in] geom_elt \a GeometricElt for which the computation takes place.
*/
void PrepareInternalDataForQuadraturePoint(const AtQuadPointNS::ForUnknown& quad_pt_unknown_data,
void PrepareInternalDataForQuadraturePoint(const InfosAtQuadPointNS::ForUnknownList& quad_pt_unknown_list_data,
const GeometricElt& geom_elt,
const Advanced::RefFEltInLocalOperator& ref_felt,
const std::vector<double>& local_displacement,
......@@ -281,7 +281,7 @@ namespace MoReFEM
*
* \tparam MeshDimensionT Dimension of the mesh.
*