Skip to content

Commit c4e764f

Browse files
nmnobrenmnobre
committed
Rewrite the interface for (side_)nodal_soln() to take vdim
1 parent a856686 commit c4e764f

15 files changed

+143
-90
lines changed

‎include/fe/fe.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,8 @@ class FE : public FEGenericBase<typename FEOutputType<T>::type>
386386
*
387387
* On a p-refined element, \p o should be the base order of the element.
388388
*/
389-
static void nodal_soln(const Elem * elem, const Order o,
389+
static void nodal_soln(const unsigned vdim,
390+
const Elem * elem, const Order o,
390391
const std::vector<Number> & elem_soln,
391392
std::vector<Number> & nodal_soln,
392393
bool add_p_level = true);
@@ -397,7 +398,8 @@ class FE : public FEGenericBase<typename FEOutputType<T>::type>
397398
*
398399
* On a p-refined element, \p o should be the base order of the element.
399400
*/
400-
static void side_nodal_soln(const Elem * elem, const Order o,
401+
static void side_nodal_soln(const unsigned vdim,
402+
const Elem * elem, const Order o,
401403
const unsigned int side,
402404
const std::vector<Number> & elem_soln,
403405
std::vector<Number> & nodal_soln_on_side,
@@ -739,7 +741,8 @@ class FE : public FEGenericBase<typename FEOutputType<T>::type>
739741
/**
740742
* A default implementation for side_nodal_soln
741743
*/
742-
static void default_side_nodal_soln(const Elem * elem, const Order o,
744+
static void default_side_nodal_soln(const unsigned vdim,
745+
const Elem * elem, const Order o,
743746
const unsigned int side,
744747
const std::vector<Number> & elem_soln,
745748
std::vector<Number> & nodal_soln_on_side,

‎include/fe/fe_interface.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ class FEInterface
289289
* should be updated so that it does not take a \p dim argument.
290290
*/
291291
static void nodal_soln(const unsigned int dim,
292+
const unsigned int vdim,
292293
const FEType & fe_t,
293294
const Elem * elem,
294295
const std::vector<Number> & elem_soln,
@@ -304,7 +305,8 @@ class FEInterface
304305
* order of the element. The Elem::p_level(), if any, is accounted
305306
* for internally by this routine.
306307
*/
307-
static void side_nodal_soln(const FEType & fe_t,
308+
static void side_nodal_soln(const unsigned int vdim,
309+
const FEType & fe_t,
308310
const Elem * elem,
309311
const unsigned int side,
310312
const std::vector<Number> & elem_soln,

‎include/fe/fe_macro.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
template LIBMESH_EXPORT void FE<2,SUBDIVISION>::init_shape_functions(const std::vector<Point> &, const Elem *); \
6565
template LIBMESH_EXPORT void FE<2,SUBDIVISION>::init_dual_shape_functions(unsigned int, unsigned int); \
6666
template LIBMESH_EXPORT void FE<2,SUBDIVISION>::default_all_shape_derivs (const Elem * elem, const Order o, const std::vector<Point> & p, std::vector<std::vector<Real>> * comps[3], const bool add_p_level); \
67-
template LIBMESH_EXPORT void FE<2,SUBDIVISION>::default_side_nodal_soln(const Elem * elem, const Order o, const unsigned int side, const std::vector<Number> & elem_soln, std::vector<Number> & nodal_soln_on_side, bool add_p_level)
67+
template LIBMESH_EXPORT void FE<2,SUBDIVISION>::default_side_nodal_soln(const unsigned vdim, const Elem * elem, const Order o, const unsigned int side, const std::vector<Number> & elem_soln, std::vector<Number> & nodal_soln_on_side, bool add_p_level)
6868

6969
#endif // LIBMESH_ENABLE_INFINITE_ELEMENTS
7070

@@ -121,7 +121,8 @@
121121

122122
#define LIBMESH_FE_NODAL_SOLN_DIM(_fetype, _funcname, _dim) \
123123
template <> \
124-
void FE<_dim,_fetype>::nodal_soln(const Elem * elem, \
124+
void FE<_dim,_fetype>::nodal_soln(const unsigned, \
125+
const Elem * elem, \
125126
const Order order, \
126127
const std::vector<Number> & elem_soln,\
127128
std::vector<Number> & nodal_soln, \
@@ -137,13 +138,14 @@ LIBMESH_FE_NODAL_SOLN_DIM(fetype, _funcname, 3)
137138

138139
#define LIBMESH_FE_SIDE_NODAL_SOLN_DIM(_fetype, _dim) \
139140
template <> \
140-
void FE<_dim,_fetype>::side_nodal_soln(const Elem * elem, \
141+
void FE<_dim,_fetype>::side_nodal_soln(const unsigned vdim, \
142+
const Elem * elem, \
141143
const Order order, \
142144
const unsigned int side, \
143145
const std::vector<Number> & elem_soln,\
144146
std::vector<Number> & nodal_soln, \
145147
const bool add_p_level) \
146-
{ default_side_nodal_soln(elem, order, side, elem_soln, nodal_soln, add_p_level); }
148+
{ default_side_nodal_soln(vdim, elem, order, side, elem_soln, nodal_soln, add_p_level); }
147149

148150
#define LIBMESH_FE_SIDE_NODAL_SOLN(fetype) \
149151
LIBMESH_FE_SIDE_NODAL_SOLN_DIM(fetype, 0) \

‎src/fe/fe.C

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,14 +706,15 @@ FE<Dim,T>::default_all_shape_derivs (const Elem * elem,
706706

707707
template <unsigned int Dim, FEFamily T>
708708
void
709-
FE<Dim,T>::default_side_nodal_soln(const Elem * elem, const Order o,
709+
FE<Dim,T>::default_side_nodal_soln(const unsigned vdim,
710+
const Elem * elem, const Order o,
710711
const unsigned int side,
711712
const std::vector<Number> & elem_soln,
712713
std::vector<Number> & nodal_soln_on_side,
713714
const bool add_p_level)
714715
{
715716
std::vector<Number> full_nodal_soln;
716-
nodal_soln(elem, o, elem_soln, full_nodal_soln, add_p_level);
717+
nodal_soln(vdim, elem, o, elem_soln, full_nodal_soln, add_p_level);
717718
const std::vector<unsigned int> side_nodes =
718719
elem->nodes_on_side(side);
719720

‎src/fe/fe_hierarchic_vec.C

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,70 +96,78 @@ void hierarchic_vec_nodal_soln(const Elem * elem,
9696
// of explicit instantiation at the end of this file.
9797
// This could be macro-ified so that it fits on one line...
9898
template <>
99-
void FE<0,HIERARCHIC_VEC>::nodal_soln(const Elem * elem,
99+
void FE<0,HIERARCHIC_VEC>::nodal_soln(const unsigned vdim,
100+
const Elem * elem,
100101
const Order order,
101102
const std::vector<Number> & elem_soln,
102103
std::vector<Number> & nodal_soln,
103104
const bool add_p_level)
104-
{ FE<0,HIERARCHIC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
105+
{ FE<0,HIERARCHIC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
105106

106107
template <>
107-
void FE<1,HIERARCHIC_VEC>::nodal_soln(const Elem * elem,
108+
void FE<1,HIERARCHIC_VEC>::nodal_soln(const unsigned vdim,
109+
const Elem * elem,
108110
const Order order,
109111
const std::vector<Number> & elem_soln,
110112
std::vector<Number> & nodal_soln,
111113
const bool add_p_level)
112-
{ FE<1,HIERARCHIC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
114+
{ FE<1,HIERARCHIC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
113115

114116
template <>
115-
void FE<2,HIERARCHIC_VEC>::nodal_soln(const Elem * elem,
117+
void FE<2,HIERARCHIC_VEC>::nodal_soln(const unsigned,
118+
const Elem * elem,
116119
const Order order,
117120
const std::vector<Number> & elem_soln,
118121
std::vector<Number> & nodal_soln,
119122
const bool add_p_level)
120-
{ hierarchic_vec_nodal_soln(elem, order, elem_soln, 2 /*dimension*/, nodal_soln, add_p_level); }
123+
{ hierarchic_vec_nodal_soln(elem, order, elem_soln, 2 /*dim*/, nodal_soln, add_p_level); }
121124

122125
template <>
123-
void FE<3,HIERARCHIC_VEC>::nodal_soln(const Elem * elem,
126+
void FE<3,HIERARCHIC_VEC>::nodal_soln(const unsigned,
127+
const Elem * elem,
124128
const Order order,
125129
const std::vector<Number> & elem_soln,
126130
std::vector<Number> & nodal_soln,
127131
const bool add_p_level)
128-
{ hierarchic_vec_nodal_soln(elem, order, elem_soln, 3 /*dimension*/, nodal_soln, add_p_level); }
132+
{ hierarchic_vec_nodal_soln(elem, order, elem_soln, 3 /*dim*/, nodal_soln, add_p_level); }
129133

130134
LIBMESH_FE_SIDE_NODAL_SOLN(HIERARCHIC_VEC)
131135

132136
template <>
133-
void FE<0,L2_HIERARCHIC_VEC>::nodal_soln(const Elem * elem,
137+
void FE<0,L2_HIERARCHIC_VEC>::nodal_soln(const unsigned vdim,
138+
const Elem * elem,
134139
const Order order,
135140
const std::vector<Number> & elem_soln,
136141
std::vector<Number> & nodal_soln,
137142
const bool add_p_level)
138-
{ FE<0,HIERARCHIC_VEC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
143+
{ FE<0,HIERARCHIC_VEC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
139144

140145
template <>
141-
void FE<1,L2_HIERARCHIC_VEC>::nodal_soln(const Elem * elem,
146+
void FE<1,L2_HIERARCHIC_VEC>::nodal_soln(const unsigned vdim,
147+
const Elem * elem,
142148
const Order order,
143149
const std::vector<Number> & elem_soln,
144150
std::vector<Number> & nodal_soln,
145151
const bool add_p_level)
146-
{ FE<1,HIERARCHIC_VEC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
152+
{ FE<1,HIERARCHIC_VEC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
147153

148154
template <>
149-
void FE<2,L2_HIERARCHIC_VEC>::nodal_soln(const Elem * elem,
155+
void FE<2,L2_HIERARCHIC_VEC>::nodal_soln(const unsigned vdim,
156+
const Elem * elem,
150157
const Order order,
151158
const std::vector<Number> & elem_soln,
152159
std::vector<Number> & nodal_soln,
153160
const bool add_p_level)
154-
{ FE<2,HIERARCHIC_VEC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
161+
{ FE<2,HIERARCHIC_VEC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
155162

156163
template <>
157-
void FE<3,L2_HIERARCHIC_VEC>::nodal_soln(const Elem * elem,
164+
void FE<3,L2_HIERARCHIC_VEC>::nodal_soln(const unsigned vdim,
165+
const Elem * elem,
158166
const Order order,
159167
const std::vector<Number> & elem_soln,
160168
std::vector<Number> & nodal_soln,
161169
const bool add_p_level)
162-
{ FE<3,HIERARCHIC_VEC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
170+
{ FE<3,HIERARCHIC_VEC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
163171

164172
LIBMESH_FE_SIDE_NODAL_SOLN(L2_HIERARCHIC_VEC)
165173

‎src/fe/fe_interface.C

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,8 @@ void FEInterface::dofs_on_edge(const Elem * const elem,
865865

866866

867867

868-
869868
void FEInterface::nodal_soln(const unsigned int dim,
869+
const unsigned int vdim,
870870
const FEType & fe_t,
871871
const Elem * elem,
872872
const std::vector<Number> & elem_soln,
@@ -885,12 +885,13 @@ void FEInterface::nodal_soln(const unsigned int dim,
885885

886886
const Order order = fe_t.order;
887887

888-
void_fe_with_vec_switch(nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level));
888+
void_fe_with_vec_switch(nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level));
889889
}
890890

891891

892892

893-
void FEInterface::side_nodal_soln(const FEType & fe_t,
893+
void FEInterface::side_nodal_soln(const unsigned int vdim,
894+
const FEType & fe_t,
894895
const Elem * elem,
895896
const unsigned int side,
896897
const std::vector<Number> & elem_soln,
@@ -910,7 +911,7 @@ void FEInterface::side_nodal_soln(const FEType & fe_t,
910911
const Order order = fe_t.order;
911912
const unsigned int dim = elem->dim();
912913

913-
void_fe_with_vec_switch(side_nodal_soln(elem, order, side, elem_soln, nodal_soln, add_p_level));
914+
void_fe_with_vec_switch(side_nodal_soln(vdim, elem, order, side, elem_soln, nodal_soln, add_p_level));
914915
}
915916

916917

‎src/fe/fe_lagrange_vec.C

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -634,31 +634,35 @@ void lagrange_vec_nodal_soln(const Elem * elem,
634634
// of explicit instantiation at the end of this file.
635635
// This could be macro-ified so that it fits on one line...
636636
template <>
637-
void FE<0,LAGRANGE_VEC>::nodal_soln(const Elem * elem,
637+
void FE<0,LAGRANGE_VEC>::nodal_soln(const unsigned vdim,
638+
const Elem * elem,
638639
const Order order,
639640
const std::vector<Number> & elem_soln,
640641
std::vector<Number> & nodal_soln,
641642
const bool add_p_level)
642-
{ FE<0,LAGRANGE>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
643+
{ FE<0,LAGRANGE>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
643644

644645
template <>
645-
void FE<1,LAGRANGE_VEC>::nodal_soln(const Elem * elem,
646+
void FE<1,LAGRANGE_VEC>::nodal_soln(const unsigned vdim,
647+
const Elem * elem,
646648
const Order order,
647649
const std::vector<Number> & elem_soln,
648650
std::vector<Number> & nodal_soln,
649651
const bool add_p_level)
650-
{ FE<1,LAGRANGE>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
652+
{ FE<1,LAGRANGE>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
651653

652654
template <>
653-
void FE<2,LAGRANGE_VEC>::nodal_soln(const Elem * elem,
655+
void FE<2,LAGRANGE_VEC>::nodal_soln(const unsigned,
656+
const Elem * elem,
654657
const Order order,
655658
const std::vector<Number> & elem_soln,
656659
std::vector<Number> & nodal_soln,
657660
const bool add_p_level)
658661
{ lagrange_vec_nodal_soln(elem, order, elem_soln, 2 /*dimension*/, nodal_soln, add_p_level); }
659662

660663
template <>
661-
void FE<3,LAGRANGE_VEC>::nodal_soln(const Elem * elem,
664+
void FE<3,LAGRANGE_VEC>::nodal_soln(const unsigned,
665+
const Elem * elem,
662666
const Order order,
663667
const std::vector<Number> & elem_soln,
664668
std::vector<Number> & nodal_soln,
@@ -668,36 +672,40 @@ void FE<3,LAGRANGE_VEC>::nodal_soln(const Elem * elem,
668672
LIBMESH_FE_SIDE_NODAL_SOLN(LAGRANGE_VEC)
669673

670674
template <>
671-
void FE<0,L2_LAGRANGE_VEC>::nodal_soln(const Elem * elem,
675+
void FE<0,L2_LAGRANGE_VEC>::nodal_soln(const unsigned vdim,
676+
const Elem * elem,
672677
const Order order,
673678
const std::vector<Number> & elem_soln,
674679
std::vector<Number> & nodal_soln,
675680
const bool add_p_level)
676-
{ FE<0,LAGRANGE_VEC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
681+
{ FE<0,LAGRANGE_VEC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
677682

678683
template <>
679-
void FE<1,L2_LAGRANGE_VEC>::nodal_soln(const Elem * elem,
684+
void FE<1,L2_LAGRANGE_VEC>::nodal_soln(const unsigned vdim,
685+
const Elem * elem,
680686
const Order order,
681687
const std::vector<Number> & elem_soln,
682688
std::vector<Number> & nodal_soln,
683689
const bool add_p_level)
684-
{ FE<1,LAGRANGE_VEC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
690+
{ FE<1,LAGRANGE_VEC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
685691

686692
template <>
687-
void FE<2,L2_LAGRANGE_VEC>::nodal_soln(const Elem * elem,
693+
void FE<2,L2_LAGRANGE_VEC>::nodal_soln(const unsigned vdim,
694+
const Elem * elem,
688695
const Order order,
689696
const std::vector<Number> & elem_soln,
690697
std::vector<Number> & nodal_soln,
691698
const bool add_p_level)
692-
{ FE<2,LAGRANGE_VEC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
699+
{ FE<2,LAGRANGE_VEC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
693700

694701
template <>
695-
void FE<3,L2_LAGRANGE_VEC>::nodal_soln(const Elem * elem,
702+
void FE<3,L2_LAGRANGE_VEC>::nodal_soln(const unsigned vdim,
703+
const Elem * elem,
696704
const Order order,
697705
const std::vector<Number> & elem_soln,
698706
std::vector<Number> & nodal_soln,
699707
const bool add_p_level)
700-
{ FE<3,LAGRANGE_VEC>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level); }
708+
{ FE<3,LAGRANGE_VEC>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level); }
701709

702710
LIBMESH_FE_SIDE_NODAL_SOLN(L2_LAGRANGE_VEC)
703711

‎src/fe/fe_monomial_vec.C

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,29 +128,32 @@ monomial_vec_nodal_soln(const Elem * elem,
128128
// This could be macro-ified so that it fits on one line...
129129
template <>
130130
void
131-
FE<0, MONOMIAL_VEC>::nodal_soln(const Elem * elem,
131+
FE<0, MONOMIAL_VEC>::nodal_soln(const unsigned vdim,
132+
const Elem * elem,
132133
const Order order,
133134
const std::vector<Number> & elem_soln,
134135
std::vector<Number> & nodal_soln,
135136
const bool add_p_level)
136137
{
137-
FE<0, MONOMIAL>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level);
138+
FE<0, MONOMIAL>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level);
138139
}
139140

140141
template <>
141142
void
142-
FE<1, MONOMIAL_VEC>::nodal_soln(const Elem * elem,
143+
FE<1, MONOMIAL_VEC>::nodal_soln(const unsigned vdim,
144+
const Elem * elem,
143145
const Order order,
144146
const std::vector<Number> & elem_soln,
145147
std::vector<Number> & nodal_soln,
146148
const bool add_p_level)
147149
{
148-
FE<1, MONOMIAL>::nodal_soln(elem, order, elem_soln, nodal_soln, add_p_level);
150+
FE<1, MONOMIAL>::nodal_soln(vdim, elem, order, elem_soln, nodal_soln, add_p_level);
149151
}
150152

151153
template <>
152154
void
153-
FE<2, MONOMIAL_VEC>::nodal_soln(const Elem * elem,
155+
FE<2, MONOMIAL_VEC>::nodal_soln(const unsigned,
156+
const Elem * elem,
154157
const Order order,
155158
const std::vector<Number> & elem_soln,
156159
std::vector<Number> & nodal_soln,
@@ -161,7 +164,8 @@ FE<2, MONOMIAL_VEC>::nodal_soln(const Elem * elem,
161164

162165
template <>
163166
void
164-
FE<3, MONOMIAL_VEC>::nodal_soln(const Elem * elem,
167+
FE<3, MONOMIAL_VEC>::nodal_soln(const unsigned,
168+
const Elem * elem,
165169
const Order order,
166170
const std::vector<Number> & elem_soln,
167171
std::vector<Number> & nodal_soln,

0 commit comments

Comments
 (0)