Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove using namespace libMesh #28842

Open
wants to merge 8 commits into
base: next
Choose a base branch
from
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion framework/include/actions/AddPeriodicBCAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ class AddPeriodicBCAction : public Action
*/
bool autoTranslationBoundaries();

void setPeriodicVars(PeriodicBoundaryBase & p, const std::vector<VariableName> & var_names);
void setPeriodicVars(libMesh::PeriodicBoundaryBase & p,
const std::vector<VariableName> & var_names);

MooseMesh * _mesh;
};
11 changes: 6 additions & 5 deletions framework/include/actions/AddVariableAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,23 @@ class AddVariableAction : public MooseObjectAction
/**
* determine the FEType by examining family and order in the provided parameters
*/
static FEType feType(const InputParameters & params);
static libMesh::FEType feType(const InputParameters & params);

/**
* DEPRECATED: Use variableType instead
*/
static std::string
determineType(const FEType & fe_type, unsigned int components, bool is_fv = false);
determineType(const libMesh::FEType & fe_type, unsigned int components, bool is_fv = false);

/**
* Determines a variable type
* @param fe_type The FE type
* @param is_fv Whether or not the variable is use for finite volume
* @param is_array Whether or not the variable is an array variable
*/
static std::string
variableType(const FEType & fe_type, const bool is_fv = false, const bool is_array = false);
static std::string variableType(const libMesh::FEType & fe_type,
const bool is_fv = false,
const bool is_array = false);

protected:
/**
Expand Down Expand Up @@ -85,7 +86,7 @@ class AddVariableAction : public MooseObjectAction
std::set<SubdomainID> getSubdomainIDs();

/// FEType for the variable being created
FEType _fe_type;
libMesh::FEType _fe_type;

/// True if the variable being created is a scalar
bool _scalar_var;
Expand Down
2 changes: 1 addition & 1 deletion framework/include/actions/SetupQuadratureAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class SetupQuadratureAction : public Action
}

protected:
QuadratureType _type;
libMesh::QuadratureType _type;
Order _order;
Order _element_order;
Order _side_order;
Expand Down
2 changes: 1 addition & 1 deletion framework/include/auxkernels/ElementQualityAux.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ class ElementQualityAux : public AuxKernel
virtual Real computeValue() override;

/// The metric type to use
ElemQuality _metric_type;
libMesh::ElemQuality _metric_type;
};
2 changes: 1 addition & 1 deletion framework/include/auxkernels/ProjectionAux.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ProjectionAux : public AuxKernel
const MooseVariableFieldBase & _source_variable;

/// The system owning the source variable
const System & _source_sys;
const libMesh::System & _source_sys;

/// Whether to use the auxkernel block restriction to limit the values for the source variables
bool _use_block_restriction_for_source;
Expand Down
16 changes: 8 additions & 8 deletions framework/include/base/Adaptivity.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class DisplacedProblem;
template <typename>
class MooseVariableFE;
typedef MooseVariableFE<Real> MooseVariable;
typedef MooseVariableFE<VectorValue<Real>> VectorMooseVariable;
typedef MooseVariableFE<libMesh::VectorValue<Real>> VectorMooseVariable;
class MooseEnum;
class MultiMooseEnum;

Expand Down Expand Up @@ -82,7 +82,7 @@ class Adaptivity : public ConsoleStreamInterface,
/**
* Set the error norm (FIXME: improve description)
*/
void setErrorNorm(SystemNorm & sys_norm);
void setErrorNorm(libMesh::SystemNorm & sys_norm);

/**
*
Expand Down Expand Up @@ -241,7 +241,7 @@ class Adaptivity : public ConsoleStreamInterface,
*
* @param indicator_field The name of the field to get an ErrorVector for.
*/
ErrorVector & getErrorVector(const std::string & indicator_field);
libMesh::ErrorVector & getErrorVector(const std::string & indicator_field);

/**
* Update the ErrorVectors that have been requested through calls to getErrorVector().
Expand All @@ -262,16 +262,16 @@ class Adaptivity : public ConsoleStreamInterface,
/// on/off flag reporting if the adaptivity system has been initialized
bool _initialized;
/// A mesh refinement object to be used either with initial refinement or with Adaptivity.
std::unique_ptr<MeshRefinement> _mesh_refinement;
std::unique_ptr<libMesh::MeshRefinement> _mesh_refinement;
/// Error estimator to be used by the apps.
std::unique_ptr<ErrorEstimator> _error_estimator;
std::unique_ptr<libMesh::ErrorEstimator> _error_estimator;
/// Error vector for use with the error estimator.
std::unique_ptr<ErrorVector> _error;
std::unique_ptr<libMesh::ErrorVector> _error;

std::shared_ptr<DisplacedProblem> _displaced_problem;

/// A mesh refinement object for displaced mesh
std::unique_ptr<MeshRefinement> _displaced_mesh_refinement;
std::unique_ptr<libMesh::MeshRefinement> _displaced_mesh_refinement;

/// the number of adaptivity steps to do at the beginning of simulation
unsigned int _initial_steps;
Expand Down Expand Up @@ -310,7 +310,7 @@ class Adaptivity : public ConsoleStreamInterface,
bool _recompute_markers_during_cycles;

/// Stores pointers to ErrorVectors associated with indicator field names
std::map<std::string, std::unique_ptr<ErrorVector>> _indicator_field_to_error_vector;
std::map<std::string, std::unique_ptr<libMesh::ErrorVector>> _indicator_field_to_error_vector;

bool _p_refinement_flag = false;
};
Expand Down
Loading