Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@hverhelst
hverhelst committed Jun 23, 2021
2 parents 8299459 + 0dd0f56 commit a0a2a60
Show file tree
Hide file tree
Showing 6 changed files with 143 additions and 47 deletions.
58 changes: 45 additions & 13 deletions gsMaterialMatrix.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1051,19 +1051,51 @@ class gsMaterialMatrix : public gsMaterialMatrixBaseDim<dim,T>
mutable gsMatrix<T> m_Tmat,m_rhomat;

// Geometric data point
using Base::m_map, Base::m_map_def;

using Base::m_Acov_ori, Base::m_Acon_ori, Base::m_Acov_def, Base::m_Acon_def, Base::m_Bcov_ori, Base::m_Bcon_ori, Base::m_Bcov_def, Base::m_Bcon_def;
using Base::m_acov_ori, Base::m_acon_ori, Base::m_acov_def, Base::m_acon_def;
using Base::m_ncov_ori, Base::m_ncov_def;
using Base::m_Gcov_ori, Base::m_Gcon_ori, Base::m_Gcov_def, Base::m_Gcon_def, Base::m_Gcov_ori_L, Base::m_Gcov_def_L;
using Base::m_gcov_ori, Base::m_gcov_def, Base::m_gcon_ori, Base::m_gcon_def;
using Base::m_Acov_ori_mat, Base::m_Acon_ori_mat, Base::m_Acov_def_mat, Base::m_Acon_def_mat, Base::m_Bcov_ori_mat, Base::m_Bcov_def_mat;
using Base::m_acov_ori_mat, Base::m_acon_ori_mat, Base::m_acov_def_mat, Base::m_acon_def_mat, Base::m_ncov_ori_mat, Base::m_ncov_def_mat;

using Base::m_stretches, Base::m_stretchvec;

using Base::m_J0_sq, Base::m_J_sq;
using Base::m_map;
using Base::m_map_def;

using Base::m_Acov_ori;
using Base::m_Acon_ori;
using Base::m_Acov_def;
using Base::m_Acon_def;
using Base::m_Bcov_ori;
using Base::m_Bcon_ori;
using Base::m_Bcov_def;
using Base::m_Bcon_def;
using Base::m_acov_ori;
using Base::m_acon_ori;
using Base::m_acov_def;
using Base::m_acon_def;
using Base::m_ncov_ori;
using Base::m_ncov_def;
using Base::m_Gcov_ori;
using Base::m_Gcon_ori;
using Base::m_Gcov_def;
using Base::m_Gcon_def;
using Base::m_Gcov_ori_L;
using Base::m_Gcov_def_L;
using Base::m_gcov_ori;
using Base::m_gcov_def;
using Base::m_gcon_ori;
using Base::m_gcon_def;
using Base::m_Acov_ori_mat;
using Base::m_Acon_ori_mat;
using Base::m_Acov_def_mat;
using Base::m_Acon_def_mat;
using Base::m_Bcov_ori_mat;
using Base::m_Bcov_def_mat;
using Base::m_acov_ori_mat;
using Base::m_acon_ori_mat;
using Base::m_acov_def_mat;
using Base::m_acon_def_mat;
using Base::m_ncov_ori_mat;
using Base::m_ncov_def_mat;

using Base::m_stretches;
using Base::m_stretchvec;

using Base::m_J0_sq;
using Base::m_J_sq;


gsOptionList m_options;
Expand Down
58 changes: 45 additions & 13 deletions gsMaterialMatrixComposite.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,51 @@ class gsMaterialMatrixComposite : public gsMaterialMatrixBaseDim<dim,T>
mutable gsMatrix<T> m_Tmat, m_E1mat, m_E2mat, m_G12mat, m_nu12mat, m_nu21mat, m_phiMat, m_rhoMat;

// Geometric data point
using Base::m_map, Base::m_map_def;

using Base::m_Acov_ori, Base::m_Acon_ori, Base::m_Acov_def, Base::m_Acon_def, Base::m_Bcov_ori, Base::m_Bcon_ori, Base::m_Bcov_def, Base::m_Bcon_def;
using Base::m_acov_ori, Base::m_acon_ori, Base::m_acov_def, Base::m_acon_def;
using Base::m_ncov_ori, Base::m_ncov_def;
using Base::m_Gcov_ori, Base::m_Gcon_ori, Base::m_Gcov_def, Base::m_Gcon_def, Base::m_Gcov_ori_L, Base::m_Gcov_def_L;
using Base::m_gcov_ori, Base::m_gcov_def, Base::m_gcon_ori, Base::m_gcon_def;
using Base::m_Acov_ori_mat, Base::m_Acon_ori_mat, Base::m_Acov_def_mat, Base::m_Acon_def_mat, Base::m_Bcov_ori_mat, Base::m_Bcov_def_mat;
using Base::m_acov_ori_mat, Base::m_acon_ori_mat, Base::m_acov_def_mat, Base::m_acon_def_mat, Base::m_ncov_ori_mat, Base::m_ncov_def_mat;

using Base::m_stretches, Base::m_stretchvec;

using Base::m_J0_sq, Base::m_J_sq;
using Base::m_map;
using Base::m_map_def;

using Base::m_Acov_ori;
using Base::m_Acon_ori;
using Base::m_Acov_def;
using Base::m_Acon_def;
using Base::m_Bcov_ori;
using Base::m_Bcon_ori;
using Base::m_Bcov_def;
using Base::m_Bcon_def;
using Base::m_acov_ori;
using Base::m_acon_ori;
using Base::m_acov_def;
using Base::m_acon_def;
using Base::m_ncov_ori;
using Base::m_ncov_def;
using Base::m_Gcov_ori;
using Base::m_Gcon_ori;
using Base::m_Gcov_def;
using Base::m_Gcon_def;
using Base::m_Gcov_ori_L;
using Base::m_Gcov_def_L;
using Base::m_gcov_ori;
using Base::m_gcov_def;
using Base::m_gcon_ori;
using Base::m_gcon_def;
using Base::m_Acov_ori_mat;
using Base::m_Acon_ori_mat;
using Base::m_Acov_def_mat;
using Base::m_Acon_def_mat;
using Base::m_Bcov_ori_mat;
using Base::m_Bcov_def_mat;
using Base::m_acov_ori_mat;
using Base::m_acon_ori_mat;
using Base::m_acov_def_mat;
using Base::m_acon_def_mat;
using Base::m_ncov_ori_mat;
using Base::m_ncov_def_mat;

using Base::m_stretches;
using Base::m_stretchvec;

using Base::m_J0_sq;
using Base::m_J_sq;

gsOptionList m_options;

Expand Down
2 changes: 1 addition & 1 deletion gsMaterialMatrixEval.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ class gsMaterialMatrixEval : public gsFunction<T>

protected:
gsMaterialMatrixBase<T> * m_materialMat;
gsMatrix<T> m_z;
mutable gsMaterialMatrixEval<T,out> * m_piece;
index_t m_pIndex;

gsMatrix<T> m_z;


};
Expand Down
58 changes: 45 additions & 13 deletions gsMaterialMatrixLinear.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,51 @@ class gsMaterialMatrixLinear : public gsMaterialMatrixBaseDim<dim,T>
mutable gsMatrix<T> m_pstress, m_pstressvec;

// Geometric data point
using Base::m_map, Base::m_map_def;

using Base::m_Acov_ori, Base::m_Acon_ori, Base::m_Acov_def, Base::m_Acon_def, Base::m_Bcov_ori, Base::m_Bcon_ori, Base::m_Bcov_def, Base::m_Bcon_def;
using Base::m_acov_ori, Base::m_acon_ori, Base::m_acov_def, Base::m_acon_def;
using Base::m_ncov_ori, Base::m_ncov_def;
using Base::m_Gcov_ori, Base::m_Gcon_ori, Base::m_Gcov_def, Base::m_Gcon_def, Base::m_Gcov_ori_L, Base::m_Gcov_def_L;
using Base::m_gcov_ori, Base::m_gcov_def, Base::m_gcon_ori, Base::m_gcon_def;
using Base::m_Acov_ori_mat, Base::m_Acon_ori_mat, Base::m_Acov_def_mat, Base::m_Acon_def_mat, Base::m_Bcov_ori_mat, Base::m_Bcov_def_mat;
using Base::m_acov_ori_mat, Base::m_acon_ori_mat, Base::m_acov_def_mat, Base::m_acon_def_mat, Base::m_ncov_ori_mat, Base::m_ncov_def_mat;

using Base::m_stretches, Base::m_stretchvec;

using Base::m_J0_sq, Base::m_J_sq;
using Base::m_map;
using Base::m_map_def;

using Base::m_Acov_ori;
using Base::m_Acon_ori;
using Base::m_Acov_def;
using Base::m_Acon_def;
using Base::m_Bcov_ori;
using Base::m_Bcon_ori;
using Base::m_Bcov_def;
using Base::m_Bcon_def;
using Base::m_acov_ori;
using Base::m_acon_ori;
using Base::m_acov_def;
using Base::m_acon_def;
using Base::m_ncov_ori;
using Base::m_ncov_def;
using Base::m_Gcov_ori;
using Base::m_Gcon_ori;
using Base::m_Gcov_def;
using Base::m_Gcon_def;
using Base::m_Gcov_ori_L;
using Base::m_Gcov_def_L;
using Base::m_gcov_ori;
using Base::m_gcov_def;
using Base::m_gcon_ori;
using Base::m_gcon_def;
using Base::m_Acov_ori_mat;
using Base::m_Acon_ori_mat;
using Base::m_Acov_def_mat;
using Base::m_Acon_def_mat;
using Base::m_Bcov_ori_mat;
using Base::m_Bcov_def_mat;
using Base::m_acov_ori_mat;
using Base::m_acon_ori_mat;
using Base::m_acov_def_mat;
using Base::m_acon_def_mat;
using Base::m_ncov_ori_mat;
using Base::m_ncov_def_mat;

using Base::m_stretches;
using Base::m_stretchvec;

using Base::m_J0_sq;
using Base::m_J_sq;



Expand Down
2 changes: 1 addition & 1 deletion gsThinShellFunctions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void gsShellStressFunction<T>::eval_into(const gsMatrix<T> & u, gsMatrix<T> & re
auto S_m = S0.tr() * Ttilde;
auto S_f = S1.tr() * Ttilde;

gsExprEvaluator ev(m_assembler);
gsExprEvaluator<> ev(m_assembler);
gsMatrix<T> tmp;

switch (m_stress_type)
Expand Down
12 changes: 6 additions & 6 deletions gsThinShellUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class var1_expr : public _expr<var1_expr<E> >
res.resize(rows(), cols()); // rows()*
normal = _G.data().normal(k);// not normalized to unit length
normal.normalize();
grad_expr<U> vGrad = grad_expr(_u);
grad_expr<U> vGrad = grad_expr<U>(_u);

bGrads = vGrad.eval(k);
cJac = _G.data().values[1].reshapeCol(k, _G.data().dim.first, _G.data().dim.second).transpose();
Expand Down Expand Up @@ -328,8 +328,8 @@ class var1dif_expr : public _expr<var1dif_expr<E1, E2> >
res.resize(rows(), cols()); // rows()*
normal = _G.data().normal(k);// not normalized to unit length
normal.normalize();
grad_expr<U> uGrad = grad_expr(_u);
grad_expr<V> vGrad = grad_expr(_v);
grad_expr<U> uGrad = grad_expr<U>(_u);
grad_expr<V> vGrad = grad_expr<V>(_v);

bGrads = uGrad.eval(k) - vGrad.eval(k);
cJac = _G.data().values[1].reshapeCol(k, _G.data().dim.first, _G.data().dim.second).transpose();
Expand All @@ -351,8 +351,8 @@ class var1dif_expr : public _expr<var1dif_expr<E1, E2> >
eval_impl(const U & u, const V & v, const index_t k) const
{
GISMO_ASSERT(1==_v.data().actives.cols(), "Single actives expected");
grad_expr<U> uGrad = grad_expr(_u);
solGrad_expr<Scalar> vGrad = solGrad_expr(_v);
grad_expr<U> uGrad = grad_expr<U>(_u);
solGrad_expr<Scalar> vGrad = solGrad_expr<V>(_v);
res.resize(rows(), cols()); // rows()*

normal = _G.data().normal(k);// not normalized to unit length
Expand Down Expand Up @@ -802,7 +802,7 @@ class deriv2_expr : public _expr<deriv2_expr<E> >
The geometry map has components c=[c1,c2,c3]
*/
// evaluate the geometry map of U
solHess_expr<Scalar> sHess = solHess_expr(_u);
solHess_expr<Scalar> sHess = solHess_expr<U>(_u);
res = sHess.eval(k).transpose();
return res;
}
Expand Down

0 comments on commit a0a2a60

Please sign in to comment.