From 8f0543a90d9a51255aae93a94dcf7ae8de2aebc0 Mon Sep 17 00:00:00 2001 From: Guillaume Giudicelli Date: Sun, 13 Oct 2024 15:32:38 -0600 Subject: [PATCH] Adapt framework test objects to libMesh namespace removal refs #28499 --- test/include/auxkernels/CoupledGradAux.h | 2 +- test/include/kernels/UsrFunc.h | 28 +++++++++++++------ test/include/postprocessors/TestVectorType.h | 4 +-- test/include/userobjects/RestartableTypes.h | 2 +- test/src/auxkernels/CoupledGradAux.C | 2 ++ test/src/executioners/LinearPicardSteady.C | 2 ++ test/src/kernels/ExceptionKernel.C | 2 ++ test/src/materials/ExceptionMaterial.C | 2 ++ test/src/materials/QuadratureMaterial.C | 2 ++ test/src/postprocessors/TestVectorType.C | 2 ++ test/src/problems/FixedPointProblem.C | 2 ++ test/src/userobjects/AllSystemsEvaluable.C | 2 ++ .../userobjects/RandomHitSolutionModifier.C | 2 ++ test/src/userobjects/RestartableTypes.C | 2 ++ test/src/userobjects/TestSaveInMesh.C | 2 ++ .../userobjects/TestWeightedGapUserObject.C | 2 ++ 16 files changed, 47 insertions(+), 13 deletions(-) diff --git a/test/include/auxkernels/CoupledGradAux.h b/test/include/auxkernels/CoupledGradAux.h index 6f7c7d06af19..b2c4ea398d60 100644 --- a/test/include/auxkernels/CoupledGradAux.h +++ b/test/include/auxkernels/CoupledGradAux.h @@ -27,7 +27,7 @@ class CoupledGradAux : public AuxKernel virtual Real computeValue(); /// Gradient being set by this kernel - RealGradient _grad; + libMesh::RealGradient _grad; /// The number of coupled variable int _coupled; /// The value of coupled gradient diff --git a/test/include/kernels/UsrFunc.h b/test/include/kernels/UsrFunc.h index ab68dacc09d8..e6855c74b0ae 100644 --- a/test/include/kernels/UsrFunc.h +++ b/test/include/kernels/UsrFunc.h @@ -37,10 +37,14 @@ Number ManSol4ADR1src(const Point & p, Real & omega, Real & t, bool & is_transient); -Number -ManSol4ADR1exv(const Point & p, const Parameters &, const std::string &, const std::string &); -Gradient -ManSol4ADR1exd(const Point & p, const Parameters &, const std::string &, const std::string &); +Number ManSol4ADR1exv(const Point & p, + const libMesh::Parameters &, + const std::string &, + const std::string &); +Gradient ManSol4ADR1exd(const Point & p, + const libMesh::Parameters &, + const std::string &, + const std::string &); /** * Manufactured solution for advection-diffusion problem-2. @@ -61,10 +65,16 @@ Number ManSol4ADR2src(const Point & p, Real & Ck, Real & omega, Real & t); +Number ManSol4ADR2exv(const Point & p, + const libMesh::Parameters &, + const std::string &, + const std::string &); +Gradient ManSol4ADR2exd(const Point & p, + const libMesh::Parameters &, + const std::string &, + const std::string &); + Number -ManSol4ADR2exv(const Point & p, const Parameters &, const std::string &, const std::string &); +ManSolzeroV(const Point & p, const libMesh::Parameters &, const std::string &, const std::string &); Gradient -ManSol4ADR2exd(const Point & p, const Parameters &, const std::string &, const std::string &); - -Number ManSolzeroV(const Point & p, const Parameters &, const std::string &, const std::string &); -Gradient ManSolzeroG(const Point & p, const Parameters &, const std::string &, const std::string &); +ManSolzeroG(const Point & p, const libMesh::Parameters &, const std::string &, const std::string &); diff --git a/test/include/postprocessors/TestVectorType.h b/test/include/postprocessors/TestVectorType.h index dbf21f1bf534..258c6bbc5592 100644 --- a/test/include/postprocessors/TestVectorType.h +++ b/test/include/postprocessors/TestVectorType.h @@ -13,7 +13,7 @@ /** * A postprocessor for testing e.g. that a parallel system vector has - * not been inadvertently redeclared as ghosted + * not been inadvertently re-declared as ghosted */ class TestVectorType : public GeneralPostprocessor { @@ -43,5 +43,5 @@ class TestVectorType : public GeneralPostprocessor std::string _test_vec_name; /// The type to expect to find - ParallelType _par_type; + libMesh::ParallelType _par_type; }; diff --git a/test/include/userobjects/RestartableTypes.h b/test/include/userobjects/RestartableTypes.h index 8979cae29227..358654b55de2 100644 --- a/test/include/userobjects/RestartableTypes.h +++ b/test/include/userobjects/RestartableTypes.h @@ -105,5 +105,5 @@ class RestartableTypes : public GeneralUserObject std::map & _map_data; DenseVector & _dense_vector_data; DenseMatrix & _dense_matrix_data; - Parameters & _raw_parameters; + libMesh::Parameters & _raw_parameters; }; diff --git a/test/src/auxkernels/CoupledGradAux.C b/test/src/auxkernels/CoupledGradAux.C index 092b5a12caac..521c9c584685 100644 --- a/test/src/auxkernels/CoupledGradAux.C +++ b/test/src/auxkernels/CoupledGradAux.C @@ -9,6 +9,8 @@ #include "CoupledGradAux.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", CoupledGradAux); InputParameters diff --git a/test/src/executioners/LinearPicardSteady.C b/test/src/executioners/LinearPicardSteady.C index 39ee20959f77..455b65c9cdc4 100644 --- a/test/src/executioners/LinearPicardSteady.C +++ b/test/src/executioners/LinearPicardSteady.C @@ -18,6 +18,8 @@ #include "libmesh/equation_systems.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", LinearPicardSteady); InputParameters diff --git a/test/src/kernels/ExceptionKernel.C b/test/src/kernels/ExceptionKernel.C index 487c5e987564..6a21cd739dfe 100644 --- a/test/src/kernels/ExceptionKernel.C +++ b/test/src/kernels/ExceptionKernel.C @@ -13,6 +13,8 @@ #include "libmesh/threads.h" +using namespace libMesh; + /** * Class static initialization: * These members are used to create easily accessed shared memory among threads diff --git a/test/src/materials/ExceptionMaterial.C b/test/src/materials/ExceptionMaterial.C index 1161a3c538df..a7c44be94d47 100644 --- a/test/src/materials/ExceptionMaterial.C +++ b/test/src/materials/ExceptionMaterial.C @@ -10,6 +10,8 @@ #include "ExceptionMaterial.h" #include "NonlinearSystemBase.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", ExceptionMaterial); InputParameters diff --git a/test/src/materials/QuadratureMaterial.C b/test/src/materials/QuadratureMaterial.C index c2d5ba3919ad..057aa1605a66 100644 --- a/test/src/materials/QuadratureMaterial.C +++ b/test/src/materials/QuadratureMaterial.C @@ -9,6 +9,8 @@ #include "QuadratureMaterial.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", QuadratureMaterial); InputParameters diff --git a/test/src/postprocessors/TestVectorType.C b/test/src/postprocessors/TestVectorType.C index 701037a8abc0..715209658d3a 100644 --- a/test/src/postprocessors/TestVectorType.C +++ b/test/src/postprocessors/TestVectorType.C @@ -13,6 +13,8 @@ #include "libmesh/numeric_vector.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", TestVectorType); InputParameters diff --git a/test/src/problems/FixedPointProblem.C b/test/src/problems/FixedPointProblem.C index e27a475949a4..c003d950daa0 100644 --- a/test/src/problems/FixedPointProblem.C +++ b/test/src/problems/FixedPointProblem.C @@ -11,6 +11,8 @@ #include "NonlinearSystemBase.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", FixedPointProblem); InputParameters diff --git a/test/src/userobjects/AllSystemsEvaluable.C b/test/src/userobjects/AllSystemsEvaluable.C index a2f6f8d2ec2b..4202da36b695 100644 --- a/test/src/userobjects/AllSystemsEvaluable.C +++ b/test/src/userobjects/AllSystemsEvaluable.C @@ -18,6 +18,8 @@ #include "libmesh/dof_map.h" #include "libmesh/numeric_vector.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", AllSystemsEvaluable); InputParameters diff --git a/test/src/userobjects/RandomHitSolutionModifier.C b/test/src/userobjects/RandomHitSolutionModifier.C index 828c24194e8c..77d27788ddae 100644 --- a/test/src/userobjects/RandomHitSolutionModifier.C +++ b/test/src/userobjects/RandomHitSolutionModifier.C @@ -14,6 +14,8 @@ #include "NonlinearSystemBase.h" #include "RandomHitUserObject.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", RandomHitSolutionModifier); InputParameters diff --git a/test/src/userobjects/RestartableTypes.C b/test/src/userobjects/RestartableTypes.C index 8bbf7d5e5552..22420732b9b2 100644 --- a/test/src/userobjects/RestartableTypes.C +++ b/test/src/userobjects/RestartableTypes.C @@ -9,6 +9,8 @@ #include "RestartableTypes.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", RestartableTypes); InputParameters diff --git a/test/src/userobjects/TestSaveInMesh.C b/test/src/userobjects/TestSaveInMesh.C index 61faacbc8283..fb0c84e27416 100644 --- a/test/src/userobjects/TestSaveInMesh.C +++ b/test/src/userobjects/TestSaveInMesh.C @@ -15,6 +15,8 @@ #include "libmesh/checkpoint_io.h" #include "libmesh/nemesis_io.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", TestSaveInMesh); InputParameters diff --git a/test/src/userobjects/TestWeightedGapUserObject.C b/test/src/userobjects/TestWeightedGapUserObject.C index 973ccd95ea03..913c18c17dfa 100644 --- a/test/src/userobjects/TestWeightedGapUserObject.C +++ b/test/src/userobjects/TestWeightedGapUserObject.C @@ -15,6 +15,8 @@ #include "libmesh/quadrature.h" #include "timpi/parallel_sync.h" +using namespace libMesh; + registerMooseObject("MooseTestApp", TestWeightedGapUserObject); InputParameters