Skip to content

Commit b86be2d

Browse files
itopcuogluitopcuoglu
committed
static_cast<ptrdiff_t>() instances in MeshBlock.C
1 parent a9c9d39 commit b86be2d

File tree

1 file changed

+33
-24
lines changed

1 file changed

+33
-24
lines changed

‎src/MeshBlock.C

+33-24
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,8 @@ void MeshBlock::writeGridFile(int bid)
781781
ncells);
782782
for (i = 0; i < nnodes; i++) {
783783
fprintf(
784-
fp, "%.14e %.14e %.14e %d\n", x[3 * i], x[(3 * i) + 1],
785-
x[(3 * i) + 2], iblank[i]);
784+
fp, "%.14e %.14e %.14e %d\n", x[static_cast<ptrdiff_t>(3 * i)],
785+
x[(3 * i) + 1], x[(3 * i) + 2], iblank[i]);
786786
}
787787

788788
ba = 1 - BASE;
@@ -791,7 +791,8 @@ void MeshBlock::writeGridFile(int bid)
791791
for (i = 0; i < nc[n]; i++) {
792792
if (nvert == 4) {
793793
fprintf(
794-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
794+
fp, "%d %d %d %d %d %d %d %d\n",
795+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
795796
vconn[n][(nvert * i) + 1] + ba,
796797
vconn[n][(nvert * i) + 2] + ba,
797798
vconn[n][(nvert * i) + 2] + ba,
@@ -801,7 +802,8 @@ void MeshBlock::writeGridFile(int bid)
801802
vconn[n][(nvert * i) + 3] + ba);
802803
} else if (nvert == 5) {
803804
fprintf(
804-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
805+
fp, "%d %d %d %d %d %d %d %d\n",
806+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
805807
vconn[n][(nvert * i) + 1] + ba,
806808
vconn[n][(nvert * i) + 2] + ba,
807809
vconn[n][(nvert * i) + 3] + ba,
@@ -811,7 +813,8 @@ void MeshBlock::writeGridFile(int bid)
811813
vconn[n][(nvert * i) + 4] + ba);
812814
} else if (nvert == 6) {
813815
fprintf(
814-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
816+
fp, "%d %d %d %d %d %d %d %d\n",
817+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
815818
vconn[n][(nvert * i) + 1] + ba,
816819
vconn[n][(nvert * i) + 2] + ba,
817820
vconn[n][(nvert * i) + 2] + ba,
@@ -821,7 +824,8 @@ void MeshBlock::writeGridFile(int bid)
821824
vconn[n][(nvert * i) + 5] + ba);
822825
} else if (nvert == 8) {
823826
fprintf(
824-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
827+
fp, "%d %d %d %d %d %d %d %d\n",
828+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
825829
vconn[n][(nvert * i) + 1] + ba,
826830
vconn[n][(nvert * i) + 2] + ba,
827831
vconn[n][(nvert * i) + 3] + ba,
@@ -860,7 +864,7 @@ void MeshBlock::writeCellFile(int bid)
860864
fp,
861865
"VARLOCATION = (1=NODAL, 2=NODAL, 3=NODAL, 4=NODAL,5=CELLCENTERED)\n");
862866
for (i = 0; i < nnodes; i++) {
863-
fprintf(fp, "%lf\n", x[3 * i]);
867+
fprintf(fp, "%lf\n", x[static_cast<ptrdiff_t>(3 * i)]);
864868
}
865869
for (i = 0; i < nnodes; i++) {
866870
fprintf(fp, "%lf\n", x[(3 * i) + 1]);
@@ -880,7 +884,8 @@ void MeshBlock::writeCellFile(int bid)
880884
for (i = 0; i < nc[n]; i++) {
881885
if (nvert == 4) {
882886
fprintf(
883-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
887+
fp, "%d %d %d %d %d %d %d %d\n",
888+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
884889
vconn[n][(nvert * i) + 1] + ba,
885890
vconn[n][(nvert * i) + 2] + ba,
886891
vconn[n][(nvert * i) + 2] + ba,
@@ -890,7 +895,8 @@ void MeshBlock::writeCellFile(int bid)
890895
vconn[n][(nvert * i) + 3] + ba);
891896
} else if (nvert == 5) {
892897
fprintf(
893-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
898+
fp, "%d %d %d %d %d %d %d %d\n",
899+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
894900
vconn[n][(nvert * i) + 1] + ba,
895901
vconn[n][(nvert * i) + 2] + ba,
896902
vconn[n][(nvert * i) + 3] + ba,
@@ -900,7 +906,8 @@ void MeshBlock::writeCellFile(int bid)
900906
vconn[n][(nvert * i) + 4] + ba);
901907
} else if (nvert == 6) {
902908
fprintf(
903-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
909+
fp, "%d %d %d %d %d %d %d %d\n",
910+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
904911
vconn[n][(nvert * i) + 1] + ba,
905912
vconn[n][(nvert * i) + 2] + ba,
906913
vconn[n][(nvert * i) + 2] + ba,
@@ -910,7 +917,8 @@ void MeshBlock::writeCellFile(int bid)
910917
vconn[n][(nvert * i) + 5] + ba);
911918
} else if (nvert == 8) {
912919
fprintf(
913-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
920+
fp, "%d %d %d %d %d %d %d %d\n",
921+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
914922
vconn[n][(nvert * i) + 1] + ba,
915923
vconn[n][(nvert * i) + 2] + ba,
916924
vconn[n][(nvert * i) + 3] + ba,
@@ -963,8 +971,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type)
963971
if (type == 0) {
964972
for (i = 0; i < nnodes; i++) {
965973
fprintf(
966-
fp, "%lf %lf %lf %d %d ", x[3 * i], x[(3 * i) + 1],
967-
x[(3 * i) + 2], ibl[i], meshtag);
974+
fp, "%lf %lf %lf %d %d ", x[static_cast<ptrdiff_t>(3 * i)],
975+
x[(3 * i) + 1], x[(3 * i) + 2], ibl[i], meshtag);
968976
for (j = 0; j < nvar; j++) {
969977
fprintf(fp, "%lf ", q[(i * nvar) + j]);
970978
}
@@ -1000,7 +1008,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type)
10001008
vconn[n][(nvert * i) + 3] + ba);
10011009
} else if (nvert == 5) {
10021010
fprintf(
1003-
fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba,
1011+
fp, "%d %d %d %d %d %d %d %d\n",
1012+
vconn[n][static_cast<ptrdiff_t>(nvert * i)] + ba,
10041013
vconn[n][(nvert * i) + 1] + ba,
10051014
vconn[n][(nvert * i) + 2] + ba,
10061015
vconn[n][(nvert * i) + 3] + ba,
@@ -1406,9 +1415,9 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect(
14061415

14071416
// get node indices and coordinates for this boundary face
14081417
// load 1st three nodes
1409-
double* pt1 = &x[3 * inode[0]];
1410-
double* pt2 = &x[3 * inode[1]];
1411-
double* pt3 = &x[3 * inode[2]];
1418+
double* pt1 = &x[static_cast<ptrdiff_t>(3 * inode[0])];
1419+
double* pt2 = &x[static_cast<ptrdiff_t>(3 * inode[1])];
1420+
double* pt3 = &x[static_cast<ptrdiff_t>(3 * inode[2])];
14121421

14131422
// test triangle 1: pass first 3 triangles
14141423
if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt3) != 0) {
@@ -1524,9 +1533,9 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect(
15241533

15251534
// get node indices and coordinates for this boundary face
15261535
// load 1st three nodes
1527-
double* pt1 = &x[3 * inode[0]];
1528-
double* pt2 = &x[3 * inode[1]];
1529-
double* pt3 = &x[3 * inode[2]];
1536+
double* pt1 = &x[static_cast<ptrdiff_t>(3 * inode[0])];
1537+
double* pt2 = &x[static_cast<ptrdiff_t>(3 * inode[1])];
1538+
double* pt3 = &x[static_cast<ptrdiff_t>(3 * inode[2])];
15301539

15311540
// test triangle 1: pass first 3 triangles
15321541
if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt3) != 0) {
@@ -1537,7 +1546,7 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect(
15371546
// if quad, test second triangle using last node
15381547
nvert = (inode[3] == -1) ? 3 : 4; // number of face vertices
15391548
if (nvert == 4) {
1540-
double* pt4 = &x[3 * inode[3]];
1549+
double* pt4 = &x[static_cast<ptrdiff_t>(3 * inode[3])];
15411550
if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt4) != 0) {
15421551
tagList[j] = 1;
15431552
break; // jump to next octant (break from inner BC loop)
@@ -2265,7 +2274,7 @@ void MeshBlock::create_hex_cell_map()
22652274
double xd[3];
22662275
int idx[3];
22672276
for (int j = 0; j < 3; j++) {
2268-
int const lnode = vconn[0][8 * i] - BASE;
2277+
int const lnode = vconn[0][static_cast<ptrdiff_t>(8 * i)] - BASE;
22692278
int const tnode = vconn[0][(8 * i) + 6] - BASE;
22702279
xc[j] = 0.5 * (x[(3 * lnode) + j] + x[(3 * tnode) + j]);
22712280
}
@@ -2312,8 +2321,8 @@ void MeshBlock::checkOrphans()
23122321
if (nodeRes[i] >= std::numeric_limits<double>::max()) {
23132322
if (iblank[i] == 1) {
23142323
fprintf(
2315-
fp, "%f %f %f %f\n", x[3 * i], x[(3 * i) + 1],
2316-
x[(3 * i) + 2], nodeRes[i]);
2324+
fp, "%f %f %f %f\n", x[static_cast<ptrdiff_t>(3 * i)],
2325+
x[(3 * i) + 1], x[(3 * i) + 2], nodeRes[i]);
23172326
norphan++;
23182327
}
23192328
}

0 commit comments

Comments
 (0)