Skip to content

Commit

Permalink
Remove libMesh namespace from framework source:
Browse files Browse the repository at this point in the history
- heavily rely on using namespace libMesh
- for some files, add libMesh:: everywhere
refs idaholab#28499
  • Loading branch information
GiudGiud committed Oct 14, 2024
1 parent 91067a5 commit 858662c
Show file tree
Hide file tree
Showing 61 changed files with 145 additions and 56 deletions.
2 changes: 2 additions & 0 deletions framework/src/actions/AdaptivityAction.C
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "libmesh/system_norm.h"
#include "libmesh/enum_norm_type.h"

using namespace libMesh;

registerMooseAction("MooseApp", AdaptivityAction, "setup_adaptivity");
registerMooseAction("MooseApp", AdaptivityAction, "add_geometric_rm");
registerMooseAction("MooseApp", AdaptivityAction, "add_algebraic_rm");
Expand Down
4 changes: 2 additions & 2 deletions framework/src/actions/AddBoundsVectorsAction.C
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ AddBoundsVectorsAction::act()
if (!_problem->numNonlinearSystems() && _problem->numLinearSystems())
mooseError("Vector bounds cannot be used with only LinearSystems!");

_problem->getNonlinearSystemBase(/*nl_sys=*/0).addVector("lower_bound", false, GHOSTED);
_problem->getNonlinearSystemBase(/*nl_sys=*/0).addVector("upper_bound", false, GHOSTED);
_problem->getNonlinearSystemBase(/*nl_sys=*/0).addVector("lower_bound", false, libMesh::GHOSTED);
_problem->getNonlinearSystemBase(/*nl_sys=*/0).addVector("upper_bound", false, libMesh::GHOSTED);
}
2 changes: 2 additions & 0 deletions framework/src/actions/AddPeriodicBCAction.C
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include "libmesh/periodic_boundary.h" // translation PBCs provided by libmesh

using namespace libMesh;

registerMooseAction("MooseApp", AddPeriodicBCAction, "add_periodic_bc");
registerMooseAction("MooseApp", AddPeriodicBCAction, "add_geometric_rm");
registerMooseAction("MooseApp", AddPeriodicBCAction, "add_algebraic_rm");
Expand Down
2 changes: 2 additions & 0 deletions framework/src/actions/AddVariableAction.C
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "libmesh/string_to_enum.h"
#include "libmesh/fe_interface.h"

using namespace libMesh;

registerMooseAction("MooseApp", AddVariableAction, "add_variable");

InputParameters
Expand Down
2 changes: 2 additions & 0 deletions framework/src/actions/MeshOnlyAction.C
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "libmesh/exodusII_io_helper.h"
#include "libmesh/checkpoint_io.h"

using namespace libMesh;

registerMooseAction("MooseApp", MeshOnlyAction, "mesh_only");

InputParameters
Expand Down
2 changes: 2 additions & 0 deletions framework/src/base/Adaptivity.C
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include "libmesh/error_vector.h"
#include "libmesh/distributed_mesh.h"

using namespace libMesh;

#ifdef LIBMESH_ENABLE_AMR

Adaptivity::Adaptivity(FEProblemBase & fe_problem)
Expand Down
2 changes: 2 additions & 0 deletions framework/src/base/Assembly.C
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
#include "libmesh/vector_value.h"
#include "libmesh/fe.h"

using namespace libMesh;

template <typename P, typename C>
void
coordTransformFactor(const SubProblem & s,
Expand Down
2 changes: 2 additions & 0 deletions framework/src/dirackernels/DiracKernelInfo.C
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include "libmesh/enum_point_locator_type.h"
#include "libmesh/point.h"

using namespace libMesh;

DiracKernelInfo::DiracKernelInfo()
: _point_locator(), _point_equal_distance_sq(libMesh::TOLERANCE * libMesh::TOLERANCE)
{
Expand Down
2 changes: 2 additions & 0 deletions framework/src/functions/MooseParsedFunctionWrapper.C
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include "Function.h"
#include "MooseUtils.h"

using namespace libMesh;

MooseParsedFunctionWrapper::MooseParsedFunctionWrapper(FEProblemBase & feproblem,
const std::string & function_str,
const std::vector<std::string> & vars,
Expand Down
2 changes: 2 additions & 0 deletions framework/src/geomsearch/FindContactPoint.C
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "libmesh/fe_base.h"
#include "libmesh/vector_value.h"

using namespace libMesh;

namespace Moose
{

Expand Down
2 changes: 2 additions & 0 deletions framework/src/ics/InitialConditionTempl.C
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include "libmesh/fe_interface.h"
#include "libmesh/quadrature.h"

using namespace libMesh;

template <typename T>
InitialConditionTempl<T>::InitialConditionTempl(const InputParameters & parameters)
: InitialConditionBase(parameters),
Expand Down
2 changes: 1 addition & 1 deletion framework/src/meshgenerators/SideSetsFromPointsGenerator.C
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ SideSetsFromPointsGenerator::generate()

// Our flood fill doesn't do any communication, so it requires a
// serialized mesh
MeshSerializer serial(*mesh);
libMesh::MeshSerializer serial(*mesh);

// Get the BoundaryIDs from the mesh
std::vector<BoundaryID> boundary_ids =
Expand Down
4 changes: 2 additions & 2 deletions framework/src/meshgenerators/XYDelaunayGenerator.C
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ XYDelaunayGenerator::generate()
if (_desired_area_func != "")
{
// poly2tri will clone this so it's fine going out of scope
ParsedFunction<Real> area_func{_desired_area_func};
libMesh::ParsedFunction<Real> area_func{_desired_area_func};
poly2tri.set_desired_area_function(&area_func);
}
else if (_use_auto_area_func)
Expand Down Expand Up @@ -440,7 +440,7 @@ XYDelaunayGenerator::generate()

// libMesh mesh stitching still requires a serialized mesh, and it's
// cheaper to do that once than to do it once-per-hole
MeshSerializer serial(*mesh, doing_stitching);
libMesh::MeshSerializer serial(*mesh, doing_stitching);

// Define a reference map variable for subdomain map
auto & main_subdomain_map = mesh->set_subdomain_name_map();
Expand Down
4 changes: 2 additions & 2 deletions framework/src/meshgenerators/XYZDelaunayGenerator.C
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ XYZDelaunayGenerator::generate()

// libMesh mesh stitching still requires a serialized mesh, and it's
// cheaper to do that once than to do it once-per-hole
MeshSerializer serial(*mesh, doing_stitching);
libMesh::MeshSerializer serial(*mesh, doing_stitching);

// We'll be looking for any sides that match between hole meshes and
// the newly triangulated mesh, to apply bcids accordingly. We
Expand Down Expand Up @@ -349,7 +349,7 @@ XYZDelaunayGenerator::generate()
// redundant serialization and deserialization (libMesh
// MeshedHole and stitch_meshes still also require
// serialization) we'll do the serialization up front.
MeshSerializer serial_hole(hole_mesh);
libMesh::MeshSerializer serial_hole(hole_mesh);

// We'll look for any sides that match between the hole mesh and
// the newly triangulated mesh, and apply bcids accordingly.
Expand Down
2 changes: 2 additions & 0 deletions framework/src/multiapps/QuadraturePointMultiApp.C
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#include "libmesh/elem.h"
#include "libmesh/fe.h"

using namespace libMesh;

registerMooseObject("MooseApp", QuadraturePointMultiApp);
// TODO: Deprecate and use Positions system

Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/AdvancedOutput.C
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

#include "libmesh/fe_interface.h"

using namespace libMesh;

// A function, only available in this file, for adding the AdvancedOutput parameters. This is
// used to eliminate code duplication between the difference specializations of the validParams
// function.
Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/BlockRestrictionDebugOutput.C
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#include "libmesh/transient_system.h"

using namespace libMesh;

registerMooseObject("MooseApp", BlockRestrictionDebugOutput);

InputParameters
Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/Checkpoint.C
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include "libmesh/enum_xdr_mode.h"
#include "libmesh/utility.h"

using namespace libMesh;

registerMooseObject("MooseApp", Checkpoint);

InputParameters
Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/Console.C
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
// libMesh includes
#include "libmesh/enum_norm_type.h"

using namespace libMesh;

registerMooseObject("MooseApp", Console);

InputParameters
Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/ConsoleUtils.C
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

#include "libmesh/string_to_enum.h"

using namespace libMesh;

namespace ConsoleUtils
{

Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/DOFMapOutput.C
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include <cxxabi.h>
#include <fstream>

using namespace libMesh;

registerMooseObjectAliased("MooseApp", DOFMapOutput, "DOFMap");

InputParameters
Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/Exodus.C
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "libmesh/exodusII_io.h"
#include "libmesh/libmesh_config.h" // LIBMESH_HAVE_HDF5

using namespace libMesh;

registerMooseObject("MooseApp", Exodus);

InputParameters
Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/GMVOutput.C
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include "libmesh/equation_systems.h"
#include "libmesh/gmv_io.h"

using namespace libMesh;

registerMooseObjectAliased("MooseApp", GMVOutput, "GMV");

InputParameters
Expand Down
2 changes: 2 additions & 0 deletions framework/src/outputs/Nemesis.C
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#include "libmesh/dof_map.h"
#include "libmesh/nemesis_io.h"

using namespace libMesh;

registerMooseObject("MooseApp", Nemesis);

InputParameters
Expand Down
6 changes: 3 additions & 3 deletions framework/src/partitioner/HierarchicalGridPartitioner.C
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ HierarchicalGridPartitioner::_do_partition(MeshBase & mesh, const unsigned int /

// Bound the coarse mesh (n_nodes * n_nodes)
auto nodes_mesh = std::make_unique<ReplicatedMesh>(this->_communicator);
nodes_mesh->partitioner() = std::make_unique<LinearPartitioner>();
nodes_mesh->partitioner() = std::make_unique<libMesh::LinearPartitioner>();

if (mesh.spatial_dimension() == 2)
MeshTools::Generation::build_cube(*nodes_mesh,
Expand Down Expand Up @@ -163,7 +163,7 @@ HierarchicalGridPartitioner::_do_partition(MeshBase & mesh, const unsigned int /
}

auto procs_mesh = std::make_unique<ReplicatedMesh>(this->_communicator);
procs_mesh->partitioner() = std::make_unique<LinearPartitioner>();
procs_mesh->partitioner() = std::make_unique<libMesh::LinearPartitioner>();

if (mesh.spatial_dimension() == 2)
MeshTools::Generation::build_cube(*procs_mesh,
Expand Down Expand Up @@ -195,7 +195,7 @@ HierarchicalGridPartitioner::_do_partition(MeshBase & mesh, const unsigned int /

auto nodes_point_locator_ptr = nodes_mesh->sub_point_locator();

std::vector<std::unique_ptr<PointLocatorBase>> procs_point_locators(procs_meshes.size());
std::vector<std::unique_ptr<libMesh::PointLocatorBase>> procs_point_locators(procs_meshes.size());

for (unsigned int i = 0; i < procs_meshes.size(); i++)
procs_point_locators[i] = procs_meshes[i]->sub_point_locator();
Expand Down
16 changes: 8 additions & 8 deletions framework/src/partitioner/LibmeshPartitioner.C
Original file line number Diff line number Diff line change
Expand Up @@ -129,23 +129,23 @@ LibmeshPartitioner::clone() const
break;
}
case 2: // hilbert_sfc
return std::make_unique<HilbertSFCPartitioner>();
return std::make_unique<libMesh::HilbertSFCPartitioner>();

case 3: // morton_sfc
return std::make_unique<MortonSFCPartitioner>();
return std::make_unique<libMesh::MortonSFCPartitioner>();

case 4: // subdomain_partitioner
return _app.getFactory().clone(*this);
}
// this cannot happen but I need to trick the compiler into
// believing me
mooseError("Error in LibmeshPartitioner: Supplied partitioner option causes error in clone()");
return std::make_unique<MetisPartitioner>();
return std::make_unique<libMesh::MetisPartitioner>();
}

void
LibmeshPartitioner::prepareBlocksForSubdomainPartitioner(
const MeshBase & mesh, SubdomainPartitioner & subdomain_partitioner)
const MeshBase & mesh, libMesh::SubdomainPartitioner & subdomain_partitioner)
{
// For making sure all of the blocks exist
std::set<subdomain_id_type> mesh_subdomain_ids;
Expand Down Expand Up @@ -174,8 +174,8 @@ LibmeshPartitioner::partition(MeshBase & mesh, const unsigned int n)
if (_partitioner_name == "subdomain_partitioner")
{
mooseAssert(_partitioner.get(), "Partitioner is a NULL object");
prepareBlocksForSubdomainPartitioner(mesh,
static_cast<SubdomainPartitioner &>(*_partitioner.get()));
prepareBlocksForSubdomainPartitioner(
mesh, static_cast<libMesh::SubdomainPartitioner &>(*_partitioner.get()));
}

_partitioner->partition(mesh, n);
Expand All @@ -187,8 +187,8 @@ LibmeshPartitioner::partition(MeshBase & mesh)
if (_partitioner_name == "subdomain_partitioner")
{
mooseAssert(_partitioner.get(), "Partitioner is a NULL object");
prepareBlocksForSubdomainPartitioner(mesh,
static_cast<SubdomainPartitioner &>(*_partitioner.get()));
prepareBlocksForSubdomainPartitioner(
mesh, static_cast<libMesh::SubdomainPartitioner &>(*_partitioner.get()));
}

_partitioner->partition(mesh);
Expand Down
2 changes: 2 additions & 0 deletions framework/src/partitioner/PetscExternalPartitioner.C
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include "libmesh/elem.h"
#include "libmesh/mesh_base.h"

using namespace libMesh;

registerMooseObject("MooseApp", PetscExternalPartitioner);

#include <memory>
Expand Down
2 changes: 2 additions & 0 deletions framework/src/positions/QuadraturePointsPositions.C
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#include "libmesh/quadrature_gauss.h"
#include "SetupQuadratureAction.h"

using namespace libMesh;

registerMooseObject("MooseApp", QuadraturePointsPositions);

InputParameters
Expand Down
5 changes: 3 additions & 2 deletions framework/src/postprocessors/FindValueOnLine.C
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,11 @@ FindValueOnLine::getValueAtPoint(const Point & p)
{
const Elem * elem = (*_pl)(p);

processor_id_type elem_proc_id = elem ? elem->processor_id() : DofObject::invalid_processor_id;
processor_id_type elem_proc_id =
elem ? elem->processor_id() : libMesh::DofObject::invalid_processor_id;
_communicator.min(elem_proc_id);

if (elem_proc_id == DofObject::invalid_processor_id)
if (elem_proc_id == libMesh::DofObject::invalid_processor_id)
{
// there is no element
mooseError("No element found at the current search point. Please make sure the sampling line "
Expand Down
4 changes: 2 additions & 2 deletions framework/src/postprocessors/PointValue.C
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ PointValue::execute()
pl->enable_out_of_mesh_mode();

auto * elem = (*pl)(_point);
auto elem_id = elem ? elem->id() : DofObject::invalid_id;
auto elem_id = elem ? elem->id() : libMesh::DofObject::invalid_id;
gatherMin(elem_id);

if (elem_id == DofObject::invalid_id)
if (elem_id == libMesh::DofObject::invalid_id)
mooseError("No element located at ", _point, " in PointValue Postprocessor named: ", name());
}
}
Expand Down
3 changes: 2 additions & 1 deletion framework/src/postprocessors/PseudoTimestep.C
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ PseudoTimestep::currentResidualNorm() const
Real res_norm = 0.0;
for (const auto var_num : make_range(nl.system().n_vars()))
{
auto var_res = nl.system().calculate_norm(nl.getResidualNonTimeVector(), var_num, DISCRETE_L2);
auto var_res =
nl.system().calculate_norm(nl.getResidualNonTimeVector(), var_num, libMesh::DISCRETE_L2);
res_norm = res_norm + std::pow(var_res, 2);
}
res_norm = std::sqrt(res_norm);
Expand Down
2 changes: 1 addition & 1 deletion framework/src/postprocessors/VariableResidual.C
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void
VariableResidual::execute()
{
NonlinearSystemBase & nl = _fe_problem.getNonlinearSystemBase(_sys.number());
_var_residual = nl.system().calculate_norm(nl.RHS(), _var.number(), DISCRETE_L2);
_var_residual = nl.system().calculate_norm(nl.RHS(), _var.number(), libMesh::DISCRETE_L2);
}

PostprocessorValue
Expand Down
2 changes: 2 additions & 0 deletions framework/src/preconditioners/PhysicsBasedPreconditioner.C
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "libmesh/string_to_enum.h"
#include "libmesh/coupling_matrix.h"

using namespace libMesh;

registerMooseObjectAliased("MooseApp", PhysicsBasedPreconditioner, "PBP");

InputParameters
Expand Down
Loading

0 comments on commit 858662c

Please sign in to comment.