diff --git a/kratos/geometries/line_gauss_lobatto_3d_2.h b/applications/SolidMechanicsApplication/custom_geometries/line_gauss_lobatto_3d_2.h similarity index 96% rename from kratos/geometries/line_gauss_lobatto_3d_2.h rename to applications/SolidMechanicsApplication/custom_geometries/line_gauss_lobatto_3d_2.h index 38516f07ddc3..c4e17ea3271e 100644 --- a/kratos/geometries/line_gauss_lobatto_3d_2.h +++ b/applications/SolidMechanicsApplication/custom_geometries/line_gauss_lobatto_3d_2.h @@ -23,7 +23,7 @@ // Project includes #include "geometries/geometry.h" -#include "integration/line_gauss_lobatto_integration_points.h" +#include "custom_integration/solid_mechanics_line_gauss_lobatto_integration_points.h" namespace Kratos @@ -831,16 +831,11 @@ class LineGaussLobatto3D2 : public Geometry static const IntegrationPointsContainerType AllIntegrationPoints() { IntegrationPointsContainerType integration_points = {{ - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), - Quadrature >::GenerateIntegrationPoints(), + Quadrature >::GenerateIntegrationPoints(), + Quadrature >::GenerateIntegrationPoints(), + Quadrature >::GenerateIntegrationPoints(), + Quadrature >::GenerateIntegrationPoints(), + Quadrature >::GenerateIntegrationPoints() } }; return integration_points; diff --git a/kratos/integration/line_gauss_lobatto_integration_points.h b/applications/SolidMechanicsApplication/custom_integration/solid_mechanics_line_gauss_lobatto_integration_points.h similarity index 85% rename from kratos/integration/line_gauss_lobatto_integration_points.h rename to applications/SolidMechanicsApplication/custom_integration/solid_mechanics_line_gauss_lobatto_integration_points.h index c092bb6d5294..6f3e8ce40d27 100644 --- a/kratos/integration/line_gauss_lobatto_integration_points.h +++ b/applications/SolidMechanicsApplication/custom_integration/solid_mechanics_line_gauss_lobatto_integration_points.h @@ -12,8 +12,7 @@ // -#if !defined(KRATOS_LINE_GAUSS_LOBATTO_INTEGRATION_POINTS_H_INCLUDED ) -#define KRATOS_LINE_GAUSS_LOBATTO_INTEGRATION_POINTS_H_INCLUDED +#pragma once // System includes @@ -26,10 +25,10 @@ namespace Kratos { -class LineGaussLobattoIntegrationPoints1 +class SolidMechanicsLineGaussLobattoIntegrationPoints1 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints1); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints1); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -64,10 +63,10 @@ class LineGaussLobattoIntegrationPoints1 }; -class LineGaussLobattoIntegrationPoints2 +class SolidMechanicsLineGaussLobattoIntegrationPoints2 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints2); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints2); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -103,10 +102,10 @@ class LineGaussLobattoIntegrationPoints2 }; -class LineGaussLobattoIntegrationPoints3 +class SolidMechanicsLineGaussLobattoIntegrationPoints3 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints3); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints3); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -140,14 +139,14 @@ class LineGaussLobattoIntegrationPoints3 } -}; // Class LineGaussLobattoIntegrationPoints3 +}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints3 -class LineGaussLobattoIntegrationPoints4 +class SolidMechanicsLineGaussLobattoIntegrationPoints4 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints4); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints4); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -182,14 +181,14 @@ class LineGaussLobattoIntegrationPoints4 } -}; // Class LineGaussLobattoIntegrationPoints4 +}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints4 -class LineGaussLobattoIntegrationPoints5 +class SolidMechanicsLineGaussLobattoIntegrationPoints5 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints5); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints5); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -225,14 +224,14 @@ class LineGaussLobattoIntegrationPoints5 } -}; // Class LineGaussLobattoIntegrationPoints5 +}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints5 -class LineGaussLobattoIntegrationPoints6 +class SolidMechanicsLineGaussLobattoIntegrationPoints6 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints6); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints6); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -269,14 +268,14 @@ class LineGaussLobattoIntegrationPoints6 } -}; // Class LineGaussLobattoIntegrationPoints6 +}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints6 -class LineGaussLobattoIntegrationPoints7 +class SolidMechanicsLineGaussLobattoIntegrationPoints7 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints7); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints7); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -314,14 +313,14 @@ class LineGaussLobattoIntegrationPoints7 } -}; // Class LineGaussLobattoIntegrationPoints7 +}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints7 -class LineGaussLobattoIntegrationPoints8 +class SolidMechanicsLineGaussLobattoIntegrationPoints8 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints8); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints8); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -360,14 +359,14 @@ class LineGaussLobattoIntegrationPoints8 } -}; // Class LineGaussLobattoIntegrationPoints8 +}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints8 -class LineGaussLobattoIntegrationPoints9 +class SolidMechanicsLineGaussLobattoIntegrationPoints9 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints9); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints9); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -407,14 +406,14 @@ class LineGaussLobattoIntegrationPoints9 } -}; // Class LineGaussLobattoIntegrationPoints9 +}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints9 -class LineGaussLobattoIntegrationPoints10 +class SolidMechanicsLineGaussLobattoIntegrationPoints10 { public: - KRATOS_CLASS_POINTER_DEFINITION(LineGaussLobattoIntegrationPoints10); + KRATOS_CLASS_POINTER_DEFINITION(SolidMechanicsLineGaussLobattoIntegrationPoints10); typedef std::size_t SizeType; static const unsigned int Dimension = 1; @@ -455,7 +454,7 @@ class LineGaussLobattoIntegrationPoints10 } -}; // Class LineGaussLobattoIntegrationPoints10 +}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints10 ///@} @@ -473,6 +472,5 @@ class LineGaussLobattoIntegrationPoints10 } // namespace Kratos. -#endif // KRATOS_LINE_GAUSS_LOBATTO_INTEGRATION_POINTS_H_INCLUDED defined diff --git a/applications/SolidMechanicsApplication/solid_mechanics_application.cpp b/applications/SolidMechanicsApplication/solid_mechanics_application.cpp index 0df89680673b..00c234c6d747 100644 --- a/applications/SolidMechanicsApplication/solid_mechanics_application.cpp +++ b/applications/SolidMechanicsApplication/solid_mechanics_application.cpp @@ -38,7 +38,7 @@ #include "geometries/line_2d_2.h" #include "geometries/line_3d_2.h" #include "geometries/line_3d_3.h" -#include "geometries/line_gauss_lobatto_3d_2.h" +#include "custom_geometries/line_gauss_lobatto_3d_2.h" #include "geometries/point_2d.h" #include "geometries/point_3d.h" @@ -321,7 +321,7 @@ KratosSolidMechanicsApplication::KratosSolidMechanicsApplication() Element::GeometryType::PointsArrayType(3))), mLargeDisplacementBeamSEMCElement3D2N( 0, Kratos::make_shared< LineGaussLobatto3D2 >( - Element::GeometryType::PointsArrayType(2))), + Element::GeometryType::PointsArrayType(2))), mGeometricallyExactRodElement3D2N( 0, Kratos::make_shared< Line3D2 >( Element::GeometryType::PointsArrayType(2))),