From cd0ffdd4156cc2adff9d80ef9df4b5decb519557 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Fri, 13 Dec 2024 22:08:05 -0700 Subject: [PATCH 01/17] uint8_t underlying type for enum --- src/TiogaMeshInfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TiogaMeshInfo.h b/src/TiogaMeshInfo.h index 164f732..4722d58 100644 --- a/src/TiogaMeshInfo.h +++ b/src/TiogaMeshInfo.h @@ -24,7 +24,7 @@ struct MeshBlockInfo static constexpr int max_vertex_types = 4; using GlobalIDType = uint64_t; - enum QVarType { ROW = 0, COL }; + enum QVarType : uint8_t { ROW = 0, COL }; TiogaView wall_ids; TiogaView overset_ids; From 98e3eb8b83b489455b2b3913b3f0f67adee7e1f7 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Fri, 13 Dec 2024 22:26:56 -0700 Subject: [PATCH 02/17] Changing the argument int nx to const int in markWallBoundary() --- src/MeshBlock.C | 3 ++- src/MeshBlock.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/MeshBlock.C b/src/MeshBlock.C index 8c97a84..dc747f3 100644 --- a/src/MeshBlock.C +++ b/src/MeshBlock.C @@ -1040,7 +1040,8 @@ void MeshBlock::getWallBounds(int* mtag, int* existWall, double wbox[6]) } } -void MeshBlock::markWallBoundary(int* sam, int nx[3], const double extents[6]) +void MeshBlock::markWallBoundary( + int* sam, const int nx[3], const double extents[6]) { int i, j, k, m, n; int nvert; diff --git a/src/MeshBlock.h b/src/MeshBlock.h index 7719a94..fa23074 100644 --- a/src/MeshBlock.h +++ b/src/MeshBlock.h @@ -340,7 +340,7 @@ class MeshBlock void getWallBounds(int* mtag, int* existWall, double wbox[6]); - void markWallBoundary(int* sam, int nx[3], const double extents[6]); + void markWallBoundary(int* sam, const int nx[3], const double extents[6]); void markBoundaryAdaptiveMap( char nodetype2tag, From 475b41a23c6c9d1108997160c0fe5343bab6a9f4 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Fri, 13 Dec 2024 22:32:24 -0700 Subject: [PATCH 03/17] Removed redundant boolean literal --- src/MeshBlock.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeshBlock.C b/src/MeshBlock.C index dc747f3..49b3b1a 100644 --- a/src/MeshBlock.C +++ b/src/MeshBlock.C @@ -512,7 +512,7 @@ void MeshBlock::tagBoundaryFaces() auto node_found = WBC_nodes.insert(Node(nodei, &x[static_cast(3 * nodei)])); - if (node_found.second == false) { + if (!node_found.second) { // duplicates exist const Node n = *node_found.first; WBC_unique_map[i] = n.id; From 549eeea93e207b8a6cfe930c60a78812ee6b0c5b Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Fri, 13 Dec 2024 22:55:52 -0700 Subject: [PATCH 04/17] Changing void return type to void const --- src/tioga.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tioga.h b/src/tioga.h index ecd0c13..7b6c1d4 100644 --- a/src/tioga.h +++ b/src/tioga.h @@ -303,7 +303,7 @@ class tioga ihigh = 1; } - void setp4estcallback( + void const setp4estcallback( void (*f1)(double*, int*, int*, int*), void (*f2)(int*, int*)) { for (int ib = 0; ib < nblocks; ib++) { @@ -313,7 +313,7 @@ class tioga } } - void set_p4est() + void const set_p4est() { for (int ib = 0; ib < nblocks; ib++) { mytag[ib] = -mytag[ib]; From aa9eaf0da31325879a6f0c3947fd56857953961f Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Mon, 16 Dec 2024 13:15:12 -0700 Subject: [PATCH 05/17] Changing clang version from 17 to 19 for CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bbefa7..a679d90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,7 +118,7 @@ jobs: echo "CCACHE_EXTRAFILES=${{github.workspace}}/.clang-tidy" >> $GITHUB_ENV echo "CCACHE_MAXSIZE=50M" >> $GITHUB_ENV echo "CTCACHE_DIR=~/.cache/ctcache" >> $GITHUB_ENV - echo "CLANG_TIDY_VERSION=17" >> $GITHUB_ENV + echo "CLANG_TIDY_VERSION=19" >> $GITHUB_ENV - name: Install clang-tidy run: | echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries From 47ca87c5bea9c0fe6bbe7eb38c22160d08361bd0 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Mon, 16 Dec 2024 13:18:57 -0700 Subject: [PATCH 06/17] Updating .clang-tidy to eliminate outdated option --- .clang-tidy | 1 - 1 file changed, 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index bab542e..48ed27e 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -27,7 +27,6 @@ Checks: 'bugprone-*, WarningsAsErrors: '' HeaderFilterRegex: '.*' HeaderFileExtensions: ['', "H", 'h', 'hh', 'hpp', 'hxx'] -AnalyzeTemporaryDtors: false FormatStyle: none User: user CheckOptions: From f5035c9902b1247bd2fbafeb7216f706d18e90c8 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Mon, 16 Dec 2024 14:41:48 -0700 Subject: [PATCH 07/17] Replacing macros with enum definitions --- src/ADT.C | 6 ++++-- src/MeshBlock.h | 4 +--- src/cartOps.C | 4 ++-- src/codetypes.h | 42 +++++++++++++++++++++--------------------- src/dataUpdate.C | 5 +++-- src/globals.h | 2 +- src/highOrder.C | 5 ++--- src/kaiser.C | 4 ++-- src/tioga.h | 5 ++--- 9 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/ADT.C b/src/ADT.C index c3df0fa..2d50147 100644 --- a/src/ADT.C +++ b/src/ADT.C @@ -27,6 +27,7 @@ #include "ADT.h" #include "buildADTrecursion.h" #include +#include void ADT::buildADT(int d, int nelements, double* elementBbox) { @@ -74,7 +75,8 @@ void ADT::buildADT(int d, int nelements, double* elementBbox) } for (i = 0; i < ndim / 2; i++) { i2 = 2 * i + 1; - adtExtents[i2] = std::max(adtExtents[i2], coord[j6 + i + ndim / 2]); + adtExtents[i2] = + std::max(adtExtents[i2], coord[j6 + i + (ndim / 2)]); } } // @@ -112,7 +114,7 @@ void ADT::buildADT(int d, int nelements, double* elementBbox) // fp=fopen("adtReals.dat","w"); // fp1=fopen("adtInts.dat","w"); for (i = 0; i < nelem; i++) { - i4 = 4 * adtIntegers[static_cast(4 * i)]; + i4 = 4 * adtIntegers[static_cast(4 * i)]; adtIntegers[i4 + 3] = i; } // for(i=0;i #include #include +#include #include "codetypes.h" #include "MeshBlock.h" #include "tioga_math.h" -#define ROW 0 -#define COLUMN 1 +enum : uint8_t { ROW = 0, COLUMN = 1 }; void MeshBlock::setCartIblanks() { diff --git a/src/codetypes.h b/src/codetypes.h index 6dd69ff..d69398c 100644 --- a/src/codetypes.h +++ b/src/codetypes.h @@ -38,8 +38,7 @@ typedef int32_t qcoord_t; /*====================================================================*/ /* Base for indexing (0 or 1) */ /*====================================================================*/ -#define BASE 1 - +enum : uint8_t { BASE = 1 }; /*====================================================================*/ /* Define arithmetic constants */ /*====================================================================*/ @@ -55,22 +54,23 @@ typedef int32_t qcoord_t; // #define RAD2DEG (180.0/PI) // #define DEG2RAD (PI/180.0) #define TOL 1.0e-10 -#define HOLEMAPSIZE 192 +// #define HOLEMAPSIZE 192 +enum : uint8_t { HOLEMAPSIZE = 192 }; // #define NFRINGE 3 // #define NVAR 6 -#define WALLNODETYPE 0 -#define OUTERNODETYPE 1 +// #define WALLNODETYPE 0 +// #define OUTERNODETYPE 1 +enum : uint8_t { WALLNODETYPE = 0, OUTERNODETYPE = 1 }; /*==================================================================*/ /* ADAPTIVE HOLE MAP OCTANT INFO */ /*==================================================================*/ -#define INTERSECT_ALG \ - 1 // [0] point-box inclusion only - // [1] face-box intersection (water-tight) - -#define NON_UNIQUE_NODES \ - 1 // [0] wbc nodes are NOT listed as obc nodes - // [1] wbc nodes may also be listed as obc nodes +// 1 // [0] point-box inclusion only +// // [1] face-box intersection (water-tight) +enum : uint8_t { INTERSECT_ALG = 1 }; +// 1 // [0] wbc nodes are NOT listed as obc nodes +// // [1] wbc nodes may also be listed as obc nodes +enum : uint8_t { NON_UNIQUE_NODES }; /* Fixed Octree Constraints: Do Not Change */ #define OCTANT_MAXLEVEL 30 // 32-bit integer #define OCTANT_CHILDREN 8 @@ -82,9 +82,7 @@ typedef int32_t qcoord_t; /** Conversion from integer coordinates to double coordinates */ #define INT2DBL ((double)1.0 / (double)OCTANT_ROOT_LEN) -#define OUTSIDE_SB 0 -#define INSIDE_SB 1 -#define WALL_SB 2 +enum : uint8_t { OUTSIDE_SB = 0, INSIDE_SB = 1, WALL_SB = 2 }; /*==================================================================*/ /* inline debugging tools */ /*==================================================================*/ @@ -109,12 +107,14 @@ typedef int32_t qcoord_t; /*===================================================================*/ /* Code specific types */ /*===================================================================*/ -#define XLO 0 -#define XHI 1 -#define YLO 2 -#define YHI 3 -#define ZLO 4 -#define ZHI 5 +// #define XLO 0 +// #define XHI 1 +// #define YLO 2 +// #define YHI 3 +// #define ZLO 4 +// #define ZHI 5 + +enum : uint8_t { XLO = 0, XHI = 1, YLO = 2, YHI = 3, ZLO = 4, ZHI = 5 }; /* Mesh Block Complement/Composite Rank Data */ class meshblockCompInfo diff --git a/src/dataUpdate.C b/src/dataUpdate.C index bc4d2e8..a265998 100644 --- a/src/dataUpdate.C +++ b/src/dataUpdate.C @@ -25,8 +25,9 @@ #include "codetypes.h" #include "MeshBlock.h" -#define ROW 0 -#define COLUMN 1 +// #define ROW 0 +// #define COLUMN 1 +enum : uint8_t { ROW = 0, COLUMN = 1 }; void MeshBlock::getInterpolatedSolution( int* nints, diff --git a/src/globals.h b/src/globals.h index 1fa6b28..888ea4c 100644 --- a/src/globals.h +++ b/src/globals.h @@ -27,7 +27,7 @@ #include "tioga.h" using namespace TIOGA; -#define MAXBLOCKS 100 +enum : uint8_t { MAXBLOCKS = 100 }; tioga* tg; /* ** pointer storage for connectivity arrays that diff --git a/src/highOrder.C b/src/highOrder.C index 7e0a6ae..13c4c76 100644 --- a/src/highOrder.C +++ b/src/highOrder.C @@ -21,14 +21,13 @@ #include #include #include +#include #include "codetypes.h" #include "MeshBlock.h" #include "tioga_utils.h" #include "tioga_math.h" -#define ROW 0 -#define COLUMN 1 -#define NFRAC 1331 +enum : uint16_t { ROW = 0, COLUMN = 1, NFRAC = 1331 }; void MeshBlock::getCellIblanks2() { diff --git a/src/kaiser.C b/src/kaiser.C index 87d5d9c..8599783 100644 --- a/src/kaiser.C +++ b/src/kaiser.C @@ -1,8 +1,8 @@ #include "kaiser.h" #include +#include -#define NROWS 3 -#define NCOLS 3 +enum : uint8_t { NROWS = 3, NCOLS = 3 }; // This functions expects a 3x3 matrix void kaiser( diff --git a/src/tioga.h b/src/tioga.h index 7b6c1d4..e14e3aa 100644 --- a/src/tioga.h +++ b/src/tioga.h @@ -34,12 +34,11 @@ * meshes containing element and node IDs greater than what a 4-byte signed int * can support */ -#define TIOGA_HAS_UINT64T 1 - +enum : uint8_t { TIOGA_HAS_UINT64T = 1 }; /** Define a macro entry flagging whether TIOGA has hetereogenous execution * space support, and uses the new API for registering mesh/solution data */ -#define TIOGA_HAS_NGP_IFACE 1 +enum : uint8_t { TIOGA_HAS_NGP_IFACE = 1 }; /** * Topology Independent Overset Grid Assembler (TIOGA) From a060873488b7da0c619c432be6b8d9c95c14ba6f Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Mon, 16 Dec 2024 15:23:20 -0700 Subject: [PATCH 08/17] Changing void const to void --- src/tioga.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tioga.h b/src/tioga.h index e14e3aa..495e860 100644 --- a/src/tioga.h +++ b/src/tioga.h @@ -302,7 +302,7 @@ class tioga ihigh = 1; } - void const setp4estcallback( + void setp4estcallback( void (*f1)(double*, int*, int*, int*), void (*f2)(int*, int*)) { for (int ib = 0; ib < nblocks; ib++) { @@ -312,7 +312,7 @@ class tioga } } - void const set_p4est() + void set_p4est() { for (int ib = 0; ib < nblocks; ib++) { mytag[ib] = -mytag[ib]; From 94165e59b801f0deb80619f121d73b0cf21f6c7d Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Mon, 16 Dec 2024 15:48:29 -0700 Subject: [PATCH 09/17] Removing redundant explicit casting --- src/CartBlock.C | 19 ++++------ src/CartGrid.C | 10 ++--- src/MeshBlock.C | 82 +++++++++++++++++------------------------ src/MeshBlock.h | 3 +- src/bookKeeping.C | 37 +++++++++---------- src/codetypes.h | 7 ---- src/dataUpdate.C | 2 - src/exchangeAMRDonors.C | 8 ++-- src/exchangeBoxes.C | 2 +- src/exchangeDonors.C | 12 +++--- src/getCartReceptors.C | 27 ++++++-------- src/highOrder.C | 16 +++----- src/holeMap.C | 15 ++++---- src/parallelComm.C | 24 ++++++------ src/search.C | 2 +- 15 files changed, 112 insertions(+), 154 deletions(-) diff --git a/src/CartBlock.C b/src/CartBlock.C index 95e45ed..50e9241 100644 --- a/src/CartBlock.C +++ b/src/CartBlock.C @@ -111,11 +111,9 @@ void CartBlock::getInterpolatedData( } for (i = 0; i < listptr->nweights; i++) { - int const cell_index = - static_cast(cart_utils::get_cell_index( - dims[0], dims[1], nf, - listptr->inode[static_cast(3 * i)], - listptr->inode[3 * i + 1], listptr->inode[3 * i + 2])); + int const cell_index = (cart_utils::get_cell_index( + dims[0], dims[1], nf, listptr->inode[3 * i], + listptr->inode[3 * i + 1], listptr->inode[3 * i + 2])); for (n = 0; n < nvar_cell; n++) { weight = listptr->weights[i]; qq[n] += qcell[cell_index + ncell_nf * n] * weight; @@ -171,8 +169,7 @@ void CartBlock::preprocess(CartGrid* cg) for (int n = 0; n < 3; n++) { dx[n] = cg->dx[3 * global_id + n]; } - dims[0] = cg->ihi[static_cast(3 * global_id)] - - cg->ilo[static_cast(3 * global_id)] + 1; + dims[0] = cg->ihi[3 * global_id] - cg->ilo[3 * global_id] + 1; dims[1] = cg->ihi[3 * global_id + 1] - cg->ilo[3 * global_id + 1] + 1; dims[2] = cg->ihi[3 * global_id + 2] - cg->ilo[3 * global_id + 2] + 1; nf = cg->nf; @@ -260,10 +257,10 @@ void CartBlock::insertInInterpList( } if (donor_frac == nullptr) { listptr->nweights = 8; - listptr->weights = (double*)malloc( - sizeof(double) * (static_cast(listptr->nweights * 2))); - listptr->inode = (int*)malloc( - sizeof(int) * (static_cast(listptr->nweights * 2 * 3))); + listptr->weights = + (double*)malloc(sizeof(double) * (listptr->nweights * 2)); + listptr->inode = + (int*)malloc(sizeof(int) * (listptr->nweights * 2 * 3)); cart_interp::linear_interpolation( nf, ix, dims, rst, &(listptr->nweights), listptr->inode, diff --git a/src/CartGrid.C b/src/CartGrid.C index f18e0bf..a473097 100644 --- a/src/CartGrid.C +++ b/src/CartGrid.C @@ -217,17 +217,15 @@ void CartGrid::search(double* x, int* donorid, int npts) } } } - if (myid == 2 && abs(x[static_cast(3 * i)] - 0.739573) < 1e-5 && + if (myid == 2 && abs(x[3 * i] - 0.739573) < 1e-5 && abs(x[3 * i + 1] + 0.259310) < 1e-5 && abs(x[3 * i + 2] + 0.639614) < 1e-5) { printf( - "%d %d %f %f %f %d\n", myid, i, x[static_cast(3 * i)], - x[3 * i + 1], x[3 * i + 2], donorid[i]); + "%d %d %f %f %f %d\n", myid, i, x[3 * i], x[3 * i + 1], + x[3 * i + 2], donorid[i]); } if (donorid[i] == -1) { - printf( - "%d %f %f %f\n", myid, x[static_cast(3 * i)], x[3 * i + 1], - x[3 * i + 2]); + printf("%d %f %f %f\n", myid, x[3 * i], x[3 * i + 1], x[3 * i + 2]); } } // printf("CartGrid::search Processor %d located %d of %d diff --git a/src/MeshBlock.C b/src/MeshBlock.C index 49b3b1a..44903c8 100644 --- a/src/MeshBlock.C +++ b/src/MeshBlock.C @@ -627,11 +627,11 @@ void MeshBlock::tagBoundaryFaces() } // allocate wall face node list - wbcfacenode.resize(static_cast(4 * nwbcface)); + wbcfacenode.resize(4 * nwbcface); wbcfacebox.resize(nwbcface); // allocate outer face node list - obcfacenode.resize(static_cast(4 * nobcface)); + obcfacenode.resize(4 * nobcface); obcfacebox.resize(nobcface); /* ====================== */ @@ -780,8 +780,8 @@ void MeshBlock::writeGridFile(int bid) ncells); for (i = 0; i < nnodes; i++) { fprintf( - fp, "%.14e %.14e %.14e %d\n", x[static_cast(3 * i)], - x[3 * i + 1], x[3 * i + 2], iblank[i]); + fp, "%.14e %.14e %.14e %d\n", x[3 * i], x[3 * i + 1], x[3 * i + 2], + iblank[i]); } ba = 1 - BASE; @@ -790,32 +790,28 @@ void MeshBlock::writeGridFile(int bid) for (i = 0; i < nc[n]; i++) { if (nvert == 4) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba); } else if (nvert == 5) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba); } else if (nvert == 6) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 5] + ba, vconn[n][nvert * i + 5] + ba); } else if (nvert == 8) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 5] + ba, vconn[n][nvert * i + 6] + ba, @@ -851,7 +847,7 @@ void MeshBlock::writeCellFile(int bid) fp, "VARLOCATION = (1=NODAL, 2=NODAL, 3=NODAL, 4=NODAL,5=CELLCENTERED)\n"); for (i = 0; i < nnodes; i++) { - fprintf(fp, "%lf\n", x[static_cast(3 * i)]); + fprintf(fp, "%lf\n", x[3 * i]); } for (i = 0; i < nnodes; i++) { fprintf(fp, "%lf\n", x[3 * i + 1]); @@ -871,32 +867,28 @@ void MeshBlock::writeCellFile(int bid) for (i = 0; i < nc[n]; i++) { if (nvert == 4) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba); } else if (nvert == 5) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba); } else if (nvert == 6) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 5] + ba, vconn[n][nvert * i + 5] + ba); } else if (nvert == 8) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 5] + ba, vconn[n][nvert * i + 6] + ba, @@ -946,8 +938,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) if (type == 0) { for (i = 0; i < nnodes; i++) { fprintf( - fp, "%lf %lf %lf %d %d ", x[static_cast(3 * i)], - x[3 * i + 1], x[3 * i + 2], ibl[i], meshtag); + fp, "%lf %lf %lf %d %d ", x[3 * i], x[3 * i + 1], x[3 * i + 2], + ibl[i], meshtag); for (j = 0; j < nvar; j++) { fprintf(fp, "%lf ", q[i * nvar + j]); } @@ -958,8 +950,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) } else { for (i = 0; i < nnodes; i++) { fprintf( - fp, "%lf %lf %lf %d %d ", x[static_cast(3 * i)], - x[3 * i + 1], x[3 * i + 2], ibl[i], meshtag); + fp, "%lf %lf %lf %d %d ", x[3 * i], x[3 * i + 1], x[3 * i + 2], + ibl[i], meshtag); for (j = 0; j < nvar; j++) { fprintf(fp, "%lf ", q[j * nnodes + i]); } @@ -972,32 +964,28 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) for (i = 0; i < nc[n]; i++) { if (nvert == 4) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba); } else if (nvert == 5) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba); } else if (nvert == 6) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 5] + ba, vconn[n][nvert * i + 5] + ba); } else if (nvert == 8) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", - vconn[n][static_cast(nvert * i)] + ba, + fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 5] + ba, vconn[n][nvert * i + 6] + ba, @@ -1374,14 +1362,13 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect( /* possible overlap: use face intersection test */ // load face boundary nodes: set pointer to nodes - inode = - &bcfacenode[static_cast(4 * i)]; // last node may be -1 + inode = &bcfacenode[4 * i]; // last node may be -1 // get node indices and coordinates for this boundary face // load 1st three nodes - double* pt1 = &x[static_cast(3 * inode[0])]; - double* pt2 = &x[static_cast(3 * inode[1])]; - double* pt3 = &x[static_cast(3 * inode[2])]; + double* pt1 = &x[3 * inode[0]]; + double* pt2 = &x[3 * inode[1]]; + double* pt3 = &x[3 * inode[2]]; // test triangle 1: pass first 3 triangles if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt3) != 0) { @@ -1392,7 +1379,7 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect( // if quad, test second triangle using last node nvert = (inode[3] == -1) ? 3 : 4; // number of face vertices if (nvert == 4) { - double* pt4 = &x[static_cast(3 * inode[3])]; + double* pt4 = &x[3 * inode[3]]; if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt4) != 0) { tagList[j] = 1; break; // jump to next octant (break from inner BC loop) @@ -1493,14 +1480,13 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect( /* possible overlap: use face intersection test */ // load face boundary nodes: set pointer to nodes - inode = - &bcfacenode[static_cast(4 * i)]; // last node may be -1 + inode = &bcfacenode[4 * i]; // last node may be -1 // get node indices and coordinates for this boundary face // load 1st three nodes - double* pt1 = &x[static_cast(3 * inode[0])]; - double* pt2 = &x[static_cast(3 * inode[1])]; - double* pt3 = &x[static_cast(3 * inode[2])]; + double* pt1 = &x[3 * inode[0]]; + double* pt2 = &x[3 * inode[1]]; + double* pt3 = &x[3 * inode[2]]; // test triangle 1: pass first 3 triangles if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt3) != 0) { @@ -1511,7 +1497,7 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect( // if quad, test second triangle using last node nvert = (inode[3] == -1) ? 3 : 4; // number of face vertices if (nvert == 4) { - double* pt4 = &x[static_cast(3 * inode[3])]; + double* pt4 = &x[3 * inode[3]]; if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt4) != 0) { tagList[j] = 1; break; // jump to next octant (break from inner BC loop) @@ -2239,7 +2225,7 @@ void MeshBlock::create_hex_cell_map() double xd[3]; int idx[3]; for (int j = 0; j < 3; j++) { - int const lnode = vconn[0][static_cast(8 * i)] - BASE; + int const lnode = vconn[0][8 * i] - BASE; int const tnode = vconn[0][8 * i + 6] - BASE; xc[j] = 0.5 * (x[3 * lnode + j] + x[3 * tnode + j]); } @@ -2285,8 +2271,8 @@ void MeshBlock::checkOrphans() if (nodeRes[i] >= std::numeric_limits::max()) { if (iblank[i] == 1) { fprintf( - fp, "%f %f %f %f\n", x[static_cast(3 * i)], - x[3 * i + 1], x[3 * i + 2], nodeRes[i]); + fp, "%f %f %f %f\n", x[3 * i], x[3 * i + 1], + x[3 * i + 2], nodeRes[i]); norphan++; } } diff --git a/src/MeshBlock.h b/src/MeshBlock.h index feee53f..a9e03b3 100644 --- a/src/MeshBlock.h +++ b/src/MeshBlock.h @@ -493,8 +493,7 @@ class MeshBlock void outputOrphan(FILE* fp, int i) { fprintf( - fp, "%f %f %f\n", rxyz[static_cast(3 * i)], rxyz[3 * i + 1], - rxyz[3 * i + 2]); + fp, "%f %f %f\n", rxyz[3 * i], rxyz[3 * i + 1], rxyz[3 * i + 2]); } void clearOrphans(HOLEMAP* holemap, int nmesh, const int* itmp); void clearOrphans(ADAPTIVE_HOLEMAP* holemap, int nmesh, int* itmp); diff --git a/src/bookKeeping.C b/src/bookKeeping.C index 116fa18..763d21d 100644 --- a/src/bookKeeping.C +++ b/src/bookKeeping.C @@ -42,7 +42,7 @@ void MeshBlock::getDonorPacket(PACKET* sndPack, int nsend) const // for (i = 0; i < nsearch; i++) { if (donorId[i] > -1) { - k = isearch[static_cast(2 * i)]; + k = isearch[2 * i]; sndPack[k].nints += 3; sndPack[k].nreals++; } @@ -59,7 +59,7 @@ void MeshBlock::getDonorPacket(PACKET* sndPack, int nsend) const // for (i = 0; i < nsearch; i++) { if (donorId[i] > -1) { - k = isearch[static_cast(2 * i)]; + k = isearch[2 * i]; sndPack[k].intData[icount[k]++] = meshtag; // mesh tag sndPack[k].intData[icount[k]++] = isearch[2 * i + 1]; // point id sndPack[k].intData[icount[k]++] = i; // point id on the donor side @@ -76,7 +76,7 @@ void MeshBlock::getMBDonorPktSizes( { for (int i = 0; i < nsearch; i++) { if (donorId[i] > -1) { - int const ii = isearch[static_cast(3 * i)]; + int const ii = isearch[3 * i]; nints[ii] += 4; nreals[ii] += 2; } @@ -93,7 +93,7 @@ void MeshBlock::getMBDonorPackets( continue; } - int const k = isearch[static_cast(3 * i)]; + int const k = isearch[3 * i]; int& ix = ixOffset[k]; int& rx = rxOffset[k]; @@ -180,9 +180,7 @@ void MeshBlock::processDonors( if (verbose != 0) TRACEI(iblank[i]); if (verbose != 0) TRACED(nodeRes[i]); if (verbose != 0) { - printf( - "%f %f %f\n", x[static_cast(3 * i)], x[3 * i + 1], - x[3 * i + 2]); + printf("%f %f %f\n", x[3 * i], x[3 * i + 1], x[3 * i + 2]); } if (donorList[i] == nullptr) { if (verbose != 0) { @@ -191,8 +189,8 @@ void MeshBlock::processDonors( for (j = 0; j < nmesh; j++) { if (j != (meshtag - BASE) && (holemap[j].existWall != 0)) { if (checkHoleMap( - &x[static_cast(3 * i)], holemap[j].nx, - holemap[j].sam, holemap[j].extents) != 0) { + &x[3 * i], holemap[j].nx, holemap[j].sam, + holemap[j].extents) != 0) { iblank[i] = 0; break; } @@ -220,8 +218,8 @@ void MeshBlock::processDonors( if (j != (meshtag - BASE) && (holemap[j].existWall != 0)) { if (iflag[j] == 0) { if (checkHoleMap( - &x[static_cast(3 * i)], holemap[j].nx, - holemap[j].sam, holemap[j].extents) != 0) { + &x[3 * i], holemap[j].nx, holemap[j].sam, + holemap[j].extents) != 0) { iblank[i] = 0; break; } @@ -243,8 +241,7 @@ void MeshBlock::processDonors( myid, wbcnode[i] - BASE, donorList[wbcnode[i] - BASE]); ii = wbcnode[i] - BASE; printf( - "xloc=%e %e %e\n", x[static_cast(3 * ii)], - x[3 * ii + 1], x[3 * ii + 2]); + "xloc=%e %e %e\n", x[3 * ii], x[3 * ii + 1], x[3 * ii + 2]); printf( "Computations will continue, but may suffer from accuracy " "problems\n"); @@ -408,8 +405,8 @@ void MeshBlock::processDonors( for (j = 0; j < nmesh; j++) { if (j != (meshtag - BASE) && (holemap[j].existWall != 0U)) { - int const SB_val = checkAdaptiveHoleMap( - &x[static_cast(3 * i)], &holemap[j]); + int const SB_val = + checkAdaptiveHoleMap(&x[3 * i], &holemap[j]); if (SB_val != OUTSIDE_SB) { iblank[i] = 0; break; @@ -446,8 +443,8 @@ void MeshBlock::processDonors( if (iflag[j] == 0) { // body{j} does NOT have candidate so check if point is // INSIDE SB - int const SB_val = checkAdaptiveHoleMap( - &x[static_cast(3 * i)], &holemap[j]); + int const SB_val = + checkAdaptiveHoleMap(&x[3 * i], &holemap[j]); if (SB_val != OUTSIDE_SB) { iblank[i] = 0; break; @@ -472,8 +469,8 @@ void MeshBlock::processDonors( myid, wbcnode[i] - BASE, donorList[wbcnode[i] - BASE]); ii = wbcnode[i] - BASE; fprintf( - stderr, "xloc=%e %e %e\n", x[static_cast(3 * ii)], - x[3 * ii + 1], x[3 * ii + 2]); + stderr, "xloc=%e %e %e\n", x[3 * ii], x[3 * ii + 1], + x[3 * ii + 2]); fprintf( stderr, "Computations will continue, but may suffer from accuracy " @@ -653,7 +650,7 @@ void MeshBlock::findInterpData(int* recid, int irecord, double receptorRes2) // if (myid==63 && irecord==3224) verbose=1; // if (myid==1 && irecord==158192 && meshtag==1) verbose=1; receptorRes = fabs(receptorRes2); - procid = isearch[static_cast(3 * irecord)]; + procid = isearch[3 * irecord]; pointid = isearch[3 * irecord + 1]; blockid = isearch[3 * irecord + 2]; meshtagrecv = tagsearch[irecord]; diff --git a/src/codetypes.h b/src/codetypes.h index d69398c..c737662 100644 --- a/src/codetypes.h +++ b/src/codetypes.h @@ -54,7 +54,6 @@ enum : uint8_t { BASE = 1 }; // #define RAD2DEG (180.0/PI) // #define DEG2RAD (PI/180.0) #define TOL 1.0e-10 -// #define HOLEMAPSIZE 192 enum : uint8_t { HOLEMAPSIZE = 192 }; // #define NFRINGE 3 // #define NVAR 6 @@ -107,12 +106,6 @@ enum : uint8_t { OUTSIDE_SB = 0, INSIDE_SB = 1, WALL_SB = 2 }; /*===================================================================*/ /* Code specific types */ /*===================================================================*/ -// #define XLO 0 -// #define XHI 1 -// #define YLO 2 -// #define YHI 3 -// #define ZLO 4 -// #define ZHI 5 enum : uint8_t { XLO = 0, XHI = 1, YLO = 2, YHI = 3, ZLO = 4, ZHI = 5 }; diff --git a/src/dataUpdate.C b/src/dataUpdate.C index a265998..af6d4b9 100644 --- a/src/dataUpdate.C +++ b/src/dataUpdate.C @@ -25,8 +25,6 @@ #include "codetypes.h" #include "MeshBlock.h" -// #define ROW 0 -// #define COLUMN 1 enum : uint8_t { ROW = 0, COLUMN = 1 }; void MeshBlock::getInterpolatedSolution( diff --git a/src/exchangeAMRDonors.C b/src/exchangeAMRDonors.C index 48aa4ad..35f5cc4 100644 --- a/src/exchangeAMRDonors.C +++ b/src/exchangeAMRDonors.C @@ -95,7 +95,7 @@ void tioga::exchangeAMRDonors() assert( (mb->isearch[static_cast(3 * i)] < nsend && mb->isearch[static_cast(3 * i)] >= 0)); - obreceptors[imap[mb->isearch[static_cast(3 * i)]]]++; + obreceptors[imap[mb->isearch[3 * i]]]++; } } } @@ -134,7 +134,7 @@ void tioga::exchangeAMRDonors() mb->receptorIdCart[i]; sndPack[procid].intData[intcount[procid]++] = ib; sndPack[procid].realData[realcount[procid]++] = - mb->rxyzCart[static_cast(3 * i)]; + mb->rxyzCart[3 * i]; sndPack[procid].realData[realcount[procid]++] = mb->rxyzCart[3 * i + 1]; sndPack[procid].realData[realcount[procid]++] = @@ -146,7 +146,7 @@ void tioga::exchangeAMRDonors() auto& mb = mblocks[ib]; for (i = 0; i < mb->nsearch; i++) { if (mb->donorId[i] != -1) { - procid = imap[mb->isearch[static_cast(3 * i)]]; + procid = imap[mb->isearch[3 * i]]; sndPack[procid].intData[intcount[procid]++] = mb->isearch[3 * i + 1]; sndPack[procid].intData[intcount[procid]++] = @@ -257,7 +257,7 @@ void tioga::exchangeAMRDonors() cancelledData = (int*)malloc(sizeof(int) * 4 * ncancel); cb[i].getCancellationData(cancelledData, &ncancel); for (j = 0; j < ncancel; j++) { - procid = cancelledData[static_cast(4 * j)]; + procid = cancelledData[4 * j]; ctype = cancelledData[4 * j + 1]; remoteid = cancelledData[4 * j + 2]; remoteblockid = cancelledData[4 * j + 3]; diff --git a/src/exchangeBoxes.C b/src/exchangeBoxes.C index 4ff7018..11c0473 100644 --- a/src/exchangeBoxes.C +++ b/src/exchangeBoxes.C @@ -85,7 +85,7 @@ void tioga::exchangeBoxes() displs[i] = displs[i - 1] + nbPerProc[i - 1] * 16; } - std::vector myOBBdata(static_cast(nblocks * 16)); + std::vector myOBBdata(nblocks * 16); std::vector allOBBdata(static_cast(ntotalblks * 16)); int m = 0; diff --git a/src/exchangeDonors.C b/src/exchangeDonors.C index b7ca20b..cc2637e 100644 --- a/src/exchangeDonors.C +++ b/src/exchangeDonors.C @@ -139,7 +139,7 @@ void tioga::exchangeDonors() for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { - int const k = donorRecords[n][static_cast(3 * i)]; + int const k = donorRecords[n][3 * i]; sndPack[k].nints += 2; sndPack[k].nreals++; } @@ -153,7 +153,7 @@ void tioga::exchangeDonors() for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { - int const k = donorRecords[n][static_cast(3 * i)]; + int const k = donorRecords[n][3 * i]; sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 1]; sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 2]; sndPack[k].realData[rxOffset[k]++] = receptorResolution[n][i]; @@ -213,7 +213,7 @@ void tioga::exchangeDonors() for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { - int const k = donorRecords[n][static_cast(3 * i)]; + int const k = donorRecords[n][3 * i]; sndPack[k].nints += 2; } } @@ -223,7 +223,7 @@ void tioga::exchangeDonors() for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { - int const k = donorRecords[n][static_cast(3 * i)]; + int const k = donorRecords[n][3 * i]; sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 1]; sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 2]; } @@ -264,7 +264,7 @@ void tioga::exchangeDonors() std::fill(ixOffset.begin(), ixOffset.end(), 0); for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { - int const k = donorRecords[n][static_cast(3 * i)]; + int const k = donorRecords[n][3 * i]; sndPack[k].nints += 2; } } @@ -273,7 +273,7 @@ void tioga::exchangeDonors() } for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { - int const k = donorRecords[n][static_cast(3 * i)]; + int const k = donorRecords[n][3 * i]; sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 1]; sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 2]; } diff --git a/src/getCartReceptors.C b/src/getCartReceptors.C index 91ef057..0971f70 100644 --- a/src/getCartReceptors.C +++ b/src/getCartReceptors.C @@ -61,14 +61,12 @@ void MeshBlock::getCartReceptors(CartGrid* cg, parallelComm* pc) nsearch = 0; // for (int c = 0; c < cg->ngrids; c++) { - int const cell_count = - (cg->dims[static_cast(3 * c)] + 2 * cg->nf) * - (cg->dims[3 * c + 1] + 2 * cg->nf) * - (cg->dims[3 * c + 2] + 2 * cg->nf); + int const cell_count = (cg->dims[3 * c] + 2 * cg->nf) * + (cg->dims[3 * c + 1] + 2 * cg->nf) * + (cg->dims[3 * c + 2] + 2 * cg->nf); int const vol = static_cast( - cg->dx[static_cast(3 * c)] * cg->dx[3 * c + 1] * - cg->dx[3 * c + 2]); + cg->dx[3 * c] * cg->dx[3 * c + 1] * cg->dx[3 * c + 2]); for (int n = 0; n < 3; n++) { obcart->dxc[n] = cg->dx[3 * c + n] * (cg->dims[3 * c + n]) * 0.5; @@ -86,7 +84,7 @@ void MeshBlock::getCartReceptors(CartGrid* cg, parallelComm* pc) auto* xtm = (double*)malloc(sizeof(double) * 3); - for (int j = 0; j < cg->dims[static_cast(3 * c)]; j++) { + for (int j = 0; j < cg->dims[3 * c]; j++) { for (int k = 0; k < cg->dims[3 * c + 1]; k++) { for (int l = 0; l < cg->dims[3 * c + 2]; l++) { fillReceptorDataPtr( @@ -96,7 +94,7 @@ void MeshBlock::getCartReceptors(CartGrid* cg, parallelComm* pc) } } - for (int j = 0; j < cg->dims[static_cast(3 * c)] + 1; j++) { + for (int j = 0; j < cg->dims[3 * c] + 1; j++) { for (int k = 0; k < cg->dims[3 * c + 1] + 1; k++) { for (int l = 0; l < cg->dims[3 * c + 2] + 1; l++) { fillReceptorDataPtr( @@ -187,20 +185,17 @@ void MeshBlock::fillReceptorDataPtr( int itm = -1; if (isNodal) { itm = cart_utils::get_concatenated_node_index( - cg->dims[static_cast(3 * c)], cg->dims[3 * c + 1], - cg->dims[3 * c + 2], cg->nf, j, k, l); + cg->dims[3 * c], cg->dims[3 * c + 1], cg->dims[3 * c + 2], cg->nf, + j, k, l); - xtm[0] = cg->xlo[static_cast(3 * c)] + - j * cg->dx[static_cast(3 * c)]; + xtm[0] = cg->xlo[3 * c] + j * cg->dx[3 * c]; xtm[1] = cg->xlo[3 * c + 1] + k * cg->dx[3 * c + 1]; xtm[2] = cg->xlo[3 * c + 2] + l * cg->dx[3 * c + 2]; } else { itm = cart_utils::get_cell_index( - cg->dims[static_cast(3 * c)], cg->dims[3 * c + 1], cg->nf, j, - k, l); + cg->dims[3 * c], cg->dims[3 * c + 1], cg->nf, j, k, l); - xtm[0] = cg->xlo[static_cast(3 * c)] + - (j + 0.5) * cg->dx[static_cast(3 * c)]; + xtm[0] = cg->xlo[3 * c] + (j + 0.5) * cg->dx[3 * c]; xtm[1] = cg->xlo[3 * c + 1] + (k + 0.5) * cg->dx[3 * c + 1]; xtm[2] = cg->xlo[3 * c + 2] + (l + 0.5) * cg->dx[3 * c + 2]; } diff --git a/src/highOrder.C b/src/highOrder.C index 13c4c76..1045142 100644 --- a/src/highOrder.C +++ b/src/highOrder.C @@ -158,8 +158,7 @@ void MeshBlock::clearOrphans(HOLEMAP* holemap, int nmesh, const int* itmp) if (k != (meshtag - BASE) && (holemap[k].existWall != 0)) { if (checkHoleMap( - &rxyz[static_cast(3 * m)], - holemap[k].nx, holemap[k].sam, + &rxyz[3 * m], holemap[k].nx, holemap[k].sam, holemap[k].extents) != 0) { reject = 1; break; @@ -353,16 +352,14 @@ void MeshBlock::processPointDonors() interpList2[m].inode = (int*)malloc(sizeof(int)); interpList2[m].nweights = 0; donor_frac( - &(icell), &(xsearch[static_cast(3 * i)]), - &(interpList2[m].nweights), &(interpList2[m].inode[0]), - frac, &(rst[static_cast(3 * i)]), &ndim); + &(icell), &(xsearch[3 * i]), &(interpList2[m].nweights), + &(interpList2[m].inode[0]), frac, &(rst[3 * i]), &ndim); interpList2[m].weights = (double*)malloc(sizeof(double) * interpList2[m].nweights); for (j = 0; j < interpList2[m].nweights; j++) { interpList2[m].weights[j] = frac[j]; } - interpList2[m].receptorInfo[0] = - isearch[static_cast(3 * i)]; + interpList2[m].receptorInfo[0] = isearch[3 * i]; interpList2[m].receptorInfo[1] = isearch[3 * i + 1]; interpList2[m].receptorInfo[2] = isearch[3 * i + 2]; m++; @@ -389,15 +386,14 @@ void MeshBlock::processPointDonors() xv[ivert][j] = x[i3 + j]; } } - xp[0] = xsearch[static_cast(3 * i)]; + xp[0] = xsearch[3 * i]; xp[1] = xsearch[3 * i + 1]; xp[2] = xsearch[3 * i + 2]; computeNodalWeights(xv, xp, frac2, nvert); for (j = 0; j < nvert; j++) { interpList2[m].weights[j] = frac2[j]; } - interpList2[m].receptorInfo[0] = - isearch[static_cast(3 * i)]; + interpList2[m].receptorInfo[0] = isearch[3 * i]; interpList2[m].receptorInfo[1] = isearch[3 * i + 1]; interpList2[m].receptorInfo[2] = isearch[3 * i + 2]; m++; diff --git a/src/holeMap.C b/src/holeMap.C index 914ec85..a29b06e 100644 --- a/src/holeMap.C +++ b/src/holeMap.C @@ -126,9 +126,8 @@ void tioga::getHoleMap() MPI_Allreduce( bboxLocal, bboxGlobal, 3 * maxtag, MPI_DOUBLE, MPI_MIN, scomm); MPI_Allreduce( - &(bboxLocal[static_cast(3 * maxtag)]), - &(bboxGlobal[static_cast(3 * maxtag)]), 3 * maxtag, MPI_DOUBLE, - MPI_MAX, scomm); + &(bboxLocal[3 * maxtag]), &(bboxGlobal[3 * maxtag]), 3 * maxtag, + MPI_DOUBLE, MPI_MAX, scomm); // // find the bounding box for each mesh // from the globally reduced data @@ -763,7 +762,7 @@ void tioga::getAdaptiveHoleMap() elvl->octants[j].z = lvl->octants[j].z; elvl->octants[j].filltype = lvl->octants[j].filltype; elvl->octants[j].leafflag = - static_cast(lvl->octants[j].refined) == 0U; + lvl->octants[j].refined == 0U; if (lvl->octants[j].refined != 0U) { for (c = 0; c < OCTANT_CHILDREN; c++) { elvl->octants[j].children[c] = @@ -981,7 +980,7 @@ void writePointsVolume( for (pt = 0, k = 0; k < npts1d; ++k) { for (j = 0; j < npts1d; ++j) { for (i = 0; i < npts1d; ++i) { - double* co = &x[static_cast(3 * pt)]; + double* co = &x[3 * pt]; fprintf( fp, "%f %f %f %d %d %d\n", co[0], co[1], co[2], type, level, id); @@ -1008,7 +1007,7 @@ void writePointsVolumeBrick( for (pt = 0, k = 0; k < npts1d; ++k) { for (j = 0; j < npts1d; ++j) { for (i = 0; i < npts1d; ++i) { - double* co = &x[static_cast(3 * pt)]; + double* co = &x[3 * pt]; fprintf(fp, "%f ", co[0]); pt++; } @@ -1020,7 +1019,7 @@ void writePointsVolumeBrick( for (pt = 0, k = 0; k < npts1d; ++k) { for (j = 0; j < npts1d; ++j) { for (i = 0; i < npts1d; ++i) { - double* co = &x[static_cast(3 * pt)]; + double* co = &x[3 * pt]; fprintf(fp, "%f ", co[1]); pt++; } @@ -1032,7 +1031,7 @@ void writePointsVolumeBrick( for (pt = 0, k = 0; k < npts1d; ++k) { for (j = 0; j < npts1d; ++j) { for (i = 0; i < npts1d; ++i) { - double* co = &x[static_cast(3 * pt)]; + double* co = &x[3 * pt]; fprintf(fp, "%f ", co[2]); pt++; } diff --git a/src/parallelComm.C b/src/parallelComm.C index aa58c02..7fb3b33 100644 --- a/src/parallelComm.C +++ b/src/parallelComm.C @@ -215,7 +215,7 @@ void parallelComm::sendRecvPackets(PACKET* sndPack, PACKET* rcvPack) status = (MPI_Status*)malloc(sizeof(MPI_Status) * 2 * (nsend + nrecv)); // for (i = 0; i < nsend; i++) { - scount[static_cast(2 * i)] = sndPack[i].nints; + scount[2 * i] = sndPack[i].nints; scount[2 * i + 1] = sndPack[i].nreals; } // @@ -224,19 +224,19 @@ void parallelComm::sendRecvPackets(PACKET* sndPack, PACKET* rcvPack) // for (i = 0; i < nrecv; i++) { MPI_Irecv( - &(rcount[static_cast(2 * i)]), 2, MPI_INT, rcvMap[i], tag, - scomm, &request[irnum++]); + &(rcount[2 * i]), 2, MPI_INT, rcvMap[i], tag, scomm, + &request[irnum++]); } // for (i = 0; i < nsend; i++) { MPI_Isend( - &(scount[static_cast(2 * i)]), 2, MPI_INT, sndMap[i], tag, - scomm, &request[irnum++]); + &(scount[2 * i]), 2, MPI_INT, sndMap[i], tag, scomm, + &request[irnum++]); } // MPI_Waitall(irnum, request, status); for (i = 0; i < nrecv; i++) { - rcvPack[i].nints = rcount[static_cast(2 * i)]; + rcvPack[i].nints = rcount[2 * i]; rcvPack[i].nreals = rcount[2 * i + 1]; } // @@ -295,7 +295,7 @@ void parallelComm::sendRecvPacketsCheck(PACKET* sndPack, PACKET* rcvPack) status = (MPI_Status*)malloc(sizeof(MPI_Status) * 2 * (nsend + nrecv)); // for (i = 0; i < nsend; i++) { - scount[static_cast(2 * i)] = sndPack[i].nints; + scount[2 * i] = sndPack[i].nints; scount[2 * i + 1] = sndPack[i].nreals; } // @@ -304,20 +304,20 @@ void parallelComm::sendRecvPacketsCheck(PACKET* sndPack, PACKET* rcvPack) // for (i = 0; i < nrecv; i++) { MPI_Irecv( - &(rcount[static_cast(2 * i)]), 2, MPI_INT, rcvMap[i], tag, - scomm, &request[irnum++]); + &(rcount[2 * i]), 2, MPI_INT, rcvMap[i], tag, scomm, + &request[irnum++]); } // for (i = 0; i < nsend; i++) { MPI_Isend( - &(scount[static_cast(2 * i)]), 2, MPI_INT, sndMap[i], tag, - scomm, &request[irnum++]); + &(scount[2 * i]), 2, MPI_INT, sndMap[i], tag, scomm, + &request[irnum++]); } // MPI_Waitall(irnum, request, status); for (i = 0; i < nrecv; i++) { - rcvPack[i].nints = rcount[static_cast(2 * i)]; + rcvPack[i].nints = rcount[2 * i]; rcvPack[i].nreals = rcount[2 * i + 1]; } diff --git a/src/search.C b/src/search.C index 1551593..033d5b5 100644 --- a/src/search.C +++ b/src/search.C @@ -349,7 +349,7 @@ void MeshBlock::search() for (i = 0; i < nsearch; i++) { if (xtag[i] == i) { // adt->searchADT(this,&(donorId[i]),&(xsearch[3*i])); - adt->searchADT(this, dId, &(xsearch[static_cast(3 * i)])); + adt->searchADT(this, dId, &(xsearch[3 * i])); // std::cout << "ADT -> (" << dId[0] << "," << dId[1] << ")\n"; donorId[i] = dId[0]; } else { From d059c2e2814c9d646c311ec2e819debe83c563d0 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Mon, 16 Dec 2024 16:40:52 -0700 Subject: [PATCH 10/17] Addressing the readability-math-missing-parentheses warning --- src/CartBlock.C | 24 +++--- src/CartGrid.C | 32 +++++--- src/MeshBlock.C | 213 ++++++++++++++++++++++++++++-------------------- src/MeshBlock.h | 3 +- src/cartUtils.h | 14 ++-- 5 files changed, 165 insertions(+), 121 deletions(-) diff --git a/src/CartBlock.C b/src/CartBlock.C index 50e9241..b4c58d0 100644 --- a/src/CartBlock.C +++ b/src/CartBlock.C @@ -113,10 +113,10 @@ void CartBlock::getInterpolatedData( for (i = 0; i < listptr->nweights; i++) { int const cell_index = (cart_utils::get_cell_index( dims[0], dims[1], nf, listptr->inode[3 * i], - listptr->inode[3 * i + 1], listptr->inode[3 * i + 2])); + listptr->inode[(3 * i) + 1], listptr->inode[(3 * i) + 2])); for (n = 0; n < nvar_cell; n++) { weight = listptr->weights[i]; - qq[n] += qcell[cell_index + ncell_nf * n] * weight; + qq[n] += qcell[cell_index + (ncell_nf * n)] * weight; } int const ind_offset = 3 * (listptr->nweights + i); @@ -127,7 +127,7 @@ void CartBlock::getInterpolatedData( for (n = 0; n < nvar_node; n++) { weight = listptr->weights[listptr->nweights + i]; qq[nvar_cell + n] += - qnode[node_index + nnode_nf * n] * weight; + qnode[node_index + (nnode_nf * n)] * weight; } } @@ -148,14 +148,14 @@ void CartBlock::update(const double* qval, int index) return; } for (int i = 0; i < nvar_node; i++) { - qnode[index - ncell_nf + nnode_nf * i] = qval[nvar_cell + i]; + qnode[index - ncell_nf + (nnode_nf * i)] = qval[nvar_cell + i]; } } else { if (nvar_cell == 0) { return; } for (int i = 0; i < nvar_cell; i++) { - qcell[index + ncell_nf * i] = qval[i]; + qcell[index + (ncell_nf * i)] = qval[i]; } } } @@ -164,14 +164,14 @@ void CartBlock::preprocess(CartGrid* cg) { int nfrac; for (int n = 0; n < 3; n++) { - xlo[n] = cg->xlo[3 * global_id + n]; + xlo[n] = cg->xlo[(3 * global_id) + n]; } for (int n = 0; n < 3; n++) { - dx[n] = cg->dx[3 * global_id + n]; + dx[n] = cg->dx[(3 * global_id) + n]; } dims[0] = cg->ihi[3 * global_id] - cg->ilo[3 * global_id] + 1; - dims[1] = cg->ihi[3 * global_id + 1] - cg->ilo[3 * global_id + 1] + 1; - dims[2] = cg->ihi[3 * global_id + 2] - cg->ilo[3 * global_id + 2] + 1; + dims[1] = cg->ihi[(3 * global_id) + 1] - cg->ilo[(3 * global_id) + 1] + 1; + dims[2] = cg->ihi[(3 * global_id) + 2] - cg->ilo[(3 * global_id) + 2] + 1; nf = cg->nf; myid = cg->myid; donor_frac = cg->donor_frac; @@ -755,21 +755,21 @@ void CartBlock::writeCellFile(int bid) for (k = 0; k < dims[2] + 1; k++) { for (j = 0; j < dims[1] + 1; j++) { for (i = 0; i < dims[0] + 1; i++) { - fprintf(fp, "%lf\n", xlo[0] + dx[0] * i); + fprintf(fp, "%lf\n", xlo[0] + (dx[0] * i)); } } } for (k = 0; k < dims[2] + 1; k++) { for (j = 0; j < dims[1] + 1; j++) { for (i = 0; i < dims[0] + 1; i++) { - fprintf(fp, "%lf\n", xlo[1] + dx[1] * j); + fprintf(fp, "%lf\n", xlo[1] + (dx[1] * j)); } } } for (k = 0; k < dims[2] + 1; k++) { for (j = 0; j < dims[1] + 1; j++) { for (i = 0; i < dims[0] + 1; i++) { - fprintf(fp, "%lf\n", xlo[2] + dx[2] * k); + fprintf(fp, "%lf\n", xlo[2] + (dx[2] * k)); } } } diff --git a/src/CartGrid.C b/src/CartGrid.C index a473097..0027452 100644 --- a/src/CartGrid.C +++ b/src/CartGrid.C @@ -159,7 +159,8 @@ void CartGrid::preprocess() for (i = 0; i < ngrids; i++) { for (n = 0; n < 3; n++) { xlosup[n] = - ((xlosup[n] <= xlo[3 * i + n]) ? xlosup[n] : xlo[3 * i + n]); + ((xlosup[n] <= xlo[(3 * i) + n]) ? xlosup[n] + : xlo[(3 * i) + n]); } maxlevel = ((maxlevel >= level_num[i]) ? maxlevel : level_num[i]); } @@ -172,7 +173,7 @@ void CartGrid::preprocess() for (i = 0; i < ngrids; i++) { lcount[level_num[i]]++; for (n = 0; n < 3; n++) { - dxlvl[3 * level_num[i] + n] = dx[3 * i + n]; + dxlvl[(3 * level_num[i]) + n] = dx[(3 * i) + n]; } } } @@ -191,7 +192,8 @@ void CartGrid::search(double* x, int* donorid, int npts) donorid[i] = -1; for (l = maxlevel - 1; l >= 0 && static_cast(flag) == 0; l--) { for (n = 0; n < 3; n++) { - il[n] = floor((x[3 * i + n] - xlosup[n]) / dxlvl[3 * l + n]); + il[n] = + floor((x[(3 * i) + n] - xlosup[n]) / dxlvl[(3 * l) + n]); } for (j = 0; j < ngrids && static_cast(flag) == 0; j++) { if (level_num[j] == l) { @@ -202,13 +204,15 @@ void CartGrid::search(double* x, int* donorid, int npts) // for(n=0;n<3;n++) flag = flag && (il[n] >=ilo[3*j+n]); // for(n=0;n<3;n++) flag = flag && (il[n] <=ihi[3*j+n]); for (n = 0; n < 3; n++) { - flag = flag && ((x[3 * i + n] - xlo[3 * j + n]) > -TOL); + flag = flag && + ((x[(3 * i) + n] - xlo[(3 * j) + n]) > -TOL); } for (n = 0; n < 3; n++) { - flag = flag && - ((x[3 * i + n] - - (xlo[3 * j + n] + - dx[3 * j + n] * (dims[3 * j + n]))) < TOL); + flag = + flag && + ((x[(3 * i) + n] - + (xlo[(3 * j) + n] + + dx[(3 * j) + n] * (dims[(3 * j) + n]))) < TOL); } if (flag) { dcount++; @@ -218,14 +222,16 @@ void CartGrid::search(double* x, int* donorid, int npts) } } if (myid == 2 && abs(x[3 * i] - 0.739573) < 1e-5 && - abs(x[3 * i + 1] + 0.259310) < 1e-5 && - abs(x[3 * i + 2] + 0.639614) < 1e-5) { + abs(x[(3 * i) + 1] + 0.259310) < 1e-5 && + abs(x[(3 * i) + 2] + 0.639614) < 1e-5) { printf( - "%d %d %f %f %f %d\n", myid, i, x[3 * i], x[3 * i + 1], - x[3 * i + 2], donorid[i]); + "%d %d %f %f %f %d\n", myid, i, x[3 * i], x[(3 * i) + 1], + x[(3 * i) + 2], donorid[i]); } if (donorid[i] == -1) { - printf("%d %f %f %f\n", myid, x[3 * i], x[3 * i + 1], x[3 * i + 2]); + printf( + "%d %f %f %f\n", myid, x[3 * i], x[(3 * i) + 1], + x[(3 * i) + 2]); } } // printf("CartGrid::search Processor %d located %d of %d diff --git a/src/MeshBlock.C b/src/MeshBlock.C index 44903c8..1c99aa6 100644 --- a/src/MeshBlock.C +++ b/src/MeshBlock.C @@ -227,7 +227,7 @@ void MeshBlock::tagBoundary() nvert = nv[n]; for (i = 0; i < nc[n]; i++) { for (m = 0; m < nvert; m++) { - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; i3 = 3 * inode[m]; for (j = 0; j < 3; j++) { xv[m][j] = x[i3 + j]; @@ -300,12 +300,12 @@ void MeshBlock::tagBoundary() for (int j = 0; j < 3; j++) { xd[j] = obb->dxc[j]; for (int k = 0; k < 3; k++) { - xd[j] += (x[3 * i + k] - obb->xc[k]) * obb->vec[j][k]; + xd[j] += (x[(3 * i) + k] - obb->xc[k]) * obb->vec[j][k]; } idx[j] = static_cast(xd[j] / mapdx[j]); } int const indx = - idx[2] * mapdims[1] * mapdims[0] + idx[1] * mapdims[0] + idx[0]; + (idx[2] * mapdims[1] * mapdims[0]) + (idx[1] * mapdims[0]) + idx[0]; iptr[i] = icft[indx + 1]; icft[indx + 1] = i; } @@ -352,15 +352,15 @@ void MeshBlock::tagBoundary() xmax[j] = std::numeric_limits::lowest(); } for (m = 0; m < nvert; m++) { - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; if (iflag[inode[m]] != 0) { itag = 1; } for (int j = 0; j < 3; j++) { xd[j] = obb->dxc[j]; for (int k = 0; k < 3; k++) { - xd[j] += - (x[3 * inode[m] + k] - obb->xc[k]) * obb->vec[j][k]; + xd[j] += (x[(3 * inode[m]) + k] - obb->xc[k]) * + obb->vec[j][k]; } xmin[j] = std::min(xd[j], xmin[j]); xmax[j] = std::max(xd[j], xmax[j]); @@ -380,8 +380,8 @@ void MeshBlock::tagBoundary() idx[1] = std::max(std::min(k, mapdims[1] - 1), 0); idx[2] = std::max(std::min(l, mapdims[2] - 1), 0); mapmask - [idx[2] * mapdims[1] * mapdims[0] + - idx[1] * mapdims[0] + idx[0]] = 1; + [(idx[2] * mapdims[1] * mapdims[0]) + + (idx[1] * mapdims[0]) + idx[0]] = 1; } } } @@ -418,7 +418,7 @@ void MeshBlock::tagBoundary() nvert = nv[n]; for (i = 0; i < nc[n]; i++) { for (m = 0; m < nvert; m++) { - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; if (iextmp[inode[m]] == 1) //(iflag[inode[m]]) { cellRes[k] = std::numeric_limits::max(); @@ -427,7 +427,7 @@ void MeshBlock::tagBoundary() } if (cellRes[k] == std::numeric_limits::max()) { for (m = 0; m < nvert; m++) { - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; if (iextmp[inode[m]] != 1) { iextmp1[inode[m]] = 1; } @@ -589,7 +589,7 @@ void MeshBlock::tagBoundaryFaces() for (i = 0; i < nc[n]; i++) { flagwbc = flagobc = 0; for (j = 0; j < nvert; j++) { - ii = vconn[n][nvert * i + j] - BASE; + ii = vconn[n][(nvert * i) + j] - BASE; if (iflagwbc[ii] != 0) { flagwbc = 1; } @@ -602,7 +602,7 @@ void MeshBlock::tagBoundaryFaces() if ((flagwbc != 0) || (flagobc != 0)) { ctype = celltypes[nvert]; for (j = 0; j < nvert; j++) { - inode[j] = vconn[n][nvert * i + j] - BASE; + inode[j] = vconn[n][(nvert * i) + j] - BASE; } for (f = 0; f < nfaces[ctype]; f++) { @@ -643,7 +643,7 @@ void MeshBlock::tagBoundaryFaces() for (i = 0; i < nc[n]; i++) { flagwbc = flagobc = 0; for (j = 0; j < nvert; j++) { - ii = vconn[n][nvert * i + j] - BASE; + ii = vconn[n][(nvert * i) + j] - BASE; if (iflagwbc[ii] != 0) { flagwbc = 1; } @@ -655,7 +655,7 @@ void MeshBlock::tagBoundaryFaces() if ((flagwbc != 0) || (flagobc != 0)) { ctype = celltypes[nvert]; for (j = 0; j < nvert; j++) { - inode[j] = vconn[n][nvert * i + j] - BASE; + inode[j] = vconn[n][(nvert * i) + j] - BASE; } for (f = 0; f < nfaces[ctype]; f++) { @@ -668,10 +668,10 @@ void MeshBlock::tagBoundaryFaces() inode, iflagwbc.data(), nfacevert, faceNodes, nullptr) != 0)) { for (d = 0; d < 3; d++) { - wbcfacenode[4 * nwbcface + d] = + wbcfacenode[(4 * nwbcface) + d] = inode[faceNodes[d] - BASE]; } - wbcfacenode[4 * nwbcface + 3] = + wbcfacenode[(4 * nwbcface) + 3] = (nfacevert == 4) ? inode[faceNodes[3] - BASE] : -1; // initialize cell bounding box data @@ -714,10 +714,10 @@ void MeshBlock::tagBoundaryFaces() inode, iflagobc.data(), nfacevert, faceNodes, duplicateCheck) != 0)) { for (d = 0; d < 3; d++) { - obcfacenode[4 * nobcface + d] = + obcfacenode[(4 * nobcface) + d] = inode[faceNodes[d] - BASE]; } - obcfacenode[4 * nobcface + 3] = + obcfacenode[(4 * nobcface) + 3] = (nfacevert == 4) ? inode[faceNodes[3] - BASE] : -1; // initialize cell bounding box data @@ -780,8 +780,8 @@ void MeshBlock::writeGridFile(int bid) ncells); for (i = 0; i < nnodes; i++) { fprintf( - fp, "%.14e %.14e %.14e %d\n", x[3 * i], x[3 * i + 1], x[3 * i + 2], - iblank[i]); + fp, "%.14e %.14e %.14e %d\n", x[3 * i], x[(3 * i) + 1], + x[(3 * i) + 2], iblank[i]); } ba = 1 - BASE; @@ -791,31 +791,43 @@ void MeshBlock::writeGridFile(int bid) if (nvert == 4) { fprintf( fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, - vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, - vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, - vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba, - vconn[n][nvert * i + 3] + ba); + vconn[n][(nvert * i) + 1] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 3] + ba); } else if (nvert == 5) { fprintf( fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, - vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, - vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, - vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba, - vconn[n][nvert * i + 4] + ba); + vconn[n][(nvert * i) + 1] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 4] + ba); } else if (nvert == 6) { fprintf( fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, - vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, - vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, - vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 5] + ba, - vconn[n][nvert * i + 5] + ba); + vconn[n][(nvert * i) + 1] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 5] + ba, + vconn[n][(nvert * i) + 5] + ba); } else if (nvert == 8) { fprintf( fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, - vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, - vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, - vconn[n][nvert * i + 5] + ba, vconn[n][nvert * i + 6] + ba, - vconn[n][nvert * i + 7] + ba); + vconn[n][(nvert * i) + 1] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 5] + ba, + vconn[n][(nvert * i) + 6] + ba, + vconn[n][(nvert * i) + 7] + ba); } } } @@ -850,10 +862,10 @@ void MeshBlock::writeCellFile(int bid) fprintf(fp, "%lf\n", x[3 * i]); } for (i = 0; i < nnodes; i++) { - fprintf(fp, "%lf\n", x[3 * i + 1]); + fprintf(fp, "%lf\n", x[(3 * i) + 1]); } for (i = 0; i < nnodes; i++) { - fprintf(fp, "%lf\n", x[3 * i + 2]); + fprintf(fp, "%lf\n", x[(3 * i) + 2]); } for (i = 0; i < nnodes; i++) { fprintf(fp, "%d\n", iblank[i]); @@ -868,31 +880,43 @@ void MeshBlock::writeCellFile(int bid) if (nvert == 4) { fprintf( fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, - vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, - vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, - vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 3] + ba, - vconn[n][nvert * i + 3] + ba); + vconn[n][(nvert * i) + 1] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 3] + ba); } else if (nvert == 5) { fprintf( fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, - vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, - vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, - vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 4] + ba, - vconn[n][nvert * i + 4] + ba); + vconn[n][(nvert * i) + 1] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 4] + ba); } else if (nvert == 6) { fprintf( fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, - vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, - vconn[n][nvert * i + 2] + ba, vconn[n][nvert * i + 3] + ba, - vconn[n][nvert * i + 4] + ba, vconn[n][nvert * i + 5] + ba, - vconn[n][nvert * i + 5] + ba); + vconn[n][(nvert * i) + 1] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 5] + ba, + vconn[n][(nvert * i) + 5] + ba); } else if (nvert == 8) { fprintf( fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, - vconn[n][nvert * i + 1] + ba, vconn[n][nvert * i + 2] + ba, - vconn[n][nvert * i + 3] + ba, vconn[n][nvert * i + 4] + ba, - vconn[n][nvert * i + 5] + ba, vconn[n][nvert * i + 6] + ba, - vconn[n][nvert * i + 7] + ba); + vconn[n][(nvert * i) + 1] + ba, + vconn[n][(nvert * i) + 2] + ba, + vconn[n][(nvert * i) + 3] + ba, + vconn[n][(nvert * i) + 4] + ba, + vconn[n][(nvert * i) + 5] + ba, + vconn[n][(nvert * i) + 6] + ba, + vconn[n][(nvert * i) + 7] + ba); } } } @@ -938,10 +962,10 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) if (type == 0) { for (i = 0; i < nnodes; i++) { fprintf( - fp, "%lf %lf %lf %d %d ", x[3 * i], x[3 * i + 1], x[3 * i + 2], - ibl[i], meshtag); + fp, "%lf %lf %lf %d %d ", x[3 * i], x[(3 * i) + 1], + x[(3 * i) + 2], ibl[i], meshtag); for (j = 0; j < nvar; j++) { - fprintf(fp, "%lf ", q[i * nvar + j]); + fprintf(fp, "%lf ", q[(i * nvar) + j]); } // for(j=0;j::lowest(); for (j = 0; j < nvert; j++) { - i3 = 3 * (vconn[n][nvert * i + j] - BASE); + i3 = 3 * (vconn[n][(nvert * i) + j] - BASE); for (k = 0; k < 3; k++) { xv = x[i3 + k]; iv = floor((xv - extents[k]) / ds[k]); @@ -1550,7 +1586,7 @@ void MeshBlock::getReducedOBB(OBB* obc, double* realData) bbox[3] = bbox[4] = bbox[5] = std::numeric_limits::lowest(); for (m = 0; m < nvert; m++) { - i3 = 3 * (vconn[n][nvert * i + m] - BASE); + i3 = 3 * (vconn[n][(nvert * i) + m] - BASE); for (j = 0; j < 3; j++) { xd[j] = 0; } @@ -1581,7 +1617,7 @@ void MeshBlock::getReducedOBB(OBB* obc, double* realData) continue; } for (m = 0; m < nvert; m++) { - i3 = 3 * (vconn[n][nvert * i + m] - BASE); + i3 = 3 * (vconn[n][(nvert * i) + m] - BASE); for (j = 0; j < 3; j++) { xd[j] = 0; } @@ -2064,11 +2100,11 @@ void MeshBlock::check_for_uniform_hex() for (int i = 0; i < nc[n]; i++) { int vold = -1; for (int m = 0; m < nvert; m++) { - if (vconn[n][nvert * i + m] == vold) { + if (vconn[n][(nvert * i) + m] == vold) { return; // degenerated hex are not uniform } - vold = vconn[n][nvert * i + m]; - int const i3 = 3 * (vconn[n][nvert * i + m] - BASE); + vold = vconn[n][(nvert * i) + m]; + int const i3 = 3 * (vconn[n][(nvert * i) + m] - BASE); for (int k = 0; k < 3; k++) { xv[m][k] = x[i3 + k]; } @@ -2226,8 +2262,8 @@ void MeshBlock::create_hex_cell_map() int idx[3]; for (int j = 0; j < 3; j++) { int const lnode = vconn[0][8 * i] - BASE; - int const tnode = vconn[0][8 * i + 6] - BASE; - xc[j] = 0.5 * (x[3 * lnode + j] + x[3 * tnode + j]); + int const tnode = vconn[0][(8 * i) + 6] - BASE; + xc[j] = 0.5 * (x[(3 * lnode) + j] + x[(3 * tnode) + j]); } for (int j = 0; j < 3; j++) { xd[j] = 0; @@ -2236,7 +2272,8 @@ void MeshBlock::create_hex_cell_map() } idx[j] = static_cast(xd[j] / dx[j]); } - uindx[idx[2] * idims[1] * idims[0] + idx[1] * idims[0] + idx[0]] = i; + uindx[(idx[2] * idims[1] * idims[0]) + (idx[1] * idims[0]) + idx[0]] = + i; } } @@ -2271,8 +2308,8 @@ void MeshBlock::checkOrphans() if (nodeRes[i] >= std::numeric_limits::max()) { if (iblank[i] == 1) { fprintf( - fp, "%f %f %f %f\n", x[3 * i], x[3 * i + 1], - x[3 * i + 2], nodeRes[i]); + fp, "%f %f %f %f\n", x[3 * i], x[(3 * i) + 1], + x[(3 * i) + 2], nodeRes[i]); norphan++; } } diff --git a/src/MeshBlock.h b/src/MeshBlock.h index a9e03b3..41cafdd 100644 --- a/src/MeshBlock.h +++ b/src/MeshBlock.h @@ -493,7 +493,8 @@ class MeshBlock void outputOrphan(FILE* fp, int i) { fprintf( - fp, "%f %f %f\n", rxyz[3 * i], rxyz[3 * i + 1], rxyz[3 * i + 2]); + fp, "%f %f %f\n", rxyz[3 * i], rxyz[(3 * i) + 1], + rxyz[(3 * i) + 2]); } void clearOrphans(HOLEMAP* holemap, int nmesh, const int* itmp); void clearOrphans(ADAPTIVE_HOLEMAP* holemap, int nmesh, int* itmp); diff --git a/src/cartUtils.h b/src/cartUtils.h index 6adb2cb..57427d4 100644 --- a/src/cartUtils.h +++ b/src/cartUtils.h @@ -24,15 +24,15 @@ namespace cart_utils { // Q[nq,nZ+2*nf,nY+2*nf,nX+2*nf]--> C++ Cell storage inline int get_cell_index(int nX, int nY, int nf, int i, int j, int k) { - return (nY + 2 * nf) * (nX + 2 * nf) * (k + nf) + (nX + 2 * nf) * (j + nf) + - (i + nf); + return ((nY + (2 * nf)) * (nX + (2 * nf)) * (k + nf)) + + ((nX + (2 * nf)) * (j + nf)) + (i + nf); } // Q[nq,nZ+1+2*nf,nY+1+2*nf,nX+1+2*nf]--> C++ node storage inline int get_node_index(int nX, int nY, int nf, int i, int j, int k) { - return (nY + 1 + 2 * nf) * (nX + 1 + 2 * nf) * (k + nf) + - (nX + 1 + 2 * nf) * (j + nf) + (i + nf); + return ((nY + 1 + (2 * nf)) * (nX + 1 + (2 * nf)) * (k + nf)) + + ((nX + 1 + (2 * nf)) * (j + nf)) + (i + nf); } // Q[nq,nZ+1+2*nf,nY+1+2*nf,nX+1+2*nf]--> C++ node storage @@ -41,9 +41,9 @@ inline int get_node_index(int nX, int nY, int nf, int i, int j, int k) inline int get_concatenated_node_index(int nX, int nY, int nZ, int nf, int i, int j, int k) { - return (nY + 1 + 2 * nf) * (nX + 1 + 2 * nf) * (k + nf) + - (nX + 1 + 2 * nf) * (j + nf) + (i + nf) + - (nX + 2 * nf) * (nY + 2 * nf) * (nZ + 2 * nf); + return ((nY + 1 + (2 * nf)) * (nX + 1 + (2 * nf)) * (k + nf)) + + ((nX + 1 + (2 * nf)) * (j + nf)) + (i + nf) + + ((nX + (2 * nf)) * (nY + (2 * nf)) * (nZ + (2 * nf))); } } // namespace cart_utils From 2ad699fe9a2b2ff6d475f26724ae18d942c14f55 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Tue, 17 Dec 2024 12:11:34 -0700 Subject: [PATCH 11/17] More readability-math-missing-parentheses fixes --- src/bookKeeping.C | 43 ++++++++++++++++++++-------------------- src/buildADTrecursion.C | 12 +++++------ src/cartOps.C | 12 +++++------ src/cellVolume.C | 4 ++-- src/checkContainment.C | 2 +- src/dataUpdate.C | 8 ++++---- src/exchangeAMRDonors.C | 14 ++++++------- src/exchangeBoxes.C | 8 ++++---- src/exchangeDonors.C | 12 +++++------ src/exchangeSearchData.C | 2 +- 10 files changed, 59 insertions(+), 58 deletions(-) diff --git a/src/bookKeeping.C b/src/bookKeeping.C index 763d21d..4d943ca 100644 --- a/src/bookKeeping.C +++ b/src/bookKeeping.C @@ -60,8 +60,8 @@ void MeshBlock::getDonorPacket(PACKET* sndPack, int nsend) const for (i = 0; i < nsearch; i++) { if (donorId[i] > -1) { k = isearch[2 * i]; - sndPack[k].intData[icount[k]++] = meshtag; // mesh tag - sndPack[k].intData[icount[k]++] = isearch[2 * i + 1]; // point id + sndPack[k].intData[icount[k]++] = meshtag; // mesh tag + sndPack[k].intData[icount[k]++] = isearch[(2 * i) + 1]; // point id sndPack[k].intData[icount[k]++] = i; // point id on the donor side sndPack[k].realData[dcount[k]++] = cellRes[donorId[i]]; // donor resolution @@ -97,10 +97,10 @@ void MeshBlock::getMBDonorPackets( int& ix = ixOffset[k]; int& rx = rxOffset[k]; - sndPack[k].intData[ix++] = meshtag; // Unique mesh tag - sndPack[k].intData[ix++] = isearch[3 * i + 1]; // point ID - sndPack[k].intData[ix++] = i; // point ID on donor side - sndPack[k].intData[ix++] = isearch[3 * i + 2]; // receptor block ID + sndPack[k].intData[ix++] = meshtag; // Unique mesh tag + sndPack[k].intData[ix++] = isearch[(3 * i) + 1]; // point ID + sndPack[k].intData[ix++] = i; // point ID on donor side + sndPack[k].intData[ix++] = isearch[(3 * i) + 2]; // receptor block ID sndPack[k].realData[rx++] = cellRes[donorId[i]]; sndPack[k].realData[rx++] = res_search[xtag[i]]; } @@ -180,7 +180,7 @@ void MeshBlock::processDonors( if (verbose != 0) TRACEI(iblank[i]); if (verbose != 0) TRACED(nodeRes[i]); if (verbose != 0) { - printf("%f %f %f\n", x[3 * i], x[3 * i + 1], x[3 * i + 2]); + printf("%f %f %f\n", x[3 * i], x[(3 * i) + 1], x[(3 * i) + 2]); } if (donorList[i] == nullptr) { if (verbose != 0) { @@ -241,7 +241,8 @@ void MeshBlock::processDonors( myid, wbcnode[i] - BASE, donorList[wbcnode[i] - BASE]); ii = wbcnode[i] - BASE; printf( - "xloc=%e %e %e\n", x[3 * ii], x[3 * ii + 1], x[3 * ii + 2]); + "xloc=%e %e %e\n", x[3 * ii], x[(3 * ii) + 1], + x[(3 * ii) + 2]); printf( "Computations will continue, but may suffer from accuracy " "problems\n"); @@ -271,11 +272,11 @@ void MeshBlock::processDonors( nvert = nv[n]; for (i = 0; i < nc[n]; i++) { for (m = 0; m < nvert; m++) { - if (mtag[(vconn[n][nvert * i + m] - BASE)] == 1) { + if (mtag[(vconn[n][(nvert * i) + m] - BASE)] == 1) { for (mm = 0; mm < nvert; mm++) { if (m != mm && - mtag[vconn[n][nvert * i + mm] - BASE] != 1) { - mtag1[vconn[n][nvert * i + mm] - BASE] = 1; + mtag[vconn[n][(nvert * i) + mm] - BASE] != 1) { + mtag1[vconn[n][(nvert * i) + mm] - BASE] = 1; } } } @@ -469,8 +470,8 @@ void MeshBlock::processDonors( myid, wbcnode[i] - BASE, donorList[wbcnode[i] - BASE]); ii = wbcnode[i] - BASE; fprintf( - stderr, "xloc=%e %e %e\n", x[3 * ii], x[3 * ii + 1], - x[3 * ii + 2]); + stderr, "xloc=%e %e %e\n", x[3 * ii], x[(3 * ii) + 1], + x[(3 * ii) + 2]); fprintf( stderr, "Computations will continue, but may suffer from accuracy " @@ -501,11 +502,11 @@ void MeshBlock::processDonors( nvert = nv[n]; for (i = 0; i < nc[n]; i++) { for (m = 0; m < nvert; m++) { - if (mtag[(vconn[n][nvert * i + m] - BASE)] == 1) { + if (mtag[(vconn[n][(nvert * i) + m] - BASE)] == 1) { for (mm = 0; mm < nvert; mm++) { if (m != mm && - mtag[vconn[n][nvert * i + mm] - BASE] != 1) { - mtag1[vconn[n][nvert * i + mm] - BASE] = 1; + mtag[vconn[n][(nvert * i) + mm] - BASE] != 1) { + mtag1[vconn[n][(nvert * i) + mm] - BASE] = 1; } } } @@ -651,8 +652,8 @@ void MeshBlock::findInterpData(int* recid, int irecord, double receptorRes2) // if (myid==1 && irecord==158192 && meshtag==1) verbose=1; receptorRes = fabs(receptorRes2); procid = isearch[3 * irecord]; - pointid = isearch[3 * irecord + 1]; - blockid = isearch[3 * irecord + 2]; + pointid = isearch[(3 * irecord) + 1]; + blockid = isearch[(3 * irecord) + 2]; meshtagrecv = tagsearch[irecord]; if (verbose != 0) { TRACEI(procid); @@ -681,7 +682,7 @@ void MeshBlock::findInterpData(int* recid, int irecord, double receptorRes2) if (verbose != 0) TRACEI(i) if (verbose != 0) TRACED(nodeRes[241291]); for (m = 0; m < nvert; m++) { - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; if (verbose != 0) TRACEI(inode[m]); if (verbose != 0) TRACEI(iblank[inode[m]]) if (verbose != 0) TRACED(nodeRes[inode[m]]) @@ -714,7 +715,7 @@ void MeshBlock::findInterpData(int* recid, int irecord, double receptorRes2) // for (m = 0; m < nvert; m++) { verbose = 0; - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; // if (myid==763 && inode[m]==9515) verbose=1; // if (myid==1 && meshtag==2 && inode[m]==240304) verbose=1; if (verbose != 0) TRACEI(inode[m]); @@ -956,7 +957,7 @@ void MeshBlock::reduce_fringes() verbose = 0; ncount = 0; for (m = 0; m < nvert; m++) { - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; ncount = ncount + static_cast( iblank_reduced[inode[m]] == 1 || iblank_reduced[inode[m]] < 0); diff --git a/src/buildADTrecursion.C b/src/buildADTrecursion.C index 7d4564b..f208ebb 100644 --- a/src/buildADTrecursion.C +++ b/src/buildADTrecursion.C @@ -53,7 +53,7 @@ void buildADTrecursion( // collect coordinates along the dimension dimcut // for (i = 0; i < nav; i++) { - adtWork[i] = coord[ndim * elementsAvailable[i] + dimcut]; + adtWork[i] = coord[(ndim * elementsAvailable[i]) + dimcut]; } // // reorder elements with nleft elements to @@ -81,9 +81,9 @@ void buildADTrecursion( // contained in this leaf // for (i = 0; i < nd; i++) { - adtReals[ndim * (*adtCount) + i] = + adtReals[(ndim * (*adtCount)) + i] = std::numeric_limits::max(); - adtReals[ndim * (*adtCount) + i + nd] = + adtReals[(ndim * (*adtCount)) + i + nd] = std::numeric_limits::lowest(); } // @@ -103,7 +103,7 @@ void buildADTrecursion( // unless root // if (side > 0) { - adtIntegers[4 * parent + side] = elementsAvailable[nleft - 1]; + adtIntegers[(4 * parent) + side] = elementsAvailable[nleft - 1]; } parentToChild = *adtCount; // @@ -129,10 +129,10 @@ void buildADTrecursion( adtIntegers[ii + 2] = -1; adtIntegers[ii + 3] = -1; for (j = 0; j < ndim; j++) { - adtReals[jj + j] = coord[ndim * elementsAvailable[0] + j]; + adtReals[jj + j] = coord[(ndim * elementsAvailable[0]) + j]; } if (side > 0) { - adtIntegers[4 * parent + side] = elementsAvailable[0]; + adtIntegers[(4 * parent) + side] = elementsAvailable[0]; } } } diff --git a/src/cartOps.C b/src/cartOps.C index 1329ddd..21d7d27 100644 --- a/src/cartOps.C +++ b/src/cartOps.C @@ -75,7 +75,7 @@ void MeshBlock::getUnresolvedMandatoryReceptors() for (i = 0; i < nc[n]; i++) { fcount = 0; for (m = 0; m < nvert; m++) { - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; if (nodeRes[inode[m]] >= std::numeric_limits::max()) { fcount++; @@ -248,7 +248,7 @@ void MeshBlock::findInterpListCart() } nvert = nv[n]; for (m = 0; m < nvert; m++) { - inode[m] = vconn[n][nvert * i + m] - BASE; + inode[m] = vconn[n][(nvert * i) + m] - BASE; i3 = 3 * inode[m]; for (j = 0; j < 3; j++) { xv[m][j] = x[i3 + j]; @@ -362,7 +362,7 @@ void MeshBlock::getInterpolatedSolutionAMR( printf("warning: weights are not convex 3\n"); } for (k = 0; k < nvar; k++) { - qq[k] += q[inode * nvar + k] * weight; + qq[k] += q[(inode * nvar) + k] * weight; } } (*intData)[icount++] = sndMap[interpList[i].receptorInfo[0]]; @@ -386,7 +386,7 @@ void MeshBlock::getInterpolatedSolutionAMR( printf("warning: weights are not convex 4\n"); } for (k = 0; k < nvar; k++) { - qq[k] += q[inode * nvar + k] * weight; + qq[k] += q[(inode * nvar) + k] * weight; // if (myid==0 && dcount==0) { // printf("nsu3d/interp: %d %d %f // %f\n",k,inode,weight,q[inode*nvar+k]); @@ -412,7 +412,7 @@ void MeshBlock::getInterpolatedSolutionAMR( inode = interpList[i].inode[m]; weight = interpList[i].weights[m]; for (k = 0; k < nvar; k++) { - qq[k] += q[k * nnodes + inode] * weight; + qq[k] += q[(k * nnodes) + inode] * weight; } } (*intData)[icount++] = sndMap[interpList[i].receptorInfo[0]]; @@ -432,7 +432,7 @@ void MeshBlock::getInterpolatedSolutionAMR( inode = interpListCart[i].inode[m]; weight = interpListCart[i].weights[m]; for (k = 0; k < nvar; k++) { - qq[k] += q[k * nnodes + inode] * weight; + qq[k] += q[(k * nnodes) + inode] * weight; } } (*intData)[icount++] = interpListCart[i].receptorInfo[0]; diff --git a/src/cellVolume.C b/src/cellVolume.C index a20a989..a791b52 100644 --- a/src/cellVolume.C +++ b/src/cellVolume.C @@ -13,8 +13,8 @@ double scalarProduct( double c3) { return ( - a1 * b2 * c3 - a1 * b3 * c2 + a2 * b3 * c1 - a2 * b1 * c3 + - a3 * b1 * c2 - a3 * b2 * c1); + (a1 * b2 * c3) - (a1 * b3 * c2) + (a2 * b3 * c1) - (a2 * b1 * c3) + + (a3 * b1 * c2) - (a3 * b2 * c1)); } void cellVolume( diff --git a/src/checkContainment.C b/src/checkContainment.C index 0f540be..9cf57b4 100644 --- a/src/checkContainment.C +++ b/src/checkContainment.C @@ -52,7 +52,7 @@ void MeshBlock::checkContainment( // nvert = nv[n]; for (m = 0; m < nvert; m++) { - i3 = 3 * (vconn[n][nvert * i + m] - BASE); + i3 = 3 * (vconn[n][(nvert * i) + m] - BASE); for (j = 0; j < 3; j++) { xv[m][j] = x[i3 + j]; } diff --git a/src/dataUpdate.C b/src/dataUpdate.C index af6d4b9..0ed9936 100644 --- a/src/dataUpdate.C +++ b/src/dataUpdate.C @@ -73,7 +73,7 @@ void MeshBlock::getInterpolatedSolution( printf("warning: weights are not convex 1\n"); } for (k = 0; k < nvar; k++) { - qq[k] += q[inode * nvar + k] * weight; + qq[k] += q[(inode * nvar) + k] * weight; } } (*intData)[icount++] = interpList[i].receptorInfo[0]; @@ -94,7 +94,7 @@ void MeshBlock::getInterpolatedSolution( inode = interpList[i].inode[m]; weight = interpList[i].weights[m]; for (k = 0; k < nvar; k++) { - qq[k] += q[k * nnodes + inode] * weight; + qq[k] += q[(k * nnodes) + inode] * weight; } } (*intData)[icount++] = interpList[i].receptorInfo[0]; @@ -121,12 +121,12 @@ void MeshBlock::updateSolnData(int inode, const double* qvar, double* q) const } assert(inode < nnodes); for (k = 0; k < nvar; k++) { - q[inode * nvar + k] = qvar[k]; + q[(inode * nvar) + k] = qvar[k]; } } if (interptype == COLUMN) { for (k = 0; k < nvar; k++) { - q[nnodes * k + inode] = qvar[k]; + q[(nnodes * k) + inode] = qvar[k]; } } } diff --git a/src/exchangeAMRDonors.C b/src/exchangeAMRDonors.C index 35f5cc4..fc085dd 100644 --- a/src/exchangeAMRDonors.C +++ b/src/exchangeAMRDonors.C @@ -136,9 +136,9 @@ void tioga::exchangeAMRDonors() sndPack[procid].realData[realcount[procid]++] = mb->rxyzCart[3 * i]; sndPack[procid].realData[realcount[procid]++] = - mb->rxyzCart[3 * i + 1]; + mb->rxyzCart[(3 * i) + 1]; sndPack[procid].realData[realcount[procid]++] = - mb->rxyzCart[3 * i + 2]; + mb->rxyzCart[(3 * i) + 2]; } } } @@ -148,9 +148,9 @@ void tioga::exchangeAMRDonors() if (mb->donorId[i] != -1) { procid = imap[mb->isearch[3 * i]]; sndPack[procid].intData[intcount[procid]++] = - mb->isearch[3 * i + 1]; + mb->isearch[(3 * i) + 1]; sndPack[procid].intData[intcount[procid]++] = - mb->isearch[3 * i + 2]; + mb->isearch[(3 * i) + 2]; sndPack[procid].intData[intcount[procid]++] = mb->meshtag; sndPack[procid].intData[intcount[procid]++] = i; sndPack[procid].intData[intcount[procid]++] = ib; @@ -258,9 +258,9 @@ void tioga::exchangeAMRDonors() cb[i].getCancellationData(cancelledData, &ncancel); for (j = 0; j < ncancel; j++) { procid = cancelledData[4 * j]; - ctype = cancelledData[4 * j + 1]; - remoteid = cancelledData[4 * j + 2]; - remoteblockid = cancelledData[4 * j + 3]; + ctype = cancelledData[(4 * j) + 1]; + remoteid = cancelledData[(4 * j) + 2]; + remoteblockid = cancelledData[(4 * j) + 3]; sndPack[procid].intData[intcount[procid]++] = ctype; sndPack[procid].intData[intcount[procid]++] = remoteid; sndPack[procid].intData[intcount[procid]++] = remoteblockid; diff --git a/src/exchangeBoxes.C b/src/exchangeBoxes.C index 11c0473..9998a27 100644 --- a/src/exchangeBoxes.C +++ b/src/exchangeBoxes.C @@ -240,9 +240,9 @@ void tioga::exchangeBoxes() int const roff = idxOffset[k] * 6; int const key_recv = - mxtgsqr * ip + maxtag * (mtags[ib] - 1) + obbID[ob] - 1; + (mxtgsqr * ip) + (maxtag * (mtags[ib] - 1)) + obbID[ob] - 1; int const key_send = - mxtgsqr * myid + maxtag * (obbID[ob] - 1) + (mtags[ib] - 1); + (mxtgsqr * myid) + (maxtag * (obbID[ob] - 1)) + (mtags[ib] - 1); intBoxMap[key_recv] = static_cast(i); ibProcMap[k][ioff] = static_cast(i); obblist[i].comm_idx = k; @@ -253,8 +253,8 @@ void tioga::exchangeBoxes() sndPack[k].intData[static_cast(3 * ioff)] = key_send; // mb->getMeshTag(); - sndPack[k].intData[3 * ioff + 1] = ib; - sndPack[k].intData[3 * ioff + 2] = mb->getMeshTag(); + sndPack[k].intData[(3 * ioff) + 1] = ib; + sndPack[k].intData[(3 * ioff) + 2] = mb->getMeshTag(); // mb->getReducedOBB2(&obbRecv[ob], &(sndPack[k].realData[roff])); mb->getReducedOBB(&obbRecv[ob], &(sndPack[k].realData[roff])); diff --git a/src/exchangeDonors.C b/src/exchangeDonors.C index cc2637e..d1e9b52 100644 --- a/src/exchangeDonors.C +++ b/src/exchangeDonors.C @@ -154,8 +154,8 @@ void tioga::exchangeDonors() for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { int const k = donorRecords[n][3 * i]; - sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 1]; - sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 2]; + sndPack[k].intData[ixOffset[k]++] = donorRecords[n][(3 * i) + 1]; + sndPack[k].intData[ixOffset[k]++] = donorRecords[n][(3 * i) + 2]; sndPack[k].realData[rxOffset[k]++] = receptorResolution[n][i]; } } @@ -224,8 +224,8 @@ void tioga::exchangeDonors() for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { int const k = donorRecords[n][3 * i]; - sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 1]; - sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 2]; + sndPack[k].intData[ixOffset[k]++] = donorRecords[n][(3 * i) + 1]; + sndPack[k].intData[ixOffset[k]++] = donorRecords[n][(3 * i) + 2]; } } // @@ -274,8 +274,8 @@ void tioga::exchangeDonors() for (int n = 0; n < nblocks; n++) { for (int i = 0; i < nrecords[n]; i++) { int const k = donorRecords[n][3 * i]; - sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 1]; - sndPack[k].intData[ixOffset[k]++] = donorRecords[n][3 * i + 2]; + sndPack[k].intData[ixOffset[k]++] = donorRecords[n][(3 * i) + 1]; + sndPack[k].intData[ixOffset[k]++] = donorRecords[n][(3 * i) + 2]; } } // diff --git a/src/exchangeSearchData.C b/src/exchangeSearchData.C index a61fdd7..766652d 100644 --- a/src/exchangeSearchData.C +++ b/src/exchangeSearchData.C @@ -231,7 +231,7 @@ void tioga::exchangeSearchData(int at_points) mb->isearch[ioff++] = k; mb->isearch[ioff++] = rcvPack[k].intData[m++]; mb->isearch[ioff++] = obblist[ii].iblk_remote; - mb->tagsearch[ioff / 3 - 1] = obblist[ii].tag_remote; + mb->tagsearch[(ioff / 3) - 1] = obblist[ii].tag_remote; #ifdef TIOGA_HAS_NODEGID std::memcpy( From 239a3daea0cac6112f3f3d23c70a787ce404affb Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Tue, 17 Dec 2024 12:47:31 -0700 Subject: [PATCH 12/17] static_cast --- src/CartBlock.C | 9 ++++++--- src/CartGrid.C | 11 +++++++---- src/MeshBlock.C | 9 ++++++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/CartBlock.C b/src/CartBlock.C index b4c58d0..8b21f80 100644 --- a/src/CartBlock.C +++ b/src/CartBlock.C @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include "TiogaMeshInfo.h" #include "codetypes.h" #include "CartBlock.h" @@ -30,7 +32,6 @@ #include "linCartInterp.h" #include "linklist.h" #include "tioga_utils.h" -#include void CartBlock::registerData(int lid, TIOGA::AMRMeshInfo* minfo) { @@ -112,7 +113,8 @@ void CartBlock::getInterpolatedData( for (i = 0; i < listptr->nweights; i++) { int const cell_index = (cart_utils::get_cell_index( - dims[0], dims[1], nf, listptr->inode[3 * i], + dims[0], dims[1], nf, + listptr->inode[static_cast(3 * i)], listptr->inode[(3 * i) + 1], listptr->inode[(3 * i) + 2])); for (n = 0; n < nvar_cell; n++) { weight = listptr->weights[i]; @@ -169,7 +171,8 @@ void CartBlock::preprocess(CartGrid* cg) for (int n = 0; n < 3; n++) { dx[n] = cg->dx[(3 * global_id) + n]; } - dims[0] = cg->ihi[3 * global_id] - cg->ilo[3 * global_id] + 1; + dims[0] = cg->ihi[static_cast(3 * global_id)] - + cg->ilo[static_cast(3 * global_id)] + 1; dims[1] = cg->ihi[(3 * global_id) + 1] - cg->ilo[(3 * global_id) + 1] + 1; dims[2] = cg->ihi[(3 * global_id) + 2] - cg->ilo[(3 * global_id) + 2] + 1; nf = cg->nf; diff --git a/src/CartGrid.C b/src/CartGrid.C index 0027452..308258a 100644 --- a/src/CartGrid.C +++ b/src/CartGrid.C @@ -23,6 +23,7 @@ #include #include #include +#include #include "tioga_gpu.h" #include "TiogaMeshInfo.h" @@ -221,17 +222,19 @@ void CartGrid::search(double* x, int* donorid, int npts) } } } - if (myid == 2 && abs(x[3 * i] - 0.739573) < 1e-5 && + if (myid == 2 && + abs(x[static_cast(3 * i)] - 0.739573) < 1e-5 && abs(x[(3 * i) + 1] + 0.259310) < 1e-5 && abs(x[(3 * i) + 2] + 0.639614) < 1e-5) { printf( - "%d %d %f %f %f %d\n", myid, i, x[3 * i], x[(3 * i) + 1], + "%d %d %f %f %f %d\n", myid, i, + x[static_cast(3 * i)], x[(3 * i) + 1], x[(3 * i) + 2], donorid[i]); } if (donorid[i] == -1) { printf( - "%d %f %f %f\n", myid, x[3 * i], x[(3 * i) + 1], - x[(3 * i) + 2]); + "%d %f %f %f\n", myid, x[static_cast(3 * i)], + x[(3 * i) + 1], x[(3 * i) + 2]); } } // printf("CartGrid::search Processor %d located %d of %d diff --git a/src/MeshBlock.C b/src/MeshBlock.C index 1c99aa6..24a8d0b 100644 --- a/src/MeshBlock.C +++ b/src/MeshBlock.C @@ -988,7 +988,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) for (i = 0; i < nc[n]; i++) { if (nvert == 4) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 2] + ba, @@ -1008,7 +1009,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) vconn[n][(nvert * i) + 4] + ba); } else if (nvert == 6) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 2] + ba, @@ -1018,7 +1020,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) vconn[n][(nvert * i) + 5] + ba); } else if (nvert == 8) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 3] + ba, From f8dfa2da76c4c526a8b0d9c81df28ca4cfdd7495 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Tue, 17 Dec 2024 16:01:47 -0700 Subject: [PATCH 13/17] static_cast --- src/CartBlock.C | 10 ++++++---- src/MeshBlock.C | 3 ++- src/MeshBlock.h | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/CartBlock.C b/src/CartBlock.C index 8b21f80..da2812f 100644 --- a/src/CartBlock.C +++ b/src/CartBlock.C @@ -260,10 +260,12 @@ void CartBlock::insertInInterpList( } if (donor_frac == nullptr) { listptr->nweights = 8; - listptr->weights = - (double*)malloc(sizeof(double) * (listptr->nweights * 2)); - listptr->inode = - (int*)malloc(sizeof(int) * (listptr->nweights * 2 * 3)); + listptr->weights = (double*)malloc( + sizeof(double) * + (static_cast(listptr->nweights * 2))); + listptr->inode = (int*)malloc( + sizeof(int) * + (static_cast(listptr->nweights * 2 * 3))); cart_interp::linear_interpolation( nf, ix, dims, rst, &(listptr->nweights), listptr->inode, diff --git a/src/MeshBlock.C b/src/MeshBlock.C index 24a8d0b..b8a189a 100644 --- a/src/MeshBlock.C +++ b/src/MeshBlock.C @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include "mpi.h" #include "codetypes.h" #include "MeshBlock.h" @@ -32,7 +34,6 @@ #include "linklist.h" #include "tioga_math.h" #include "tioga_utils.h" -#include void MeshBlock::setData( int btag, diff --git a/src/MeshBlock.h b/src/MeshBlock.h index 41cafdd..9eeb216 100644 --- a/src/MeshBlock.h +++ b/src/MeshBlock.h @@ -493,8 +493,8 @@ class MeshBlock void outputOrphan(FILE* fp, int i) { fprintf( - fp, "%f %f %f\n", rxyz[3 * i], rxyz[(3 * i) + 1], - rxyz[(3 * i) + 2]); + fp, "%f %f %f\n", rxyz[static_cast(3 * i)], + rxyz[(3 * i) + 1], rxyz[(3 * i) + 2]); } void clearOrphans(HOLEMAP* holemap, int nmesh, const int* itmp); void clearOrphans(ADAPTIVE_HOLEMAP* holemap, int nmesh, int* itmp); From 7acc22c1729475d49fb84dd86ccba88db1b478b2 Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Tue, 17 Dec 2024 16:21:54 -0700 Subject: [PATCH 14/17] Removing inline specifiers from implicitly inlined functions to eliminate the warning readability-redundant-inline-specifier --- src/MeshBlock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MeshBlock.h b/src/MeshBlock.h index 9eeb216..eb6ad36 100644 --- a/src/MeshBlock.h +++ b/src/MeshBlock.h @@ -515,8 +515,8 @@ class MeshBlock void setCartIblanks(); // Getters - inline int getMeshTag() const { return meshtag + (1 - BASE); } - inline int getWallFlag() const { return static_cast(nwbc > 0); } + int getMeshTag() const { return meshtag + (1 - BASE); } + int getWallFlag() const { return static_cast(nwbc > 0); } /** * Get donor packet for multi-block/partition setups From 3d8c2c1f16a09006e54c1199afa917347a662def Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Tue, 17 Dec 2024 16:55:01 -0700 Subject: [PATCH 15/17] static_cast() instances in MeshBlock.C --- src/MeshBlock.C | 63 ++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/src/MeshBlock.C b/src/MeshBlock.C index b8a189a..04fb785 100644 --- a/src/MeshBlock.C +++ b/src/MeshBlock.C @@ -781,8 +781,8 @@ void MeshBlock::writeGridFile(int bid) ncells); for (i = 0; i < nnodes; i++) { fprintf( - fp, "%.14e %.14e %.14e %d\n", x[3 * i], x[(3 * i) + 1], - x[(3 * i) + 2], iblank[i]); + fp, "%.14e %.14e %.14e %d\n", x[static_cast(3 * i)], + x[(3 * i) + 1], x[(3 * i) + 2], iblank[i]); } ba = 1 - BASE; @@ -791,7 +791,8 @@ void MeshBlock::writeGridFile(int bid) for (i = 0; i < nc[n]; i++) { if (nvert == 4) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 2] + ba, @@ -801,7 +802,8 @@ void MeshBlock::writeGridFile(int bid) vconn[n][(nvert * i) + 3] + ba); } else if (nvert == 5) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 3] + ba, @@ -811,7 +813,8 @@ void MeshBlock::writeGridFile(int bid) vconn[n][(nvert * i) + 4] + ba); } else if (nvert == 6) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 2] + ba, @@ -821,7 +824,8 @@ void MeshBlock::writeGridFile(int bid) vconn[n][(nvert * i) + 5] + ba); } else if (nvert == 8) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 3] + ba, @@ -860,7 +864,7 @@ void MeshBlock::writeCellFile(int bid) fp, "VARLOCATION = (1=NODAL, 2=NODAL, 3=NODAL, 4=NODAL,5=CELLCENTERED)\n"); for (i = 0; i < nnodes; i++) { - fprintf(fp, "%lf\n", x[3 * i]); + fprintf(fp, "%lf\n", x[static_cast(3 * i)]); } for (i = 0; i < nnodes; i++) { fprintf(fp, "%lf\n", x[(3 * i) + 1]); @@ -880,7 +884,8 @@ void MeshBlock::writeCellFile(int bid) for (i = 0; i < nc[n]; i++) { if (nvert == 4) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 2] + ba, @@ -890,7 +895,8 @@ void MeshBlock::writeCellFile(int bid) vconn[n][(nvert * i) + 3] + ba); } else if (nvert == 5) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 3] + ba, @@ -900,7 +906,8 @@ void MeshBlock::writeCellFile(int bid) vconn[n][(nvert * i) + 4] + ba); } else if (nvert == 6) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 2] + ba, @@ -910,7 +917,8 @@ void MeshBlock::writeCellFile(int bid) vconn[n][(nvert * i) + 5] + ba); } else if (nvert == 8) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 3] + ba, @@ -963,8 +971,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) if (type == 0) { for (i = 0; i < nnodes; i++) { fprintf( - fp, "%lf %lf %lf %d %d ", x[3 * i], x[(3 * i) + 1], - x[(3 * i) + 2], ibl[i], meshtag); + fp, "%lf %lf %lf %d %d ", x[static_cast(3 * i)], + x[(3 * i) + 1], x[(3 * i) + 2], ibl[i], meshtag); for (j = 0; j < nvar; j++) { fprintf(fp, "%lf ", q[(i * nvar) + j]); } @@ -975,8 +983,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) } else { for (i = 0; i < nnodes; i++) { fprintf( - fp, "%lf %lf %lf %d %d ", x[3 * i], x[(3 * i) + 1], - x[(3 * i) + 2], ibl[i], meshtag); + fp, "%lf %lf %lf %d %d ", x[static_cast(3 * i)], + x[(3 * i) + 1], x[(3 * i) + 2], ibl[i], meshtag); for (j = 0; j < nvar; j++) { fprintf(fp, "%lf ", q[(j * nnodes) + i]); } @@ -1000,7 +1008,8 @@ void MeshBlock::writeFlowFile(int bid, double* q, int nvar, int type) vconn[n][(nvert * i) + 3] + ba); } else if (nvert == 5) { fprintf( - fp, "%d %d %d %d %d %d %d %d\n", vconn[n][nvert * i] + ba, + fp, "%d %d %d %d %d %d %d %d\n", + vconn[n][static_cast(nvert * i)] + ba, vconn[n][(nvert * i) + 1] + ba, vconn[n][(nvert * i) + 2] + ba, vconn[n][(nvert * i) + 3] + ba, @@ -1406,9 +1415,9 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect( // get node indices and coordinates for this boundary face // load 1st three nodes - double* pt1 = &x[3 * inode[0]]; - double* pt2 = &x[3 * inode[1]]; - double* pt3 = &x[3 * inode[2]]; + double* pt1 = &x[static_cast(3 * inode[0])]; + double* pt2 = &x[static_cast(3 * inode[1])]; + double* pt3 = &x[static_cast(3 * inode[2])]; // test triangle 1: pass first 3 triangles if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt3) != 0) { @@ -1419,7 +1428,7 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect( // if quad, test second triangle using last node nvert = (inode[3] == -1) ? 3 : 4; // number of face vertices if (nvert == 4) { - double* pt4 = &x[3 * inode[3]]; + double* pt4 = &x[static_cast(3 * inode[3])]; if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt4) != 0) { tagList[j] = 1; break; // jump to next octant (break from inner BC loop) @@ -1524,9 +1533,9 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect( // get node indices and coordinates for this boundary face // load 1st three nodes - double* pt1 = &x[3 * inode[0]]; - double* pt2 = &x[3 * inode[1]]; - double* pt3 = &x[3 * inode[2]]; + double* pt1 = &x[static_cast(3 * inode[0])]; + double* pt2 = &x[static_cast(3 * inode[1])]; + double* pt3 = &x[static_cast(3 * inode[2])]; // test triangle 1: pass first 3 triangles if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt3) != 0) { @@ -1537,7 +1546,7 @@ void MeshBlock::markBoundaryAdaptiveMapSurfaceIntersect( // if quad, test second triangle using last node nvert = (inode[3] == -1) ? 3 : 4; // number of face vertices if (nvert == 4) { - double* pt4 = &x[3 * inode[3]]; + double* pt4 = &x[static_cast(3 * inode[3])]; if (triBoxOverlap(boxcenter, halfdx, pt1, pt2, pt4) != 0) { tagList[j] = 1; break; // jump to next octant (break from inner BC loop) @@ -2265,7 +2274,7 @@ void MeshBlock::create_hex_cell_map() double xd[3]; int idx[3]; for (int j = 0; j < 3; j++) { - int const lnode = vconn[0][8 * i] - BASE; + int const lnode = vconn[0][static_cast(8 * i)] - BASE; int const tnode = vconn[0][(8 * i) + 6] - BASE; xc[j] = 0.5 * (x[(3 * lnode) + j] + x[(3 * tnode) + j]); } @@ -2312,8 +2321,8 @@ void MeshBlock::checkOrphans() if (nodeRes[i] >= std::numeric_limits::max()) { if (iblank[i] == 1) { fprintf( - fp, "%f %f %f %f\n", x[3 * i], x[(3 * i) + 1], - x[(3 * i) + 2], nodeRes[i]); + fp, "%f %f %f %f\n", x[static_cast(3 * i)], + x[(3 * i) + 1], x[(3 * i) + 2], nodeRes[i]); norphan++; } } From 6372bd2de482e2c33d7525b00136cf0104ccab1d Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Thu, 19 Dec 2024 12:45:07 -0700 Subject: [PATCH 16/17] Changing enum to define in tioga.h --- src/tioga.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tioga.h b/src/tioga.h index 495e860..31bcb1a 100644 --- a/src/tioga.h +++ b/src/tioga.h @@ -34,11 +34,11 @@ * meshes containing element and node IDs greater than what a 4-byte signed int * can support */ -enum : uint8_t { TIOGA_HAS_UINT64T = 1 }; +#define TIOGA_HAS_UINT64T 1 /** Define a macro entry flagging whether TIOGA has hetereogenous execution * space support, and uses the new API for registering mesh/solution data */ -enum : uint8_t { TIOGA_HAS_NGP_IFACE = 1 }; +#define TIOGA_HAS_NGP_IFACE 1 /** * Topology Independent Overset Grid Assembler (TIOGA) From cde51b0ff2b0a28f840ae50d6f6312694a8472cf Mon Sep 17 00:00:00 2001 From: Ilker Topcuoglu Date: Thu, 26 Dec 2024 13:31:01 -0700 Subject: [PATCH 17/17] Fixing enum declarations --- src/TiogaMeshInfo.h | 2 +- src/codetypes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TiogaMeshInfo.h b/src/TiogaMeshInfo.h index 4722d58..12d4787 100644 --- a/src/TiogaMeshInfo.h +++ b/src/TiogaMeshInfo.h @@ -24,7 +24,7 @@ struct MeshBlockInfo static constexpr int max_vertex_types = 4; using GlobalIDType = uint64_t; - enum QVarType : uint8_t { ROW = 0, COL }; + enum QVarType : uint8_t { ROW = 0, COL = 1 }; TiogaView wall_ids; TiogaView overset_ids; diff --git a/src/codetypes.h b/src/codetypes.h index c737662..e082cf8 100644 --- a/src/codetypes.h +++ b/src/codetypes.h @@ -69,7 +69,7 @@ enum : uint8_t { INTERSECT_ALG = 1 }; // 1 // [0] wbc nodes are NOT listed as obc nodes // // [1] wbc nodes may also be listed as obc nodes -enum : uint8_t { NON_UNIQUE_NODES }; +enum : uint8_t { NON_UNIQUE_NODES = 1 }; /* Fixed Octree Constraints: Do Not Change */ #define OCTANT_MAXLEVEL 30 // 32-bit integer #define OCTANT_CHILDREN 8