Skip to content

Principle stretch computation hotfix #32

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 2 commits into from
Jul 11, 2025
Merged

Principle stretch computation hotfix #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51bae8
mark functions for depreciation, improve principle stretch computation
hverhelst Jul 11, 2025
eebeb1b
Update src/gsMaterialMatrixNonlinear.hpp
hverhelst Jul 11, 2025
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
6 changes: 6 additions & 0 deletions src/gsMaterialMatrixBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ class gsMaterialMatrixBase
* @param[in] u The in-plane shell coordinates to be eveluated on
* @param result The result
*/
GISMO_DEPRECATED
virtual void pstretch_into(const index_t /*patch*/, const gsMatrix<T>& /*u*/, gsMatrix<T>& /*result*/) const
{ GISMO_NO_IMPLEMENTATION; }
/**
Expand All @@ -205,6 +206,7 @@ class gsMaterialMatrixBase
* @param[in] u The in-plane shell coordinates to be eveluated on
* @param result The result
*/
GISMO_DEPRECATED
virtual void pstretchDir_into(const index_t /*patch*/, const gsMatrix<T>& /*u*/, gsMatrix<T>& /*result*/) const
{ GISMO_NO_IMPLEMENTATION; }
/**
Expand All @@ -214,6 +216,7 @@ class gsMaterialMatrixBase
* @param[in] u The in-plane shell coordinates to be eveluated on
* @param result The result
*/
GISMO_DEPRECATED
virtual void pstress_into(const index_t /*patch*/, const gsMatrix<T>& /*u*/, gsMatrix<T>& /*result*/) const
{ GISMO_NO_IMPLEMENTATION; }
/**
Expand All @@ -223,6 +226,7 @@ class gsMaterialMatrixBase
* @param[in] u The in-plane shell coordinates to be eveluated on
* @param result The result
*/
GISMO_DEPRECATED
virtual void pstressDir_into(const index_t /*patch*/, const gsMatrix<T>& /*u*/, gsMatrix<T>& /*result*/) const
{ GISMO_NO_IMPLEMENTATION; }
/**
Expand All @@ -242,6 +246,7 @@ class gsMaterialMatrixBase
* @param[in] u The in-plane shell coordinates to be eveluated on
* @param result The result
*/
GISMO_DEPRECATED
virtual void parameters_into(const index_t /*patch*/, const gsMatrix<T>& /*u*/, gsMatrix<T>& /*result*/) const
{ GISMO_NO_IMPLEMENTATION; }

Expand All @@ -252,6 +257,7 @@ class gsMaterialMatrixBase
* @param[in] u The in-plane shell coordinates to be eveluated on
* @param result The result
*/
GISMO_DEPRECATED
virtual void transform_into(const index_t /*patch*/, const gsMatrix<T>& /*u*/, gsMatrix<T>& /*result*/) const
{ GISMO_NO_IMPLEMENTATION; }

Expand Down
1 change: 0 additions & 1 deletion src/gsMaterialMatrixBaseDim.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ gsMatrix<T> gsMaterialMatrixBaseDim<dim,T>::eval3D_deformation(const index_t pat
this->_computePoints(patch,u);

gsMatrix<T> result(9, u.cols() * z.rows());
std::pair<gsVector<T>,gsMatrix<T>> res;
index_t colIdx;
for (index_t k=0; k!=u.cols(); k++)
{
Expand Down
11 changes: 11 additions & 0 deletions src/gsMaterialMatrixNonlinear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ class gsMaterialMatrixNonlinear : public gsMaterialMatrixBaseDim<dim,T>
/// See \ref gsMaterialMatrixBase for details
gsMatrix<T> eval3D_CauchyVector(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T>& z, enum MaterialOutput out = MaterialOutput::Generic) const override;

/// See \ref gsMaterialMatrixBase for details
gsMatrix<T> eval3D_pstretch(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T>& z) const override;

/// See \ref gsMaterialMatrixBase for details
gsMatrix<T> eval3D_pstress(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T>& z, enum MaterialOutput out = MaterialOutput::Generic) const override;

Expand Down Expand Up @@ -569,6 +572,14 @@ class gsMaterialMatrixNonlinear : public gsMaterialMatrixBaseDim<dim,T>
template<enum Material _mat, bool _com>
typename std::enable_if<!_com && !(_mat==Material::SvK), gsMatrix<T>>::type _eval3D_pstress_impl(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T>& z) const;

// Stretch overrides
template<bool _com>
typename std::enable_if<_com, gsMatrix<T>>::type
eval3D_pstretch_impl(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T>& z) const;
template<bool _com>
typename std::enable_if<!_com, gsMatrix<T>>::type
eval3D_pstretch_impl(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T>& z) const;

template<enum Material _mat>
typename std::enable_if<_mat==Material::MR, void>::type _setRatio_impl(const gsFunctionSet<T> & Ratio);
template<enum Material _mat>
Expand Down
51 changes: 51 additions & 0 deletions src/gsMaterialMatrixNonlinear.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ template <bool _comp>
typename std::enable_if<!_comp, void>::type
gsMaterialMatrixNonlinear<dim,T,matId,comp,mat,imp>::_pstretch_into_impl(const index_t patch, const gsMatrix<T>& u, gsMatrix<T>& result) const
{
gsDebugVar("AAAAA)");
Base::pstretch_into(patch,u,result);
}

Expand Down Expand Up @@ -563,6 +564,56 @@ gsMatrix<T> gsMaterialMatrixNonlinear<dim,T,matId,comp,mat,imp>::eval3D_CauchyVe
return this->eval3D_CauchyStress(patch,u,z,out);
}

template <short_t dim, class T, index_t matId, bool comp, enum Material mat, enum Implementation imp >
gsMatrix<T> gsMaterialMatrixNonlinear<dim,T,matId,comp,mat,imp>::eval3D_pstretch(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T> & z) const
{
return eval3D_pstretch_impl<comp>(patch,u,z);
}

template <short_t dim, class T, index_t matId, bool comp, enum Material mat, enum Implementation imp >
template <bool _comp>
typename std::enable_if< _comp, gsMatrix<T>>::type
gsMaterialMatrixNonlinear<dim,T,matId,comp,mat,imp>::eval3D_pstretch_impl(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T> & z) const
{
this->_computePoints(patch,u);

gsMatrix<T> result(3, u.cols() * z.rows());
std::pair<gsVector<T>,gsMatrix<T>> res;
index_t colIdx;

gsMatrix<T> C33s = _eval3D_Compressible_C33(patch,u,z);
T C33;

gsMatrix<T,3,3> c;
for (index_t k=0; k!= u.cols(); k++)
{
for( index_t j=0; j < z.rows(); ++j ) // through-thickness points
{
colIdx = j*u.cols()+k;
this->_getMetric(k, z(j, k) * m_data.mine().m_Tmat(0, k)); // on point i, on height z(0,j)

C33 = C33s(0,k);

// Compute c
c.setZero();
c.block(0,0,2,2) = m_data.mine().m_Gcov_def.block(0,0,2,2);
c(2,2) = C33; // c33

res = this->_evalStretch(c,m_data.mine().m_gcon_ori);
result.col(colIdx) = res.first;
}
}
return result;
}

template <short_t dim, class T, index_t matId, bool comp, enum Material mat, enum Implementation imp >
template <bool _comp>
typename std::enable_if<!_comp, gsMatrix<T>>::type
gsMaterialMatrixNonlinear<dim,T,matId,comp,mat,imp>::eval3D_pstretch_impl(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T> & z) const
{
return Base::eval3D_pstretch(patch,u,z);
}

template <short_t dim, class T, index_t matId, bool comp, enum Material mat, enum Implementation imp >
gsMatrix<T> gsMaterialMatrixNonlinear<dim,T,matId,comp,mat,imp>::eval3D_pstress(const index_t patch, const gsMatrix<T> & u, const gsMatrix<T> & z, enum MaterialOutput out) const
{
Expand Down
2 changes: 1 addition & 1 deletion src/gsThinShellUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <gsUtils/gsPointGrid.h>

#include <gsAssembler/gsAssemblerOptions.h>
#include <gsAssembler/gsExpressions.h>
#include <gsExpressions/gsExpressions.h>


# define MatExprType auto
Expand Down