Skip to content

Commit

Permalink
removed redundant separation lines (#12724)
Browse files Browse the repository at this point in the history
Co-authored-by: Gennady Markelov <[email protected]>
  • Loading branch information
markelov208 and Gennady Markelov authored Oct 8, 2024
1 parent 4449c2d commit b316375
Show file tree
Hide file tree
Showing 82 changed files with 0 additions and 831 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,12 @@ Condition::Pointer PwCondition<TDim, TNumNodes>::Create(IndexType NewId,
return Condition::Pointer(new PwCondition(NewId, pGeom, pProperties));
}

//----------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void PwCondition<TDim, TNumNodes>::GetDofList(DofsVectorType& rConditionDofList, const ProcessInfo&) const
{
rConditionDofList = GetDofs();
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void PwCondition<TDim, TNumNodes>::CalculateLocalSystem(MatrixType& rLeftHandSideMatrix,
VectorType& rRightHandSideVector,
Expand All @@ -66,8 +64,6 @@ void PwCondition<TDim, TNumNodes>::CalculateLocalSystem(MatrixType& rLeft
KRATOS_CATCH("")
}

//----------------------------------------------------------------------------------------

template <unsigned int TDim, unsigned int TNumNodes>
void PwCondition<TDim, TNumNodes>::CalculateLeftHandSide(MatrixType& rLeftHandSideMatrix,
const ProcessInfo& rCurrentProcessInfo)
Expand All @@ -79,7 +75,6 @@ void PwCondition<TDim, TNumNodes>::CalculateLeftHandSide(MatrixType& rLef
KRATOS_CATCH("");
}

//----------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void PwCondition<TDim, TNumNodes>::CalculateRightHandSide(VectorType& rRightHandSideVector,
const ProcessInfo& rCurrentProcessInfo)
Expand All @@ -98,14 +93,12 @@ void PwCondition<TDim, TNumNodes>::CalculateRightHandSide(VectorType& rRi
KRATOS_CATCH("")
}

//----------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void PwCondition<TDim, TNumNodes>::EquationIdVector(EquationIdVectorType& rResult, const ProcessInfo&) const
{
rResult = Geo::DofUtilities::ExtractEquationIdsFrom(GetDofs());
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void PwCondition<TDim, TNumNodes>::CalculateAll(MatrixType& rLeftHandSideMatrix,
VectorType& rRightHandSideVector,
Expand All @@ -114,7 +107,6 @@ void PwCondition<TDim, TNumNodes>::CalculateAll(MatrixType& rLeftHandSide
this->CalculateRHS(rRightHandSideVector, CurrentProcessInfo);
}

//----------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void PwCondition<TDim, TNumNodes>::CalculateRHS(VectorType& rRightHandSideVector, const ProcessInfo& CurrentProcessInfo)
{
Expand All @@ -139,7 +131,6 @@ std::string PwCondition<TDim, TNumNodes>::Info() const
return "PwCondition";
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
template class PwCondition<2, 1>;
template class PwCondition<2, 2>;
template class PwCondition<2, 3>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) PwCondition : public Condition
public:
KRATOS_CLASS_INTRUSIVE_POINTER_DEFINITION(PwCondition);

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

PwCondition() : PwCondition(0, nullptr, nullptr) {}

PwCondition(IndexType NewId, GeometryType::Pointer pGeometry)
Expand All @@ -53,8 +51,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) PwCondition : public Condition

~PwCondition() override = default;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Condition::Pointer Create(IndexType NewId,
NodesArrayType const& ThisNodes,
PropertiesType::Pointer pProperties) const override;
Expand All @@ -63,8 +59,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) PwCondition : public Condition

void GetDofList(DofsVectorType& rConditionDofList, const ProcessInfo&) const override;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

void CalculateLocalSystem(MatrixType& rLeftHandSideMatrix,
VectorType& rRightHandSideVector,
const ProcessInfo& rCurrentProcessInfo) override;
Expand All @@ -77,17 +71,13 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) PwCondition : public Condition

std::string Info() const override;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

protected:
virtual void CalculateAll(MatrixType& rLeftHandSideMatrix,
VectorType& rRightHandSideVector,
const ProcessInfo& rCurrentProcessInfo);

virtual void CalculateRHS(VectorType& rRightHandSideVector, const ProcessInfo& rCurrentProcessInfo);

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

private:
[[nodiscard]] DofsVectorType GetDofs() const;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ Condition::Pointer PwNormalFluxCondition<TDim, TNumNodes>::Create(IndexType
return Condition::Pointer(new PwNormalFluxCondition(NewId, this->GetGeometry().Create(ThisNodes), pProperties));
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

template <unsigned int TDim, unsigned int TNumNodes>
void PwNormalFluxCondition<TDim, TNumNodes>::CalculateRHS(VectorType& rRightHandSideVector,
const ProcessInfo& CurrentProcessInfo)
Expand Down Expand Up @@ -75,9 +73,6 @@ void PwNormalFluxCondition<TDim, TNumNodes>::CalculateRHS(VectorType& rRi
}
}

//----------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------

template <unsigned int TDim, unsigned int TNumNodes>
void PwNormalFluxCondition<TDim, TNumNodes>::CalculateAndAddRHS(VectorType& rRightHandSideVector,
NormalFluxVariables& rVariables)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) PwNormalFluxCondition : public PwCon
using VectorType = Vector;
using MatrixType = Matrix;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

// Default constructor
PwNormalFluxCondition() : PwCondition<TDim, TNumNodes>() {}

Expand All @@ -58,16 +56,12 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) PwNormalFluxCondition : public PwCon
{
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Condition::Pointer Create(IndexType NewId,
NodesArrayType const& ThisNodes,
PropertiesType::Pointer pProperties) const override;

std::string Info() const override;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

protected:
struct NormalFluxVariables {
double NormalFlux;
Expand All @@ -78,19 +72,11 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) PwNormalFluxCondition : public PwCon

// Member Variables

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

void CalculateRHS(VectorType& rRightHandSideVector, const ProcessInfo& CurrentProcessInfo) override;

void CalculateAndAddRHS(VectorType& rRightHandSideVector, NormalFluxVariables& rVariables);

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

private:
// Member Variables

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

// Serialization

friend class Serializer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,12 @@ Condition::Pointer UPwCondition<TDim, TNumNodes>::Create(IndexType
return Condition::Pointer(new UPwCondition(NewId, GetGeometry().Create(ThisNodes), pProperties));
}

//----------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void UPwCondition<TDim, TNumNodes>::GetDofList(DofsVectorType& rConditionDofList, const ProcessInfo&) const
{
rConditionDofList = GetDofs();
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void UPwCondition<TDim, TNumNodes>::CalculateLocalSystem(MatrixType& rLeftHandSideMatrix,
VectorType& rRightHandSideVector,
Expand All @@ -59,7 +57,6 @@ void UPwCondition<TDim, TNumNodes>::CalculateLocalSystem(MatrixType& rLef
KRATOS_CATCH("")
}

//----------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void UPwCondition<TDim, TNumNodes>::CalculateRightHandSide(VectorType& rRightHandSideVector,
const ProcessInfo& rCurrentProcessInfo)
Expand All @@ -78,14 +75,12 @@ void UPwCondition<TDim, TNumNodes>::CalculateRightHandSide(VectorType& rR
KRATOS_CATCH("")
}

//----------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void UPwCondition<TDim, TNumNodes>::EquationIdVector(EquationIdVectorType& rResult, const ProcessInfo&) const
{
rResult = Geo::DofUtilities::ExtractEquationIdsFrom(GetDofs());
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void UPwCondition<TDim, TNumNodes>::CalculateAll(MatrixType& rLeftHandSideMatrix,
VectorType& rRightHandSideVector,
Expand All @@ -94,7 +89,6 @@ void UPwCondition<TDim, TNumNodes>::CalculateAll(MatrixType& rLeftHandSid
this->CalculateRHS(rRightHandSideVector, CurrentProcessInfo);
}

//----------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void UPwCondition<TDim, TNumNodes>::CalculateRHS(VectorType& rRightHandSideVector, const ProcessInfo& CurrentProcessInfo)
{
Expand All @@ -119,7 +113,6 @@ std::string UPwCondition<TDim, TNumNodes>::Info() const
return "UPwCondition";
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
template class UPwCondition<2, 1>;
template class UPwCondition<2, 2>;
template class UPwCondition<3, 1>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwCondition : public Condition
public:
KRATOS_CLASS_INTRUSIVE_POINTER_DEFINITION(UPwCondition);

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

UPwCondition() : UPwCondition(0, nullptr, nullptr) {}

UPwCondition(IndexType NewId, GeometryType::Pointer pGeometry)
Expand All @@ -53,8 +51,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwCondition : public Condition

~UPwCondition() override = default;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Condition::Pointer Create(IndexType NewId,
NodesArrayType const& ThisNodes,
PropertiesType::Pointer pProperties) const override;
Expand All @@ -65,8 +61,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwCondition : public Condition

void SetIntegrationMethod(IntegrationMethod method) { mThisIntegrationMethod = method; }

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

void CalculateLocalSystem(MatrixType& rLeftHandSideMatrix,
VectorType& rRightHandSideVector,
const ProcessInfo& rCurrentProcessInfo) override;
Expand All @@ -77,8 +71,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwCondition : public Condition

std::string Info() const override;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

protected:
virtual void CalculateAll(MatrixType& rLeftHandSideMatrix,
VectorType& rRightHandSideVector,
Expand All @@ -88,8 +80,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwCondition : public Condition

[[nodiscard]] DofsVectorType GetDofs() const;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

private:
GeometryData::IntegrationMethod mThisIntegrationMethod{Condition::GetIntegrationMethod()};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Condition::Pointer UPwFaceLoadCondition<TDim, TNumNodes>::Create(IndexType
return Condition::Pointer(new UPwFaceLoadCondition(NewId, this->GetGeometry().Create(ThisNodes), pProperties));
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
template <unsigned int TDim, unsigned int TNumNodes>
void UPwFaceLoadCondition<TDim, TNumNodes>::CalculateRHS(VectorType& rRightHandSideVector,
const ProcessInfo& CurrentProcessInfo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwFaceLoadCondition : public UPwCon
using VectorType = Vector;
using MatrixType = Matrix;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

// Default constructor
UPwFaceLoadCondition() : UPwCondition<TDim, TNumNodes>() {}

Expand All @@ -56,30 +54,18 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwFaceLoadCondition : public UPwCon
{
}

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Condition::Pointer Create(IndexType NewId,
NodesArrayType const& ThisNodes,
PropertiesType::Pointer pProperties) const override;

std::string Info() const override;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

protected:
// Member Variables

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

void CalculateRHS(VectorType& rRightHandSideVector, const ProcessInfo& CurrentProcessInfo) override;

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

private:
// Member Variables

//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

// Serialization

friend class Serializer;
Expand Down
Loading

0 comments on commit b316375

Please sign in to comment.