Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/boundary_conditions/src/pressure_pinning.C
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ namespace GRINS
libMesh::FEType fe_type = c.get_element_fe(var)->get_fe_type();

libMesh::Point point_loc_in_masterelem =
libMesh::FEInterface::inverse_map(c.get_dim(), fe_type, &c.get_elem(), _pin_location);
libMesh::FEMap::inverse_map(c.get_dim(), &c.get_elem(), _pin_location);

std::vector<libMesh::Real> phi(n_var_dofs);

for (unsigned int i=0; i != n_var_dofs; i++)
phi[i] = libMesh::FEInterface::shape( c.get_dim(), fe_type, &c.get_elem(), i,
phi[i] = libMesh::FEInterface::shape( fe_type, &c.get_elem(), i,
point_loc_in_masterelem );

for (unsigned int i=0; i != n_var_dofs; i++)
Expand Down
4 changes: 2 additions & 2 deletions src/physics/src/physics.C
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ namespace GRINS
std::unique_ptr<FEGenericBase<libMesh::Real> >
fe_new(FEGenericBase<libMesh::Real>::build(elem_dim, fe_type));

// Map the physical co-ordinates to the master co-ordinates using the inverse_map from fe_interface.h
// Map the physical co-ordinates to the master co-ordinates using the inverse_map
// Build a vector of point co-ordinates to send to reinit
Point master_point = elem ?
FEInterface::inverse_map(elem_dim, fe_type, elem, p) :
FEMap::inverse_map(elem_dim, elem, p) :
Point(0);

std::vector<Point> coor(1, master_point);
Expand Down
2 changes: 1 addition & 1 deletion src/qoi/src/absorption_coeff.C
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ namespace GRINS

// need to map the physical coordinates of QP to reference coordinates
libMesh::Elem & main_elem = context.get_elem();
libMesh::Point qp_ref = libMesh::FEInterface::inverse_map(main_elem.dim(),main_elem.type(),&main_elem,qp_xyz);
libMesh::Point qp_ref = libMesh::FEMap::inverse_map(main_elem.dim(),&main_elem,qp_xyz);

std::vector<libMesh::Point> qp(1);
qp[0] = qp_ref;
Expand Down
10 changes: 5 additions & 5 deletions src/qoi/src/laser_absorption.C
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ namespace GRINS
{
// create an EDGE2 elem to represent the start of the laser beam
std::shared_ptr<libMesh::Elem> elem( new libMesh::Edge2() );
elem->set_node(0) = new libMesh::Node(bottom_origin);
elem->set_node(1) = new libMesh::Node(top_origin);
elem->set_node(0, new libMesh::Node(bottom_origin));
elem->set_node(1, new libMesh::Node(top_origin));

// now use QGauss to identify the quadratures weights and points on this "laser" elem
libMesh::Order order = (libMesh::Order)(2*n_quadrature_points - 1);
Expand Down Expand Up @@ -115,7 +115,7 @@ namespace GRINS

std::shared_ptr<libMesh::Elem> elem( new libMesh::Quad9() );

elem->set_node(0) = new libMesh::Node(p);
elem->set_node(0, new libMesh::Node(p));
elem->node_ptr(0)->set_id(0);

for (unsigned int s = 1; s < 8; ++s)
Expand All @@ -130,13 +130,13 @@ namespace GRINS

libMesh::Point node = radius*(x1*p + x2*w);

elem->set_node(s) = new libMesh::Node(node);
elem->set_node(s, new libMesh::Node(node));
elem->node_ptr(s)->set_id(s);

p = node;
}

elem->set_node(8) = new libMesh::Node(centerline_origin);
elem->set_node(8, new libMesh::Node(centerline_origin));
elem->node_ptr(8)->set_id(8);

// need a dummy ID to get through several asserts
Expand Down
18 changes: 9 additions & 9 deletions src/qoi/src/rayfire_mesh.C
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ namespace GRINS
// add end point as node on the rayfire mesh
end_node = _mesh->add_point(end_point);
libMesh::Elem * elem = _mesh->add_elem(new libMesh::Edge2);
elem->set_node(0) = start_node;
elem->set_node(1) = end_node;
elem->set_node(0, start_node);
elem->set_node(1, end_node);

// warn if rayfire elem is shorter than TOLERANCE
if ( (start_point-end_point).norm() < libMesh::TOLERANCE)
Expand Down Expand Up @@ -586,7 +586,7 @@ namespace GRINS
if (_dim == 3)
{
const libMesh::Elem * elem_edge = NULL;
std::unique_ptr<const libMesh::Elem> side_elem = cur_elem->build_side_ptr(side,false);
std::unique_ptr<const libMesh::Elem> side_elem = cur_elem->build_side_ptr(side);

for (unsigned int s=0; s<side_elem->n_sides(); ++s)
{
Expand Down Expand Up @@ -923,7 +923,7 @@ namespace GRINS

for (unsigned int s=0; s<cur_elem->n_sides(); ++s)
{
std::unique_ptr<const libMesh::Elem> side_elem = cur_elem->build_side_ptr(s,false);
std::unique_ptr<const libMesh::Elem> side_elem = cur_elem->build_side_ptr(s);

if (side_elem->contains_point(initial_point,libMesh::TOLERANCE*0.1))
continue;
Expand Down Expand Up @@ -1064,7 +1064,7 @@ namespace GRINS
for (unsigned int n=0; n<first_order_elem->n_nodes(); ++n)
{
libMesh::Node * node = new libMesh::Node(elem->point(n));
first_order_elem->set_node(n) = node;
first_order_elem->set_node(n, node);
}

return first_order_elem;
Expand Down Expand Up @@ -1152,8 +1152,8 @@ namespace GRINS
new_node = _mesh->add_point(end_point);
libMesh::Elem * elem = _mesh->add_elem(new libMesh::Edge2);

elem->set_node(0) = prev_node;
elem->set_node(1) = new_node;
elem->set_node(0, prev_node);
elem->set_node(1, new_node);

libmesh_assert_less( (*(elem->node_ptr(0))-_origin).norm(), (*(elem->node_ptr(1))-_origin).norm());

Expand Down Expand Up @@ -1226,8 +1226,8 @@ namespace GRINS

// add a new rayfire elem
libMesh::Elem * elem = _mesh->add_elem(new libMesh::Edge2);
elem->set_node(0) = _mesh->node_ptr(start_node->id());
elem->set_node(1) = _mesh->node_ptr(end_node->id());
elem->set_node(0, _mesh->node_ptr(start_node->id()));
elem->set_node(1, _mesh->node_ptr(end_node->id()));

libmesh_assert_less( (*(elem->node_ptr(0))-_origin).norm(), (*(elem->node_ptr(1))-_origin).norm());

Expand Down
8 changes: 4 additions & 4 deletions src/utilities/src/distance_function.C
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,17 @@ namespace GRINS {
libmesh_assert(libMesh::initialized());

// Add distance function system
_equation_systems.add_system<libMesh::System>("distance_function");

// Get reference to distance function system we just added
libMesh::System& sys = _equation_systems.get_system<libMesh::System>("distance_function");
libMesh::System& sys = _equation_systems.add_system<libMesh::System>("distance_function");

// Add distance function variable
sys.add_variable("distance", libMesh::FIRST);

// Attach initialization function
sys.attach_init_object(*this);

// Initialize if necessary
if (!sys.is_initialized())
sys.init();
}

//---------------------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions test/interface/rayfire_test_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ namespace GRINSTesting

libMesh::Elem* elem = mesh->add_elem( new libMesh::Quad4 );
for (unsigned int n=0; n<4; n++)
elem->set_node(n) = mesh->node_ptr(n);
elem->set_node(n, mesh->node_ptr(n));

mesh->prepare_for_use();

Expand All @@ -181,7 +181,7 @@ namespace GRINSTesting

libMesh::Elem* elem = mesh->add_elem( new libMesh::Quad9 );
for (unsigned int n=0; n<9; n++)
elem->set_node(n) = mesh->node_ptr(n);
elem->set_node(n, mesh->node_ptr(n));

mesh->prepare_for_use();

Expand All @@ -206,7 +206,7 @@ namespace GRINSTesting

libMesh::Elem* elem = mesh->add_elem( new libMesh::Hex8 );
for (unsigned int n=0; n<8; n++)
elem->set_node(n) = mesh->node_ptr(n);
elem->set_node(n, mesh->node_ptr(n));

mesh->prepare_for_use();

Expand Down Expand Up @@ -256,7 +256,7 @@ namespace GRINSTesting

libMesh::Elem* elem = mesh->add_elem( new libMesh::Hex27 );
for (unsigned int n=0; n<27; n++)
elem->set_node(n) = mesh->node_ptr(n);
elem->set_node(n, mesh->node_ptr(n));

mesh->prepare_for_use();

Expand All @@ -277,7 +277,7 @@ namespace GRINSTesting

libMesh::Elem* elem = mesh->add_elem( new libMesh::Tet4 );
for (unsigned int n=0; n<4; n++)
elem->set_node(n) = mesh->node_ptr(n);
elem->set_node(n, mesh->node_ptr(n));

mesh->prepare_for_use();

Expand All @@ -304,7 +304,7 @@ namespace GRINSTesting

libMesh::Elem* elem = mesh->add_elem( new libMesh::Tet10 );
for (unsigned int n=0; n<10; n++)
elem->set_node(n) = mesh->node_ptr(n);
elem->set_node(n, mesh->node_ptr(n));

mesh->prepare_for_use();

Expand Down
Loading