From 11d9a090d11d7cb87c21d6b1dc08e4e29349e182 Mon Sep 17 00:00:00 2001 From: Guillaume Giudicelli Date: Sun, 13 Oct 2024 17:54:06 -0600 Subject: [PATCH] Adapt modules to removal of libMesh namespace rfs #28499 --- .gitignore | 1 + .../src/actions/ChemicalCompositionAction.C | 2 +- .../src/kernels/CoupledConvectionReactionSub.C | 2 ++ .../src/kernels/CoupledDiffusionReactionSub.C | 2 ++ .../include/utils/BrentsMethod.h | 1 + .../userobjects/UnobstructedPlanarViewFactor.h | 2 +- .../include/userobjects/ViewFactorRayStudy.h | 4 ++-- .../src/actions/MortarGapHeatTransferAction.C | 2 +- .../src/actions/ThermalContactAction.C | 3 ++- .../userobjects/UnobstructedPlanarViewFactor.C | 2 +- .../src/userobjects/ViewFactorRayStudy.C | 4 +++- .../src/userobjects/LevelSetOlssonTerminator.C | 3 ++- .../navier_stokes/include/actions/CNSAction.h | 2 +- .../navier_stokes/include/actions/INSAction.h | 2 +- .../executioners/SIMPLENonlinearAssembly.h | 2 +- .../fviks/FVConvectionCorrelationInterface.h | 2 +- .../INSFVRhieChowInterpolatorSegregated.h | 2 +- .../include/userobjects/RhieChowMassFlux.h | 2 +- modules/navier_stokes/src/actions/CNSAction.C | 2 ++ modules/navier_stokes/src/actions/INSAction.C | 2 ++ .../navier_stokes/src/executioners/SIMPLE.C | 2 ++ .../src/executioners/SIMPLENonlinearAssembly.C | 2 ++ .../src/executioners/SegregatedSolverBase.C | 2 ++ .../INSFVMushyPorousFrictionFunctorMaterial.C | 4 ++-- .../src/problems/NavierStokesProblem.C | 2 ++ .../src/utils/FaceCenteredMapFunctor.C | 2 ++ .../optimization/include/utils/ParameterMesh.h | 17 ++++++++++------- .../src/executioners/AdjointSolve.C | 2 ++ .../src/executioners/AdjointTransientSolve.C | 2 ++ .../ParameterMeshOptimization.C | 2 ++ modules/optimization/src/utils/ParameterMesh.C | 2 ++ .../include/actions/ConservedAction.h | 2 +- .../include/actions/GrainGrowthAction.h | 2 +- .../include/actions/NonconservedAction.h | 2 +- .../include/postprocessors/FeatureFloodCount.h | 4 ++-- .../include/utils/PolycrystalICTools.h | 6 +++--- .../src/actions/CHPFCRFFSplitVariablesAction.C | 2 ++ .../phase_field/src/actions/ConservedAction.C | 2 ++ .../src/actions/GrainGrowthAction.C | 2 ++ .../GrainGrowthLinearizedInterfaceAction.C | 6 ++++-- .../src/actions/NonconservedAction.C | 4 +++- .../src/meshgenerators/EBSDMeshGenerator.C | 2 +- .../SphereSurfaceMeshGenerator.C | 4 ++-- .../phase_field/src/utils/PolycrystalICTools.C | 2 ++ .../PorousFlowAdvectiveFluxCalculatorBase.h | 2 +- .../include/userobjects/PorousFlowDictator.h | 4 ++-- .../include/utils/PorousFlowConnectedNodes.h | 1 + .../src/dirackernels/PorousFlowLineGeometry.C | 8 ++++---- .../include/outputs/RayTracingMeshOutput.h | 2 +- .../ray_tracing/include/raytracing/ClaimRays.h | 8 ++++---- .../ray_tracing/include/raytracing/TraceRay.h | 2 +- .../include/raytracing/TraceRayTools.h | 18 ++++++++++-------- .../include/userobjects/RayTracingStudy.h | 12 ++++++------ .../include/utils/ElemIndexHelper.h | 14 +++++++------- .../ray_tracing/include/utils/ParallelStudy.h | 2 +- .../include/utils/RayTracingPackingUtils.h | 4 ++-- .../ray_tracing/include/utils/ReceiveBuffer.h | 2 +- modules/ray_tracing/include/utils/SendBuffer.h | 2 +- .../ray_tracing/src/outputs/RayTracingExodus.C | 2 +- .../src/outputs/RayTracingMeshOutput.C | 2 ++ .../src/outputs/RayTracingNemesis.C | 2 +- modules/ray_tracing/src/raytracing/ClaimRays.C | 2 ++ modules/ray_tracing/src/raytracing/Ray.C | 2 ++ modules/ray_tracing/src/raytracing/TraceRay.C | 1 + .../ray_tracing/src/raytracing/TraceRayTools.C | 2 ++ .../src/userobjects/RayTracingStudy.C | 2 ++ .../ray_tracing/src/utils/ElemIndexHelper.C | 7 ++++--- .../include/userobjects/SlopeLimitingBase.h | 4 ++-- .../userobjects/SlopeReconstructionBase.h | 2 +- modules/rdg/src/materials/AEFVMaterial.C | 2 ++ .../include/utils/ReportingIDGeneratorUtils.h | 13 +++++++------ .../CoarseMeshExtraElementIDGenerator.C | 7 ++++--- .../PolygonConcentricCircleMeshGenerator.C | 2 ++ .../PolygonConcentricCircleMeshGeneratorBase.C | 2 +- .../meshgenerators/PolygonMeshGeneratorBase.C | 2 ++ .../src/meshgenerators/RevolveGenerator.C | 2 ++ .../src/utils/ReportingIDGeneratorUtils.C | 2 ++ modules/reactor/unit/src/main.C | 2 +- modules/richards/src/actions/Q2PAction.C | 4 ++-- .../include/kernels/ADStressDivergenceShell.h | 2 +- .../ADComputeIncrementalShellStrain.h | 2 +- .../include/utils/RotationTensor.h | 1 + .../vectorpostprocessors/InteractionIntegral.h | 4 ++-- .../include/vectorpostprocessors/JIntegral.h | 4 ++-- .../src/actions/LineElementAction.C | 8 ++------ .../constraints/NodalFrictionalConstraint.C | 2 ++ .../src/constraints/NodalStickConstraint.C | 2 ++ .../src/kernels/ADStressDivergenceShell.C | 2 +- .../ADComputeIncrementalShellStrain.C | 2 +- .../ADComputeIsotropicElasticityTensorShell.C | 2 +- .../src/materials/ADComputeShellStress.C | 2 +- .../ComputeUpdatedEulerAngle.C | 2 +- .../src/scalarkernels/GlobalStrain.C | 2 ++ .../src/userobjects/CavityPressureUserObject.C | 2 ++ .../solid_mechanics/src/utils/RotationTensor.C | 2 ++ .../src/vectorpostprocessors/JIntegral.C | 2 +- .../solid_mechanics/test/plugins/mutex_test.C | 2 ++ .../solid_mechanics/test/plugins/sma_memory.C | 2 ++ .../include/utils/SobolCalculators.h | 2 +- modules/stochastic_tools/src/utils/POD.C | 2 ++ .../src/utils/SobolCalculators.C | 2 +- .../unit/src/TestBootstrapCalculators.C | 1 + .../unit/src/TestStochasticToolsCalculators.C | 1 + .../src/TestStochasticToolsSobolCalculators.C | 1 + .../include/base/FlowModel.h | 2 +- .../include/base/HeatConductionModel.h | 4 ++-- .../include/base/Simulation.h | 12 +++++++----- ...tTransferFromExternalAppTemperature1Phase.h | 2 +- .../HeatTransferFromHeatStructure1Phase.h | 2 +- .../HeatTransferFromHeatStructure3D1Phase.h | 2 +- .../HeatTransferFromTemperature1Phase.h | 4 ++-- .../functions/THMParsedFunctionWrapper.h | 2 +- .../thermal_hydraulics/src/base/FlowModel.C | 2 ++ .../src/base/HeatConductionModel.C | 2 ++ .../thermal_hydraulics/src/base/Simulation.C | 2 ++ modules/thermal_hydraulics/src/base/THMMesh.C | 2 ++ .../src/components/FileMeshComponent.C | 2 +- .../components/FormLossFromExternalApp1Phase.C | 2 +- .../components/HSBoundaryExternalAppHeatFlux.C | 4 ++-- .../src/components/HeatStructureFromFile3D.C | 2 +- ...HeatTransferFromExternalAppHeatFlux1Phase.C | 2 +- .../HeatTransferFromHeatStructure1Phase.C | 2 +- .../HeatTransferFromHeatStructure3D1Phase.C | 10 ++++++---- .../HeatTransferFromTemperature1Phase.C | 6 +++--- .../thermal_hydraulics/src/components/Shaft.C | 4 ++-- .../src/components/TotalPowerBase.C | 2 +- .../src/components/VolumeJunction1Phase.C | 4 ++-- .../src/functions/THMParsedFunctionWrapper.C | 4 ++-- .../include/materials/LevelSetBiMaterialBase.h | 2 +- .../xfem/include/outputs/XFEMCutMeshOutput.h | 4 ++-- .../userobjects/NodeValueAtXFEMInterface.h | 4 ++-- modules/xfem/src/outputs/XFEMCutMeshOutput.C | 2 +- 132 files changed, 261 insertions(+), 159 deletions(-) diff --git a/.gitignore b/.gitignore index 86df037c5f3e..a595f710f088 100644 --- a/.gitignore +++ b/.gitignore @@ -312,6 +312,7 @@ share/ /modules/ray_tracing/unit/ray_tracing-unit.yaml /modules/phase_field/unit/phase_field-unit.yaml /modules/heat_transfer/unit/heat_transfer-unit.yaml +/modules/solid_mechanics/unit/solid_mechanics-unit.yaml /modules/tensor_mechanics/unit/tensor_mechanics-unit.yaml /modules/richards/unit/richards-unit.yaml /modules/level_set/unit/level_set-unit.yaml diff --git a/modules/chemical_reactions/src/actions/ChemicalCompositionAction.C b/modules/chemical_reactions/src/actions/ChemicalCompositionAction.C index 04a7ec84eca7..f4e70ab8f1a1 100644 --- a/modules/chemical_reactions/src/actions/ChemicalCompositionAction.C +++ b/modules/chemical_reactions/src/actions/ChemicalCompositionAction.C @@ -429,7 +429,7 @@ ChemicalCompositionAction::act() auto aux_var_type = AddVariableAction::variableType( FEType(Utility::string_to_enum(_problem->mesh().hasSecondOrderElements() ? "SECOND" : "FIRST"), - Utility::string_to_enum("LAGRANGE")), + Utility::string_to_enum("LAGRANGE")), /* is_fv = */ getParam("is_fv"), /* is_array = */ false); auto params = _factory.getValidParams(aux_var_type); diff --git a/modules/chemical_reactions/src/kernels/CoupledConvectionReactionSub.C b/modules/chemical_reactions/src/kernels/CoupledConvectionReactionSub.C index 639bee587886..1ac46a0ac60d 100644 --- a/modules/chemical_reactions/src/kernels/CoupledConvectionReactionSub.C +++ b/modules/chemical_reactions/src/kernels/CoupledConvectionReactionSub.C @@ -9,6 +9,8 @@ #include "CoupledConvectionReactionSub.h" +using libMesh::RealGradient; + registerMooseObject("ChemicalReactionsApp", CoupledConvectionReactionSub); InputParameters diff --git a/modules/chemical_reactions/src/kernels/CoupledDiffusionReactionSub.C b/modules/chemical_reactions/src/kernels/CoupledDiffusionReactionSub.C index 3a0dc64ca7fb..307bfbca653a 100644 --- a/modules/chemical_reactions/src/kernels/CoupledDiffusionReactionSub.C +++ b/modules/chemical_reactions/src/kernels/CoupledDiffusionReactionSub.C @@ -9,6 +9,8 @@ #include "CoupledDiffusionReactionSub.h" +using libMesh::RealGradient; + registerMooseObject("ChemicalReactionsApp", CoupledDiffusionReactionSub); InputParameters diff --git a/modules/fluid_properties/include/utils/BrentsMethod.h b/modules/fluid_properties/include/utils/BrentsMethod.h index 29aff0ebc01c..a2e31d250367 100644 --- a/modules/fluid_properties/include/utils/BrentsMethod.h +++ b/modules/fluid_properties/include/utils/BrentsMethod.h @@ -11,6 +11,7 @@ // MOOSE includes #include "Moose.h" +#include "MooseTypes.h" // C++ includes #include diff --git a/modules/heat_transfer/include/userobjects/UnobstructedPlanarViewFactor.h b/modules/heat_transfer/include/userobjects/UnobstructedPlanarViewFactor.h index b5c2eaf73396..e7cfa3d14d8a 100644 --- a/modules/heat_transfer/include/userobjects/UnobstructedPlanarViewFactor.h +++ b/modules/heat_transfer/include/userobjects/UnobstructedPlanarViewFactor.h @@ -38,7 +38,7 @@ class UnobstructedPlanarViewFactor : public ViewFactorBase ///@{ data of the to_elem side being initialized std::unique_ptr _current_remote_side; - std::unique_ptr _current_remote_fe; + std::unique_ptr _current_remote_fe; Real _current_remote_side_volume; const std::vector * _current_remote_JxW; const std::vector * _current_remote_xyz; diff --git a/modules/heat_transfer/include/userobjects/ViewFactorRayStudy.h b/modules/heat_transfer/include/userobjects/ViewFactorRayStudy.h index 9ffc5e00b85a..42d00a0861dd 100644 --- a/modules/heat_transfer/include/userobjects/ViewFactorRayStudy.h +++ b/modules/heat_transfer/include/userobjects/ViewFactorRayStudy.h @@ -113,9 +113,9 @@ class ViewFactorRayStudy : public RayTracingStudy const RayDataIndex _ray_index_start_total_weight; /// Face FE used for creating face quadrature points and weights - const std::unique_ptr _fe_face; + const std::unique_ptr _fe_face; /// Face quadrature used for _fe_face - const std::unique_ptr _q_face; + const std::unique_ptr _q_face; // Whether or not the mesh is 3D const bool _is_3d; diff --git a/modules/heat_transfer/src/actions/MortarGapHeatTransferAction.C b/modules/heat_transfer/src/actions/MortarGapHeatTransferAction.C index 6d52a12b5c50..69270b9ca61d 100644 --- a/modules/heat_transfer/src/actions/MortarGapHeatTransferAction.C +++ b/modules/heat_transfer/src/actions/MortarGapHeatTransferAction.C @@ -223,7 +223,7 @@ MortarGapHeatTransferAction::addMortarVariable() mooseError("The mortar thermal action can only be used with LAGRANGE finite elements"); params.set("family") = Utility::enum_to_string(primal_type.family); - params.set("order") = Utility::enum_to_string(OrderWrapper{lm_order}); + params.set("order") = Utility::enum_to_string(libMesh::OrderWrapper{lm_order}); if (_user_provided_mortar_meshes) params.set>("block") = { diff --git a/modules/heat_transfer/src/actions/ThermalContactAction.C b/modules/heat_transfer/src/actions/ThermalContactAction.C index 59a8a8856ef2..61248aa165a7 100644 --- a/modules/heat_transfer/src/actions/ThermalContactAction.C +++ b/modules/heat_transfer/src/actions/ThermalContactAction.C @@ -384,7 +384,8 @@ ThermalContactAction::addMaterials() void ThermalContactAction::addSecondaryFluxVector() { - _problem->getNonlinearSystemBase(/*nl_sys_num=*/0).addVector("secondary_flux", false, GHOSTED); + _problem->getNonlinearSystemBase(/*nl_sys_num=*/0) + .addVector("secondary_flux", false, libMesh::GHOSTED); _problem->getNonlinearSystemBase(/*nl_sys_num=*/0).zeroVectorForResidual("secondary_flux"); // It is risky to apply this optimization to contact problems diff --git a/modules/heat_transfer/src/userobjects/UnobstructedPlanarViewFactor.C b/modules/heat_transfer/src/userobjects/UnobstructedPlanarViewFactor.C index 376019140036..9ff9bc944fed 100644 --- a/modules/heat_transfer/src/userobjects/UnobstructedPlanarViewFactor.C +++ b/modules/heat_transfer/src/userobjects/UnobstructedPlanarViewFactor.C @@ -149,7 +149,7 @@ UnobstructedPlanarViewFactor::reinitFace(dof_id_type elem_id, unsigned int side) Order order = current_remote_elem->default_order(); unsigned int dim = _mesh.getMesh().mesh_dimension(); _current_remote_fe = FEBase::build(dim, FEType(order)); - QGauss qface(dim - 1, FEType(order).default_quadrature_order()); + libMesh::QGauss qface(dim - 1, FEType(order).default_quadrature_order()); _current_remote_fe->attach_quadrature_rule(&qface); _current_remote_JxW = &_current_remote_fe->get_JxW(); diff --git a/modules/heat_transfer/src/userobjects/ViewFactorRayStudy.C b/modules/heat_transfer/src/userobjects/ViewFactorRayStudy.C index 14ddf0671cd2..9c1d0acf18b3 100644 --- a/modules/heat_transfer/src/userobjects/ViewFactorRayStudy.C +++ b/modules/heat_transfer/src/userobjects/ViewFactorRayStudy.C @@ -24,6 +24,8 @@ #include "ReflectRayBC.h" #include "RayTracingPackingUtils.h" +using namespace libMesh; + registerMooseObject("HeatTransferApp", ViewFactorRayStudy); InputParameters @@ -441,7 +443,7 @@ ViewFactorRayStudy::generateStartElems() continue; // Sanity check on QGRID not working on some types - if (_q_face->type() == QGRID && elem->type() == TET4) + if (_q_face->type() == libMesh::QGRID && elem->type() == TET4) mooseError( "Cannot use GRID quadrature type with tetrahedral elements in ViewFactorRayStudy '", _name, diff --git a/modules/level_set/src/userobjects/LevelSetOlssonTerminator.C b/modules/level_set/src/userobjects/LevelSetOlssonTerminator.C index c0d2e1f4271d..2cfd09112f8a 100644 --- a/modules/level_set/src/userobjects/LevelSetOlssonTerminator.C +++ b/modules/level_set/src/userobjects/LevelSetOlssonTerminator.C @@ -26,7 +26,8 @@ LevelSetOlssonTerminator::validParams() LevelSetOlssonTerminator::LevelSetOlssonTerminator(const InputParameters & params) : GeneralUserObject(params), - _solution_diff(_fe_problem.getNonlinearSystem(0).addVector("solution_diff", false, PARALLEL)), + _solution_diff( + _fe_problem.getNonlinearSystem(0).addVector("solution_diff", false, libMesh::PARALLEL)), _tol(getParam("tol")), _min_t_steps(getParam("min_steps")) { diff --git a/modules/navier_stokes/include/actions/CNSAction.h b/modules/navier_stokes/include/actions/CNSAction.h index 833714f5fc2d..916ee6835c60 100644 --- a/modules/navier_stokes/include/actions/CNSAction.h +++ b/modules/navier_stokes/include/actions/CNSAction.h @@ -100,7 +100,7 @@ class CNSAction : public Action /// Pressures on static pressure boundaries std::vector _static_pressure; /// FE type for various variables - FEType _fe_type; + libMesh::FEType _fe_type; /// Initial value for pressure Real _initial_pressure; /// Initial value for temperature diff --git a/modules/navier_stokes/include/actions/INSAction.h b/modules/navier_stokes/include/actions/INSAction.h index 6b401f397b6f..5995565c05ad 100644 --- a/modules/navier_stokes/include/actions/INSAction.h +++ b/modules/navier_stokes/include/actions/INSAction.h @@ -73,7 +73,7 @@ class INSAction : public Action /// Temperature function names at fixed temperature boundaries std::vector _temperature_function; /// FE type for various variables - FEType _fe_type; + libMesh::FEType _fe_type; /// Whether we use AD or not bool _use_ad; /// Temperature variable name to facilitate temperature variable added outside diff --git a/modules/navier_stokes/include/executioners/SIMPLENonlinearAssembly.h b/modules/navier_stokes/include/executioners/SIMPLENonlinearAssembly.h index 8e3adae0a9a5..3cfacbfcf933 100644 --- a/modules/navier_stokes/include/executioners/SIMPLENonlinearAssembly.h +++ b/modules/navier_stokes/include/executioners/SIMPLENonlinearAssembly.h @@ -62,7 +62,7 @@ class SIMPLENonlinearAssembly : public SegregatedSolverBase std::pair solveAdvectedSystem(const unsigned int system_num, NonlinearSystemBase & system, const Real relaxation_factor, - SolverConfiguration & solver_config, + libMesh::SolverConfiguration & solver_config, const Real abs_tol); /// Solve the solid energy conservation equation. diff --git a/modules/navier_stokes/include/fviks/FVConvectionCorrelationInterface.h b/modules/navier_stokes/include/fviks/FVConvectionCorrelationInterface.h index af5416a3d2a7..90e581dbdbb5 100644 --- a/modules/navier_stokes/include/fviks/FVConvectionCorrelationInterface.h +++ b/modules/navier_stokes/include/fviks/FVConvectionCorrelationInterface.h @@ -34,7 +34,7 @@ class FVConvectionCorrelationInterface : public FVInterfaceKernel const bool _use_wall_cell; /// libmesh object to find points in the mesh - std::unique_ptr _pl; + std::unique_ptr _pl; /// Boolean to see if variable1 is the fluid const bool _var1_is_fluid; diff --git a/modules/navier_stokes/include/userobjects/INSFVRhieChowInterpolatorSegregated.h b/modules/navier_stokes/include/userobjects/INSFVRhieChowInterpolatorSegregated.h index bd671de7da72..9a1742d64a7f 100644 --- a/modules/navier_stokes/include/userobjects/INSFVRhieChowInterpolatorSegregated.h +++ b/modules/navier_stokes/include/userobjects/INSFVRhieChowInterpolatorSegregated.h @@ -126,7 +126,7 @@ class INSFVRhieChowInterpolatorSegregated : public RhieChowInterpolatorBase std::vector _momentum_system_numbers; /// Pointers to the momentum equation implicit system(s) - std::vector _momentum_implicit_systems; + std::vector _momentum_implicit_systems; /// Residual tag corresponding to the pressure gradient contribution TagID _pressure_gradient_tag; diff --git a/modules/navier_stokes/include/userobjects/RhieChowMassFlux.h b/modules/navier_stokes/include/userobjects/RhieChowMassFlux.h index 0ce995e3ff0e..05cc7a5f1e58 100644 --- a/modules/navier_stokes/include/userobjects/RhieChowMassFlux.h +++ b/modules/navier_stokes/include/userobjects/RhieChowMassFlux.h @@ -157,7 +157,7 @@ class RhieChowMassFlux : public GeneralUserObject, std::vector _global_momentum_system_numbers; /// Pointers to the momentum equation implicit system(s) from libmesh - std::vector _momentum_implicit_systems; + std::vector _momentum_implicit_systems; /// Pointer to the pressure system const LinearSystem * _pressure_system; diff --git a/modules/navier_stokes/src/actions/CNSAction.C b/modules/navier_stokes/src/actions/CNSAction.C index ae7694d1f498..0a540842de0c 100644 --- a/modules/navier_stokes/src/actions/CNSAction.C +++ b/modules/navier_stokes/src/actions/CNSAction.C @@ -21,6 +21,8 @@ #include "libmesh/vector_value.h" #include "libmesh/string_to_enum.h" +using namespace libMesh; + registerMooseAction("NavierStokesApp", CNSAction, "add_navier_stokes_variables"); registerMooseAction("NavierStokesApp", CNSAction, "add_navier_stokes_kernels"); registerMooseAction("NavierStokesApp", CNSAction, "add_navier_stokes_bcs"); diff --git a/modules/navier_stokes/src/actions/INSAction.C b/modules/navier_stokes/src/actions/INSAction.C index 08fee41937ef..9dfd365bfbb4 100644 --- a/modules/navier_stokes/src/actions/INSAction.C +++ b/modules/navier_stokes/src/actions/INSAction.C @@ -23,6 +23,8 @@ #include "libmesh/vector_value.h" #include "libmesh/string_to_enum.h" +using namespace libMesh; + registerMooseAction("NavierStokesApp", INSAction, "append_mesh_generator"); registerMooseAction("NavierStokesApp", INSAction, "add_navier_stokes_variables"); registerMooseAction("NavierStokesApp", INSAction, "add_navier_stokes_ics"); diff --git a/modules/navier_stokes/src/executioners/SIMPLE.C b/modules/navier_stokes/src/executioners/SIMPLE.C index f751e198ec12..eefff83fe2ad 100644 --- a/modules/navier_stokes/src/executioners/SIMPLE.C +++ b/modules/navier_stokes/src/executioners/SIMPLE.C @@ -22,6 +22,8 @@ #include #include +using namespace libMesh; + registerMooseObject("NavierStokesApp", SIMPLE); InputParameters diff --git a/modules/navier_stokes/src/executioners/SIMPLENonlinearAssembly.C b/modules/navier_stokes/src/executioners/SIMPLENonlinearAssembly.C index 2ec21abba3a6..e3ae411b8381 100644 --- a/modules/navier_stokes/src/executioners/SIMPLENonlinearAssembly.C +++ b/modules/navier_stokes/src/executioners/SIMPLENonlinearAssembly.C @@ -22,6 +22,8 @@ #include #include +using namespace libMesh; + registerMooseObject("NavierStokesApp", SIMPLENonlinearAssembly); InputParameters diff --git a/modules/navier_stokes/src/executioners/SegregatedSolverBase.C b/modules/navier_stokes/src/executioners/SegregatedSolverBase.C index 029cb132ed03..6f6365cb66d1 100644 --- a/modules/navier_stokes/src/executioners/SegregatedSolverBase.C +++ b/modules/navier_stokes/src/executioners/SegregatedSolverBase.C @@ -23,6 +23,8 @@ #include #include +using namespace libMesh; + InputParameters SegregatedSolverBase::validParams() { diff --git a/modules/navier_stokes/src/functormaterials/INSFVMushyPorousFrictionFunctorMaterial.C b/modules/navier_stokes/src/functormaterials/INSFVMushyPorousFrictionFunctorMaterial.C index e2c0a690bb65..059bcc4e28e7 100644 --- a/modules/navier_stokes/src/functormaterials/INSFVMushyPorousFrictionFunctorMaterial.C +++ b/modules/navier_stokes/src/functormaterials/INSFVMushyPorousFrictionFunctorMaterial.C @@ -55,7 +55,7 @@ INSFVMushyPorousFrictionFunctorMaterial::INSFVMushyPorousFrictionFunctorMaterial mooseAssert(_dendrite_spacing_scaling(r, t) > 0, "Dendrite spacing scaling should be positive!"); const auto cs = _c / Utility::pow<2>(_dendrite_spacing_scaling(r, t)); - const auto Fk = 0.5 + std::atan(_s * (fs - _fs_crit)) / pi; + const auto Fk = 0.5 + std::atan(_s * (fs - _fs_crit)) / libMesh::pi; const auto K = Utility::pow<3>(_fl(r, t)) / ((Utility::pow<2>(fs) + epsilon) * Fk * cs) + epsilon; return _mu(r, t) / K; @@ -70,7 +70,7 @@ INSFVMushyPorousFrictionFunctorMaterial::INSFVMushyPorousFrictionFunctorMaterial mooseAssert(_dendrite_spacing_scaling(r, t) > 0, "Dendrite spacing scaling should be positive!"); const auto cs = _c / Utility::pow<2>(_dendrite_spacing_scaling(r, t)); - const auto Fk = 0.5 + std::atan(_s * (fs - _fs_crit)) / pi; + const auto Fk = 0.5 + std::atan(_s * (fs - _fs_crit)) / libMesh::pi; const auto K = Utility::pow<3>(_fl(r, t)) / ((Utility::pow<2>(fs) + epsilon) * Fk * cs) + epsilon; return _forchheimer_coef * _rho_l(r, t) / std::sqrt(K); diff --git a/modules/navier_stokes/src/problems/NavierStokesProblem.C b/modules/navier_stokes/src/problems/NavierStokesProblem.C index 864c3e1b5636..94590e76cb98 100644 --- a/modules/navier_stokes/src/problems/NavierStokesProblem.C +++ b/modules/navier_stokes/src/problems/NavierStokesProblem.C @@ -11,6 +11,8 @@ #include "NonlinearSystemBase.h" #include "libmesh/petsc_matrix.h" +using namespace libMesh; + registerMooseObject("NavierStokesApp", NavierStokesProblem); InputParameters diff --git a/modules/navier_stokes/src/utils/FaceCenteredMapFunctor.C b/modules/navier_stokes/src/utils/FaceCenteredMapFunctor.C index 197028066e0c..15b6ff567a74 100644 --- a/modules/navier_stokes/src/utils/FaceCenteredMapFunctor.C +++ b/modules/navier_stokes/src/utils/FaceCenteredMapFunctor.C @@ -17,6 +17,8 @@ #include "libmesh/elem.h" #include "libmesh/point.h" +using namespace libMesh; + namespace Moose { template ::value, int>::type = 0> diff --git a/modules/optimization/include/utils/ParameterMesh.h b/modules/optimization/include/utils/ParameterMesh.h index ee1f291e51ef..f2ad6baabb6b 100644 --- a/modules/optimization/include/utils/ParameterMesh.h +++ b/modules/optimization/include/utils/ParameterMesh.h @@ -22,6 +22,9 @@ namespace libMesh { class System; } + +using libMesh::RealGradient; + /** * Utility class to use an Exodus mesh to define controllable parameters for optimization problems * This class will: @@ -34,7 +37,7 @@ class System; class ParameterMesh { public: - ParameterMesh(const FEType & param_type, + ParameterMesh(const libMesh::FEType & param_type, const std::string & exodus_mesh, const std::vector & var_names = {}); @@ -72,12 +75,12 @@ class ParameterMesh std::vector getParameterValues(std::string var_name, unsigned int timestep) const; protected: - Parallel::Communicator _communicator; - ReplicatedMesh _mesh; - std::unique_ptr _eq; - System * _sys; - std::unique_ptr _point_locator; - std::unique_ptr _exodusII_io; + libMesh::Parallel::Communicator _communicator; + libMesh::ReplicatedMesh _mesh; + std::unique_ptr _eq; + libMesh::System * _sys; + std::unique_ptr _point_locator; + std::unique_ptr _exodusII_io; dof_id_type _param_dofs; }; diff --git a/modules/optimization/src/executioners/AdjointSolve.C b/modules/optimization/src/executioners/AdjointSolve.C index dc188c177776..604012030f6d 100644 --- a/modules/optimization/src/executioners/AdjointSolve.C +++ b/modules/optimization/src/executioners/AdjointSolve.C @@ -19,6 +19,8 @@ #include "libmesh/petsc_vector.h" #include "petscmat.h" +using namespace libMesh; + InputParameters AdjointSolve::validParams() { diff --git a/modules/optimization/src/executioners/AdjointTransientSolve.C b/modules/optimization/src/executioners/AdjointTransientSolve.C index c27d7923941d..33694abd7359 100644 --- a/modules/optimization/src/executioners/AdjointTransientSolve.C +++ b/modules/optimization/src/executioners/AdjointTransientSolve.C @@ -16,6 +16,8 @@ #include "libmesh/sparse_matrix.h" #include "libmesh/numeric_vector.h" +using namespace libMesh; + InputParameters AdjointTransientSolve::validParams() { diff --git a/modules/optimization/src/optimizationreporters/ParameterMeshOptimization.C b/modules/optimization/src/optimizationreporters/ParameterMeshOptimization.C index db943b895432..ddd1a5b85644 100644 --- a/modules/optimization/src/optimizationreporters/ParameterMeshOptimization.C +++ b/modules/optimization/src/optimizationreporters/ParameterMeshOptimization.C @@ -13,6 +13,8 @@ #include "ParameterMesh.h" #include "libmesh/string_to_enum.h" +using namespace libMesh; + registerMooseObject("OptimizationApp", ParameterMeshOptimization); InputParameters diff --git a/modules/optimization/src/utils/ParameterMesh.C b/modules/optimization/src/utils/ParameterMesh.C index cf2a25f4d522..6caf18533a03 100644 --- a/modules/optimization/src/utils/ParameterMesh.C +++ b/modules/optimization/src/utils/ParameterMesh.C @@ -17,6 +17,8 @@ #include "libmesh/numeric_vector.h" #include "libmesh/explicit_system.h" +using namespace libMesh; + ParameterMesh::ParameterMesh(const FEType & param_type, const std::string & exodus_mesh, const std::vector & var_names) diff --git a/modules/phase_field/include/actions/ConservedAction.h b/modules/phase_field/include/actions/ConservedAction.h index 981635d1a3c5..bb9a7dccd9d7 100644 --- a/modules/phase_field/include/actions/ConservedAction.h +++ b/modules/phase_field/include/actions/ConservedAction.h @@ -37,7 +37,7 @@ class ConservedAction : public Action /// Name of the variable being created const NonlinearVariableName _var_name; /// FEType for the variable being created - FEType _fe_type; + libMesh::FEType _fe_type; /// Scaling parameter const Real _scaling; }; diff --git a/modules/phase_field/include/actions/GrainGrowthAction.h b/modules/phase_field/include/actions/GrainGrowthAction.h index 5e71560911d7..11ab65618753 100644 --- a/modules/phase_field/include/actions/GrainGrowthAction.h +++ b/modules/phase_field/include/actions/GrainGrowthAction.h @@ -32,7 +32,7 @@ class GrainGrowthAction : public Action const std::string _var_name_base; /// FEType for the variable being created - const FEType _fe_type; + const libMesh::FEType _fe_type; /// Take initial values from file? const bool _initial_from_file; diff --git a/modules/phase_field/include/actions/NonconservedAction.h b/modules/phase_field/include/actions/NonconservedAction.h index d17329b798cf..c44002b12568 100644 --- a/modules/phase_field/include/actions/NonconservedAction.h +++ b/modules/phase_field/include/actions/NonconservedAction.h @@ -28,5 +28,5 @@ class NonconservedAction : public Action /// Name of the variable being created const NonlinearVariableName _var_name; /// FEType for the variable being created - const FEType _fe_type; + const libMesh::FEType _fe_type; }; diff --git a/modules/phase_field/include/postprocessors/FeatureFloodCount.h b/modules/phase_field/include/postprocessors/FeatureFloodCount.h index 0b96971d1b41..5d74a55077ee 100644 --- a/modules/phase_field/include/postprocessors/FeatureFloodCount.h +++ b/modules/phase_field/include/postprocessors/FeatureFloodCount.h @@ -668,9 +668,9 @@ class FeatureFloodCount : public GeneralPostprocessor, std::vector _feature_id_to_local_index; /// A pointer to the periodic boundary constraints object - PeriodicBoundaries * _pbs; + libMesh::PeriodicBoundaries * _pbs; - std::unique_ptr _point_locator; + std::unique_ptr _point_locator; /// Average value of the domain which can optionally be used to find features in a field const PostprocessorValue & _element_average_value; diff --git a/modules/phase_field/include/utils/PolycrystalICTools.h b/modules/phase_field/include/utils/PolycrystalICTools.h index d0f17f28e28d..a05f4f9863f3 100644 --- a/modules/phase_field/include/utils/PolycrystalICTools.h +++ b/modules/phase_field/include/utils/PolycrystalICTools.h @@ -61,20 +61,20 @@ unsigned int assignPointToGrain(const Point & p, AdjacencyMatrix buildGrainAdjacencyMatrix(const std::map & entity_to_grain, MooseMesh & mesh, - const PeriodicBoundaries * pb, + const libMesh::PeriodicBoundaries * pb, unsigned int n_grains, bool is_elemental); AdjacencyMatrix buildElementalGrainAdjacencyMatrix(const std::map & element_to_grain, MooseMesh & mesh, - const PeriodicBoundaries * pb, + const libMesh::PeriodicBoundaries * pb, unsigned int n_grains); AdjacencyMatrix buildNodalGrainAdjacencyMatrix(const std::map & node_to_grain, MooseMesh & mesh, - const PeriodicBoundaries * pb, + const libMesh::PeriodicBoundaries * pb, unsigned int n_grains); std::vector assignOpsToGrains(AdjacencyMatrix & adjacency_matrix, diff --git a/modules/phase_field/src/actions/CHPFCRFFSplitVariablesAction.C b/modules/phase_field/src/actions/CHPFCRFFSplitVariablesAction.C index 222e25586597..9699686c3c71 100644 --- a/modules/phase_field/src/actions/CHPFCRFFSplitVariablesAction.C +++ b/modules/phase_field/src/actions/CHPFCRFFSplitVariablesAction.C @@ -15,6 +15,8 @@ #include "libmesh/string_to_enum.h" +using namespace libMesh; + registerMooseAction("PhaseFieldApp", CHPFCRFFSplitVariablesAction, "add_variable"); InputParameters diff --git a/modules/phase_field/src/actions/ConservedAction.C b/modules/phase_field/src/actions/ConservedAction.C index 7e1e6c174078..c8c6979b1450 100644 --- a/modules/phase_field/src/actions/ConservedAction.C +++ b/modules/phase_field/src/actions/ConservedAction.C @@ -18,6 +18,8 @@ #include "libmesh/string_to_enum.h" +using namespace libMesh; + registerMooseAction("PhaseFieldApp", ConservedAction, "add_variable"); registerMooseAction("PhaseFieldApp", ConservedAction, "add_kernel"); diff --git a/modules/phase_field/src/actions/GrainGrowthAction.C b/modules/phase_field/src/actions/GrainGrowthAction.C index ca9ffc3808b1..7479f976b0c0 100644 --- a/modules/phase_field/src/actions/GrainGrowthAction.C +++ b/modules/phase_field/src/actions/GrainGrowthAction.C @@ -20,6 +20,8 @@ #include "libmesh/string_to_enum.h" +using namespace libMesh; + registerMooseAction("PhaseFieldApp", GrainGrowthAction, "add_aux_variable"); registerMooseAction("PhaseFieldApp", GrainGrowthAction, "add_aux_kernel"); registerMooseAction("PhaseFieldApp", GrainGrowthAction, "add_variable"); diff --git a/modules/phase_field/src/actions/GrainGrowthLinearizedInterfaceAction.C b/modules/phase_field/src/actions/GrainGrowthLinearizedInterfaceAction.C index d2be23209830..13179b3231b2 100644 --- a/modules/phase_field/src/actions/GrainGrowthLinearizedInterfaceAction.C +++ b/modules/phase_field/src/actions/GrainGrowthLinearizedInterfaceAction.C @@ -206,8 +206,10 @@ GrainGrowthLinearizedInterfaceAction::act() if (_current_task == "add_bounds_vectors") { - _problem->getNonlinearSystemBase(/*nl_sys_num=*/0).addVector("lower_bound", false, GHOSTED); - _problem->getNonlinearSystemBase(/*nl_sys_num=*/0).addVector("upper_bound", false, GHOSTED); + _problem->getNonlinearSystemBase(/*nl_sys_num=*/0) + .addVector("lower_bound", false, libMesh::GHOSTED); + _problem->getNonlinearSystemBase(/*nl_sys_num=*/0) + .addVector("upper_bound", false, libMesh::GHOSTED); } // Add AuxVriable and AuxKernel for Bnds variable diff --git a/modules/phase_field/src/actions/NonconservedAction.C b/modules/phase_field/src/actions/NonconservedAction.C index 14425a89d88c..c82ff4395505 100644 --- a/modules/phase_field/src/actions/NonconservedAction.C +++ b/modules/phase_field/src/actions/NonconservedAction.C @@ -18,6 +18,8 @@ #include "libmesh/string_to_enum.h" +using namespace libMesh; + registerMooseAction("PhaseFieldApp", NonconservedAction, "add_variable"); registerMooseAction("PhaseFieldApp", NonconservedAction, "add_kernel"); @@ -64,7 +66,7 @@ NonconservedAction::NonconservedAction(const InputParameters & params) : Action(params), _var_name(name()), _fe_type(Utility::string_to_enum(getParam("order")), - Utility::string_to_enum(getParam("family"))) + Utility::string_to_enum(getParam("family"))) { } diff --git a/modules/phase_field/src/meshgenerators/EBSDMeshGenerator.C b/modules/phase_field/src/meshgenerators/EBSDMeshGenerator.C index fef093ec76ff..de646e93ebd3 100644 --- a/modules/phase_field/src/meshgenerators/EBSDMeshGenerator.C +++ b/modules/phase_field/src/meshgenerators/EBSDMeshGenerator.C @@ -192,7 +192,7 @@ EBSDMeshGenerator::generate() { if (_pre_refine) { - MeshRefinement mesh_refinement(*_base); + libMesh::MeshRefinement mesh_refinement(*_base); mesh_refinement.uniformly_refine(_pre_refine); } return std::move(_base); diff --git a/modules/phase_field/src/meshgenerators/SphereSurfaceMeshGenerator.C b/modules/phase_field/src/meshgenerators/SphereSurfaceMeshGenerator.C index e8e34e5adce4..c150a0249ee8 100644 --- a/modules/phase_field/src/meshgenerators/SphereSurfaceMeshGenerator.C +++ b/modules/phase_field/src/meshgenerators/SphereSurfaceMeshGenerator.C @@ -49,7 +49,7 @@ SphereSurfaceMeshGenerator::generate() mesh->set_mesh_dimension(2); mesh->set_spatial_dimension(3); - const Sphere sphere(_center, _radius); + const libMesh::Sphere sphere(_center, _radius); // icosahedron points (using golden ratio rectangle construction) const Real phi = (1.0 + std::sqrt(5.0)) / 2.0; @@ -90,7 +90,7 @@ SphereSurfaceMeshGenerator::generate() // Now we have the beginnings of a sphere. // Add some more elements by doing uniform refinements and // popping nodes to the boundary. - MeshRefinement mesh_refinement(*mesh); + libMesh::MeshRefinement mesh_refinement(*mesh); // Loop over the elements, refine, pop nodes to boundary. for (unsigned int r = 0; r < _depth; ++r) diff --git a/modules/phase_field/src/utils/PolycrystalICTools.C b/modules/phase_field/src/utils/PolycrystalICTools.C index 6ce6576c4d0b..4a3a34a72d76 100644 --- a/modules/phase_field/src/utils/PolycrystalICTools.C +++ b/modules/phase_field/src/utils/PolycrystalICTools.C @@ -17,6 +17,8 @@ #include "libmesh/periodic_boundaries.h" #include "libmesh/point_locator_base.h" +using namespace libMesh; + namespace GraphColoring { const unsigned int INVALID_COLOR = std::numeric_limits::max(); diff --git a/modules/porous_flow/include/userobjects/PorousFlowAdvectiveFluxCalculatorBase.h b/modules/porous_flow/include/userobjects/PorousFlowAdvectiveFluxCalculatorBase.h index 45a2267ac5a4..f769ea1f88bc 100644 --- a/modules/porous_flow/include/userobjects/PorousFlowAdvectiveFluxCalculatorBase.h +++ b/modules/porous_flow/include/userobjects/PorousFlowAdvectiveFluxCalculatorBase.h @@ -108,7 +108,7 @@ class PorousFlowAdvectiveFluxCalculatorBase : public AdvectiveFluxCalculatorBase const MaterialProperty>> & _dgrad_p_dvar; /// FEType to use - const FEType _fe_type; + const libMesh::FEType _fe_type; /// Kuzmin-Turek shape function const VariablePhiValue & _phi; diff --git a/modules/porous_flow/include/userobjects/PorousFlowDictator.h b/modules/porous_flow/include/userobjects/PorousFlowDictator.h index db62dbdd5760..4c02c34a56e2 100644 --- a/modules/porous_flow/include/userobjects/PorousFlowDictator.h +++ b/modules/porous_flow/include/userobjects/PorousFlowDictator.h @@ -143,7 +143,7 @@ class PorousFlowDictator : public GeneralUserObject, public Coupleable * Note, this is meaningless if there are no named porous_flow_variables: consistentFEType() * should be used to check this */ - FEType feType() const; + libMesh::FEType feType() const; /** * Check if the simulation includes derivatives of permeability @@ -184,7 +184,7 @@ class PorousFlowDictator : public GeneralUserObject, public Coupleable bool _consistent_fe_type; /// FE type used by the PorousFlow variables - FEType _fe_type; + libMesh::FEType _fe_type; /// _moose_var_num[i] = the moose variable number corresponding to porous flow variable i std::vector _moose_var_num; diff --git a/modules/porous_flow/include/utils/PorousFlowConnectedNodes.h b/modules/porous_flow/include/utils/PorousFlowConnectedNodes.h index bcd6034ea86f..1317735b0244 100644 --- a/modules/porous_flow/include/utils/PorousFlowConnectedNodes.h +++ b/modules/porous_flow/include/utils/PorousFlowConnectedNodes.h @@ -10,6 +10,7 @@ #pragma once #include "Moose.h" +#include "MooseTypes.h" /** * Class designed to hold node ID information and information diff --git a/modules/porous_flow/src/dirackernels/PorousFlowLineGeometry.C b/modules/porous_flow/src/dirackernels/PorousFlowLineGeometry.C index 1e2b346302c9..a598cb32f921 100644 --- a/modules/porous_flow/src/dirackernels/PorousFlowLineGeometry.C +++ b/modules/porous_flow/src/dirackernels/PorousFlowLineGeometry.C @@ -183,15 +183,15 @@ PorousFlowLineGeometry::initialSetup() pl->enable_out_of_mesh_mode(); auto * elem = (*pl)(start); - auto elem_id = elem ? elem->id() : DofObject::invalid_id; + auto elem_id = elem ? elem->id() : libMesh::DofObject::invalid_id; _communicator.min(elem_id); - if (elem_id == DofObject::invalid_id) + if (elem_id == libMesh::DofObject::invalid_id) paramError("line_base", "base point ", start, " lies outside the mesh"); elem = (*pl)(end); - elem_id = elem ? elem->id() : DofObject::invalid_id; + elem_id = elem ? elem->id() : libMesh::DofObject::invalid_id; _communicator.min(elem_id); - if (elem_id == DofObject::invalid_id) + if (elem_id == libMesh::DofObject::invalid_id) paramError("line_length", "length causes end point ", end, " to lie outside the mesh"); regenPoints(); diff --git a/modules/ray_tracing/include/outputs/RayTracingMeshOutput.h b/modules/ray_tracing/include/outputs/RayTracingMeshOutput.h index 09c4a850c850..3eaa4f377522 100644 --- a/modules/ray_tracing/include/outputs/RayTracingMeshOutput.h +++ b/modules/ray_tracing/include/outputs/RayTracingMeshOutput.h @@ -66,7 +66,7 @@ class RayTracingMeshOutput : public FileOutput, public UserObjectInterface /// The EquationSystems std::unique_ptr _es; /// The system that stores the field data - ExplicitSystem * _sys; + libMesh::ExplicitSystem * _sys; private: /** diff --git a/modules/ray_tracing/include/raytracing/ClaimRays.h b/modules/ray_tracing/include/raytracing/ClaimRays.h index 6845676de66d..488830b1dd2a 100644 --- a/modules/ray_tracing/include/raytracing/ClaimRays.h +++ b/modules/ray_tracing/include/raytracing/ClaimRays.h @@ -31,7 +31,7 @@ class MooseMesh; /** * Helper object for claiming Rays */ -class ClaimRays : public ParallelObject, public MeshChangedInterface +class ClaimRays : public libMesh::ParallelObject, public MeshChangedInterface { public: /** @@ -101,7 +101,7 @@ class ClaimRays : public ParallelObject, public MeshChangedInterface /** * Get the inflated bounding box for rank \pid. */ - const BoundingBox & inflatedBoundingBox(const processor_id_type pid) const + const libMesh::BoundingBox & inflatedBoundingBox(const processor_id_type pid) const { return _inflated_bboxes[pid]; } @@ -159,10 +159,10 @@ class ClaimRays : public ParallelObject, public MeshChangedInterface std::vector> & _local_rays; /// The point locator - std::unique_ptr _point_locator = nullptr; + std::unique_ptr _point_locator = nullptr; /// The inflated bounding boxes for all processors - std::vector _inflated_bboxes; + std::vector _inflated_bboxes; /// Map of point neighbors for each element std::unordered_map> _elem_point_neighbors; diff --git a/modules/ray_tracing/include/raytracing/TraceRay.h b/modules/ray_tracing/include/raytracing/TraceRay.h index 1148288d026b..454e11853beb 100644 --- a/modules/ray_tracing/include/raytracing/TraceRay.h +++ b/modules/ray_tracing/include/raytracing/TraceRay.h @@ -514,7 +514,7 @@ class TraceRay std::vector _results; /// Helper for building element sides without excessive allocation - ElemSideBuilder _elem_side_builder; + libMesh::ElemSideBuilder _elem_side_builder; /// Reusable for getting the RayBCs in onBoundary() std::vector _on_boundary_ray_bcs; diff --git a/modules/ray_tracing/include/raytracing/TraceRayTools.h b/modules/ray_tracing/include/raytracing/TraceRayTools.h index 22369a5677e8..a7052ff05331 100644 --- a/modules/ray_tracing/include/raytracing/TraceRayTools.h +++ b/modules/ray_tracing/include/raytracing/TraceRayTools.h @@ -12,6 +12,8 @@ // MOOSE includes #include "StaticallyAllocatedSet.h" #include "Conversion.h" +#include "MooseTypes.h" +#include "libMeshReducedNamespace.h" // Local includes #include "DebugRay.h" @@ -558,7 +560,7 @@ bool intersectQuad(const Point & start, * @return Whether or not the line segment intersected with the face */ template -typename std::enable_if::value, bool>::type +typename std::enable_if::value, bool>::type sideIntersectedByLine(const Elem * elem, const Point & start_point, const Point & direction, @@ -732,7 +734,7 @@ sideIntersectedByLine(const Elem * elem, * @return Whether or not the line segment intersected with the face */ template -typename std::enable_if::value, bool>::type +typename std::enable_if::value, bool>::type sideIntersectedByLine(const Elem * elem, const Point & start_point, const Point & direction, @@ -803,7 +805,7 @@ sideIntersectedByLine(const Elem * elem, * @return Whether or not the line segment intersected with the face */ template -typename std::enable_if::value, bool>::type +typename std::enable_if::value, bool>::type sideIntersectedByLine(const Elem * elem, const Point & start_point, const Point & direction, @@ -889,8 +891,8 @@ unsigned short atVertexOnSide(const Elem * elem, const Point & point, const unsi * Returns the number of nodes on a side for an Elem that is not a Pyramid or Prism. */ template -inline typename std::enable_if::value && - !std::is_base_of::value, +inline typename std::enable_if::value && + !std::is_base_of::value, unsigned short>::type nodesPerSide(const unsigned short) { @@ -911,7 +913,7 @@ nodesPerSide(const unsigned short side) * Returns the number of nodes on a side on a Prism elem. */ template -inline typename std::enable_if::value, unsigned short>::type +inline typename std::enable_if::value, unsigned short>::type nodesPerSide(const unsigned short side) { return T::nodes_per_side - (side == 0 || side == 4); @@ -1029,7 +1031,7 @@ bool withinExtremaOnSide(const Elem * const elem, * @return If the point is within an edge on the side of the element */ template -typename std::enable_if::value, bool>::type withinEdgeOnSideTempl( +typename std::enable_if::value, bool>::type withinEdgeOnSideTempl( const Elem * const elem, const Point & point, const unsigned short side, ElemExtrema & extrema); /** @@ -1039,7 +1041,7 @@ typename std::enable_if::value, bool>::type withinEdgeO * edges, therefore this function errors. */ template -typename std::enable_if::value, bool>::type +typename std::enable_if::value, bool>::type withinEdgeOnSideTempl(const Elem * const, const Point &, const unsigned short, ElemExtrema &) { mooseError("Should not call withinEdgeOnSideTempl() with a non-Cell derived Elem"); diff --git a/modules/ray_tracing/include/userobjects/RayTracingStudy.h b/modules/ray_tracing/include/userobjects/RayTracingStudy.h index aacb4d35f7f2..9a3b5d4d4ec0 100644 --- a/modules/ray_tracing/include/userobjects/RayTracingStudy.h +++ b/modules/ray_tracing/include/userobjects/RayTracingStudy.h @@ -1011,7 +1011,7 @@ class RayTracingStudy : public GeneralUserObject RayID registerRay(const std::string & name); /// Threaded helpers for building element sides without extraneous allocation - std::vector _threaded_elem_side_builders; + std::vector _threaded_elem_side_builders; /// Timing //@{ @@ -1057,9 +1057,9 @@ class RayTracingStudy : public GeneralUserObject bool _has_same_level_active_elems; /// Nodal bounding box for the domain - BoundingBox _b_box; + libMesh::BoundingBox _b_box; /// Loose nodal bounding box for the domain - BoundingBox _loose_b_box; + libMesh::BoundingBox _loose_b_box; /// An inflated max distance for the domain Real _domain_max_length; /// The total volume of the domain @@ -1076,9 +1076,9 @@ class RayTracingStudy : public GeneralUserObject /// The TraceRay objects for each thread (they do the physical tracing) std::vector> _threaded_trace_ray; /// Face FE used for computing face normals for each thread - std::vector> _threaded_fe_face; + std::vector> _threaded_fe_face; /// Face quadrature used for computing face normals for each thread - std::vector> _threaded_q_face; + std::vector> _threaded_q_face; /// Threaded cache for side normals that have been computed already during tracing std::vector, Point>> _threaded_cached_normals; @@ -1093,7 +1093,7 @@ class RayTracingStudy : public GeneralUserObject const std::unique_ptr _parallel_ray_study; /// Quadrature rule for laying points across a 1D ray segment - std::unique_ptr _segment_qrule; + std::unique_ptr _segment_qrule; /// Total number of processor crossings for Rays that finished on this processor unsigned long long int _ending_processor_crossings; diff --git a/modules/ray_tracing/include/utils/ElemIndexHelper.h b/modules/ray_tracing/include/utils/ElemIndexHelper.h index a8cf178787e1..a5aad9355686 100644 --- a/modules/ray_tracing/include/utils/ElemIndexHelper.h +++ b/modules/ray_tracing/include/utils/ElemIndexHelper.h @@ -40,25 +40,25 @@ class ElemIndexHelper ElemIndexHelper(libMesh::MeshBase & mesh, const std::string & extra_elem_integer_name); /** - * Initializes the indices in a continguous manner for the given element range + * Initializes the indices in a contiguous manner for the given element range */ - void initialize(const SimpleRange elems); + void initialize(const libMesh::SimpleRange elems); /** * Whether or not the element \p elem has an index set for it using this object. */ - bool hasIndex(const Elem * elem) const + bool hasIndex(const libMesh::Elem * elem) const { mooseAssert(elem, "Null elem"); mooseAssert(_initialized, "Not initialized"); mooseAssert(_mesh.query_elem_ptr(elem->id()), "Not an elem of the mesh"); - return elem->get_extra_integer(_extra_integer) != DofObject::invalid_id; + return elem->get_extra_integer(_extra_integer) != libMesh::DofObject::invalid_id; } /** * Get the index associated with the element \p elem. */ - dof_id_type getIndex(const Elem * elem) const + libMesh::dof_id_type getIndex(const libMesh::Elem * elem) const { mooseAssert(hasIndex(elem), "Elem not in indexed range"); return elem->get_extra_integer(_extra_integer); @@ -70,7 +70,7 @@ class ElemIndexHelper * Useful for initializing data structures that will be indexed * using the indices provided by this object. */ - dof_id_type maxIndex() const { return _max_index; } + libMesh::dof_id_type maxIndex() const { return _max_index; } private: // The mesh @@ -80,5 +80,5 @@ class ElemIndexHelper /// Whether or not this object is initialized bool _initialized; /// The max index generated - dof_id_type _max_index; + libMesh::dof_id_type _max_index; }; diff --git a/modules/ray_tracing/include/utils/ParallelStudy.h b/modules/ray_tracing/include/utils/ParallelStudy.h index ebc3450d4575..7bb8a9153ea6 100644 --- a/modules/ray_tracing/include/utils/ParallelStudy.h +++ b/modules/ray_tracing/include/utils/ParallelStudy.h @@ -26,7 +26,7 @@ #include "libmesh/parallel_object.h" template -class ParallelStudy : public ParallelObject +class ParallelStudy : public libMesh::ParallelObject { public: typedef typename MooseUtils::Buffer::iterator work_iterator; diff --git a/modules/ray_tracing/include/utils/RayTracingPackingUtils.h b/modules/ray_tracing/include/utils/RayTracingPackingUtils.h index 7f0fb33e46d8..a45cd3b49cab 100644 --- a/modules/ray_tracing/include/utils/RayTracingPackingUtils.h +++ b/modules/ray_tracing/include/utils/RayTracingPackingUtils.h @@ -304,7 +304,7 @@ template BufferType pack(const Elem * elem, MeshBase * libmesh_dbg_var(mesh_base /* = nullptr */)) { - const dof_id_type id = elem ? elem->id() : DofObject::invalid_id; + const dof_id_type id = elem ? elem->id() : libMesh::DofObject::invalid_id; mooseAssert(mesh_base ? mesh_base->query_elem_ptr(id) == elem : true, "Elem doesn't exist in mesh"); @@ -318,6 +318,6 @@ unpack(const Elem *& elem, const BufferType id_as_buffer_type, MeshBase * mesh_b dof_id_type id; unpack(id_as_buffer_type, id); - elem = (id == DofObject::invalid_id ? nullptr : mesh_base->query_elem_ptr(id)); + elem = (id == libMesh::DofObject::invalid_id ? nullptr : mesh_base->query_elem_ptr(id)); } } diff --git a/modules/ray_tracing/include/utils/ReceiveBuffer.h b/modules/ray_tracing/include/utils/ReceiveBuffer.h index 9a2b16c0ebd7..fd41d64de7b9 100644 --- a/modules/ray_tracing/include/utils/ReceiveBuffer.h +++ b/modules/ray_tracing/include/utils/ReceiveBuffer.h @@ -25,7 +25,7 @@ #include template -class ReceiveBuffer : public ParallelObject +class ReceiveBuffer : public libMesh::ParallelObject { public: ReceiveBuffer(const libMesh::Parallel::Communicator & comm, diff --git a/modules/ray_tracing/include/utils/SendBuffer.h b/modules/ray_tracing/include/utils/SendBuffer.h index b8133cb0a134..3fae83542f15 100644 --- a/modules/ray_tracing/include/utils/SendBuffer.h +++ b/modules/ray_tracing/include/utils/SendBuffer.h @@ -23,7 +23,7 @@ #include template -class SendBuffer : public ParallelObject +class SendBuffer : public libMesh::ParallelObject { public: SendBuffer(const libMesh::Parallel::Communicator & comm, diff --git a/modules/ray_tracing/src/outputs/RayTracingExodus.C b/modules/ray_tracing/src/outputs/RayTracingExodus.C index 9fae24c4985b..74709a2c37ae 100644 --- a/modules/ray_tracing/src/outputs/RayTracingExodus.C +++ b/modules/ray_tracing/src/outputs/RayTracingExodus.C @@ -36,7 +36,7 @@ RayTracingExodus::outputMesh() { TIME_SECTION("outputMesh", 3, "Writing Ray Mesh"); - ExodusII_IO eio(*_segment_mesh); + libMesh::ExodusII_IO eio(*_segment_mesh); eio.set_hdf5_writing(false); // With nodal data, we need to output these variables in write_timestep diff --git a/modules/ray_tracing/src/outputs/RayTracingMeshOutput.C b/modules/ray_tracing/src/outputs/RayTracingMeshOutput.C index 9b72ab917cf2..be8b897cf1a0 100644 --- a/modules/ray_tracing/src/outputs/RayTracingMeshOutput.C +++ b/modules/ray_tracing/src/outputs/RayTracingMeshOutput.C @@ -24,6 +24,8 @@ #include "libmesh/parallel_sync.h" #include "libmesh/remote_elem.h" +using namespace libMesh; + InputParameters RayTracingMeshOutput::validParams() { diff --git a/modules/ray_tracing/src/outputs/RayTracingNemesis.C b/modules/ray_tracing/src/outputs/RayTracingNemesis.C index f4a6f3929544..ec4d88211dff 100644 --- a/modules/ray_tracing/src/outputs/RayTracingNemesis.C +++ b/modules/ray_tracing/src/outputs/RayTracingNemesis.C @@ -40,7 +40,7 @@ RayTracingNemesis::outputMesh() TIME_SECTION("outputMesh", 3, "Outputting Nemesis RayTracing Mesh"); // Build the nemesis IO object - Nemesis_IO nemesis_io(*_segment_mesh); + libMesh::Nemesis_IO nemesis_io(*_segment_mesh); nemesis_io.set_hdf5_writing(false); // With nodal data, we need to output these variables in write_timestep diff --git a/modules/ray_tracing/src/raytracing/ClaimRays.C b/modules/ray_tracing/src/raytracing/ClaimRays.C index db080ea3b597..b90e6d4ac6b4 100644 --- a/modules/ray_tracing/src/raytracing/ClaimRays.C +++ b/modules/ray_tracing/src/raytracing/ClaimRays.C @@ -19,6 +19,8 @@ #include "libmesh/enum_point_locator_type.h" #include "libmesh/mesh_tools.h" +using namespace libMesh; + ClaimRays::ClaimRays(RayTracingStudy & study, const std::vector> & rays, std::vector> & local_rays, diff --git a/modules/ray_tracing/src/raytracing/Ray.C b/modules/ray_tracing/src/raytracing/Ray.C index 9baf869ddc57..b770cf94d476 100644 --- a/modules/ray_tracing/src/raytracing/Ray.C +++ b/modules/ray_tracing/src/raytracing/Ray.C @@ -17,6 +17,8 @@ // MOOSE includes #include "DataIO.h" +using namespace libMesh; + Ray::Ray(RayTracingStudy * study, const RayID id, const std::size_t data_size, diff --git a/modules/ray_tracing/src/raytracing/TraceRay.C b/modules/ray_tracing/src/raytracing/TraceRay.C index 1b4660653b7a..810b2a531d7c 100644 --- a/modules/ray_tracing/src/raytracing/TraceRay.C +++ b/modules/ray_tracing/src/raytracing/TraceRay.C @@ -41,6 +41,7 @@ #include "libmesh/enum_to_string.h" #include "libmesh/mesh.h" +using namespace libMesh; using namespace TraceRayTools; TraceRay::TraceRay(RayTracingStudy & study, const THREAD_ID tid) diff --git a/modules/ray_tracing/src/raytracing/TraceRayTools.C b/modules/ray_tracing/src/raytracing/TraceRayTools.C index 6473627ed491..b400a81f3cb7 100644 --- a/modules/ray_tracing/src/raytracing/TraceRayTools.C +++ b/modules/ray_tracing/src/raytracing/TraceRayTools.C @@ -34,6 +34,8 @@ #include "libmesh/remote_elem.h" #include "libmesh/tensor_value.h" +using namespace libMesh; + namespace TraceRayTools { diff --git a/modules/ray_tracing/src/userobjects/RayTracingStudy.C b/modules/ray_tracing/src/userobjects/RayTracingStudy.C index 609571691094..87e5928d7031 100644 --- a/modules/ray_tracing/src/userobjects/RayTracingStudy.C +++ b/modules/ray_tracing/src/userobjects/RayTracingStudy.C @@ -27,6 +27,8 @@ #include "libmesh/parallel_sync.h" #include "libmesh/remote_elem.h" +using namespace libMesh; + InputParameters RayTracingStudy::validParams() { diff --git a/modules/ray_tracing/src/utils/ElemIndexHelper.C b/modules/ray_tracing/src/utils/ElemIndexHelper.C index 9e980d6c73da..eb00bdae743b 100644 --- a/modules/ray_tracing/src/utils/ElemIndexHelper.C +++ b/modules/ray_tracing/src/utils/ElemIndexHelper.C @@ -9,15 +9,16 @@ #include "ElemIndexHelper.h" -ElemIndexHelper::ElemIndexHelper(libMesh::MeshBase & mesh, - const std::string & extra_elem_integer_name) +using namespace libMesh; + +ElemIndexHelper::ElemIndexHelper(MeshBase & mesh, const std::string & extra_elem_integer_name) : _mesh(mesh), _extra_integer(invalid_uint), _initialized(false) { _extra_integer = mesh.add_elem_integer(extra_elem_integer_name); } void -ElemIndexHelper::initialize(const SimpleRange elems) +ElemIndexHelper::initialize(const SimpleRange elems) { // First, invalidate the integers for all elements that we know about // so that we can tell when getting an index for an elem if said elem diff --git a/modules/rdg/include/userobjects/SlopeLimitingBase.h b/modules/rdg/include/userobjects/SlopeLimitingBase.h index 970208d74543..ff502feb530e 100644 --- a/modules/rdg/include/userobjects/SlopeLimitingBase.h +++ b/modules/rdg/include/userobjects/SlopeLimitingBase.h @@ -11,7 +11,7 @@ #include "ElementLoopUserObject.h" -// Forward Declarations +using libMesh::RealGradient; /** * Base class for slope limiting to limit @@ -47,7 +47,7 @@ class SlopeLimitingBase : public ElementLoopUserObject /// required data for face assembly const MooseArray & _q_point_face; - const QBase * const & _qrule_face; + const libMesh::QBase * const & _qrule_face; const MooseArray & _JxW_face; const MooseArray & _normals_face; diff --git a/modules/rdg/include/userobjects/SlopeReconstructionBase.h b/modules/rdg/include/userobjects/SlopeReconstructionBase.h index 5b5333393195..8d643fc99a8f 100644 --- a/modules/rdg/include/userobjects/SlopeReconstructionBase.h +++ b/modules/rdg/include/userobjects/SlopeReconstructionBase.h @@ -12,7 +12,7 @@ #include "BCUserObject.h" #include "ElementLoopUserObject.h" -// Forward Declarations +using libMesh::RealGradient; /** * Base class for piecewise linear slope reconstruction diff --git a/modules/rdg/src/materials/AEFVMaterial.C b/modules/rdg/src/materials/AEFVMaterial.C index 4fe4e38a56ca..6c98e59a3d5b 100644 --- a/modules/rdg/src/materials/AEFVMaterial.C +++ b/modules/rdg/src/materials/AEFVMaterial.C @@ -12,6 +12,8 @@ #include "libmesh/quadrature.h" +using namespace libMesh; + registerMooseObject("RdgApp", AEFVMaterial); InputParameters diff --git a/modules/reactor/include/utils/ReportingIDGeneratorUtils.h b/modules/reactor/include/utils/ReportingIDGeneratorUtils.h index 190094cf05dc..20c0503dc074 100644 --- a/modules/reactor/include/utils/ReportingIDGeneratorUtils.h +++ b/modules/reactor/include/utils/ReportingIDGeneratorUtils.h @@ -38,7 +38,7 @@ enum class AssignType * @return list of reporting IDs for individual mesh elements **/ std::vector -getCellwiseIntegerIDs(const std::vector> & meshes, +getCellwiseIntegerIDs(const std::vector> & meshes, const std::vector> & pattern, const bool use_exclude_id, const std::vector & exclude_ids); @@ -50,7 +50,7 @@ getCellwiseIntegerIDs(const std::vector> & meshe * @return list of reporting IDs for individual mesh elements **/ std::vector -getPatternIntegerIDs(const std::vector> & meshes, +getPatternIntegerIDs(const std::vector> & meshes, const std::vector> & pattern); /** @@ -61,7 +61,7 @@ getPatternIntegerIDs(const std::vector> & meshes * @return list of reporting IDs for individual mesh elements **/ std::vector -getManualIntegerIDs(const std::vector> & meshes, +getManualIntegerIDs(const std::vector> & meshes, const std::vector> & pattern, const std::vector> & id_pattern); @@ -71,8 +71,9 @@ getManualIntegerIDs(const std::vector> & meshes, * @param pattern 2D vector of the mesh pattern * @return list of block IDs in input meshes **/ -std::set getCellBlockIDs(const std::vector> & meshes, - const std::vector> & pattern); +std::set +getCellBlockIDs(const std::vector> & meshes, + const std::vector> & pattern); /** * get list of block IDs for the assembly duck regions @@ -111,7 +112,7 @@ void assignReportingIDs(MeshBase & mesh, const std::vector & exclude_ids, const bool has_assembly_boundary, const std::set background_block_ids, - const std::vector> & input_meshes, + const std::vector> & input_meshes, const std::vector> & pattern, const std::vector> & id_pattern); } diff --git a/modules/reactor/src/meshgenerators/CoarseMeshExtraElementIDGenerator.C b/modules/reactor/src/meshgenerators/CoarseMeshExtraElementIDGenerator.C index 1bb73aac0806..8c61e7432d44 100644 --- a/modules/reactor/src/meshgenerators/CoarseMeshExtraElementIDGenerator.C +++ b/modules/reactor/src/meshgenerators/CoarseMeshExtraElementIDGenerator.C @@ -8,15 +8,16 @@ //* https://www.gnu.org/licenses/lgpl-2.1.html #include "CoarseMeshExtraElementIDGenerator.h" - -registerMooseObject("ReactorApp", CoarseMeshExtraElementIDGenerator); - #include "MooseMeshUtils.h" #include "libmesh/enum_point_locator_type.h" #include "libmesh/elem.h" #include "libmesh/mesh_serializer.h" +using namespace libMesh; + +registerMooseObject("ReactorApp", CoarseMeshExtraElementIDGenerator); + InputParameters CoarseMeshExtraElementIDGenerator::validParams() { diff --git a/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGenerator.C b/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGenerator.C index 5934a18523c6..5672d9017b9a 100644 --- a/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGenerator.C +++ b/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGenerator.C @@ -9,6 +9,8 @@ #include "PolygonConcentricCircleMeshGenerator.h" +using namespace libMesh; + registerMooseObject("ReactorApp", PolygonConcentricCircleMeshGenerator); InputParameters diff --git a/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGeneratorBase.C b/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGeneratorBase.C index d537ea0a5f05..3df46f631904 100644 --- a/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGeneratorBase.C +++ b/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGeneratorBase.C @@ -805,7 +805,7 @@ PolygonConcentricCircleMeshGeneratorBase::generate() if (!_has_ducts && _sides_to_adapt.empty()) { - LaplaceMeshSmoother lms(*mesh0); + libMesh::LaplaceMeshSmoother lms(*mesh0); lms.smooth(_smoothing_max_it); } diff --git a/modules/reactor/src/meshgenerators/PolygonMeshGeneratorBase.C b/modules/reactor/src/meshgenerators/PolygonMeshGeneratorBase.C index 9e0e3ba00b6b..ee985af64662 100644 --- a/modules/reactor/src/meshgenerators/PolygonMeshGeneratorBase.C +++ b/modules/reactor/src/meshgenerators/PolygonMeshGeneratorBase.C @@ -14,6 +14,8 @@ #include #include +using namespace libMesh; + InputParameters PolygonMeshGeneratorBase::validParams() { diff --git a/modules/reactor/src/meshgenerators/RevolveGenerator.C b/modules/reactor/src/meshgenerators/RevolveGenerator.C index a05ef6691cf3..7ee568f05d8c 100644 --- a/modules/reactor/src/meshgenerators/RevolveGenerator.C +++ b/modules/reactor/src/meshgenerators/RevolveGenerator.C @@ -30,6 +30,8 @@ #include "libmesh/point.h" #include "libmesh/mesh_tools.h" +using namespace libMesh; + // C++ includes #include diff --git a/modules/reactor/src/utils/ReportingIDGeneratorUtils.C b/modules/reactor/src/utils/ReportingIDGeneratorUtils.C index 8588cfc160b1..d591cb8d0ac2 100644 --- a/modules/reactor/src/utils/ReportingIDGeneratorUtils.C +++ b/modules/reactor/src/utils/ReportingIDGeneratorUtils.C @@ -9,6 +9,8 @@ #include "ReportingIDGeneratorUtils.h" +using namespace libMesh; + std::vector ReportingIDGeneratorUtils::getCellwiseIntegerIDs( const std::vector> & meshes, diff --git a/modules/reactor/unit/src/main.C b/modules/reactor/unit/src/main.C index 8b4ec04da82b..86fa3b0bbf75 100644 --- a/modules/reactor/unit/src/main.C +++ b/modules/reactor/unit/src/main.C @@ -18,7 +18,7 @@ #include #include -PerfLog Moose::perf_log("gtest"); +libMesh::PerfLog Moose::perf_log("gtest"); GTEST_API_ int main(int argc, char ** argv) diff --git a/modules/richards/src/actions/Q2PAction.C b/modules/richards/src/actions/Q2PAction.C index ab437970dc19..70f8c386262a 100644 --- a/modules/richards/src/actions/Q2PAction.C +++ b/modules/richards/src/actions/Q2PAction.C @@ -214,8 +214,8 @@ Q2PAction::act() if (_current_task == "add_aux_variable") { - FEType fe_type(Utility::string_to_enum(getParam("ORDER")), - Utility::string_to_enum("LAGRANGE")); + libMesh::FEType fe_type(Utility::string_to_enum(getParam("ORDER")), + Utility::string_to_enum("LAGRANGE")); auto type = AddVariableAction::variableType(fe_type); auto var_params = _factory.getValidParams(type); var_params.set("family") = "LAGRANGE"; diff --git a/modules/solid_mechanics/include/kernels/ADStressDivergenceShell.h b/modules/solid_mechanics/include/kernels/ADStressDivergenceShell.h index 5f149a967b1f..a7625bdcbbd0 100644 --- a/modules/solid_mechanics/include/kernels/ADStressDivergenceShell.h +++ b/modules/solid_mechanics/include/kernels/ADStressDivergenceShell.h @@ -44,7 +44,7 @@ class ADStressDivergenceShell : public ADKernel std::vector *> _J_map; /// Quadrature rule in the out of plane direction - std::unique_ptr _t_qrule; + std::unique_ptr _t_qrule; /// Quadrature weights in the out of plane direction in isoparametric coordinate system std::vector _t_weights; diff --git a/modules/solid_mechanics/include/materials/ADComputeIncrementalShellStrain.h b/modules/solid_mechanics/include/materials/ADComputeIncrementalShellStrain.h index d79fea5aa7fc..4cd4df117bc6 100644 --- a/modules/solid_mechanics/include/materials/ADComputeIncrementalShellStrain.h +++ b/modules/solid_mechanics/include/materials/ADComputeIncrementalShellStrain.h @@ -99,7 +99,7 @@ class ADComputeIncrementalShellStrain : public Material const MaterialProperty & _node_normal_old; /// Quadrature rule in the out of plane direction - std::unique_ptr _t_qrule; + std::unique_ptr _t_qrule; /// Quadrature points in the out of plane direction in isoparametric coordinate system std::vector _t_points; diff --git a/modules/solid_mechanics/include/utils/RotationTensor.h b/modules/solid_mechanics/include/utils/RotationTensor.h index 9e4d524e3f73..c65214760d89 100644 --- a/modules/solid_mechanics/include/utils/RotationTensor.h +++ b/modules/solid_mechanics/include/utils/RotationTensor.h @@ -10,6 +10,7 @@ #pragma once #include "Moose.h" +#include "MooseTypes.h" // Any requisite includes here #include "libmesh/tensor_value.h" diff --git a/modules/solid_mechanics/include/vectorpostprocessors/InteractionIntegral.h b/modules/solid_mechanics/include/vectorpostprocessors/InteractionIntegral.h index 8f89ae0e20f6..8c9f7d8bcb23 100644 --- a/modules/solid_mechanics/include/vectorpostprocessors/InteractionIntegral.h +++ b/modules/solid_mechanics/include/vectorpostprocessors/InteractionIntegral.h @@ -98,7 +98,7 @@ class InteractionIntegralTempl : public ElementVectorPostprocessor /// Vector of all coupled variables std::vector _fe_vars; /// FEType object defining order and family of displacement variables - const FEType & _fe_type; + const libMesh::FEType & _fe_type; /// Displacement variables std::vector _disp; /// Gradient of displacements @@ -144,7 +144,7 @@ class InteractionIntegralTempl : public ElementVectorPostprocessor /// Vector of shape function values for the current element const std::vector> * _phi_curr_elem; /// Vector of gradients of shape function values for the current element - const std::vector> * _dphi_curr_elem; + const std::vector> * _dphi_curr_elem; /// Kappa Lame constant Real _kappa; /// Shear modulus diff --git a/modules/solid_mechanics/include/vectorpostprocessors/JIntegral.h b/modules/solid_mechanics/include/vectorpostprocessors/JIntegral.h index bdc3b17733ab..5aec1cbcfd70 100644 --- a/modules/solid_mechanics/include/vectorpostprocessors/JIntegral.h +++ b/modules/solid_mechanics/include/vectorpostprocessors/JIntegral.h @@ -63,7 +63,7 @@ class JIntegral : public ElementVectorPostprocessor /// Vector of all coupled variables std::vector _fe_vars; /// FEType object defining order and family of displacement variables - const FEType & _fe_type; + const libMesh::FEType & _fe_type; /// Whether the crack plane is also a symmetry plane in the model bool _has_symmetry_plane; /// Poisson's ratio of the material @@ -85,7 +85,7 @@ class JIntegral : public ElementVectorPostprocessor /// Vector of shape function values for the current element const std::vector> * _phi_curr_elem; /// Vector of gradients of shape function values for the current element - const std::vector> * _dphi_curr_elem; + const std::vector> * _dphi_curr_elem; /// Current quadrature point index unsigned int _qp; /// Vectors computed by this VectorPostprocessor: diff --git a/modules/solid_mechanics/src/actions/LineElementAction.C b/modules/solid_mechanics/src/actions/LineElementAction.C index e3aa1fb30f70..b09ca19a5ed4 100644 --- a/modules/solid_mechanics/src/actions/LineElementAction.C +++ b/modules/solid_mechanics/src/actions/LineElementAction.C @@ -20,18 +20,14 @@ #include "libmesh/string_to_enum.h" #include -registerMooseAction("SolidMechanicsApp", LineElementAction, "create_problem"); +using namespace libMesh; +registerMooseAction("SolidMechanicsApp", LineElementAction, "create_problem"); registerMooseAction("SolidMechanicsApp", LineElementAction, "add_variable"); - registerMooseAction("SolidMechanicsApp", LineElementAction, "add_aux_variable"); - registerMooseAction("SolidMechanicsApp", LineElementAction, "add_kernel"); - registerMooseAction("SolidMechanicsApp", LineElementAction, "add_aux_kernel"); - registerMooseAction("SolidMechanicsApp", LineElementAction, "add_nodal_kernel"); - registerMooseAction("SolidMechanicsApp", LineElementAction, "add_material"); InputParameters diff --git a/modules/solid_mechanics/src/constraints/NodalFrictionalConstraint.C b/modules/solid_mechanics/src/constraints/NodalFrictionalConstraint.C index d79771e18d30..34fbad16a0bc 100644 --- a/modules/solid_mechanics/src/constraints/NodalFrictionalConstraint.C +++ b/modules/solid_mechanics/src/constraints/NodalFrictionalConstraint.C @@ -22,6 +22,8 @@ // C++ includes #include +using namespace libMesh; + registerMooseObject("SolidMechanicsApp", NodalFrictionalConstraint); InputParameters diff --git a/modules/solid_mechanics/src/constraints/NodalStickConstraint.C b/modules/solid_mechanics/src/constraints/NodalStickConstraint.C index 0d569b1944f5..d377947cb3c7 100644 --- a/modules/solid_mechanics/src/constraints/NodalStickConstraint.C +++ b/modules/solid_mechanics/src/constraints/NodalStickConstraint.C @@ -22,6 +22,8 @@ // C++ includes #include +using namespace libMesh; + registerMooseObject("SolidMechanicsApp", NodalStickConstraint); InputParameters diff --git a/modules/solid_mechanics/src/kernels/ADStressDivergenceShell.C b/modules/solid_mechanics/src/kernels/ADStressDivergenceShell.C index 86637837d908..559a10b975d6 100644 --- a/modules/solid_mechanics/src/kernels/ADStressDivergenceShell.C +++ b/modules/solid_mechanics/src/kernels/ADStressDivergenceShell.C @@ -50,7 +50,7 @@ ADStressDivergenceShell::ADStressDivergenceShell(const InputParameters & paramet _component(getParam("component")), _large_strain(getParam("large_strain")) { - _t_qrule = std::make_unique( + _t_qrule = std::make_unique( 1, Utility::string_to_enum(getParam("through_thickness_order"))); _t_weights = _t_qrule->get_weights(); diff --git a/modules/solid_mechanics/src/materials/ADComputeIncrementalShellStrain.C b/modules/solid_mechanics/src/materials/ADComputeIncrementalShellStrain.C index 78a5c8005474..4996ad2245c3 100644 --- a/modules/solid_mechanics/src/materials/ADComputeIncrementalShellStrain.C +++ b/modules/solid_mechanics/src/materials/ADComputeIncrementalShellStrain.C @@ -108,7 +108,7 @@ ADComputeIncrementalShellStrain::ADComputeIncrementalShellStrain(const InputPara } } - _t_qrule = std::make_unique( + _t_qrule = std::make_unique( 1, Utility::string_to_enum(getParam("through_thickness_order"))); _t_points = _t_qrule->get_points(); _strain_increment.resize(_t_points.size()); diff --git a/modules/solid_mechanics/src/materials/ADComputeIsotropicElasticityTensorShell.C b/modules/solid_mechanics/src/materials/ADComputeIsotropicElasticityTensorShell.C index 21264822a93a..0fa014898040 100644 --- a/modules/solid_mechanics/src/materials/ADComputeIsotropicElasticityTensorShell.C +++ b/modules/solid_mechanics/src/materials/ADComputeIsotropicElasticityTensorShell.C @@ -54,7 +54,7 @@ ADComputeIsotropicElasticityTensorShell::ADComputeIsotropicElasticityTensorShell _Cijkl(2, 2, 1, 1) = 0.0; // get number of quadrature points along thickness based on order - std::unique_ptr t_qrule = std::make_unique( + std::unique_ptr t_qrule = std::make_unique( 1, Utility::string_to_enum(getParam("through_thickness_order"))); _t_points = t_qrule->get_points(); _elasticity_tensor.resize(_t_points.size()); diff --git a/modules/solid_mechanics/src/materials/ADComputeShellStress.C b/modules/solid_mechanics/src/materials/ADComputeShellStress.C index ec956f3a1c1e..1c945e383cfd 100644 --- a/modules/solid_mechanics/src/materials/ADComputeShellStress.C +++ b/modules/solid_mechanics/src/materials/ADComputeShellStress.C @@ -35,7 +35,7 @@ ADComputeShellStress::ADComputeShellStress(const InputParameters & parameters) : Material(parameters) { // get number of quadrature points along thickness based on order - std::unique_ptr t_qrule = std::make_unique( + std::unique_ptr t_qrule = std::make_unique( 1, Utility::string_to_enum(getParam("through_thickness_order"))); _t_points = t_qrule->get_points(); _elasticity_tensor.resize(_t_points.size()); diff --git a/modules/solid_mechanics/src/materials/crystal_plasticity/ComputeUpdatedEulerAngle.C b/modules/solid_mechanics/src/materials/crystal_plasticity/ComputeUpdatedEulerAngle.C index f6d3375dbaad..d860157d2a1d 100644 --- a/modules/solid_mechanics/src/materials/crystal_plasticity/ComputeUpdatedEulerAngle.C +++ b/modules/solid_mechanics/src/materials/crystal_plasticity/ComputeUpdatedEulerAngle.C @@ -62,5 +62,5 @@ ComputeUpdatedEulerAngle::computeEulerAngleFromRotationMatrix(const RankTwoTenso euler_angle = (RealVectorValue)ea; if (!getParam("radian_to_degree")) - euler_angle *= pi / 180.0; + euler_angle *= libMesh::pi / 180.0; } diff --git a/modules/solid_mechanics/src/scalarkernels/GlobalStrain.C b/modules/solid_mechanics/src/scalarkernels/GlobalStrain.C index 4db078a755a7..1a78c88a73a7 100644 --- a/modules/solid_mechanics/src/scalarkernels/GlobalStrain.C +++ b/modules/solid_mechanics/src/scalarkernels/GlobalStrain.C @@ -17,6 +17,8 @@ #include "RankTwoTensor.h" #include "RankFourTensor.h" +using namespace libMesh; + registerMooseObject("SolidMechanicsApp", GlobalStrain); InputParameters diff --git a/modules/solid_mechanics/src/userobjects/CavityPressureUserObject.C b/modules/solid_mechanics/src/userobjects/CavityPressureUserObject.C index 915710de24b3..f3876340db92 100644 --- a/modules/solid_mechanics/src/userobjects/CavityPressureUserObject.C +++ b/modules/solid_mechanics/src/userobjects/CavityPressureUserObject.C @@ -9,6 +9,8 @@ #include "CavityPressureUserObject.h" +using namespace libMesh; + registerMooseObject("SolidMechanicsApp", CavityPressureUserObject); InputParameters diff --git a/modules/solid_mechanics/src/utils/RotationTensor.C b/modules/solid_mechanics/src/utils/RotationTensor.C index 486d9866cb7d..96ca1b80de73 100644 --- a/modules/solid_mechanics/src/utils/RotationTensor.C +++ b/modules/solid_mechanics/src/utils/RotationTensor.C @@ -10,6 +10,8 @@ #include "RotationTensor.h" #include "libmesh/libmesh.h" +using namespace libMesh; + RotationTensor::RotationTensor(Axis axis, Real angle) { update(axis, angle); } RotationTensor::RotationTensor(const RealVectorValue & euler_angles) { update(euler_angles); } diff --git a/modules/solid_mechanics/src/vectorpostprocessors/JIntegral.C b/modules/solid_mechanics/src/vectorpostprocessors/JIntegral.C index 60dfa2689f56..3ca89aafc16a 100644 --- a/modules/solid_mechanics/src/vectorpostprocessors/JIntegral.C +++ b/modules/solid_mechanics/src/vectorpostprocessors/JIntegral.C @@ -172,7 +172,7 @@ JIntegral::execute() { // calculate phi and dphi for this element const std::size_t dim = _current_elem->dim(); - std::unique_ptr fe(FEBase::build(dim, _fe_type)); + std::unique_ptr fe(libMesh::FEBase::build(dim, _fe_type)); fe->attach_quadrature_rule(const_cast(_qrule)); _phi_curr_elem = &fe->get_phi(); _dphi_curr_elem = &fe->get_dphi(); diff --git a/modules/solid_mechanics/test/plugins/mutex_test.C b/modules/solid_mechanics/test/plugins/mutex_test.C index 19eee4e93c51..339585a5d138 100644 --- a/modules/solid_mechanics/test/plugins/mutex_test.C +++ b/modules/solid_mechanics/test/plugins/mutex_test.C @@ -15,6 +15,8 @@ #include "SMAAspUserUtilities.h" #include "MooseError.h" +using namespace libMesh; + Real mutex_test_global_thread_counter; extern "C" void diff --git a/modules/solid_mechanics/test/plugins/sma_memory.C b/modules/solid_mechanics/test/plugins/sma_memory.C index d8f0fad39b12..b257d68a96ff 100644 --- a/modules/solid_mechanics/test/plugins/sma_memory.C +++ b/modules/solid_mechanics/test/plugins/sma_memory.C @@ -15,6 +15,8 @@ #include "SMAAspUserUtilities.h" #include "MooseError.h" +using namespace libMesh; + extern "C" void uexternaldb_( int * LOP, int * /* LRESTART */, Real /* TIME */[], Real * /* DTIME */, int * KSTEP, int * KINC) diff --git a/modules/stochastic_tools/include/utils/SobolCalculators.h b/modules/stochastic_tools/include/utils/SobolCalculators.h index 75914299df0f..1c17ca09c133 100644 --- a/modules/stochastic_tools/include/utils/SobolCalculators.h +++ b/modules/stochastic_tools/include/utils/SobolCalculators.h @@ -65,7 +65,7 @@ class SobolCalculator, std::vector> template SobolCalculator, std::vector>::SobolCalculator( - const ParallelObject & other, const std::string & name, bool resample) + const libMesh::ParallelObject & other, const std::string & name, bool resample) : Calculator>, std::vector>>(other, name), _resample(resample) { diff --git a/modules/stochastic_tools/src/utils/POD.C b/modules/stochastic_tools/src/utils/POD.C index 59a93a3ecb46..0755e4aa78b7 100644 --- a/modules/stochastic_tools/src/utils/POD.C +++ b/modules/stochastic_tools/src/utils/POD.C @@ -11,6 +11,8 @@ #include "MooseError.h" #include "POD.h" +using namespace libMesh; + namespace StochasticTools { diff --git a/modules/stochastic_tools/src/utils/SobolCalculators.C b/modules/stochastic_tools/src/utils/SobolCalculators.C index 673c41c1f6b3..90838eee4817 100644 --- a/modules/stochastic_tools/src/utils/SobolCalculators.C +++ b/modules/stochastic_tools/src/utils/SobolCalculators.C @@ -11,7 +11,7 @@ namespace StochasticTools { template -SobolCalculator::SobolCalculator(const ParallelObject & other, +SobolCalculator::SobolCalculator(const libMesh::ParallelObject & other, const std::string & name, bool resample) : Calculator, std::vector>(other, name), _resample(resample) diff --git a/modules/stochastic_tools/unit/src/TestBootstrapCalculators.C b/modules/stochastic_tools/unit/src/TestBootstrapCalculators.C index 492a5853c9ef..eefd9a692b75 100644 --- a/modules/stochastic_tools/unit/src/TestBootstrapCalculators.C +++ b/modules/stochastic_tools/unit/src/TestBootstrapCalculators.C @@ -17,6 +17,7 @@ #include "libmesh/communicator.h" #include "libmesh/parallel_object.h" +using namespace libMesh; using namespace StochasticTools; /** diff --git a/modules/stochastic_tools/unit/src/TestStochasticToolsCalculators.C b/modules/stochastic_tools/unit/src/TestStochasticToolsCalculators.C index 1ab8555518f1..2c9fdd6ad449 100644 --- a/modules/stochastic_tools/unit/src/TestStochasticToolsCalculators.C +++ b/modules/stochastic_tools/unit/src/TestStochasticToolsCalculators.C @@ -13,6 +13,7 @@ #include "libmesh/communicator.h" #include "libmesh/parallel_object.h" +using namespace libMesh; using namespace StochasticTools; template diff --git a/modules/stochastic_tools/unit/src/TestStochasticToolsSobolCalculators.C b/modules/stochastic_tools/unit/src/TestStochasticToolsSobolCalculators.C index b602991bf2a7..62c3fc9fea49 100644 --- a/modules/stochastic_tools/unit/src/TestStochasticToolsSobolCalculators.C +++ b/modules/stochastic_tools/unit/src/TestStochasticToolsSobolCalculators.C @@ -16,6 +16,7 @@ #include "libmesh/communicator.h" #include "libmesh/parallel_object.h" +using namespace libMesh; using namespace StochasticTools; Real diff --git a/modules/thermal_hydraulics/include/base/FlowModel.h b/modules/thermal_hydraulics/include/base/FlowModel.h index 321b15c14bb8..14b6babbb780 100644 --- a/modules/thermal_hydraulics/include/base/FlowModel.h +++ b/modules/thermal_hydraulics/include/base/FlowModel.h @@ -65,7 +65,7 @@ class FlowModel : public MooseObject, public NamingInterface FlowChannelBase & _flow_channel; /// The type of FE used for flow - const FEType & _fe_type; + const libMesh::FEType & _fe_type; /// The name of the user object that defines fluid properties const UserObjectName _fp_name; diff --git a/modules/thermal_hydraulics/include/base/HeatConductionModel.h b/modules/thermal_hydraulics/include/base/HeatConductionModel.h index eeb4d1a94b15..5b121a6d5384 100644 --- a/modules/thermal_hydraulics/include/base/HeatConductionModel.h +++ b/modules/thermal_hydraulics/include/base/HeatConductionModel.h @@ -58,7 +58,7 @@ class HeatConductionModel : public MooseObject, public NamingInterface * Get the FE type used for heat conduction * @return The finite element type */ - static const FEType & feType() { return _fe_type; } + static const libMesh::FEType & feType() { return _fe_type; } protected: THMProblem & _sim; @@ -82,7 +82,7 @@ class HeatConductionModel : public MooseObject, public NamingInterface protected: // FE type used for heat conduction - static FEType _fe_type; + static libMesh::FEType _fe_type; friend class Simulation; }; diff --git a/modules/thermal_hydraulics/include/base/Simulation.h b/modules/thermal_hydraulics/include/base/Simulation.h index a77d986c0b3a..95af66f7e883 100644 --- a/modules/thermal_hydraulics/include/base/Simulation.h +++ b/modules/thermal_hydraulics/include/base/Simulation.h @@ -45,7 +45,7 @@ class Simulation : public libMesh::ParallelObject, public LoggingInterface, publ /** * Gets the FE type for the flow in this simulation */ - const FEType & getFlowFEType() const { return _flow_fe_type; } + const libMesh::FEType & getFlowFEType() const { return _flow_fe_type; } /** * Sets up quadrature rules @@ -148,8 +148,10 @@ class Simulation : public libMesh::ParallelObject, public LoggingInterface, publ * @param[in] fe_type FEType of the variable * @param[in] scaling_factor Scaling factor for the variable */ - void - addSimVariable(bool nl, const VariableName & name, FEType fe_type, Real scaling_factor = 1.0); + void addSimVariable(bool nl, + const VariableName & name, + libMesh::FEType fe_type, + Real scaling_factor = 1.0); /** * Queues a variable of type MooseVariable to be added to the nonlinear or aux system. @@ -162,7 +164,7 @@ class Simulation : public libMesh::ParallelObject, public LoggingInterface, publ */ void addSimVariable(bool nl, const VariableName & name, - FEType fe_type, + libMesh::FEType fe_type, const std::vector & subdomain_names, Real scaling_factor = 1.0); @@ -425,7 +427,7 @@ class Simulation : public libMesh::ParallelObject, public LoggingInterface, publ const InputParameters & _thm_pars; /// finite element type for the flow in the simulation - FEType _flow_fe_type; + libMesh::FEType _flow_fe_type; /** * Setup equations to be solved in this simulation diff --git a/modules/thermal_hydraulics/include/components/HeatTransferFromExternalAppTemperature1Phase.h b/modules/thermal_hydraulics/include/components/HeatTransferFromExternalAppTemperature1Phase.h index a7b9f18704b8..69e8a13c6c61 100644 --- a/modules/thermal_hydraulics/include/components/HeatTransferFromExternalAppTemperature1Phase.h +++ b/modules/thermal_hydraulics/include/components/HeatTransferFromExternalAppTemperature1Phase.h @@ -29,7 +29,7 @@ class HeatTransferFromExternalAppTemperature1Phase : public HeatTransferFromTemp /// Name of the function specifying initial condition for wall temperature const FunctionName _T_wall_fn_name; /// The type of the wall temperature variable - FEType _fe_type; + libMesh::FEType _fe_type; public: static InputParameters validParams(); diff --git a/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure1Phase.h b/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure1Phase.h index b049038c156e..42b2844984e8 100644 --- a/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure1Phase.h +++ b/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure1Phase.h @@ -26,7 +26,7 @@ class HeatTransferFromHeatStructure1Phase : public HeatTransferFromTemperature1P virtual void addMooseObjects() override; protected: - virtual const FEType & getFEType() override; + virtual const libMesh::FEType & getFEType() override; virtual void setupMesh() override; virtual void check() const override; diff --git a/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure3D1Phase.h b/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure3D1Phase.h index dd929c3fdebe..fb015073dfdf 100644 --- a/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure3D1Phase.h +++ b/modules/thermal_hydraulics/include/components/HeatTransferFromHeatStructure3D1Phase.h @@ -34,7 +34,7 @@ class HeatTransferFromHeatStructure3D1Phase : public HeatTransferFromTemperature Z }; - virtual const FEType & getFEType() override; + virtual const libMesh::FEType & getFEType() override; virtual void setupMesh() override; virtual void init() override; diff --git a/modules/thermal_hydraulics/include/components/HeatTransferFromTemperature1Phase.h b/modules/thermal_hydraulics/include/components/HeatTransferFromTemperature1Phase.h index 5fcfeba0c4bf..e7c05eb70a88 100644 --- a/modules/thermal_hydraulics/include/components/HeatTransferFromTemperature1Phase.h +++ b/modules/thermal_hydraulics/include/components/HeatTransferFromTemperature1Phase.h @@ -26,7 +26,7 @@ class HeatTransferFromTemperature1Phase : public HeatTransfer1PhaseBase protected: /// Get the FE type for wall temperature variable - virtual const FEType & getFEType(); + virtual const libMesh::FEType & getFEType(); /** * Adds 1-phase heat transfer kernels @@ -34,7 +34,7 @@ class HeatTransferFromTemperature1Phase : public HeatTransfer1PhaseBase void addHeatTransferKernels(); /// The type of the wall temperature variable - FEType _fe_type; + libMesh::FEType _fe_type; public: static InputParameters validParams(); diff --git a/modules/thermal_hydraulics/include/functions/THMParsedFunctionWrapper.h b/modules/thermal_hydraulics/include/functions/THMParsedFunctionWrapper.h index b3073946508f..14c59c11bb54 100644 --- a/modules/thermal_hydraulics/include/functions/THMParsedFunctionWrapper.h +++ b/modules/thermal_hydraulics/include/functions/THMParsedFunctionWrapper.h @@ -78,7 +78,7 @@ class THMParsedFunctionWrapper std::vector _initial_vals; /// Pointer to the libMesh::ParsedFunction object - std::unique_ptr> _function_ptr; + std::unique_ptr> _function_ptr; /// Stores _addr variable indices for each ControlData value std::vector _cd_real_index; diff --git a/modules/thermal_hydraulics/src/base/FlowModel.C b/modules/thermal_hydraulics/src/base/FlowModel.C index 4f3fe7e1569b..1086d5828a19 100644 --- a/modules/thermal_hydraulics/src/base/FlowModel.C +++ b/modules/thermal_hydraulics/src/base/FlowModel.C @@ -12,6 +12,8 @@ #include "FlowChannelBase.h" #include "ConstantFunction.h" +using namespace libMesh; + InputParameters FlowModel::validParams() { diff --git a/modules/thermal_hydraulics/src/base/HeatConductionModel.C b/modules/thermal_hydraulics/src/base/HeatConductionModel.C index 951ae3b97796..18532e4dcfdc 100644 --- a/modules/thermal_hydraulics/src/base/HeatConductionModel.C +++ b/modules/thermal_hydraulics/src/base/HeatConductionModel.C @@ -15,6 +15,8 @@ #include "HeatStructureInterface.h" #include "HeatStructureCylindricalBase.h" +using namespace libMesh; + InputParameters HeatConductionModel::validParams() { diff --git a/modules/thermal_hydraulics/src/base/Simulation.C b/modules/thermal_hydraulics/src/base/Simulation.C index 2e3822e9d880..e10a883c0e2d 100644 --- a/modules/thermal_hydraulics/src/base/Simulation.C +++ b/modules/thermal_hydraulics/src/base/Simulation.C @@ -32,6 +32,8 @@ #include "libmesh/string_to_enum.h" +using namespace libMesh; + std::map Simulation::_component_variable_order_map; void diff --git a/modules/thermal_hydraulics/src/base/THMMesh.C b/modules/thermal_hydraulics/src/base/THMMesh.C index 72f60fdfc380..512973dfcc7f 100644 --- a/modules/thermal_hydraulics/src/base/THMMesh.C +++ b/modules/thermal_hydraulics/src/base/THMMesh.C @@ -15,6 +15,8 @@ #include "libmesh/face_quad4.h" #include "libmesh/face_quad9.h" +using namespace libMesh; + registerMooseObject("ThermalHydraulicsApp", THMMesh); const BoundaryName THMMesh::INVALID_BOUNDARY_ID = "invalid_boundary_id"; diff --git a/modules/thermal_hydraulics/src/components/FileMeshComponent.C b/modules/thermal_hydraulics/src/components/FileMeshComponent.C index d39f78ed683f..27fb45dc3b8c 100644 --- a/modules/thermal_hydraulics/src/components/FileMeshComponent.C +++ b/modules/thermal_hydraulics/src/components/FileMeshComponent.C @@ -70,7 +70,7 @@ FileMeshComponent::buildMesh() auto & thm_mesh = mesh(); - ExodusII_IO_Helper exio_helper(*this, false, true, false); + libMesh::ExodusII_IO_Helper exio_helper(*this, false, true, false); exio_helper.open(_file_name.c_str(), true); exio_helper.read_and_store_header_info(); diff --git a/modules/thermal_hydraulics/src/components/FormLossFromExternalApp1Phase.C b/modules/thermal_hydraulics/src/components/FormLossFromExternalApp1Phase.C index 1747fc71e3a4..a0900ac29675 100644 --- a/modules/thermal_hydraulics/src/components/FormLossFromExternalApp1Phase.C +++ b/modules/thermal_hydraulics/src/components/FormLossFromExternalApp1Phase.C @@ -31,7 +31,7 @@ void FormLossFromExternalApp1Phase::addVariables() { getTHMProblem().addSimVariable( - false, _K_prime_var_name, FEType(FIRST, LAGRANGE), _flow_channel_subdomains); + false, _K_prime_var_name, libMesh::FEType(FIRST, LAGRANGE), _flow_channel_subdomains); } void diff --git a/modules/thermal_hydraulics/src/components/HSBoundaryExternalAppHeatFlux.C b/modules/thermal_hydraulics/src/components/HSBoundaryExternalAppHeatFlux.C index ddc57d214219..f3c7309e01e9 100644 --- a/modules/thermal_hydraulics/src/components/HSBoundaryExternalAppHeatFlux.C +++ b/modules/thermal_hydraulics/src/components/HSBoundaryExternalAppHeatFlux.C @@ -77,8 +77,8 @@ HSBoundaryExternalAppHeatFlux::addVariables() const std::vector & subdomain_names = hs.getGeometricalComponent().getSubdomainNames(); - const auto fe_type = getParam("heat_flux_is_monomial") ? FEType(CONSTANT, MONOMIAL) - : FEType(FIRST, LAGRANGE); + const auto fe_type = getParam("heat_flux_is_monomial") ? libMesh::FEType(CONSTANT, MONOMIAL) + : libMesh::FEType(FIRST, LAGRANGE); getTHMProblem().addSimVariable(false, _heat_flux_name, fe_type, subdomain_names); } diff --git a/modules/thermal_hydraulics/src/components/HeatStructureFromFile3D.C b/modules/thermal_hydraulics/src/components/HeatStructureFromFile3D.C index acde6a6cfe2f..9fb19c5837ed 100644 --- a/modules/thermal_hydraulics/src/components/HeatStructureFromFile3D.C +++ b/modules/thermal_hydraulics/src/components/HeatStructureFromFile3D.C @@ -29,7 +29,7 @@ HeatStructureFromFile3D::HeatStructureFromFile3D(const InputParameters & params) { if (_file_is_readable) { - ExodusII_IO_Helper exio_helper(*this, false, true, false); + libMesh::ExodusII_IO_Helper exio_helper(*this, false, true, false); exio_helper.open(_file_name.c_str(), true); exio_helper.read_and_store_header_info(); if (exio_helper.num_dim != 3) diff --git a/modules/thermal_hydraulics/src/components/HeatTransferFromExternalAppHeatFlux1Phase.C b/modules/thermal_hydraulics/src/components/HeatTransferFromExternalAppHeatFlux1Phase.C index 85186061e33e..0749d146ebc2 100644 --- a/modules/thermal_hydraulics/src/components/HeatTransferFromExternalAppHeatFlux1Phase.C +++ b/modules/thermal_hydraulics/src/components/HeatTransferFromExternalAppHeatFlux1Phase.C @@ -33,7 +33,7 @@ HeatTransferFromExternalAppHeatFlux1Phase::addVariables() HeatTransfer1PhaseBase::addVariables(); getTHMProblem().addSimVariable( - false, _q_wall_name, FEType(CONSTANT, MONOMIAL), _flow_channel_subdomains); + false, _q_wall_name, libMesh::FEType(CONSTANT, MONOMIAL), _flow_channel_subdomains); if (!_app.isRestarting()) getTHMProblem().addConstantIC(_q_wall_name, 0, _flow_channel_subdomains); diff --git a/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure1Phase.C b/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure1Phase.C index f9bf7f8331c3..f07b6a4d1e38 100644 --- a/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure1Phase.C +++ b/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure1Phase.C @@ -38,7 +38,7 @@ HeatTransferFromHeatStructure1Phase::HeatTransferFromHeatStructure1Phase( { } -const FEType & +const libMesh::FEType & HeatTransferFromHeatStructure1Phase::getFEType() { return HeatConductionModel::feType(); diff --git a/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure3D1Phase.C b/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure3D1Phase.C index 059338de3ff2..d98f2c9d9879 100644 --- a/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure3D1Phase.C +++ b/modules/thermal_hydraulics/src/components/HeatTransferFromHeatStructure3D1Phase.C @@ -51,7 +51,7 @@ HeatTransferFromHeatStructure3D1Phase::HeatTransferFromHeatStructure3D1Phase( addDependency(_hs_name); } -const FEType & +const libMesh::FEType & HeatTransferFromHeatStructure3D1Phase::getFEType() { return HeatConductionModel::feType(); @@ -241,10 +241,12 @@ HeatTransferFromHeatStructure3D1Phase::addVariables() if (!_app.isRestarting()) getTHMProblem().addFunctionIC(_P_hf_name, _P_hf_fn_name, _flow_channel_subdomains); + getTHMProblem().addSimVariable(false, + FlowModel::TEMPERATURE_WALL, + libMesh::FEType(CONSTANT, MONOMIAL), + _flow_channel_subdomains); getTHMProblem().addSimVariable( - false, FlowModel::TEMPERATURE_WALL, FEType(CONSTANT, MONOMIAL), _flow_channel_subdomains); - getTHMProblem().addSimVariable( - false, _T_wall_name, FEType(CONSTANT, MONOMIAL), _flow_channel_subdomains); + false, _T_wall_name, libMesh::FEType(CONSTANT, MONOMIAL), _flow_channel_subdomains); // wall temperature initial condition if (!getTHMProblem().hasInitialConditionsFromFile() && !_app.isRestarting()) diff --git a/modules/thermal_hydraulics/src/components/HeatTransferFromTemperature1Phase.C b/modules/thermal_hydraulics/src/components/HeatTransferFromTemperature1Phase.C index fa4073ab62ed..faa3bc62ae46 100644 --- a/modules/thermal_hydraulics/src/components/HeatTransferFromTemperature1Phase.C +++ b/modules/thermal_hydraulics/src/components/HeatTransferFromTemperature1Phase.C @@ -25,12 +25,12 @@ HeatTransferFromTemperature1Phase::validParams() HeatTransferFromTemperature1Phase::HeatTransferFromTemperature1Phase( const InputParameters & parameters) : HeatTransfer1PhaseBase(parameters), - _fe_type(getParam("var_type") == 0 ? FEType(FIRST, LAGRANGE) - : FEType(CONSTANT, MONOMIAL)) + _fe_type(getParam("var_type") == 0 ? libMesh::FEType(FIRST, LAGRANGE) + : libMesh::FEType(CONSTANT, MONOMIAL)) { } -const FEType & +const libMesh::FEType & HeatTransferFromTemperature1Phase::getFEType() { return _fe_type; diff --git a/modules/thermal_hydraulics/src/components/Shaft.C b/modules/thermal_hydraulics/src/components/Shaft.C index c1fec03ba017..145fe3f2ec35 100644 --- a/modules/thermal_hydraulics/src/components/Shaft.C +++ b/modules/thermal_hydraulics/src/components/Shaft.C @@ -66,8 +66,8 @@ Shaft::check() const void Shaft::addVariables() { - getTHMProblem().addSimVariable( - true, _omega_var_name, FEType(FIRST, SCALAR), _scaling_factor_omega); + getTHMProblem().addSimVariable( + true, _omega_var_name, libMesh::FEType(FIRST, SCALAR), _scaling_factor_omega); if (isParamValid("initial_speed")) getTHMProblem().addConstantScalarIC(_omega_var_name, getParam("initial_speed")); diff --git a/modules/thermal_hydraulics/src/components/TotalPowerBase.C b/modules/thermal_hydraulics/src/components/TotalPowerBase.C index f40982cfb8b6..a90f24b75c45 100644 --- a/modules/thermal_hydraulics/src/components/TotalPowerBase.C +++ b/modules/thermal_hydraulics/src/components/TotalPowerBase.C @@ -24,5 +24,5 @@ TotalPowerBase::TotalPowerBase(const InputParameters & parameters) void TotalPowerBase::addVariables() { - getTHMProblem().addSimVariable(false, _power_var_name, FEType(FIRST, SCALAR)); + getTHMProblem().addSimVariable(false, _power_var_name, libMesh::FEType(FIRST, SCALAR)); } diff --git a/modules/thermal_hydraulics/src/components/VolumeJunction1Phase.C b/modules/thermal_hydraulics/src/components/VolumeJunction1Phase.C index de3fbab56d2e..3d9dc7595fed 100644 --- a/modules/thermal_hydraulics/src/components/VolumeJunction1Phase.C +++ b/modules/thermal_hydraulics/src/components/VolumeJunction1Phase.C @@ -369,7 +369,7 @@ VolumeJunction1Phase::addJunctionVariable(bool is_nonlinear, if (_use_scalar_variables) { - const FEType fe_type(FIRST, SCALAR); + const libMesh::FEType fe_type(FIRST, SCALAR); if (is_nonlinear) problem.addSimVariable(is_nonlinear, var, fe_type, scaling_factor); @@ -378,7 +378,7 @@ VolumeJunction1Phase::addJunctionVariable(bool is_nonlinear, } else { - const FEType fe_type(CONSTANT, MONOMIAL); + const libMesh::FEType fe_type(CONSTANT, MONOMIAL); const auto & subdomains = getSubdomainNames(); if (is_nonlinear) diff --git a/modules/thermal_hydraulics/src/functions/THMParsedFunctionWrapper.C b/modules/thermal_hydraulics/src/functions/THMParsedFunctionWrapper.C index fee41a7c28af..5c3b03deb955 100644 --- a/modules/thermal_hydraulics/src/functions/THMParsedFunctionWrapper.C +++ b/modules/thermal_hydraulics/src/functions/THMParsedFunctionWrapper.C @@ -29,8 +29,8 @@ THMParsedFunctionWrapper::THMParsedFunctionWrapper(Simulation & sim, { initialize(); - _function_ptr = - std::make_unique>(_function_str, &_vars, &_initial_vals); + _function_ptr = std::make_unique>( + _function_str, &_vars, &_initial_vals); for (auto & v : _vars) _addr.push_back(&_function_ptr->getVarAddress(v)); diff --git a/modules/xfem/include/materials/LevelSetBiMaterialBase.h b/modules/xfem/include/materials/LevelSetBiMaterialBase.h index 2f53ee543cf8..2d8540bdf0c6 100644 --- a/modules/xfem/include/materials/LevelSetBiMaterialBase.h +++ b/modules/xfem/include/materials/LevelSetBiMaterialBase.h @@ -54,7 +54,7 @@ class LevelSetBiMaterialBaseTempl : public Material const unsigned int _level_set_var_number; /// system reference - const System & _system; + const libMesh::System & _system; /// the subproblem solution vector const NumericVector & _solution; diff --git a/modules/xfem/include/outputs/XFEMCutMeshOutput.h b/modules/xfem/include/outputs/XFEMCutMeshOutput.h index 611a19bdf942..157046564f67 100644 --- a/modules/xfem/include/outputs/XFEMCutMeshOutput.h +++ b/modules/xfem/include/outputs/XFEMCutMeshOutput.h @@ -40,6 +40,6 @@ class XFEMCutMeshOutput : public FileOutput, public UserObjectInterface /// The EquationSystems std::unique_ptr _es; - /// Exodus for outputing points and values - std::unique_ptr _exodus_io; + /// Exodus for outputting points and values + std::unique_ptr _exodus_io; }; diff --git a/modules/xfem/include/userobjects/NodeValueAtXFEMInterface.h b/modules/xfem/include/userobjects/NodeValueAtXFEMInterface.h index 70f33ba8b463..5f3a68615035 100644 --- a/modules/xfem/include/userobjects/NodeValueAtXFEMInterface.h +++ b/modules/xfem/include/userobjects/NodeValueAtXFEMInterface.h @@ -80,7 +80,7 @@ class NodeValueAtXFEMInterface : public GeneralUserObject std::vector _nodes; /// Pointer to PointLocatorBase object - std::unique_ptr _pl; + std::unique_ptr _pl; /// Pointer to the XFEM controller object std::shared_ptr _xfem; @@ -98,7 +98,7 @@ class NodeValueAtXFEMInterface : public GeneralUserObject const unsigned int _level_set_var_number; /// System reference - const System & _system; + const libMesh::System & _system; /// The subproblem solution vector const NumericVector & _solution; diff --git a/modules/xfem/src/outputs/XFEMCutMeshOutput.C b/modules/xfem/src/outputs/XFEMCutMeshOutput.C index 4b125ce4de2f..e33ceae2405d 100644 --- a/modules/xfem/src/outputs/XFEMCutMeshOutput.C +++ b/modules/xfem/src/outputs/XFEMCutMeshOutput.C @@ -52,7 +52,7 @@ XFEMCutMeshOutput::output() int exodus_num = 1; ++_file_num; _es = std::make_unique(_cutter_uo.getCutterMesh()); - _exodus_io = std::make_unique(_es->get_mesh()); + _exodus_io = std::make_unique(_es->get_mesh()); // Default to non-HDF5 output for wider compatibility _exodus_io->set_hdf5_writing(false); _exodus_io->write_timestep(