Skip to content

Commit 0dd0f56

Browse files
hverhelsthverhelst
committed
removed warnings (also for C++14)
1 parent 2bf434f commit 0dd0f56

File tree

6 files changed

+143
-47
lines changed

6 files changed

+143
-47
lines changed

‎gsMaterialMatrix.h‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,19 +1051,51 @@ class gsMaterialMatrix : public gsMaterialMatrixBaseDim<dim,T>
10511051
mutable gsMatrix<T> m_Tmat,m_rhomat;
10521052

10531053
// Geometric data point
1054-
using Base::m_map, Base::m_map_def;
1055-
1056-
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;
1057-
using Base::m_acov_ori, Base::m_acon_ori, Base::m_acov_def, Base::m_acon_def;
1058-
using Base::m_ncov_ori, Base::m_ncov_def;
1059-
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;
1060-
using Base::m_gcov_ori, Base::m_gcov_def, Base::m_gcon_ori, Base::m_gcon_def;
1061-
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;
1062-
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;
1063-
1064-
using Base::m_stretches, Base::m_stretchvec;
1065-
1066-
using Base::m_J0_sq, Base::m_J_sq;
1054+
using Base::m_map;
1055+
using Base::m_map_def;
1056+
1057+
using Base::m_Acov_ori;
1058+
using Base::m_Acon_ori;
1059+
using Base::m_Acov_def;
1060+
using Base::m_Acon_def;
1061+
using Base::m_Bcov_ori;
1062+
using Base::m_Bcon_ori;
1063+
using Base::m_Bcov_def;
1064+
using Base::m_Bcon_def;
1065+
using Base::m_acov_ori;
1066+
using Base::m_acon_ori;
1067+
using Base::m_acov_def;
1068+
using Base::m_acon_def;
1069+
using Base::m_ncov_ori;
1070+
using Base::m_ncov_def;
1071+
using Base::m_Gcov_ori;
1072+
using Base::m_Gcon_ori;
1073+
using Base::m_Gcov_def;
1074+
using Base::m_Gcon_def;
1075+
using Base::m_Gcov_ori_L;
1076+
using Base::m_Gcov_def_L;
1077+
using Base::m_gcov_ori;
1078+
using Base::m_gcov_def;
1079+
using Base::m_gcon_ori;
1080+
using Base::m_gcon_def;
1081+
using Base::m_Acov_ori_mat;
1082+
using Base::m_Acon_ori_mat;
1083+
using Base::m_Acov_def_mat;
1084+
using Base::m_Acon_def_mat;
1085+
using Base::m_Bcov_ori_mat;
1086+
using Base::m_Bcov_def_mat;
1087+
using Base::m_acov_ori_mat;
1088+
using Base::m_acon_ori_mat;
1089+
using Base::m_acov_def_mat;
1090+
using Base::m_acon_def_mat;
1091+
using Base::m_ncov_ori_mat;
1092+
using Base::m_ncov_def_mat;
1093+
1094+
using Base::m_stretches;
1095+
using Base::m_stretchvec;
1096+
1097+
using Base::m_J0_sq;
1098+
using Base::m_J_sq;
10671099

10681100

10691101
gsOptionList m_options;

‎gsMaterialMatrixComposite.h‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,51 @@ class gsMaterialMatrixComposite : public gsMaterialMatrixBaseDim<dim,T>
135135
mutable gsMatrix<T> m_Tmat, m_E1mat, m_E2mat, m_G12mat, m_nu12mat, m_nu21mat, m_phiMat, m_rhoMat;
136136

137137
// Geometric data point
138-
using Base::m_map, Base::m_map_def;
139-
140-
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;
141-
using Base::m_acov_ori, Base::m_acon_ori, Base::m_acov_def, Base::m_acon_def;
142-
using Base::m_ncov_ori, Base::m_ncov_def;
143-
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;
144-
using Base::m_gcov_ori, Base::m_gcov_def, Base::m_gcon_ori, Base::m_gcon_def;
145-
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;
146-
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;
147-
148-
using Base::m_stretches, Base::m_stretchvec;
149-
150-
using Base::m_J0_sq, Base::m_J_sq;
138+
using Base::m_map;
139+
using Base::m_map_def;
140+
141+
using Base::m_Acov_ori;
142+
using Base::m_Acon_ori;
143+
using Base::m_Acov_def;
144+
using Base::m_Acon_def;
145+
using Base::m_Bcov_ori;
146+
using Base::m_Bcon_ori;
147+
using Base::m_Bcov_def;
148+
using Base::m_Bcon_def;
149+
using Base::m_acov_ori;
150+
using Base::m_acon_ori;
151+
using Base::m_acov_def;
152+
using Base::m_acon_def;
153+
using Base::m_ncov_ori;
154+
using Base::m_ncov_def;
155+
using Base::m_Gcov_ori;
156+
using Base::m_Gcon_ori;
157+
using Base::m_Gcov_def;
158+
using Base::m_Gcon_def;
159+
using Base::m_Gcov_ori_L;
160+
using Base::m_Gcov_def_L;
161+
using Base::m_gcov_ori;
162+
using Base::m_gcov_def;
163+
using Base::m_gcon_ori;
164+
using Base::m_gcon_def;
165+
using Base::m_Acov_ori_mat;
166+
using Base::m_Acon_ori_mat;
167+
using Base::m_Acov_def_mat;
168+
using Base::m_Acon_def_mat;
169+
using Base::m_Bcov_ori_mat;
170+
using Base::m_Bcov_def_mat;
171+
using Base::m_acov_ori_mat;
172+
using Base::m_acon_ori_mat;
173+
using Base::m_acov_def_mat;
174+
using Base::m_acon_def_mat;
175+
using Base::m_ncov_ori_mat;
176+
using Base::m_ncov_def_mat;
177+
178+
using Base::m_stretches;
179+
using Base::m_stretchvec;
180+
181+
using Base::m_J0_sq;
182+
using Base::m_J_sq;
151183

152184
gsOptionList m_options;
153185

‎gsMaterialMatrixEval.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ class gsMaterialMatrixEval : public gsFunction<T>
148148

149149
protected:
150150
gsMaterialMatrixBase<T> * m_materialMat;
151+
gsMatrix<T> m_z;
151152
mutable gsMaterialMatrixEval<T,out> * m_piece;
152153
index_t m_pIndex;
153154

154-
gsMatrix<T> m_z;
155155

156156

157157
};

‎gsMaterialMatrixLinear.h‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -201,19 +201,51 @@ class gsMaterialMatrixLinear : public gsMaterialMatrixBaseDim<dim,T>
201201
mutable gsMatrix<T> m_pstress, m_pstressvec;
202202

203203
// Geometric data point
204-
using Base::m_map, Base::m_map_def;
205-
206-
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;
207-
using Base::m_acov_ori, Base::m_acon_ori, Base::m_acov_def, Base::m_acon_def;
208-
using Base::m_ncov_ori, Base::m_ncov_def;
209-
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;
210-
using Base::m_gcov_ori, Base::m_gcov_def, Base::m_gcon_ori, Base::m_gcon_def;
211-
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;
212-
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;
213-
214-
using Base::m_stretches, Base::m_stretchvec;
215-
216-
using Base::m_J0_sq, Base::m_J_sq;
204+
using Base::m_map;
205+
using Base::m_map_def;
206+
207+
using Base::m_Acov_ori;
208+
using Base::m_Acon_ori;
209+
using Base::m_Acov_def;
210+
using Base::m_Acon_def;
211+
using Base::m_Bcov_ori;
212+
using Base::m_Bcon_ori;
213+
using Base::m_Bcov_def;
214+
using Base::m_Bcon_def;
215+
using Base::m_acov_ori;
216+
using Base::m_acon_ori;
217+
using Base::m_acov_def;
218+
using Base::m_acon_def;
219+
using Base::m_ncov_ori;
220+
using Base::m_ncov_def;
221+
using Base::m_Gcov_ori;
222+
using Base::m_Gcon_ori;
223+
using Base::m_Gcov_def;
224+
using Base::m_Gcon_def;
225+
using Base::m_Gcov_ori_L;
226+
using Base::m_Gcov_def_L;
227+
using Base::m_gcov_ori;
228+
using Base::m_gcov_def;
229+
using Base::m_gcon_ori;
230+
using Base::m_gcon_def;
231+
using Base::m_Acov_ori_mat;
232+
using Base::m_Acon_ori_mat;
233+
using Base::m_Acov_def_mat;
234+
using Base::m_Acon_def_mat;
235+
using Base::m_Bcov_ori_mat;
236+
using Base::m_Bcov_def_mat;
237+
using Base::m_acov_ori_mat;
238+
using Base::m_acon_ori_mat;
239+
using Base::m_acov_def_mat;
240+
using Base::m_acon_def_mat;
241+
using Base::m_ncov_ori_mat;
242+
using Base::m_ncov_def_mat;
243+
244+
using Base::m_stretches;
245+
using Base::m_stretchvec;
246+
247+
using Base::m_J0_sq;
248+
using Base::m_J_sq;
217249

218250

219251

‎gsThinShellFunctions.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void gsShellStressFunction<T>::eval_into(const gsMatrix<T> & u, gsMatrix<T> & re
6060
auto S_m = S0.tr() * Ttilde;
6161
auto S_f = S1.tr() * Ttilde;
6262

63-
gsExprEvaluator ev(m_assembler);
63+
gsExprEvaluator<> ev(m_assembler);
6464
gsMatrix<T> tmp;
6565

6666
switch (m_stress_type)

‎gsThinShellUtils.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class var1_expr : public _expr<var1_expr<E> >
219219
res.resize(rows(), cols()); // rows()*
220220
normal = _G.data().normal(k);// not normalized to unit length
221221
normal.normalize();
222-
grad_expr<U> vGrad = grad_expr(_u);
222+
grad_expr<U> vGrad = grad_expr<U>(_u);
223223

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

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

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

0 commit comments

Comments
 (0)