Commit 15787a3b authored by GILLES Sebastien's avatar GILLES Sebastien

#1520 Refactoring the GlobalCoordsQuadPt test (still in progress)

parent 0365ad3d
......@@ -4372,6 +4372,22 @@
BEA290AC240E8D9C00CC9594 /* used-but-marked-unused.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = "used-but-marked-unused.hpp"; sourceTree = "<group>"; };
BEA3248617A7E5BA00ADEB73 /* Exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Exception.cpp; sourceTree = "<group>"; };
BEA3248717A7E5BA00ADEB73 /* Exception.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Exception.hpp; sourceTree = "<group>"; };
BEA348F624A4BD4C00BF1CDE /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BEA348F824A4BD4C00BF1CDE /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
BEA348F924A4BD4C00BF1CDE /* main_2D_quad.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main_2D_quad.cpp; sourceTree = "<group>"; };
BEA348FA24A4BD4C00BF1CDE /* demo_3D_tetra.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_3D_tetra.lua; sourceTree = "<group>"; };
BEA348FB24A4BD4C00BF1CDE /* main_3D_hexa.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main_3D_hexa.cpp; sourceTree = "<group>"; };
BEA348FC24A4BD4C00BF1CDE /* Model.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Model.hpp; sourceTree = "<group>"; };
BEA348FD24A4BD4C00BF1CDE /* InputData.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = InputData.hpp; sourceTree = "<group>"; };
BEA348FE24A4BD4C00BF1CDE /* Model.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Model.hxx; sourceTree = "<group>"; };
BEA348FF24A4BD4C00BF1CDE /* main_2D_triangle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main_2D_triangle.cpp; sourceTree = "<group>"; };
BEA3490024A4BD4C00BF1CDE /* main_3D_tetra.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main_3D_tetra.cpp; sourceTree = "<group>"; };
BEA3490124A4BD4C00BF1CDE /* Model.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Model.cpp; sourceTree = "<group>"; };
BEA3490224A4BD4C00BF1CDE /* demo_2D_triangle.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_2D_triangle.lua; sourceTree = "<group>"; };
BEA3490324A4BD4C00BF1CDE /* demo_2D_quad.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_2D_quad.lua; sourceTree = "<group>"; };
BEA3490424A4BD4C00BF1CDE /* demo_3D_hexa.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_3D_hexa.lua; sourceTree = "<group>"; };
BEA3490524A4BD4C00BF1CDE /* main_1D.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main_1D.cpp; sourceTree = "<group>"; };
BEA3490624A4BD4C00BF1CDE /* demo_1D_edge.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_1D_edge.lua; sourceTree = "<group>"; };
BEA355D617D0971500FB643B /* LuaFunction.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = LuaFunction.hpp; sourceTree = "<group>"; };
BEA355D717D0971500FB643B /* LuaFunction.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = LuaFunction.hxx; sourceTree = "<group>"; };
BEA4AF0F246059D200669BBB /* WritePrepartitionedData.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WritePrepartitionedData.cpp; sourceTree = "<group>"; };
......@@ -7933,6 +7949,7 @@
BE5A4E201B677B23006822DD /* ConformProjector */,
BEC77E951DDDC34800F8B444 /* NonConformInterpolator */,
BE7C942A1F5FE614003D2C52 /* TestFunctions */,
BEA348F524A4BD4C00BF1CDE /* ParameterOperator */,
BEBFCE9D205919640033C4C1 /* VariationalInstances */,
);
path = Operators;
......@@ -9551,6 +9568,37 @@
path = Sources/ModelInstances;
sourceTree = "<group>";
};
BEA348F524A4BD4C00BF1CDE /* ParameterOperator */ = {
isa = PBXGroup;
children = (
BEA348F624A4BD4C00BF1CDE /* CMakeLists.txt */,
BEA348F724A4BD4C00BF1CDE /* GlobalCoordsQuadPts */,
);
path = ParameterOperator;
sourceTree = "<group>";
};
BEA348F724A4BD4C00BF1CDE /* GlobalCoordsQuadPts */ = {
isa = PBXGroup;
children = (
BEA348F824A4BD4C00BF1CDE /* CMakeLists.txt */,
BEA348FD24A4BD4C00BF1CDE /* InputData.hpp */,
BEA3490124A4BD4C00BF1CDE /* Model.cpp */,
BEA348FC24A4BD4C00BF1CDE /* Model.hpp */,
BEA348FE24A4BD4C00BF1CDE /* Model.hxx */,
BEA3490524A4BD4C00BF1CDE /* main_1D.cpp */,
BEA348F924A4BD4C00BF1CDE /* main_2D_quad.cpp */,
BEA348FF24A4BD4C00BF1CDE /* main_2D_triangle.cpp */,
BEA348FB24A4BD4C00BF1CDE /* main_3D_hexa.cpp */,
BEA3490024A4BD4C00BF1CDE /* main_3D_tetra.cpp */,
BEA348FA24A4BD4C00BF1CDE /* demo_3D_tetra.lua */,
BEA3490224A4BD4C00BF1CDE /* demo_2D_triangle.lua */,
BEA3490324A4BD4C00BF1CDE /* demo_2D_quad.lua */,
BEA3490424A4BD4C00BF1CDE /* demo_3D_hexa.lua */,
BEA3490624A4BD4C00BF1CDE /* demo_1D_edge.lua */,
);
path = GlobalCoordsQuadPts;
sourceTree = "<group>";
};
BEA4FC4118214D62002B2EA1 /* FormulationSolver */ = {
isa = PBXGroup;
children = (
......@@ -88,10 +88,10 @@ namespace MoReFEM::TestNS::GlobalCoordsQuadPt
/*!
* \brief Initialise the problem.
*
* This initialisation includes the resolution of the static problem.
*/
* \brief Initialise the problem.
*
* This initialisation includes the resolution of the static problem.
*/
void SupplInitialize();
......@@ -99,90 +99,66 @@ namespace MoReFEM::TestNS::GlobalCoordsQuadPt
void Forward();
/*!
* \brief Additional operations to finalize a dynamic step.
*
* Base class already update the time for next time iterations.
*/
* \brief Additional operations to finalize a dynamic step.
*
* Base class already update the time for next time iterations.
*/
void SupplFinalizeStep();
/*!
* \brief Initialise a dynamic step.
*
*/
* \brief Initialise a dynamic step.
*
*/
void SupplFinalize();
public:
/*!
* \brief Checks that the global coordinates for low order quadrature are the expected ones.
*
*/
* \brief Checks that the global coordinates for low order quadrature are the expected ones.
*
*/
void CheckLowOrderQuadrature() const;
/*!
* \brief Checks that the global coordinates for "medium" order quadrature are the expected ones.
*
*/
* \brief Checks that the global coordinates for "medium" order quadrature are the expected ones.
*
*/
void CheckMediumOrderQuadrature() const;
/*!
* \brief Checks that the global coordinates for high order quadrature are the expected ones.
*
*/
* \brief Checks that the global coordinates for high order quadrature are the expected ones.
*
*/
void CheckHighOrderQuadrature() const;
private:
/*!
* \brief Checks that the global coordinates for the quadrature given as argument are the expected ones.
*
* \param[in] quadrature_rule_per_topology \a QuadratureRule fow which the check is done for each topology.
*/
void CheckQuadrature(const QuadratureRulePerTopology* const quadrature_rule_per_topology,
std::string_view quadrature_order) const;
//! \copydoc doxygen_hide_model_SupplHasFinishedConditions_always_true
bool SupplHasFinishedConditions() const;
/*!
* \brief Part of InitializedStep() specific to Elastic model.
*
* As there are none, the body of this method is empty.
*/
* \brief Part of InitializedStep() specific to Elastic model.
*
* As there are none, the body of this method is empty.
*/
void SupplInitializeStep();
///@}
private:
//! Quadrature rule topology used for low degree integration.
QuadratureRulePerTopology::const_unique_ptr quadrature_rule_per_topology_low_degree_ = nullptr;
//! Quadrature rule topology used for "medium" degree integration.
QuadratureRulePerTopology::const_unique_ptr quadrature_rule_per_topology_medium_degree_ = nullptr;
//! Quadrature rule topology used for high degree integration.
QuadratureRulePerTopology::const_unique_ptr quadrature_rule_per_topology_high_degree_ = nullptr;
private:
//! Operator used to compute the global coordinates of the quadrature points.
GlobalParameterOperatorNS::GlobalCoordsQuadPoints::const_unique_ptr write_at_quad_pt_operator_low_degree_ = nullptr;
//! Parameter which will be updated by the operator to hold the global coordinates of the quadrature points.
ParameterAtQuadraturePoint<ParameterNS::Type::vector>::unique_ptr global_coords_quad_pt_low_degree_ = nullptr;
//! Operator used to compute the global coordinates of the quadrature points.
GlobalParameterOperatorNS::GlobalCoordsQuadPoints::const_unique_ptr write_at_quad_pt_operator_medium_degree_ = nullptr;
//! Parameter which will be updated by the operator to hold the global coordinates of the quadrature points.
ParameterAtQuadraturePoint<ParameterNS::Type::vector>::unique_ptr global_coords_quad_pt_medium_degree_ = nullptr;
//! Operator used to compute the global coordinates of the quadrature points.
GlobalParameterOperatorNS::GlobalCoordsQuadPoints::const_unique_ptr write_at_quad_pt_operator_high_degree_ = nullptr;
//! Parameter which will be updated by the operator to hold the global coordinates of the quadrature points.
ParameterAtQuadraturePoint<ParameterNS::Type::vector>::unique_ptr global_coords_quad_pt_high_degree_ = nullptr;
};
......
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