Skip to content

Commit b66e725

Browse files
roystgnrroystgnr
committed
Use new set_node(i,n) overload
1 parent 9fc8ee2 commit b66e725

File tree

87 files changed

+1162
-1159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1162
-1159
lines changed

‎examples/miscellaneous/miscellaneous_ex6/miscellaneous_ex6.C

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ void add_cube_convex_hull_to_mesh(MeshBase & mesh,
325325
unsigned int new_node_id = libmesh_map_find(node_id_map, old_elem->node_id(i));
326326

327327
// Node pointer assigned from input mesh
328-
new_elem->set_node(i) = mesh.node_ptr(new_node_id);
328+
new_elem->set_node(i, mesh.node_ptr(new_node_id));
329329
}
330330
}
331331
#else

‎examples/systems_of_equations/systems_of_equations_ex8/linear_elasticity_with_contact.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ void LinearElasticityWithContact::add_contact_edge_elements()
216216
Node & slave_node = mesh.node_ref(slave_node_id);
217217

218218
Elem * connector_elem = mesh.add_elem(Elem::build(EDGE2));
219-
connector_elem->set_node(0) = &master_node;
220-
connector_elem->set_node(1) = &slave_node;
219+
connector_elem->set_node(0, &master_node);
220+
connector_elem->set_node(1, &slave_node);
221221

222222
connector_elem->subdomain_id() = 10;
223223
}

‎include/geom/elem.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -2053,8 +2053,8 @@ class Elem : public ReferenceCountedObject<Elem>,
20532053
void swap2nodes(unsigned int n1, unsigned int n2)
20542054
{
20552055
Node * temp = this->node_ptr(n1);
2056-
this->set_node(n1) = this->node_ptr(n2);
2057-
this->set_node(n2) = temp;
2056+
this->set_node(n1, this->node_ptr(n2));
2057+
this->set_node(n2, temp);
20582058
}
20592059

20602060
/**
@@ -2726,7 +2726,7 @@ Elem::simple_build_side_ptr (const unsigned int i,
27262726
{
27272727
face = std::make_unique<Sideclass>(this);
27282728
for (auto n : face->node_index_range())
2729-
face->set_node(n) = this->node_ptr(Subclass::side_nodes_map[i][n]);
2729+
face->set_node(n, this->node_ptr(Subclass::side_nodes_map[i][n]));
27302730
}
27312731

27322732
#ifdef LIBMESH_ENABLE_DEPRECATED
@@ -2768,7 +2768,7 @@ Elem::simple_build_side_ptr (std::unique_ptr<Elem> & side,
27682768
side->set_p_level(this->p_level());
27692769
#endif
27702770
for (auto n : side->node_index_range())
2771-
side->set_node(n) = this->node_ptr(Subclass::side_nodes_map[i][n]);
2771+
side->set_node(n, this->node_ptr(Subclass::side_nodes_map[i][n]));
27722772
}
27732773
}
27742774

@@ -2793,7 +2793,7 @@ Elem::simple_side_ptr (std::unique_ptr<Elem> & side,
27932793
side->subdomain_id() = this->subdomain_id();
27942794

27952795
for (auto n : side->node_index_range())
2796-
side->set_node(n) = this->node_ptr(Mapclass::side_nodes_map[i][n]);
2796+
side->set_node(n, this->node_ptr(Mapclass::side_nodes_map[i][n]));
27972797
}
27982798
}
27992799

@@ -2835,7 +2835,7 @@ Elem::simple_build_edge_ptr (const unsigned int i)
28352835
std::unique_ptr<Elem> edge = std::make_unique<Edgeclass>(this);
28362836

28372837
for (auto n : edge->node_index_range())
2838-
edge->set_node(n) = this->node_ptr(Subclass::edge_nodes_map[i][n]);
2838+
edge->set_node(n, this->node_ptr(Subclass::edge_nodes_map[i][n]));
28392839

28402840
edge->set_interior_parent(this);
28412841
edge->set_mapping_type(this->mapping_type());
@@ -2872,7 +2872,7 @@ Elem::simple_build_edge_ptr (std::unique_ptr<Elem> & edge,
28722872
edge->set_p_level(this->p_level());
28732873
#endif
28742874
for (auto n : edge->node_index_range())
2875-
edge->set_node(n) = this->node_ptr(Subclass::edge_nodes_map[i][n]);
2875+
edge->set_node(n, this->node_ptr(Subclass::edge_nodes_map[i][n]));
28762876
}
28772877
}
28782878

‎include/geom/remote_elem.h

+3
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ class RemoteElem : public Elem,
101101
virtual Node * & set_node (const unsigned int i) override
102102
{ remote_elem_error("set_node"); return Elem::set_node(i); }
103103

104+
virtual void set_node (const unsigned int /*i*/, Node * /*node*/) override
105+
{ remote_elem_error("set_node"); }
106+
104107
/**
105108
* Don't hide Elem::key() defined in the base class.
106109
*/

‎src/apps/embedding.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ int main(int argc, char ** argv)
110110
if (embed == 1.0)
111111
{
112112
nodes[v] = ref.point(n);
113-
elem->set_node(v) = &nodes[v];
113+
elem->set_node(v, &nodes[v]);
114114
}
115115
else if (embed != 0.0)
116116
libmesh_error_msg("Found fractional embedding on vertex!?");
@@ -127,7 +127,7 @@ int main(int argc, char ** argv)
127127
for (auto pbn : pbns)
128128
nodes[n] += (ref.point(pbn.first) + ref.point(pbn.second))/2;
129129
nodes[n] /= pbns.size();
130-
elem->set_node(n) = &nodes[n];
130+
elem->set_node(n, &nodes[n]);
131131
}
132132

133133
const unsigned int denomdigits = std::ceil(std::log10(denominator));

‎src/fe/fe_hierarchic_shape_3D.C

+18-18
Original file line numberDiff line numberDiff line change
@@ -1341,9 +1341,9 @@ Real FE<3,SIDE_HIERARCHIC>::shape(const Elem * elem,
13411341

13421342
// We pinky swear not to modify these nodes
13431343
Elem & e = const_cast<Elem &>(*elem);
1344-
side.set_node(0) = e.node_ptr(face_vertex[0]);
1345-
side.set_node(1) = e.node_ptr(face_vertex[1]);
1346-
side.set_node(2) = e.node_ptr(face_vertex[2]);
1344+
side.set_node(0, e.node_ptr(face_vertex[0]));
1345+
side.set_node(1, e.node_ptr(face_vertex[1]));
1346+
side.set_node(2, e.node_ptr(face_vertex[2]));
13471347

13481348
const unsigned int basisnum = i - face_num*dofs_per_side;
13491349

@@ -1438,11 +1438,11 @@ Real FE<3,SIDE_HIERARCHIC>::shape(const Elem * elem,
14381438
const std::array<unsigned int, 4> face_vertex =
14391439
oriented_prism_nodes(*elem, face_num);
14401440

1441-
side->set_node(0) = e.node_ptr(face_vertex[0]);
1442-
side->set_node(1) = e.node_ptr(face_vertex[1]);
1443-
side->set_node(2) = e.node_ptr(face_vertex[2]);
1441+
side->set_node(0, e.node_ptr(face_vertex[0]));
1442+
side->set_node(1, e.node_ptr(face_vertex[1]));
1443+
side->set_node(2, e.node_ptr(face_vertex[2]));
14441444
if (face_vertex[3] < 21)
1445-
side->set_node(3) = e.node_ptr(face_vertex[3]);
1445+
side->set_node(3, e.node_ptr(face_vertex[3]));
14461446

14471447
if (face_num == 0 || face_num == 4)
14481448
sidep = {zeta[face_vertex[1]%3], zeta[face_vertex[2]%3]};
@@ -2313,25 +2313,25 @@ Real fe_hierarchic_3D_shape(const Elem * elem,
23132313
Elem & e = const_cast<Elem &>(*elem);
23142314
if (i2 == 0)
23152315
{
2316-
tri.set_node(0) = e.node_ptr(0);
2317-
tri.set_node(1) = e.node_ptr(1);
2318-
tri.set_node(2) = e.node_ptr(2);
2316+
tri.set_node(0, e.node_ptr(0));
2317+
tri.set_node(1, e.node_ptr(1));
2318+
tri.set_node(2, e.node_ptr(2));
23192319
}
23202320
else if (i2 == 1)
23212321
{
2322-
tri.set_node(0) = e.node_ptr(3);
2323-
tri.set_node(1) = e.node_ptr(4);
2324-
tri.set_node(2) = e.node_ptr(5);
2322+
tri.set_node(0, e.node_ptr(3));
2323+
tri.set_node(1, e.node_ptr(4));
2324+
tri.set_node(2, e.node_ptr(5));
23252325
}
23262326
else
23272327
{
23282328
// For interior DoFs, no flipping is necessary or done; we
23292329
// can just evaluate on any triangle ... but *not* the
23302330
// obvious 9,10,11 triangle, because that might not exist
23312331
// if we have L2_HIERARCHIC on Prism6.
2332-
tri.set_node(0) = e.node_ptr(0);
2333-
tri.set_node(1) = e.node_ptr(1);
2334-
tri.set_node(2) = e.node_ptr(2);
2332+
tri.set_node(0, e.node_ptr(0));
2333+
tri.set_node(1, e.node_ptr(1));
2334+
tri.set_node(2, e.node_ptr(2));
23352335

23362336
// For square face DoFs, prism_indices handles flipping,
23372337
// and we *can't* override that in the tri shape call.
@@ -2347,8 +2347,8 @@ Real fe_hierarchic_3D_shape(const Elem * elem,
23472347
if (tri.point(tri_edge) > tri.point((tri_edge+1)%3))
23482348
{
23492349
Node * n = tri.node_ptr(tri_edge);
2350-
tri.set_node(tri_edge) = tri.node_ptr((tri_edge+1)%3);
2351-
tri.set_node((tri_edge+1)%3) = n;
2350+
tri.set_node(tri_edge, tri.node_ptr((tri_edge+1)%3));
2351+
tri.set_node((tri_edge+1)%3, n);
23522352
}
23532353
}
23542354
}

‎src/geom/cell_hex.C

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ std::unique_ptr<Elem> Hex::side_ptr (const unsigned int i)
152152
std::unique_ptr<Elem> face = std::make_unique<Quad4>();
153153

154154
for (auto n : face->node_index_range())
155-
face->set_node(n) = this->node_ptr(Hex8::side_nodes_map[i][n]);
155+
face->set_node(n, this->node_ptr(Hex8::side_nodes_map[i][n]));
156156

157157
return face;
158158
}

‎src/geom/cell_inf_hex.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ std::unique_ptr<Elem> InfHex::side_ptr (const unsigned int i)
186186

187187
// Set the nodes
188188
for (auto n : face->node_index_range())
189-
face->set_node(n) = this->node_ptr(InfHex8::side_nodes_map[i][n]);
189+
face->set_node(n, this->node_ptr(InfHex8::side_nodes_map[i][n]));
190190

191191
return face;
192192
}
@@ -234,7 +234,7 @@ void InfHex::side_ptr (std::unique_ptr<Elem> & side,
234234

235235
// Set the nodes
236236
for (auto n : side->node_index_range())
237-
side->set_node(n) = this->node_ptr(InfHex8::side_nodes_map[i][n]);
237+
side->set_node(n, this->node_ptr(InfHex8::side_nodes_map[i][n]));
238238
}
239239

240240

‎src/geom/cell_inf_hex16.C

+3-3
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ std::unique_ptr<Elem> InfHex16::build_side_ptr (const unsigned int i,
203203

204204
// Set the nodes
205205
for (auto n : face->node_index_range())
206-
face->set_node(n) = this->node_ptr(InfHex16::side_nodes_map[i][n]);
206+
face->set_node(n, this->node_ptr(InfHex16::side_nodes_map[i][n]));
207207
}
208208

209209
#ifdef LIBMESH_ENABLE_DEPRECATED
@@ -265,7 +265,7 @@ void InfHex16::build_side_ptr (std::unique_ptr<Elem> & side,
265265

266266
// Set the nodes
267267
for (auto n : side->node_index_range())
268-
side->set_node(n) = this->node_ptr(InfHex16::side_nodes_map[i][n]);
268+
side->set_node(n, this->node_ptr(InfHex16::side_nodes_map[i][n]));
269269
}
270270

271271

@@ -328,7 +328,7 @@ void InfHex16::build_edge_ptr (std::unique_ptr<Elem> & edge,
328328

329329
// Set the nodes
330330
for (auto n : edge->node_index_range())
331-
edge->set_node(n) = this->node_ptr(InfHex16::edge_nodes_map[i][n]);
331+
edge->set_node(n, this->node_ptr(InfHex16::edge_nodes_map[i][n]));
332332
}
333333

334334

‎src/geom/cell_inf_hex18.C

+3-3
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ std::unique_ptr<Elem> InfHex18::build_side_ptr (const unsigned int i,
223223
}
224224

225225
for (auto n : face->node_index_range())
226-
face->set_node(n) = this->node_ptr(InfHex18::side_nodes_map[i][n]);
226+
face->set_node(n, this->node_ptr(InfHex18::side_nodes_map[i][n]));
227227
}
228228

229229
#ifdef LIBMESH_ENABLE_DEPRECATED
@@ -285,7 +285,7 @@ void InfHex18::build_side_ptr (std::unique_ptr<Elem> & side,
285285

286286
// Set the nodes
287287
for (auto n : side->node_index_range())
288-
side->set_node(n) = this->node_ptr(InfHex18::side_nodes_map[i][n]);
288+
side->set_node(n, this->node_ptr(InfHex18::side_nodes_map[i][n]));
289289
}
290290

291291

@@ -348,7 +348,7 @@ void InfHex18::build_edge_ptr (std::unique_ptr<Elem> & edge,
348348

349349
// Set the nodes
350350
for (auto n : edge->node_index_range())
351-
edge->set_node(n) = this->node_ptr(InfHex18::edge_nodes_map[i][n]);
351+
edge->set_node(n, this->node_ptr(InfHex18::edge_nodes_map[i][n]));
352352
}
353353

354354

‎src/geom/cell_inf_hex8.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ std::unique_ptr<Elem> InfHex8::build_side_ptr (const unsigned int i,
168168

169169
// Set the nodes
170170
for (auto n : face->node_index_range())
171-
face->set_node(n) = this->node_ptr(InfHex8::side_nodes_map[i][n]);
171+
face->set_node(n, this->node_ptr(InfHex8::side_nodes_map[i][n]));
172172
}
173173

174174
#ifdef LIBMESH_ENABLE_DEPRECATED
@@ -259,7 +259,7 @@ void InfHex8::build_edge_ptr (std::unique_ptr<Elem> & edge,
259259

260260
// Set the nodes
261261
for (auto n : edge->node_index_range())
262-
edge->set_node(n) = this->node_ptr(InfHex8::edge_nodes_map[i][n]);
262+
edge->set_node(n, this->node_ptr(InfHex8::edge_nodes_map[i][n]));
263263
}
264264

265265

‎src/geom/cell_inf_prism.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ std::unique_ptr<Elem> InfPrism::side_ptr (const unsigned int i)
184184

185185
// Set the nodes
186186
for (auto n : face->node_index_range())
187-
face->set_node(n) = this->node_ptr(InfPrism6::side_nodes_map[i][n]);
187+
face->set_node(n, this->node_ptr(InfPrism6::side_nodes_map[i][n]));
188188

189189
return face;
190190
}
@@ -231,7 +231,7 @@ void InfPrism::side_ptr (std::unique_ptr<Elem> & side,
231231

232232
// Set the nodes
233233
for (auto n : side->node_index_range())
234-
side->set_node(n) = this->node_ptr(InfPrism6::side_nodes_map[i][n]);
234+
side->set_node(n, this->node_ptr(InfPrism6::side_nodes_map[i][n]));
235235
}
236236

237237

‎src/geom/cell_inf_prism12.C

+3-3
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ std::unique_ptr<Elem> InfPrism12::build_side_ptr (const unsigned int i,
187187

188188
// Set the nodes
189189
for (auto n : face->node_index_range())
190-
face->set_node(n) = this->node_ptr(InfPrism12::side_nodes_map[i][n]);
190+
face->set_node(n, this->node_ptr(InfPrism12::side_nodes_map[i][n]));
191191
}
192192

193193
#ifdef LIBMESH_ENABLE_DEPRECATED
@@ -244,7 +244,7 @@ void InfPrism12::build_side_ptr (std::unique_ptr<Elem> & side,
244244

245245
// Set the nodes
246246
for (auto n : side->node_index_range())
247-
side->set_node(n) = this->node_ptr(InfPrism12::side_nodes_map[i][n]);
247+
side->set_node(n, this->node_ptr(InfPrism12::side_nodes_map[i][n]));
248248
}
249249

250250

@@ -305,7 +305,7 @@ void InfPrism12::build_edge_ptr (std::unique_ptr<Elem> & edge,
305305

306306
// Set the nodes
307307
for (auto n : edge->node_index_range())
308-
edge->set_node(n) = this->node_ptr(InfPrism12::edge_nodes_map[i][n]);
308+
edge->set_node(n, this->node_ptr(InfPrism12::edge_nodes_map[i][n]));
309309
}
310310

311311

‎src/geom/cell_inf_prism6.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ std::unique_ptr<Elem> InfPrism6::build_side_ptr (const unsigned int i,
163163

164164
// Set the nodes
165165
for (auto n : face->node_index_range())
166-
face->set_node(n) = this->node_ptr(InfPrism6::side_nodes_map[i][n]);
166+
face->set_node(n, this->node_ptr(InfPrism6::side_nodes_map[i][n]));
167167
}
168168

169169
#ifdef LIBMESH_ENABLE_DEPRECATED
@@ -251,7 +251,7 @@ void InfPrism6::build_edge_ptr (std::unique_ptr<Elem> & edge,
251251

252252
// Set the nodes
253253
for (auto n : edge->node_index_range())
254-
edge->set_node(n) = this->node_ptr(InfPrism6::edge_nodes_map[i][n]);
254+
edge->set_node(n, this->node_ptr(InfPrism6::edge_nodes_map[i][n]));
255255
}
256256

257257

‎src/geom/cell_prism.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ std::unique_ptr<Elem> Prism::side_ptr (const unsigned int i)
191191

192192
// Set the nodes
193193
for (auto n : face->node_index_range())
194-
face->set_node(n) = this->node_ptr(Prism6::side_nodes_map[i][n]);
194+
face->set_node(n, this->node_ptr(Prism6::side_nodes_map[i][n]));
195195

196196
return face;
197197
}
@@ -237,7 +237,7 @@ void Prism::side_ptr (std::unique_ptr<Elem> & side,
237237

238238
// Set the nodes
239239
for (auto n : side->node_index_range())
240-
side->set_node(n) = this->node_ptr(Prism6::side_nodes_map[i][n]);
240+
side->set_node(n, this->node_ptr(Prism6::side_nodes_map[i][n]));
241241
}
242242

243243

‎src/geom/cell_prism15.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ std::unique_ptr<Elem> Prism15::build_side_ptr (const unsigned int i,
236236

237237
// Set the nodes
238238
for (auto n : face->node_index_range())
239-
face->set_node(n) = this->node_ptr(Prism15::side_nodes_map[i][n]);
239+
face->set_node(n, this->node_ptr(Prism15::side_nodes_map[i][n]));
240240
}
241241

242242
#ifdef LIBMESH_ENABLE_DEPRECATED
@@ -294,7 +294,7 @@ void Prism15::build_side_ptr (std::unique_ptr<Elem> & side,
294294

295295
// Set the nodes
296296
for (auto n : side->node_index_range())
297-
side->set_node(n) = this->node_ptr(Prism15::side_nodes_map[i][n]);
297+
side->set_node(n, this->node_ptr(Prism15::side_nodes_map[i][n]));
298298
}
299299

300300

‎src/geom/cell_prism18.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ std::unique_ptr<Elem> Prism18::build_side_ptr (const unsigned int i,
275275

276276
// Set the nodes
277277
for (auto n : face->node_index_range())
278-
face->set_node(n) = this->node_ptr(Prism18::side_nodes_map[i][n]);
278+
face->set_node(n, this->node_ptr(Prism18::side_nodes_map[i][n]));
279279
}
280280

281281
#ifdef LIBMESH_ENABLE_DEPRECATED
@@ -334,7 +334,7 @@ void Prism18::build_side_ptr (std::unique_ptr<Elem> & side,
334334

335335
// Set the nodes
336336
for (auto n : side->node_index_range())
337-
side->set_node(n) = this->node_ptr(Prism18::side_nodes_map[i][n]);
337+
side->set_node(n, this->node_ptr(Prism18::side_nodes_map[i][n]));
338338
}
339339

340340

0 commit comments

Comments
 (0)