Skip to content

[FastPR][Solid] Moving Gauss-Lobatto line to SolidMechanicsApplication #13422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025
Merged

[FastPR][Solid] Moving Gauss-Lobatto line to SolidMechanicsApplication #13422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions kratos/geometries/line_gauss_lobatto_3d_2.h → ...stom_geometries/line_gauss_lobatto_3d_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -831,16 +831,11 @@ class LineGaussLobatto3D2 : public Geometry<TPointType>
static const IntegrationPointsContainerType AllIntegrationPoints()
{
IntegrationPointsContainerType integration_points = {{
Quadrature<LineGaussLobattoIntegrationPoints1, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints2, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints3, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints4, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints5, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints6, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints7, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints8, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints9, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<LineGaussLobattoIntegrationPoints10,1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<SolidMechanicsLineGaussLobattoIntegrationPoints1, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<SolidMechanicsLineGaussLobattoIntegrationPoints2, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<SolidMechanicsLineGaussLobattoIntegrationPoints3, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<SolidMechanicsLineGaussLobattoIntegrationPoints4, 1, IntegrationPoint<3> >::GenerateIntegrationPoints(),
Quadrature<SolidMechanicsLineGaussLobattoIntegrationPoints5, 1, IntegrationPoint<3> >::GenerateIntegrationPoints()
}
};
return integration_points;
Expand Down
60 changes: 29 additions & 31 deletions ...n/line_gauss_lobatto_integration_points.h → ...s_line_gauss_lobatto_integration_points.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -455,7 +454,7 @@ class LineGaussLobattoIntegrationPoints10
}


}; // Class LineGaussLobattoIntegrationPoints10
}; // Class SolidMechanicsLineGaussLobattoIntegrationPoints10


///@}
Expand All @@ -473,6 +472,5 @@ class LineGaussLobattoIntegrationPoints10

} // namespace Kratos.

#endif // KRATOS_LINE_GAUSS_LOBATTO_INTEGRATION_POINTS_H_INCLUDED defined


4 changes: 2 additions & 2 deletions applications/SolidMechanicsApplication/solid_mechanics_application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -321,7 +321,7 @@ KratosSolidMechanicsApplication::KratosSolidMechanicsApplication()
Element::GeometryType::PointsArrayType(3))),
mLargeDisplacementBeamSEMCElement3D2N(
0, Kratos::make_shared< LineGaussLobatto3D2<Node > >(
Element::GeometryType::PointsArrayType(2))),
Element::GeometryType::PointsArrayType(2))),
mGeometricallyExactRodElement3D2N(
0, Kratos::make_shared< Line3D2<Node > >(
Element::GeometryType::PointsArrayType(2))),
Expand Down
Loading