diff --git a/src/matrixfree/setNonlinearEqInitialGuess.cc b/src/matrixfree/setNonlinearEqInitialGuess.cc index e8ba24f3e..670727ed0 100644 --- a/src/matrixfree/setNonlinearEqInitialGuess.cc +++ b/src/matrixfree/setNonlinearEqInitialGuess.cc @@ -12,7 +12,8 @@ MatrixFreePDE::setNonlinearEqInitialGuess() // log time computing_timer.enter_subsection("matrixFreePDE: setNonlinearEqInitialGuess"); Timer time; - char buffer[200]; + time.start(); + char buffer[200]; for (unsigned int fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++) { @@ -114,8 +115,7 @@ MatrixFreePDE::setNonlinearEqInitialGuess() solver_control.tolerance(), solutionSet[fieldIndex]->l2_norm(), dU_norm); - pcout << buffer; - pcout << std::endl; + pcout << buffer << "\n"; } } } diff --git a/src/userInputParameters/loadVariableAttributes.cc b/src/userInputParameters/loadVariableAttributes.cc index 82355d7e8..88e274ae3 100644 --- a/src/userInputParameters/loadVariableAttributes.cc +++ b/src/userInputParameters/loadVariableAttributes.cc @@ -53,7 +53,7 @@ userInputParameters::loadVariableAttributes( varInfoListExplicitRHS.reserve(num_var_explicit_RHS); for (unsigned int i = 0; i < number_of_variables; i++) { - variable_info varInfo { + const variable_info varInfo { var_type[i] == SCALAR, i, variable_attributes.equation_dependency_parser.eval_flags_explicit_RHS[i], @@ -78,7 +78,7 @@ userInputParameters::loadVariableAttributes( varInfoListNonexplicitRHS.reserve(num_var_nonexplicit_RHS); for (unsigned int i = 0; i < number_of_variables; i++) { - variable_info varInfo { + const variable_info varInfo { var_type[i] == SCALAR, i, variable_attributes.equation_dependency_parser.eval_flags_nonexplicit_RHS[i], @@ -104,7 +104,7 @@ userInputParameters::loadVariableAttributes( varInfoListLHS.reserve(num_var_LHS); for (unsigned int i = 0; i < number_of_variables; i++) { - variable_info varInfo { + const variable_info varInfo { var_type[i] == SCALAR, i, variable_attributes.equation_dependency_parser.eval_flags_nonexplicit_LHS[i], @@ -118,14 +118,14 @@ userInputParameters::loadVariableAttributes( varChangeInfoListLHS.reserve(num_var_LHS); for (unsigned int i = 0; i < number_of_variables; i++) { - variable_info varInfo {var_type[i] == SCALAR, - i, - variable_attributes.equation_dependency_parser - .eval_flags_change_nonexplicit_LHS[i], - variable_attributes.equation_dependency_parser - .eval_flags_residual_nonexplicit_LHS[i], - !static_cast(varInfo.evaluation_flags & - dealii::EvaluationFlags::nothing)}; + const variable_info varInfo {var_type[i] == SCALAR, + i, + variable_attributes.equation_dependency_parser + .eval_flags_change_nonexplicit_LHS[i], + variable_attributes.equation_dependency_parser + .eval_flags_residual_nonexplicit_LHS[i], + !static_cast(varInfo.evaluation_flags & + dealii::EvaluationFlags::nothing)}; varChangeInfoListLHS.push_back(varInfo); } @@ -135,7 +135,7 @@ userInputParameters::loadVariableAttributes( pp_baseVarInfoList.reserve(number_of_variables); for (unsigned int i = 0; i < number_of_variables; i++) { - variable_info varInfo { + const variable_info varInfo { var_type[i] == SCALAR, i, variable_attributes.equation_dependency_parser.eval_flags_postprocess[i], @@ -164,7 +164,7 @@ userInputParameters::loadVariableAttributes( pp_varInfoList.reserve(pp_number_of_variables); for (unsigned int i = 0; i < pp_number_of_variables; i++) { - variable_info varInfo { + const variable_info varInfo { pp_var_type[i] == SCALAR, i, dealii::EvaluationFlags::nothing, diff --git a/src/userInputParameters/load_BC_list.cc b/src/userInputParameters/load_BC_list.cc index 1c608c53e..2976486db 100644 --- a/src/userInputParameters/load_BC_list.cc +++ b/src/userInputParameters/load_BC_list.cc @@ -6,6 +6,7 @@ #include #include "../../include/userInputParameters.h" +#include template void @@ -28,7 +29,7 @@ userInputParameters::load_BC_list(const std::vector &list_of_B // the same BC is applied for all boundaries if (temp.size() == 1) { - temp.resize(2 * dim, temp[0]); + temp.resize(static_cast(2 * dim), temp[0]); } // Load the BC for each boundary into 'newBC'. @@ -76,10 +77,8 @@ userInputParameters::load_BC_list(const std::vector &list_of_B // domain if (j % 2 == 0) { - AssertThrow(!((boost::iequals(temp[j], "PERIODIC") && - !boost::iequals(temp[j + 1], "PERIODIC")) || - (!boost::iequals(temp[j], "PERIODIC") && - boost::iequals(temp[j + 1], "PERIODIC"))), + AssertThrow(boost::iequals(temp[j], "PERIODIC") == + boost::iequals(temp[j + 1], "PERIODIC"), dealii::ExcMessage( std::string("Periodic boundary condition must be " "specified on both sides of domain"))); diff --git a/src/userInputParameters/load_user_constants.cc b/src/userInputParameters/load_user_constants.cc index 2b96cdcd0..39c516adc 100644 --- a/src/userInputParameters/load_user_constants.cc +++ b/src/userInputParameters/load_user_constants.cc @@ -214,7 +214,7 @@ userInputParameters::load_user_constants(inputFileReader &input_fi const std::string elastic_const_symmetry = model_constants_type_strings.at(0); - dealii::Tensor<2, 2 * dim - 1 + dim / 3> temp = + dealii::Tensor<2, 2 *dim - 1 + dim / 3> temp = get_Cij_tensor(temp_elastic_constants, elastic_const_symmetry); model_constants.push_back(temp); } diff --git a/src/userInputParameters/setTimeStepList.cc b/src/userInputParameters/setTimeStepList.cc index 0382a8443..241187b68 100644 --- a/src/userInputParameters/setTimeStepList.cc +++ b/src/userInputParameters/setTimeStepList.cc @@ -64,8 +64,9 @@ userInputParameters::setTimeStepList( timeStepList.push_back(1); for (unsigned int iter = 2; iter <= totalIncrements; iter++) { - const unsigned int decade = std::ceil(std::log10(iter)); - const unsigned int step_size = std::pow(10, decade) / numberOfOutputs; + const unsigned int decade = std::ceil(std::log10(iter)); + const auto step_size = + static_cast(std::pow(10, decade) / numberOfOutputs); if (iter % step_size == 0) { timeStepList.push_back(iter); diff --git a/src/userInputParameters/userInputParameters.cc b/src/userInputParameters/userInputParameters.cc index 81f33e2be..9a168a6c2 100644 --- a/src/userInputParameters/userInputParameters.cc +++ b/src/userInputParameters/userInputParameters.cc @@ -136,9 +136,10 @@ userInputParameters::userInputParameters(inputFileReader &input_fi } // Time stepping parameters - dtValue = parameter_handler.get_double("Time step"); - const int totalIncrements_temp = parameter_handler.get_integer("Number of time steps"); - finalTime = parameter_handler.get_double("Simulation end time"); + dtValue = parameter_handler.get_double("Time step"); + const int totalIncrements_temp = + static_cast(parameter_handler.get_integer("Number of time steps")); + finalTime = parameter_handler.get_double("Simulation end time"); // Linear solver parameters for (unsigned int i = 0; i < number_of_variables; i++) diff --git a/src/utilities/vectorBCFunction.cc b/src/utilities/vectorBCFunction.cc index fe683b7d0..950c946c7 100644 --- a/src/utilities/vectorBCFunction.cc +++ b/src/utilities/vectorBCFunction.cc @@ -18,8 +18,8 @@ vectorBCFunction::vectorBCFunction(std::vector input_values) template void -vectorBCFunction::vector_value(const dealii::Point &p, - dealii::Vector &values) const +vectorBCFunction::vector_value([[maybe_unused]] const dealii::Point &p, + dealii::Vector &values) const { for (unsigned int i = 0; i < dim; i++) {