diff --git a/applications/StructuralMechanicsApplication/custom_elements/truss_elements/linear_truss_element.cpp b/applications/StructuralMechanicsApplication/custom_elements/truss_elements/linear_truss_element.cpp index 5db5cac2303..3fc97af4e12 100644 --- a/applications/StructuralMechanicsApplication/custom_elements/truss_elements/linear_truss_element.cpp +++ b/applications/StructuralMechanicsApplication/custom_elements/truss_elements/linear_truss_element.cpp @@ -26,8 +26,8 @@ namespace Kratos /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::Initialize(const ProcessInfo& rCurrentProcessInfo) +template +void LinearTrussElement::Initialize(const ProcessInfo& rCurrentProcessInfo) { KRATOS_TRY @@ -55,8 +55,8 @@ void LinearTrussElement::Initialize(const ProcessInfo& rCur /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::InitializeMaterial() +template +void LinearTrussElement::InitializeMaterial() { KRATOS_TRY const auto &r_props = GetProperties(); @@ -77,15 +77,15 @@ void LinearTrussElement::InitializeMaterial() /***********************************************************************************/ /***********************************************************************************/ -template -Element::Pointer LinearTrussElement::Clone( +template +Element::Pointer LinearTrussElement::Clone( IndexType NewId, NodesArrayType const& rThisNodes ) const { KRATOS_TRY - LinearTrussElement::Pointer p_new_elem = Kratos::make_intrusive>(NewId, GetGeometry().Create(rThisNodes), pGetProperties()); + LinearTrussElement::Pointer p_new_elem = Kratos::make_intrusive>(NewId, GetGeometry().Create(rThisNodes), pGetProperties()); p_new_elem->SetData(this->GetData()); p_new_elem->Set(Flags(*this)); @@ -103,8 +103,8 @@ Element::Pointer LinearTrussElement::Clone( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::EquationIdVector( +template +void LinearTrussElement::EquationIdVector( EquationIdVectorType& rResult, const ProcessInfo& rCurrentProcessInfo ) const @@ -130,8 +130,8 @@ void LinearTrussElement::EquationIdVector( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::GetDofList( +template +void LinearTrussElement::GetDofList( DofsVectorType& rElementalDofList, const ProcessInfo& rCurrentProcessInfo ) const @@ -156,8 +156,8 @@ void LinearTrussElement::GetDofList( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::GetShapeFunctionsValues( +template +void LinearTrussElement::GetShapeFunctionsValues( SystemSizeBoundedArrayType& rN, const double Length, const double xi @@ -195,8 +195,8 @@ void LinearTrussElement::GetShapeFunctionsValues( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::GetShapeFunctionsValuesY( +template +void LinearTrussElement::GetShapeFunctionsValuesY( SystemSizeBoundedArrayType& rN, const double Length, const double xi @@ -233,8 +233,8 @@ void LinearTrussElement::GetShapeFunctionsValuesY( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::GetShapeFunctionsValuesZ( +template +void LinearTrussElement::GetShapeFunctionsValuesZ( SystemSizeBoundedArrayType& rN, const double Length, const double xi @@ -262,8 +262,8 @@ void LinearTrussElement::GetShapeFunctionsValuesZ( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::GetFirstDerivativesShapeFunctionsValues( +template +void LinearTrussElement::GetFirstDerivativesShapeFunctionsValues( SystemSizeBoundedArrayType& rdN_dX, const double Length, const double xi @@ -302,8 +302,8 @@ void LinearTrussElement::GetFirstDerivativesShapeFunctionsV /***********************************************************************************/ /***********************************************************************************/ -template -BoundedMatrix LinearTrussElement::GetFrenetSerretMatrix() const +template +BoundedMatrix LinearTrussElement::GetFrenetSerretMatrix() const { const auto &r_geom = GetGeometry(); BoundedMatrix T; @@ -349,8 +349,8 @@ BoundedMatrix LinearTrussElement::GetFrenetSe /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::GetNodalValuesVector(SystemSizeBoundedArrayType& rNodalValues) const +template +void LinearTrussElement::GetNodalValuesVector(SystemSizeBoundedArrayType& rNodalValues) const { if (rNodalValues.size() != SystemSize) rNodalValues.resize(SystemSize, false); @@ -398,8 +398,8 @@ void LinearTrussElement::GetNodalValuesVector(SystemSizeBou /***********************************************************************************/ /***********************************************************************************/ -template -array_1d LinearTrussElement::GetLocalAxesBodyForce( +template +array_1d LinearTrussElement::GetLocalAxesBodyForce( const Element &rElement, const GeometryType::IntegrationPointsArrayType &rIntegrationPoints, const IndexType PointNumber @@ -427,8 +427,8 @@ array_1d LinearTrussElement::GetLocalAxesBodyFor /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::CalculateLocalSystem( +template +void LinearTrussElement::CalculateLocalSystem( MatrixType& rLHS, VectorType& rRHS, const ProcessInfo& rProcessInfo @@ -503,8 +503,8 @@ void LinearTrussElement::CalculateLocalSystem( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::CalculateLeftHandSide( +template +void LinearTrussElement::CalculateLeftHandSide( MatrixType& rLHS, const ProcessInfo& rProcessInfo ) @@ -564,8 +564,8 @@ void LinearTrussElement::CalculateLeftHandSide( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::CalculateRightHandSide( +template +void LinearTrussElement::CalculateRightHandSide( VectorType& rRHS, const ProcessInfo& rProcessInfo ) @@ -632,8 +632,8 @@ void LinearTrussElement::CalculateRightHandSide( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::RotateLHS( +template +void LinearTrussElement::RotateLHS( MatrixType& rLHS ) { @@ -664,8 +664,8 @@ void LinearTrussElement::RotateLHS( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::RotateRHS( +template +void LinearTrussElement::RotateRHS( VectorType& rRHS ) { @@ -697,8 +697,8 @@ void LinearTrussElement::RotateRHS( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::RotateAll( +template +void LinearTrussElement::RotateAll( MatrixType& rLHS, VectorType& rRHS ) @@ -736,8 +736,8 @@ void LinearTrussElement::RotateAll( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::CalculateOnIntegrationPoints( +template +void LinearTrussElement::CalculateOnIntegrationPoints( const Variable& rVariable, std::vector& rOutput, const ProcessInfo& rProcessInfo @@ -815,8 +815,8 @@ void LinearTrussElement::CalculateOnIntegrationPoints( /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::CalculateOnIntegrationPoints( +template +void LinearTrussElement::CalculateOnIntegrationPoints( const Variable& rVariable, std::vector& rValues, const ProcessInfo& rCurrentProcessInfo @@ -836,8 +836,8 @@ void LinearTrussElement::CalculateOnIntegrationPoints( /***********************************************************************************/ /***********************************************************************************/ -template -int LinearTrussElement::Check(const ProcessInfo& rCurrentProcessInfo) const +template +int LinearTrussElement::Check(const ProcessInfo& rCurrentProcessInfo) const { KRATOS_TRY; @@ -850,8 +850,8 @@ int LinearTrussElement::Check(const ProcessInfo& rCurrentPr /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::save(Serializer& rSerializer) const +template +void LinearTrussElement::save(Serializer& rSerializer) const { KRATOS_SERIALIZE_SAVE_BASE_CLASS(rSerializer, Element); int IntMethod = int(this->GetIntegrationMethod()); @@ -862,8 +862,8 @@ void LinearTrussElement::save(Serializer& rSerializer) cons /***********************************************************************************/ /***********************************************************************************/ -template -void LinearTrussElement::load(Serializer& rSerializer) +template +void LinearTrussElement::load(Serializer& rSerializer) { KRATOS_SERIALIZE_LOAD_BASE_CLASS(rSerializer, Element); int IntMethod; @@ -875,8 +875,8 @@ void LinearTrussElement::load(Serializer& rSerializer) /***********************************************************************************/ /***********************************************************************************/ -template -array_1d LinearTrussElement::GetBaseShapeFunctions(const double xi) const +template +array_1d LinearTrussElement::GetBaseShapeFunctions(const double xi) const { array_1d N; @@ -895,8 +895,8 @@ array_1d LinearTrussElement::GetBaseShapeF /***********************************************************************************/ template class LinearTrussElement<2, 2>; -template class LinearTrussElement<3, 2>; template class LinearTrussElement<2, 3>; +template class LinearTrussElement<3, 2>; template class LinearTrussElement<3, 3>; } // Namespace Kratos diff --git a/applications/StructuralMechanicsApplication/custom_elements/truss_elements/linear_truss_element.h b/applications/StructuralMechanicsApplication/custom_elements/truss_elements/linear_truss_element.h index f6b81c06bcd..9b5d8ec66d5 100644 --- a/applications/StructuralMechanicsApplication/custom_elements/truss_elements/linear_truss_element.h +++ b/applications/StructuralMechanicsApplication/custom_elements/truss_elements/linear_truss_element.h @@ -52,7 +52,7 @@ using SizeType = std::size_t; * 0 1 0 2 1 * @author Alejandro Cornejo */ -template +template class KRATOS_API(STRUCTURAL_MECHANICS_APPLICATION) LinearTrussElement : public Element { diff --git a/applications/StructuralMechanicsApplication/structural_mechanics_application.h b/applications/StructuralMechanicsApplication/structural_mechanics_application.h index 8e571381a16..f423665101e 100644 --- a/applications/StructuralMechanicsApplication/structural_mechanics_application.h +++ b/applications/StructuralMechanicsApplication/structural_mechanics_application.h @@ -273,8 +273,8 @@ class KRATOS_API(STRUCTURAL_MECHANICS_APPLICATION) KratosStructuralMechanicsAppl const TrussElementLinear3D2N mTrussLinearElement3D2N; const CableElement3D2N mCableElement3D2N; const LinearTrussElement<2, 2> mLinearTrussElement2D2N; - const LinearTrussElement<3, 2> mLinearTrussElement2D3N; - const LinearTrussElement<2, 3> mLinearTrussElement3D2N; + const LinearTrussElement<2, 3> mLinearTrussElement2D3N; + const LinearTrussElement<3, 2> mLinearTrussElement3D2N; const LinearTrussElement<3, 3> mLinearTrussElement3D3N; // Adding the beam element