Skip to content

Commit 72fdc79

Browse files
tjheitjhei
committed
Merge branch 'tidy-fixes3' into clang-tidy-workflow
2 parents 2ecd257 + ddbddba commit 72fdc79

File tree

22 files changed

+44
-44
lines changed

22 files changed

+44
-44
lines changed

‎benchmarks/compressibility_formulations/plugins/compressibility_formulations.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ namespace aspect
174174
void
175175
CompressibilityFormulations<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
176176
{
177-
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == NULL)
177+
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == nullptr)
178178
{
179179
const unsigned int n_points = out.n_evaluation_points();
180180
out.additional_outputs.push_back(

‎benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/simple_nonlinear.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ namespace aspect
185185
const double stress_exponent_inv = 1/stress_exponent[c];
186186
composition_viscosities[c] = std::max(std::min(std::pow(viscosity_prefactor[c],-stress_exponent_inv) * std::pow(edot_ii,stress_exponent_inv-1), max_viscosity[c]), min_viscosity[c]);
187187
Assert(dealii::numbers::is_finite(composition_viscosities[c]), ExcMessage ("Error: Viscosity is not finite."));
188-
if (derivatives != NULL)
188+
if (derivatives != nullptr)
189189
{
190190
if (edot_ii_strict > min_strain_rate[c] && composition_viscosities[c] < max_viscosity[c] && composition_viscosities[c] > min_viscosity[c])
191191
{
@@ -204,7 +204,7 @@ namespace aspect
204204
out.viscosities[i] = Utilities::weighted_p_norm_average(volume_fractions, composition_viscosities, viscosity_averaging_p);
205205
Assert(dealii::numbers::is_finite(out.viscosities[i]), ExcMessage ("Error: Averaged viscosity is not finite."));
206206

207-
if (derivatives != NULL)
207+
if (derivatives != nullptr)
208208
{
209209
derivatives->viscosity_derivative_wrt_strain_rate[i] = Utilities::derivative_of_weighted_p_norm_average(out.viscosities[i],volume_fractions, composition_viscosities, composition_viscosities_derivatives, viscosity_averaging_p);
210210

‎benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/drucker_prager_compositions.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ namespace aspect
311311

312312
Assert(dealii::numbers::is_finite(composition_viscosities[c]),ExcMessage ("Error: Viscosity is not finite."));
313313

314-
if (derivatives != NULL)
314+
if (derivatives != nullptr)
315315
{
316316
if (use_analytical_derivative)
317317
{
@@ -397,7 +397,7 @@ namespace aspect
397397
out.viscosities[i] = Utilities::weighted_p_norm_average(volume_fractions, composition_viscosities, viscosity_averaging_p);
398398
Assert(dealii::numbers::is_finite(out.viscosities[i]),ExcMessage ("Error: Averaged viscosity is not finite."));
399399

400-
if (derivatives != NULL)
400+
if (derivatives != nullptr)
401401
{
402402
derivatives->viscosity_derivative_wrt_strain_rate[i] = Utilities::derivative_of_weighted_p_norm_average(out.viscosities[i],volume_fractions, composition_viscosities, composition_viscosities_derivatives, viscosity_averaging_p);
403403
derivatives->viscosity_derivative_wrt_pressure[i] = Utilities::derivative_of_weighted_p_norm_average(out.viscosities[i],volume_fractions, composition_viscosities, composition_dviscosities_dpressure, viscosity_averaging_p);

‎benchmarks/operator_splitting/advection_reaction/advection_reaction.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ namespace aspect
121121
// fill melt reaction rates if they exist
122122
ReactionRateOutputs<dim> *reaction_out = out.template get_additional_output<ReactionRateOutputs<dim>>();
123123

124-
if (reaction_out != NULL)
124+
if (reaction_out != nullptr)
125125
{
126126
for (unsigned int q=0; q < in.n_evaluation_points(); ++q)
127127
{
@@ -198,7 +198,7 @@ namespace aspect
198198
void
199199
ExponentialDecay<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
200200
{
201-
if (out.template get_additional_output<ReactionRateOutputs<dim>>() == NULL)
201+
if (out.template get_additional_output<ReactionRateOutputs<dim>>() == nullptr)
202202
{
203203
const unsigned int n_points = out.n_evaluation_points();
204204
out.additional_outputs.push_back(

‎benchmarks/operator_splitting/exponential_decay/exponential_decay.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ namespace aspect
121121
// fill melt reaction rates if they exist
122122
ReactionRateOutputs<dim> *reaction_out = out.template get_additional_output<ReactionRateOutputs<dim>>();
123123

124-
if (reaction_out != NULL)
124+
if (reaction_out != nullptr)
125125
{
126126
for (unsigned int q=0; q < in.n_evaluation_points(); ++q)
127127
{
@@ -197,7 +197,7 @@ namespace aspect
197197
void
198198
ExponentialDecay<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
199199
{
200-
if (out.template get_additional_output<ReactionRateOutputs<dim>>() == NULL)
200+
if (out.template get_additional_output<ReactionRateOutputs<dim>>() == nullptr)
201201
{
202202
const unsigned int n_points = out.n_evaluation_points();
203203
out.additional_outputs.push_back(

‎benchmarks/shear_bands/shear_bands.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ namespace aspect
145145
// fill melt outputs if they exist
146146
aspect::MaterialModel::MeltOutputs<dim> *melt_out = out.template get_additional_output<aspect::MaterialModel::MeltOutputs<dim>>();
147147

148-
if (melt_out != NULL)
148+
if (melt_out != nullptr)
149149
for (unsigned int i=0; i<in.n_evaluation_points(); ++i)
150150
{
151151
double porosity = std::max(in.composition[i][porosity_idx],1e-4);

‎benchmarks/solcx/solcx.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -2852,22 +2852,22 @@ namespace aspect
28522852
/*printf("%0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f\n",x,z,sum1,sum2,sum3,sum4,sum5,sum6);*/
28532853

28542854
/* Output */
2855-
if (vel != NULL)
2855+
if (vel != nullptr)
28562856
{
28572857
vel[0] = sum1;
28582858
vel[1] = sum2;
28592859
}
2860-
if (presssure != NULL)
2860+
if (presssure != nullptr)
28612861
{
28622862
(*presssure) = sum5;
28632863
}
2864-
if (total_stress != NULL)
2864+
if (total_stress != nullptr)
28652865
{
28662866
total_stress[0] = sum3;
28672867
total_stress[1] = sum6;
28682868
total_stress[2] = sum4;
28692869
}
2870-
if (strain_rate != NULL)
2870+
if (strain_rate != nullptr)
28712871
{
28722872
if (x > xc)
28732873
{

‎benchmarks/solitary_wave/solitary_wave.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ namespace aspect
444444
// fill melt outputs if they exist
445445
aspect::MaterialModel::MeltOutputs<dim> *melt_out = out.template get_additional_output<aspect::MaterialModel::MeltOutputs<dim>>();
446446

447-
if (melt_out != NULL)
447+
if (melt_out != nullptr)
448448
for (unsigned int i=0; i<in.n_evaluation_points(); ++i)
449449
{
450450
double porosity = in.composition[i][porosity_idx];

‎benchmarks/solkz/solkz.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -588,22 +588,22 @@ namespace aspect
588588

589589

590590
/* Output */
591-
if (vel != NULL)
591+
if (vel != nullptr)
592592
{
593593
vel[0] = sum2;
594594
vel[1] = sum1;
595595
}
596-
if (presssure != NULL)
596+
if (presssure != nullptr)
597597
{
598598
(*presssure) = sum5;
599599
}
600-
if (total_stress != NULL)
600+
if (total_stress != nullptr)
601601
{
602602
total_stress[0] = sum6;
603603
total_stress[1] = sum3;
604604
total_stress[2] = sum4;
605605
}
606-
if (strain_rate != NULL)
606+
if (strain_rate != nullptr)
607607
{
608608
/* sigma = tau - p, tau = sigma + p, tau[] = 2*eta*strain_rate[] */
609609
Z = exp(2.0 * B * z);

‎benchmarks/tosi_et_al_2015_gcubed/tosi.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ namespace aspect
116116

117117
// If requested compute viscosity derivatives. This is only important
118118
// if using the Newton solver.
119-
if (derivatives != NULL && in.requests_property(MaterialModel::MaterialProperties::viscosity))
119+
if (derivatives != nullptr && in.requests_property(MaterialModel::MaterialProperties::viscosity))
120120
{
121121
if (use_analytical_derivative)
122122
{

‎contrib/world_builder/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ if (NOT MSVC AND NOT APPLE)
376376
-Wcast-align -Wmissing-declarations -Wredundant-decls -Wdiv-by-zero -Wdisabled-optimization -Wswitch-default -Wunused>)
377377

378378
if (${FORCE_COLORED_OUTPUT})
379-
SET(WB_COMPILER_OPTIONS_PRIVATE -fcolor-diagnostics ${WB_COMPILER_OPTIONS_PRIVATE})
379+
SET(WB_COMPILER_OPTIONS_PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fcolor-diagnostics> ${WB_COMPILER_OPTIONS_PRIVATE})
380380
endif ()
381381

382382
else()
@@ -400,7 +400,7 @@ if (NOT MSVC AND NOT APPLE)
400400
SET(WB_COMPILER_OPTIONS_PRIVATE -pedantic -Wall -Wextra $<$<COMPILE_LANGUAGE:CXX>:-Wunused-variable -Wmissing-braces -Wunused-parameter -Wpointer-arith -Wwrite-strings -Wsynth -Wsign-compare -Woverloaded-virtual -Wno-placement-new -Wno-literal-suffix -Wno-parentheses -Wno-unused-local-typedefs -Wcast-qual -fstrict-aliasing -Wmaybe-uninitialized -Werror=maybe-uninitialized -Wparentheses -Wfloat-equal -Wundef -Wcast-align -Wlogical-op -Wmissing-declarations -Wredundant-decls -Wdiv-by-zero -Wdisabled-optimization -Wswitch-default -Wno-unused>)
401401

402402
if (${FORCE_COLORED_OUTPUT})
403-
SET(WB_COMPILER_OPTIONS_PRIVATE -fdiagnostics-color=always ${WB_COMPILER_OPTIONS_PRIVATE})
403+
SET(WB_COMPILER_OPTIONS_PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fdiagnostics-color=always> ${WB_COMPILER_OPTIONS_PRIVATE})
404404
endif()
405405

406406
else()

‎cookbooks/continental_extension/continental_extension.prm

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ end
116116

117117
# Number and names of compositional fields
118118
# The five compositional fields represent:
119-
# 1. The plastic strain that accumualates over time, with the initial plastic strain removed
119+
# 1. The plastic strain that accumulates over time, with the initial plastic strain removed
120120
# 2. The plastic strain that accumulated over time, including the initial plastic strain values
121121
# 3. The upper crust
122122
# 4. The lower crust

‎source/boundary_velocity/interface.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ namespace aspect
277277
+ ">."));
278278

279279
// the easy part: get the value
280-
const std::string value = split_parts[1];
280+
const std::string &value = split_parts[1];
281281

282282
// now for the rest. since we don't know whether there is a
283283
// component selector, start reading at the end and subtracting

‎source/material_model/entropy_model.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -530,15 +530,15 @@ namespace aspect
530530
std::make_unique<MaterialModel::SeismicAdditionalOutputs<dim>> (n_points));
531531
}
532532

533-
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == NULL)
533+
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == nullptr)
534534
{
535535
const unsigned int n_points = out.n_evaluation_points();
536536
out.additional_outputs.push_back(
537537
std::make_unique<MaterialModel::PrescribedFieldOutputs<dim>>
538538
(n_points, this->n_compositional_fields()));
539539
}
540540

541-
if (out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == NULL)
541+
if (out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == nullptr)
542542
{
543543
const unsigned int n_points = out.n_evaluation_points();
544544
out.additional_outputs.push_back(

‎tests/melt_visco_plastic.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ namespace aspect
589589
// fill melt outputs if they exist
590590
MeltOutputs<dim> *melt_out = out.template get_additional_output<MeltOutputs<dim>>();
591591

592-
if (melt_out != NULL)
592+
if (melt_out != nullptr)
593593
{
594594
for (unsigned int i=0; i<in.n_evaluation_points(); ++i)
595595
{

‎tests/multiple_named_additional_outputs.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace aspect
5959
// set up variable to interpolate prescribed field outputs onto compositional fields
6060
PrescribedFieldOutputs<dim> *prescribed_field_out = out.template get_additional_output<PrescribedFieldOutputs<dim>>();
6161

62-
if (prescribed_field_out != NULL)
62+
if (prescribed_field_out != nullptr)
6363
for (unsigned int i=0; i < in.n_evaluation_points(); ++i)
6464
{
6565
const double y = in.position[i](1);
@@ -68,7 +68,7 @@ namespace aspect
6868

6969
SeismicAdditionalOutputs<dim> *seismic_out = out.template get_additional_output<SeismicAdditionalOutputs<dim>>();
7070

71-
if (seismic_out != NULL)
71+
if (seismic_out != nullptr)
7272
for (unsigned int i=0; i < in.n_evaluation_points(); ++i)
7373
{
7474
const double y = in.position[i](1);
@@ -82,14 +82,14 @@ namespace aspect
8282
void
8383
PrescribedFieldMaterial<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
8484
{
85-
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == NULL)
85+
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == nullptr)
8686
{
8787
const unsigned int n_points = out.n_evaluation_points();
8888
out.additional_outputs.push_back(
8989
std::make_unique<MaterialModel::PrescribedFieldOutputs<dim>> (n_points,this->n_compositional_fields()));
9090
}
9191

92-
if (out.template get_additional_output<SeismicAdditionalOutputs<dim>>() == NULL)
92+
if (out.template get_additional_output<SeismicAdditionalOutputs<dim>>() == nullptr)
9393
{
9494
const unsigned int n_points = out.n_evaluation_points();
9595
out.additional_outputs.push_back(

‎tests/prescribed_field.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace aspect
5959
// set up variable to interpolate prescribed field outputs onto compositional fields
6060
PrescribedFieldOutputs<dim> *prescribed_field_out = out.template get_additional_output<PrescribedFieldOutputs<dim>>();
6161

62-
if (prescribed_field_out != NULL)
62+
if (prescribed_field_out != nullptr)
6363
for (unsigned int i=0; i < in.n_evaluation_points(); ++i)
6464
prescribed_field_out->prescribed_field_outputs[i][1] = out.densities[i];
6565
}
@@ -69,7 +69,7 @@ namespace aspect
6969
void
7070
PrescribedFieldMaterial<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
7171
{
72-
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == NULL)
72+
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == nullptr)
7373
{
7474
const unsigned int n_points = out.n_evaluation_points();
7575
out.additional_outputs.push_back(

‎tests/prescribed_field_temperature.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace aspect
5959
// set up variable to interpolate prescribed field outputs onto temperature field
6060
PrescribedTemperatureOutputs<dim> *prescribed_temperature_out = out.template get_additional_output<PrescribedTemperatureOutputs<dim>>();
6161

62-
if (prescribed_temperature_out != NULL)
62+
if (prescribed_temperature_out != nullptr)
6363
for (unsigned int i=0; i < in.n_evaluation_points(); ++i)
6464
prescribed_temperature_out->prescribed_temperature_outputs[i] = in.pressure[i];
6565
}
@@ -69,7 +69,7 @@ namespace aspect
6969
void
7070
PrescribedFieldMaterial<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
7171
{
72-
if (out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == NULL)
72+
if (out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == nullptr)
7373
{
7474
const unsigned int n_points = out.n_evaluation_points();
7575
out.additional_outputs.push_back(

‎tests/prescribed_field_with_diffusion.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace aspect
5959
// set up variable to interpolate prescribed field outputs onto compositional fields
6060
PrescribedFieldOutputs<dim> *prescribed_field_out = out.template get_additional_output<PrescribedFieldOutputs<dim>>();
6161

62-
if (prescribed_field_out != NULL)
62+
if (prescribed_field_out != nullptr)
6363
for (unsigned int i=0; i < in.n_evaluation_points(); ++i)
6464
{
6565
const double y = in.position[i](1);
@@ -72,7 +72,7 @@ namespace aspect
7272
void
7373
PrescribedFieldMaterial<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
7474
{
75-
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == NULL)
75+
if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == nullptr)
7676
{
7777
const unsigned int n_points = out.n_evaluation_points();
7878
out.additional_outputs.push_back(

‎tests/prescribed_temperature.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace aspect
5959
// set up variable to interpolate prescribed field outputs onto compositional fields
6060
PrescribedTemperatureOutputs<dim> *prescribed_temperature_out = out.template get_additional_output<PrescribedTemperatureOutputs<dim>>();
6161

62-
if (prescribed_temperature_out != NULL)
62+
if (prescribed_temperature_out != nullptr)
6363
for (unsigned int i=0; i < in.n_evaluation_points(); ++i)
6464
{
6565
const double y = in.position[i](1);
@@ -72,7 +72,7 @@ namespace aspect
7272
void
7373
PrescribedTemperatureMaterial<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
7474
{
75-
if (out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == NULL)
75+
if (out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == nullptr)
7676
{
7777
const unsigned int n_points = out.n_evaluation_points();
7878
out.additional_outputs.push_back(

‎tests/prescribed_temperature_with_diffusion.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace aspect
5959
// set up variable to interpolate prescribed field outputs onto compositional fields
6060
PrescribedTemperatureOutputs<dim> *prescribed_temperature_out = out.template get_additional_output<PrescribedTemperatureOutputs<dim>>();
6161

62-
if (prescribed_temperature_out != NULL)
62+
if (prescribed_temperature_out != nullptr)
6363
for (unsigned int i=0; i < in.n_evaluation_points(); ++i)
6464
{
6565
const double y = in.position[i](1);
@@ -72,7 +72,7 @@ namespace aspect
7272
void
7373
PrescribedTemperatureMaterial<dim>::create_additional_named_outputs (MaterialModel::MaterialModelOutputs<dim> &out) const
7474
{
75-
if (out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == NULL)
75+
if (out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == nullptr)
7676
{
7777
const unsigned int n_points = out.n_evaluation_points();
7878
out.additional_outputs.push_back(

‎unit_tests/additional_outputs.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ TEST_CASE("AdditionalOutputs works")
7777
in.requested_properties = MaterialProperties::additional_outputs;
7878

7979

80-
REQUIRE(out.get_additional_output<AdditionalOutputs1<dim>>() == NULL);
80+
REQUIRE(out.get_additional_output<AdditionalOutputs1<dim>>() == nullptr);
8181

8282
out.additional_outputs.push_back(std::make_unique<AdditionalOutputs1<dim>> (1, 1));
8383

84-
REQUIRE(out.get_additional_output<AdditionalOutputs1<dim>>() != NULL);
84+
REQUIRE(out.get_additional_output<AdditionalOutputs1<dim>>() != nullptr);
8585

8686
Material1<dim> mat;
8787
mat.evaluate(in, out);
@@ -91,7 +91,7 @@ TEST_CASE("AdditionalOutputs works")
9191
// test const version of get_additional_output:
9292
{
9393
const MaterialModelOutputs<dim> &const_out = out;
94-
REQUIRE(const_out.get_additional_output<AdditionalOutputs1<dim>>() != NULL);
94+
REQUIRE(const_out.get_additional_output<AdditionalOutputs1<dim>>() != nullptr);
9595
const AdditionalOutputs1<dim> *a = const_out.get_additional_output<AdditionalOutputs1<dim>>();
9696
REQUIRE(a != nullptr);
9797
}

0 commit comments

Comments
 (0)