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

clang-format everything again :-( #8789

Merged
merged 1 commit into from Mar 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions framework/include/base/ExecuteMooseObjectWarehouse.h
Expand Up @@ -221,10 +221,12 @@ ExecuteMooseObjectWarehouse<T>::addObject(std::shared_ptr<T> object, THREAD_ID t
_execute_objects[*it].addObject(object, tid);
}
else
mooseError("The object being added (", object->name(), ") must inherit from SetupInterface to "
"be added to the "
"ExecuteMooseObjectWarehouse "
"container.");
mooseError("The object being added (",
object->name(),
") must inherit from SetupInterface to "
"be added to the "
"ExecuteMooseObjectWarehouse "
"container.");
}

template <typename T>
Expand Down
7 changes: 4 additions & 3 deletions framework/include/restart/DataIO.h
Expand Up @@ -156,9 +156,10 @@ inline void
dataStore(std::ostream & stream, T & v, void * /*context*/)
{
#ifdef LIBMESH_HAVE_CXX11_TYPE_TRAITS
static_assert(std::is_polymorphic<T>::value == false, "Cannot serialize a class that has virtual "
"members!\nWrite a custom dataStore() "
"template specialization!\n\n");
static_assert(std::is_polymorphic<T>::value == false,
"Cannot serialize a class that has virtual "
"members!\nWrite a custom dataStore() "
"template specialization!\n\n");
static_assert(std::is_trivially_copyable<T>::value || std::is_same<T, Point>::value,
"Cannot serialize a class that is not trivially copyable!\nWrite a custom "
"dataStore() template specialization!\n\n");
Expand Down
5 changes: 3 additions & 2 deletions framework/include/utils/ColumnMajorMatrix.h
Expand Up @@ -608,8 +608,9 @@ inline ColumnMajorMatrix ColumnMajorMatrix::operator*(Real scalar) const

inline ColumnMajorMatrix ColumnMajorMatrix::operator*(const TypeVector<Real> & rhs) const
{
mooseAssert(_n_cols == LIBMESH_DIM, "Cannot perform matvec operation! The column dimension of "
"the ColumnMajorMatrix does not match the TypeVector!");
mooseAssert(_n_cols == LIBMESH_DIM,
"Cannot perform matvec operation! The column dimension of "
"the ColumnMajorMatrix does not match the TypeVector!");

ColumnMajorMatrix ret_matrix(_n_rows, 1);

Expand Down
8 changes: 5 additions & 3 deletions framework/src/actions/AddAuxVariableAction.C
Expand Up @@ -27,9 +27,11 @@ validParams<AddAuxVariableAction>()

params.addParam<MooseEnum>(
"family", families, "Specifies the family of FE shape functions to use for this variable");
params.addParam<MooseEnum>("order", orders, "Specifies the order of the FE shape function to use "
"for this variable (additional orders not listed are "
"allowed)");
params.addParam<MooseEnum>("order",
orders,
"Specifies the order of the FE shape function to use "
"for this variable (additional orders not listed are "
"allowed)");
params.addParam<Real>("initial_condition", "Specifies the initial condition for this variable");
params.addParam<std::vector<SubdomainName>>("block", "The block id where this variable lives");

Expand Down
8 changes: 5 additions & 3 deletions framework/src/actions/AddNodalNormalsAction.C
Expand Up @@ -31,9 +31,11 @@ validParams<AddNodalNormalsAction>()
"boundary", everywhere, "The boundary ID or name where the normals will be computed");
params.addParam<BoundaryName>("corner_boundary", "boundary ID or name with nodes at 'corners'");
MooseEnum orders("FIRST SECOND", "FIRST");
params.addParam<MooseEnum>("order", orders, "Specifies the order of variables that hold the "
"nodal normals. Needs to match the order of the "
"mesh");
params.addParam<MooseEnum>("order",
orders,
"Specifies the order of variables that hold the "
"nodal normals. Needs to match the order of the "
"mesh");

return params;
}
Expand Down
14 changes: 8 additions & 6 deletions framework/src/actions/AddPeriodicBCAction.C
Expand Up @@ -29,15 +29,17 @@ InputParameters
validParams<AddPeriodicBCAction>()
{
InputParameters params = validParams<Action>();
params.addParam<std::vector<std::string>>("auto_direction", "If using a generated mesh, you can "
"specifiy just the dimension(s) you "
"want to mark as periodic");
params.addParam<std::vector<std::string>>("auto_direction",
"If using a generated mesh, you can "
"specifiy just the dimension(s) you "
"want to mark as periodic");

params.addParam<BoundaryName>("primary", "Boundary ID associated with the primary boundary.");
params.addParam<BoundaryName>("secondary", "Boundary ID associated with the secondary boundary.");
params.addParam<RealVectorValue>("translation", "Vector that translates coordinates on the "
"primary boundary to coordinates on the "
"secondary boundary.");
params.addParam<RealVectorValue>("translation",
"Vector that translates coordinates on the "
"primary boundary to coordinates on the "
"secondary boundary.");
params.addParam<std::vector<std::string>>("transform_func",
"Functions that specify the transformation");
params.addParam<std::vector<std::string>>("inv_transform_func",
Expand Down
8 changes: 5 additions & 3 deletions framework/src/actions/AddVariableAction.C
Expand Up @@ -49,9 +49,11 @@ validParams<AddVariableAction>()
params += validParams<OutputInterface>();
params.addParam<MooseEnum>(
"family", families, "Specifies the family of FE shape functions to use for this variable");
params.addParam<MooseEnum>("order", orders, "Specifies the order of the FE shape function to use "
"for this variable (additional orders not listed are "
"allowed)");
params.addParam<MooseEnum>("order",
orders,
"Specifies the order of the FE shape function to use "
"for this variable (additional orders not listed are "
"allowed)");
params.addParam<Real>("initial_condition", "Specifies the initial condition for this variable");
params.addParam<std::vector<SubdomainName>>("block", "The block id where this variable lives");
params.addParam<bool>("eigen", false, "True to make this variable an eigen variable");
Expand Down
8 changes: 5 additions & 3 deletions framework/src/actions/CheckOutputAction.C
Expand Up @@ -103,9 +103,11 @@ CheckOutputAction::checkConsoleOutput()
num_screen_outputs++;

if (num_screen_outputs > 1)
mooseWarning("Multiple (", num_screen_outputs, ") Console output objects are writing to the "
"screen, this will likely cause duplicate "
"messages printed.");
mooseWarning("Multiple (",
num_screen_outputs,
") Console output objects are writing to the "
"screen, this will likely cause duplicate "
"messages printed.");
}

void
Expand Down
23 changes: 14 additions & 9 deletions framework/src/actions/CommonOutputAction.C
Expand Up @@ -42,8 +42,10 @@ validParams<CommonOutputAction>()
"nemesis", false, "Output the results using the default settings for Nemesis output");
params.addParam<bool>(
"console", true, "Output the results using the default settings for Console output");
params.addParam<bool>("csv", false, "Output the scalar variable and postprocessors to a *.csv "
"file using the default CSV output.");
params.addParam<bool>("csv",
false,
"Output the scalar variable and postprocessors to a *.csv "
"file using the default CSV output.");
params.addParam<bool>(
"vtk", false, "Output the results using the default settings for VTKOutput output");
params.addParam<bool>(
Expand Down Expand Up @@ -82,16 +84,19 @@ validParams<CommonOutputAction>()
"Times at which the output and solution is forced to occur");
params.addParam<bool>(
"append_date", false, "When true the date and time are appended to the output filename.");
params.addParam<std::string>("append_date_format", "The format of the date/time to append (see "
"http://www.cplusplus.com/reference/ctime/"
"strftime).");
params.addParam<std::string>("append_date_format",
"The format of the date/time to append (see "
"http://www.cplusplus.com/reference/ctime/"
"strftime).");

params.addParam<std::vector<VariableName>>(
"hide", "A list of the variables and postprocessors that should NOT be output to the Exodus "
"file (may include Variables, ScalarVariables, and Postprocessor names).");
"hide",
"A list of the variables and postprocessors that should NOT be output to the Exodus "
"file (may include Variables, ScalarVariables, and Postprocessor names).");
params.addParam<std::vector<VariableName>>(
"show", "A list of the variables and postprocessors that should be output to the Exodus file "
"(may include Variables, ScalarVariables, and Postprocessor names).");
"show",
"A list of the variables and postprocessors that should be output to the Exodus file "
"(may include Variables, ScalarVariables, and Postprocessor names).");

// Add the 'execute_on' input parameter
params.addParam<MultiMooseEnum>(
Expand Down
7 changes: 4 additions & 3 deletions framework/src/actions/CreateDisplacedProblemAction.C
Expand Up @@ -23,9 +23,10 @@ validParams<CreateDisplacedProblemAction>()
{
InputParameters params = validParams<Action>();
params.addParam<std::vector<std::string>>(
"displacements", "The variables corresponding to the x y z displacements of the mesh. If "
"this is provided then the displacements will be taken into account during "
"the computation.");
"displacements",
"The variables corresponding to the x y z displacements of the mesh. If "
"this is provided then the displacements will be taken into account during "
"the computation.");

return params;
}
Expand Down
15 changes: 9 additions & 6 deletions framework/src/actions/CreateProblemAction.C
Expand Up @@ -33,19 +33,22 @@ validParams<CreateProblemAction>()
params.addParam<MooseEnum>(
"rz_coord_axis", rz_coord_axis, "The rotation axis (X | Y) for axisymetric coordinates");

params.addParam<bool>("fe_cache", false, "Whether or not to turn on the finite element shape "
"function caching system. This can increase speed with "
"an associated memory cost.");
params.addParam<bool>("fe_cache",
false,
"Whether or not to turn on the finite element shape "
"function caching system. This can increase speed with "
"an associated memory cost.");

params.addParam<bool>(
"kernel_coverage_check", true, "Set to false to disable kernel->subdomain coverage check");
params.addParam<bool>("material_coverage_check",
true,
"Set to false to disable material->subdomain coverage check");

params.addParam<FileNameNoExtension>("restart_file_base", "File base name used for restart (e.g. "
"<path>/<filebase> or <path>/LATEST to "
"grab the latest file available)");
params.addParam<FileNameNoExtension>("restart_file_base",
"File base name used for restart (e.g. "
"<path>/<filebase> or <path>/LATEST to "
"grab the latest file available)");

return params;
}
Expand Down
8 changes: 5 additions & 3 deletions framework/src/actions/DynamicObjectRegistrationAction.C
Expand Up @@ -28,9 +28,11 @@ validParams<DynamicObjectRegistrationAction>()
"will be registered from (dynamic registration).");
params.addParam<std::vector<std::string>>(
"object_names", "The names of the objects to register (Default: register all).");
params.addParam<std::string>("library_path", "", "Path to search for dynamic libraries (please "
"avoid committing absolute paths in addition to "
"MOOSE_LIBRARY_PATH)");
params.addParam<std::string>("library_path",
"",
"Path to search for dynamic libraries (please "
"avoid committing absolute paths in addition to "
"MOOSE_LIBRARY_PATH)");
return params;
}

Expand Down
15 changes: 9 additions & 6 deletions framework/src/actions/SetupMeshAction.C
Expand Up @@ -26,9 +26,11 @@ validParams<SetupMeshAction>()
InputParameters params = validParams<MooseObjectAction>();
params.set<std::string>("type") = "FileMesh";

params.addParam<bool>("second_order", false, "Converts a first order mesh to a second order "
"mesh. Note: This is NOT needed if you are reading "
"an actual first order mesh.");
params.addParam<bool>("second_order",
false,
"Converts a first order mesh to a second order "
"mesh. Note: This is NOT needed if you are reading "
"an actual first order mesh.");

params.addParam<std::vector<SubdomainID>>("block_id", "IDs of the block id/name pairs");
params.addParam<std::vector<SubdomainName>>(
Expand All @@ -45,9 +47,10 @@ validParams<SetupMeshAction>()
"sideset");

params.addParam<std::vector<std::string>>(
"displacements", "The variables corresponding to the x y z displacements of the mesh. If "
"this is provided then the displacements will be taken into account during "
"the computation.");
"displacements",
"The variables corresponding to the x y z displacements of the mesh. If "
"this is provided then the displacements will be taken into account during "
"the computation.");
params.addParam<std::vector<BoundaryName>>("ghosted_boundaries",
"Boundaries to be ghosted if using Nemesis");
params.addParam<std::vector<Real>>("ghosted_boundaries_inflation",
Expand Down
12 changes: 7 additions & 5 deletions framework/src/auxkernels/AuxKernel.C
Expand Up @@ -43,11 +43,13 @@ validParams<AuxKernel>()
params.addRequiredParam<AuxVariableName>("variable",
"The name of the variable that this object applies to");

params.addParam<bool>("use_displaced_mesh", false, "Whether or not this object should use the "
"displaced mesh for computation. Note that "
"in the case this is true but no "
"displacements are provided in the Mesh block "
"the undisplaced mesh will still be used.");
params.addParam<bool>("use_displaced_mesh",
false,
"Whether or not this object should use the "
"displaced mesh for computation. Note that "
"in the case this is true but no "
"displacements are provided in the Mesh block "
"the undisplaced mesh will still be used.");
params.addParamNamesToGroup("use_displaced_mesh", "Advanced");

// This flag is set to true if the AuxKernel is being used on a boundary
Expand Down
12 changes: 7 additions & 5 deletions framework/src/auxkernels/AuxScalarKernel.C
Expand Up @@ -29,11 +29,13 @@ validParams<AuxScalarKernel>()

params.addRequiredParam<AuxVariableName>("variable",
"The name of the variable that this kernel operates on");
params.addParam<bool>("use_displaced_mesh", false, "Whether or not this object should use the "
"displaced mesh for computation. Note that "
"in the case this is true but no "
"displacements are provided in the Mesh block "
"the undisplaced mesh will still be used.");
params.addParam<bool>("use_displaced_mesh",
false,
"Whether or not this object should use the "
"displaced mesh for computation. Note that "
"in the case this is true but no "
"displacements are provided in the Mesh block "
"the undisplaced mesh will still be used.");
params.addParamNamesToGroup("use_displaced_mesh", "Advanced");

params.declareControllable("enable"); // allows Control to enable/disable this type of object
Expand Down
7 changes: 4 additions & 3 deletions framework/src/auxkernels/MaterialStdVectorAux.C
Expand Up @@ -23,9 +23,10 @@ validParams<MaterialStdVectorAux>()
"variable. If the std::vector is not of sufficient size then zero is "
"returned");
params.addParam<unsigned int>(
"selected_qp", "Evaluate the std::vector<Real> at this quadpoint. This only needs to be "
"used if you are interested in a particular quadpoint in each element: "
"otherwise do not include this parameter in your input file");
"selected_qp",
"Evaluate the std::vector<Real> at this quadpoint. This only needs to be "
"used if you are interested in a particular quadpoint in each element: "
"otherwise do not include this parameter in your input file");
params.addParamNamesToGroup("selected_qp", "Advanced");
return params;
}
Expand Down
5 changes: 3 additions & 2 deletions framework/src/auxkernels/SpatialUserObjectAux.C
Expand Up @@ -21,8 +21,9 @@ validParams<SpatialUserObjectAux>()
{
InputParameters params = validParams<AuxKernel>();
params.addRequiredParam<UserObjectName>(
"user_object", "The UserObject UserObject to get values from. Note that the UserObject "
"_must_ implement the spatialValue() virtual function!");
"user_object",
"The UserObject UserObject to get values from. Note that the UserObject "
"_must_ implement the spatialValue() virtual function!");
return params;
}

Expand Down
8 changes: 5 additions & 3 deletions framework/src/base/Coupleable.C
Expand Up @@ -97,9 +97,11 @@ Coupleable::isCoupled(const std::string & var_name, unsigned int i)
{
// Make sure the user originally requested this value in the InputParameter syntax
if (!_coupleable_params.hasCoupledValue(var_name))
mooseError("The coupled variable \"", var_name, "\" was never added to this objects's "
"InputParameters, please double-check your "
"spelling");
mooseError("The coupled variable \"",
var_name,
"\" was never added to this objects's "
"InputParameters, please double-check your "
"spelling");

return false;
}
Expand Down