Skip to content

Commit b4f7aa9

Browse files
itopcuogluitopcuoglu
authored
More clang-tidy fixes (#64)
* uint8_t underlying type for enum * Changing the argument int nx to const int in markWallBoundary() * Removed redundant boolean literal * Changing void return type to void const * Changing clang version from 17 to 19 for CI * Updating .clang-tidy to eliminate outdated option * Replacing macros with enum definitions * Changing void const to void * Removing redundant explicit casting * Addressing the readability-math-missing-parentheses warning * More readability-math-missing-parentheses fixes * static_cast<ptrdiff_t> * static_cast<unsigned long> * Removing inline specifiers from implicitly inlined functions to eliminate the warning readability-redundant-inline-specifier * static_cast<ptrdiff_t>() instances in MeshBlock.C * Changing enum to define in tioga.h * Fixing enum declarations
1 parent 02b0a92 commit b4f7aa9

28 files changed

+362
-339
lines changed

‎.clang-tidy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Checks: 'bugprone-*,
2727
WarningsAsErrors: ''
2828
HeaderFilterRegex: '.*'
2929
HeaderFileExtensions: ['', "H", 'h', 'hh', 'hpp', 'hxx']
30-
AnalyzeTemporaryDtors: false
3130
FormatStyle: none
3231
User: user
3332
CheckOptions:

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
echo "CCACHE_EXTRAFILES=${{github.workspace}}/.clang-tidy" >> $GITHUB_ENV
119119
echo "CCACHE_MAXSIZE=50M" >> $GITHUB_ENV
120120
echo "CTCACHE_DIR=~/.cache/ctcache" >> $GITHUB_ENV
121-
echo "CLANG_TIDY_VERSION=17" >> $GITHUB_ENV
121+
echo "CLANG_TIDY_VERSION=19" >> $GITHUB_ENV
122122
- name: Install clang-tidy
123123
run: |
124124
echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries

‎src/ADT.C

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "ADT.h"
2828
#include "buildADTrecursion.h"
2929
#include <limits>
30+
#include <cstddef>
3031

3132
void ADT::buildADT(int d, int nelements, double* elementBbox)
3233
{
@@ -74,7 +75,8 @@ void ADT::buildADT(int d, int nelements, double* elementBbox)
7475
}
7576
for (i = 0; i < ndim / 2; i++) {
7677
i2 = 2 * i + 1;
77-
adtExtents[i2] = std::max(adtExtents[i2], coord[j6 + i + ndim / 2]);
78+
adtExtents[i2] =
79+
std::max(adtExtents[i2], coord[j6 + i + (ndim / 2)]);
7880
}
7981
}
8082
//
@@ -112,7 +114,7 @@ void ADT::buildADT(int d, int nelements, double* elementBbox)
112114
// fp=fopen("adtReals.dat","w");
113115
// fp1=fopen("adtInts.dat","w");
114116
for (i = 0; i < nelem; i++) {
115-
i4 = 4 * adtIntegers[static_cast<int>(4 * i)];
117+
i4 = 4 * adtIntegers[static_cast<ptrdiff_t>(4 * i)];
116118
adtIntegers[i4 + 3] = i;
117119
}
118120
// for(i=0;i<nelem;i++)

‎src/CartBlock.C

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include <algorithm>
2323
#include <cassert>
2424
#include <cmath>
25+
#include <cstddef>
26+
#include <limits>
2527
#include "TiogaMeshInfo.h"
2628
#include "codetypes.h"
2729
#include "CartBlock.h"
@@ -30,7 +32,6 @@
3032
#include "linCartInterp.h"
3133
#include "linklist.h"
3234
#include "tioga_utils.h"
33-
#include <limits>
3435

3536
void CartBlock::registerData(int lid, TIOGA::AMRMeshInfo* minfo)
3637
{
@@ -111,14 +112,13 @@ void CartBlock::getInterpolatedData(
111112
}
112113

113114
for (i = 0; i < listptr->nweights; i++) {
114-
int const cell_index =
115-
static_cast<int>(cart_utils::get_cell_index(
116-
dims[0], dims[1], nf,
117-
listptr->inode[static_cast<int>(3 * i)],
118-
listptr->inode[3 * i + 1], listptr->inode[3 * i + 2]));
115+
int const cell_index = (cart_utils::get_cell_index(
116+
dims[0], dims[1], nf,
117+
listptr->inode[static_cast<ptrdiff_t>(3 * i)],
118+
listptr->inode[(3 * i) + 1], listptr->inode[(3 * i) + 2]));
119119
for (n = 0; n < nvar_cell; n++) {
120120
weight = listptr->weights[i];
121-
qq[n] += qcell[cell_index + ncell_nf * n] * weight;
121+
qq[n] += qcell[cell_index + (ncell_nf * n)] * weight;
122122
}
123123

124124
int const ind_offset = 3 * (listptr->nweights + i);
@@ -129,7 +129,7 @@ void CartBlock::getInterpolatedData(
129129
for (n = 0; n < nvar_node; n++) {
130130
weight = listptr->weights[listptr->nweights + i];
131131
qq[nvar_cell + n] +=
132-
qnode[node_index + nnode_nf * n] * weight;
132+
qnode[node_index + (nnode_nf * n)] * weight;
133133
}
134134
}
135135

@@ -150,14 +150,14 @@ void CartBlock::update(const double* qval, int index)
150150
return;
151151
}
152152
for (int i = 0; i < nvar_node; i++) {
153-
qnode[index - ncell_nf + nnode_nf * i] = qval[nvar_cell + i];
153+
qnode[index - ncell_nf + (nnode_nf * i)] = qval[nvar_cell + i];
154154
}
155155
} else {
156156
if (nvar_cell == 0) {
157157
return;
158158
}
159159
for (int i = 0; i < nvar_cell; i++) {
160-
qcell[index + ncell_nf * i] = qval[i];
160+
qcell[index + (ncell_nf * i)] = qval[i];
161161
}
162162
}
163163
}
@@ -166,15 +166,15 @@ void CartBlock::preprocess(CartGrid* cg)
166166
{
167167
int nfrac;
168168
for (int n = 0; n < 3; n++) {
169-
xlo[n] = cg->xlo[3 * global_id + n];
169+
xlo[n] = cg->xlo[(3 * global_id) + n];
170170
}
171171
for (int n = 0; n < 3; n++) {
172-
dx[n] = cg->dx[3 * global_id + n];
172+
dx[n] = cg->dx[(3 * global_id) + n];
173173
}
174-
dims[0] = cg->ihi[static_cast<int>(3 * global_id)] -
175-
cg->ilo[static_cast<int>(3 * global_id)] + 1;
176-
dims[1] = cg->ihi[3 * global_id + 1] - cg->ilo[3 * global_id + 1] + 1;
177-
dims[2] = cg->ihi[3 * global_id + 2] - cg->ilo[3 * global_id + 2] + 1;
174+
dims[0] = cg->ihi[static_cast<ptrdiff_t>(3 * global_id)] -
175+
cg->ilo[static_cast<ptrdiff_t>(3 * global_id)] + 1;
176+
dims[1] = cg->ihi[(3 * global_id) + 1] - cg->ilo[(3 * global_id) + 1] + 1;
177+
dims[2] = cg->ihi[(3 * global_id) + 2] - cg->ilo[(3 * global_id) + 2] + 1;
178178
nf = cg->nf;
179179
myid = cg->myid;
180180
donor_frac = cg->donor_frac;
@@ -261,9 +261,11 @@ void CartBlock::insertInInterpList(
261261
if (donor_frac == nullptr) {
262262
listptr->nweights = 8;
263263
listptr->weights = (double*)malloc(
264-
sizeof(double) * (static_cast<int>(listptr->nweights * 2)));
264+
sizeof(double) *
265+
(static_cast<unsigned long>(listptr->nweights * 2)));
265266
listptr->inode = (int*)malloc(
266-
sizeof(int) * (static_cast<int>(listptr->nweights * 2 * 3)));
267+
sizeof(int) *
268+
(static_cast<unsigned long>(listptr->nweights * 2 * 3)));
267269

268270
cart_interp::linear_interpolation(
269271
nf, ix, dims, rst, &(listptr->nweights), listptr->inode,
@@ -758,21 +760,21 @@ void CartBlock::writeCellFile(int bid)
758760
for (k = 0; k < dims[2] + 1; k++) {
759761
for (j = 0; j < dims[1] + 1; j++) {
760762
for (i = 0; i < dims[0] + 1; i++) {
761-
fprintf(fp, "%lf\n", xlo[0] + dx[0] * i);
763+
fprintf(fp, "%lf\n", xlo[0] + (dx[0] * i));
762764
}
763765
}
764766
}
765767
for (k = 0; k < dims[2] + 1; k++) {
766768
for (j = 0; j < dims[1] + 1; j++) {
767769
for (i = 0; i < dims[0] + 1; i++) {
768-
fprintf(fp, "%lf\n", xlo[1] + dx[1] * j);
770+
fprintf(fp, "%lf\n", xlo[1] + (dx[1] * j));
769771
}
770772
}
771773
}
772774
for (k = 0; k < dims[2] + 1; k++) {
773775
for (j = 0; j < dims[1] + 1; j++) {
774776
for (i = 0; i < dims[0] + 1; i++) {
775-
fprintf(fp, "%lf\n", xlo[2] + dx[2] * k);
777+
fprintf(fp, "%lf\n", xlo[2] + (dx[2] * k));
776778
}
777779
}
778780
}

‎src/CartGrid.C

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <cmath>
2424
#include <numeric>
2525
#include <limits>
26+
#include <cstddef>
2627

2728
#include "tioga_gpu.h"
2829
#include "TiogaMeshInfo.h"
@@ -159,7 +160,8 @@ void CartGrid::preprocess()
159160
for (i = 0; i < ngrids; i++) {
160161
for (n = 0; n < 3; n++) {
161162
xlosup[n] =
162-
((xlosup[n] <= xlo[3 * i + n]) ? xlosup[n] : xlo[3 * i + n]);
163+
((xlosup[n] <= xlo[(3 * i) + n]) ? xlosup[n]
164+
: xlo[(3 * i) + n]);
163165
}
164166
maxlevel = ((maxlevel >= level_num[i]) ? maxlevel : level_num[i]);
165167
}
@@ -172,7 +174,7 @@ void CartGrid::preprocess()
172174
for (i = 0; i < ngrids; i++) {
173175
lcount[level_num[i]]++;
174176
for (n = 0; n < 3; n++) {
175-
dxlvl[3 * level_num[i] + n] = dx[3 * i + n];
177+
dxlvl[(3 * level_num[i]) + n] = dx[(3 * i) + n];
176178
}
177179
}
178180
}
@@ -191,7 +193,8 @@ void CartGrid::search(double* x, int* donorid, int npts)
191193
donorid[i] = -1;
192194
for (l = maxlevel - 1; l >= 0 && static_cast<int>(flag) == 0; l--) {
193195
for (n = 0; n < 3; n++) {
194-
il[n] = floor((x[3 * i + n] - xlosup[n]) / dxlvl[3 * l + n]);
196+
il[n] =
197+
floor((x[(3 * i) + n] - xlosup[n]) / dxlvl[(3 * l) + n]);
195198
}
196199
for (j = 0; j < ngrids && static_cast<int>(flag) == 0; j++) {
197200
if (level_num[j] == l) {
@@ -202,13 +205,15 @@ void CartGrid::search(double* x, int* donorid, int npts)
202205
// for(n=0;n<3;n++) flag = flag && (il[n] >=ilo[3*j+n]);
203206
// for(n=0;n<3;n++) flag = flag && (il[n] <=ihi[3*j+n]);
204207
for (n = 0; n < 3; n++) {
205-
flag = flag && ((x[3 * i + n] - xlo[3 * j + n]) > -TOL);
208+
flag = flag &&
209+
((x[(3 * i) + n] - xlo[(3 * j) + n]) > -TOL);
206210
}
207211
for (n = 0; n < 3; n++) {
208-
flag = flag &&
209-
((x[3 * i + n] -
210-
(xlo[3 * j + n] +
211-
dx[3 * j + n] * (dims[3 * j + n]))) < TOL);
212+
flag =
213+
flag &&
214+
((x[(3 * i) + n] -
215+
(xlo[(3 * j) + n] +
216+
dx[(3 * j) + n] * (dims[(3 * j) + n]))) < TOL);
212217
}
213218
if (flag) {
214219
dcount++;
@@ -217,17 +222,19 @@ void CartGrid::search(double* x, int* donorid, int npts)
217222
}
218223
}
219224
}
220-
if (myid == 2 && abs(x[static_cast<int>(3 * i)] - 0.739573) < 1e-5 &&
221-
abs(x[3 * i + 1] + 0.259310) < 1e-5 &&
222-
abs(x[3 * i + 2] + 0.639614) < 1e-5) {
225+
if (myid == 2 &&
226+
abs(x[static_cast<ptrdiff_t>(3 * i)] - 0.739573) < 1e-5 &&
227+
abs(x[(3 * i) + 1] + 0.259310) < 1e-5 &&
228+
abs(x[(3 * i) + 2] + 0.639614) < 1e-5) {
223229
printf(
224-
"%d %d %f %f %f %d\n", myid, i, x[static_cast<int>(3 * i)],
225-
x[3 * i + 1], x[3 * i + 2], donorid[i]);
230+
"%d %d %f %f %f %d\n", myid, i,
231+
x[static_cast<ptrdiff_t>(3 * i)], x[(3 * i) + 1],
232+
x[(3 * i) + 2], donorid[i]);
226233
}
227234
if (donorid[i] == -1) {
228235
printf(
229-
"%d %f %f %f\n", myid, x[static_cast<int>(3 * i)], x[3 * i + 1],
230-
x[3 * i + 2]);
236+
"%d %f %f %f\n", myid, x[static_cast<ptrdiff_t>(3 * i)],
237+
x[(3 * i) + 1], x[(3 * i) + 2]);
231238
}
232239
}
233240
// printf("CartGrid::search Processor %d located %d of %d

0 commit comments

Comments
 (0)