From e585417297269f56cf7ba112efebad637c8eeb4a Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Thu, 25 Jul 2024 13:10:10 -0600 Subject: [PATCH 1/2] Fix readability-make-member-function-const. --- src/MeshBlock.C | 2 +- src/MeshBlock.h | 18 +++++++++--------- src/bookKeeping.C | 12 +++++++----- src/dataUpdate.C | 2 +- src/highOrder.C | 2 +- src/parallelComm.C | 6 +++--- src/parallelComm.h | 6 +++--- src/tioga.h | 4 ++-- 8 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/MeshBlock.C b/src/MeshBlock.C index e0ade9b..3b508c3 100644 --- a/src/MeshBlock.C +++ b/src/MeshBlock.C @@ -1898,7 +1898,7 @@ void MeshBlock::getQueryPoints2( TIOGA_FREE(inode); } -void MeshBlock::writeOBB(int bid) +void MeshBlock::writeOBB(int bid) const { FILE* fp; char intstring[12]; diff --git a/src/MeshBlock.h b/src/MeshBlock.h index 2f58a9a..28f6696 100644 --- a/src/MeshBlock.h +++ b/src/MeshBlock.h @@ -311,13 +311,13 @@ class MeshBlock void search(); void search_uniform_hex(); - void writeOBB(int bid); + void writeOBB(int bid) const; void writeOBB2(OBB* obc, int bid); - void updateSolnData(int inode, double* qvar, double* q); + void updateSolnData(int inode, double* qvar, double* q) const; - int getNinterp() { return ninterp; }; + int getNinterp() const { return ninterp; }; void getInterpolatedSolution( int* nints, @@ -384,7 +384,7 @@ class MeshBlock /** routines that do book keeping */ - void getDonorPacket(PACKET* sndPack, int nsend); + void getDonorPacket(PACKET* sndPack, int nsend) const; void initializeDonorList(); @@ -426,9 +426,9 @@ class MeshBlock void clearIblanks(); - void getStats(int mstat[2]); + void getStats(int mstat[2]) const; - void setIblanks(int inode); + void setIblanks(int inode) const; void getDonorCount(int* dcount, int* fcount); @@ -490,7 +490,7 @@ class MeshBlock double** realData, double* q, int nvar, - int interptype); + int interptype) const; void updatePointData(double* q, double* qtmp, int nvar, int interptype); void outputOrphan(FILE* fp, int i) { @@ -523,9 +523,9 @@ class MeshBlock * Get donor packet for multi-block/partition setups * */ - void getMBDonorPktSizes(std::vector&, std::vector&); + void getMBDonorPktSizes(std::vector&, std::vector&) const; - void getMBDonorPackets(std::vector&, std::vector&, PACKET*); + void getMBDonorPackets(std::vector&, std::vector&, PACKET*) const; /** Reset interpolation list data structure * diff --git a/src/bookKeeping.C b/src/bookKeeping.C index 534d0ca..6df5eb7 100644 --- a/src/bookKeeping.C +++ b/src/bookKeeping.C @@ -29,7 +29,7 @@ #include "tioga_math.h" #include "tioga_utils.h" -void MeshBlock::getDonorPacket(PACKET* sndPack, int nsend) +void MeshBlock::getDonorPacket(PACKET* sndPack, int nsend) const { int i, k; int* icount; @@ -72,7 +72,7 @@ void MeshBlock::getDonorPacket(PACKET* sndPack, int nsend) } void MeshBlock::getMBDonorPktSizes( - std::vector& nints, std::vector& nreals) + std::vector& nints, std::vector& nreals) const { for (int i = 0; i < nsearch; i++) { if (donorId[i] > -1) { @@ -84,7 +84,9 @@ void MeshBlock::getMBDonorPktSizes( } void MeshBlock::getMBDonorPackets( - std::vector& ixOffset, std::vector& rxOffset, PACKET* sndPack) + std::vector& ixOffset, + std::vector& rxOffset, + PACKET* sndPack) const { for (int i = 0; i < nsearch; i++) { if (donorId[i] < 0) { @@ -877,7 +879,7 @@ void MeshBlock::clearIblanks() } } -void MeshBlock::getStats(int mstats[2]) +void MeshBlock::getStats(int mstats[2]) const { int i; mstats[0] = mstats[1] = 0; @@ -891,7 +893,7 @@ void MeshBlock::getStats(int mstats[2]) } } -void MeshBlock::setIblanks(int inode) +void MeshBlock::setIblanks(int inode) const { /* if (fabs(nodeRes[inode]-BIGVALUE) < TOL) { diff --git a/src/dataUpdate.C b/src/dataUpdate.C index 8e16df1..9c54615 100644 --- a/src/dataUpdate.C +++ b/src/dataUpdate.C @@ -111,7 +111,7 @@ void MeshBlock::getInterpolatedSolution( if (qq != nullptr) TIOGA_FREE(qq); } -void MeshBlock::updateSolnData(int inode, double* qvar, double* q) +void MeshBlock::updateSolnData(int inode, double* qvar, double* q) const { int k; diff --git a/src/highOrder.C b/src/highOrder.C index 0f8c08d..8077212 100644 --- a/src/highOrder.C +++ b/src/highOrder.C @@ -411,7 +411,7 @@ void MeshBlock::getInterpolatedSolutionAtPoints( double** realData, double* q, int nvar, - int interptype) + int interptype) const { int i; int k, m, inode; diff --git a/src/parallelComm.C b/src/parallelComm.C index 89a4c9a..3182278 100644 --- a/src/parallelComm.C +++ b/src/parallelComm.C @@ -25,7 +25,7 @@ #include "parallelComm.h" #define REAL double -void parallelComm::sendRecvPacketsAll(PACKET* sndPack, PACKET* rcvPack) +void parallelComm::sendRecvPacketsAll(PACKET* sndPack, PACKET* rcvPack) const { int i; int *sint, *sreal, *rint, *rreal; @@ -403,7 +403,7 @@ void parallelComm::getMap(int* ns, int* nr, int** snd, int** rcv) return; } -void parallelComm::clearPackets(PACKET* sndPack, PACKET* rcvPack) +void parallelComm::clearPackets(PACKET* sndPack, PACKET* rcvPack) const { int i; // @@ -422,7 +422,7 @@ void parallelComm::clearPackets(PACKET* sndPack, PACKET* rcvPack) // } -void parallelComm::initPackets(PACKET* sndPack, PACKET* rcvPack) +void parallelComm::initPackets(PACKET* sndPack, PACKET* rcvPack) const { int i; // diff --git a/src/parallelComm.h b/src/parallelComm.h index 18b5d33..79ccce5 100644 --- a/src/parallelComm.h +++ b/src/parallelComm.h @@ -61,7 +61,7 @@ class parallelComm } } - void sendRecvPacketsAll(PACKET* sndPack, PACKET* rcvPack); + void sendRecvPacketsAll(PACKET* sndPack, PACKET* rcvPack) const; void sendRecvPackets(PACKET* sndPack, PACKET* rcvPack); @@ -71,9 +71,9 @@ class parallelComm void getMap(int* ns, int* nr, int** snd, int** rcv); - void initPackets(PACKET* sndPack, PACKET* rcvPack); + void initPackets(PACKET* sndPack, PACKET* rcvPack) const; - void clearPackets(PACKET* sndPack, PACKET* rcvPack); + void clearPackets(PACKET* sndPack, PACKET* rcvPack) const; }; #endif /* PARALLELCOMM_H */ diff --git a/src/tioga.h b/src/tioga.h index 8ab705d..81b8ac9 100644 --- a/src/tioga.h +++ b/src/tioga.h @@ -156,7 +156,7 @@ class tioga void assembleCompositeComms(); void assembleCompositeMap(); - int getNumCompositeBodies() { return ncomposite; } + int getNumCompositeBodies() const { return ncomposite; } void setNumCompositeBodies(int ncomposite); void registerCompositeBody( @@ -241,7 +241,7 @@ class tioga /** set hole map algorithm: [0] original hole map, [1] adaptive hole map */ void setHoleMapAlgorithm(int alg) { USE_ADAPTIVE_HOLEMAP = alg; }; - int getHoleMapAlgorithm() { return USE_ADAPTIVE_HOLEMAP; }; + int getHoleMapAlgorithm() const { return USE_ADAPTIVE_HOLEMAP; }; /** set symmetry bc */ void setSymmetry(int syminput) { isym = syminput; }; /** set resolutions for nodes and cells */ From ce169f2a6eeba03f52ebece73cb1e66f08edcfc2 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Thu, 25 Jul 2024 13:12:49 -0600 Subject: [PATCH 2/2] Suppress bugprone-easily-swappable-parameters. --- .clang-tidy | 1 + 1 file changed, 1 insertion(+) diff --git a/.clang-tidy b/.clang-tidy index d6dbcaa..d03b1c4 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,6 +1,7 @@ --- Checks: 'bugprone-*, -bugprone-exception-escape, + -bugprone-easily-swappable-parameters, clang-diagnostic-*, clang-analyzer-*, corecppguidelines-*,