diff --git a/apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp b/apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp index 69ee5767cb6c76995e21c2d6ea6262e58c148a75..8244182d18d410c1583d90f58212bc4987c7c9a5 100644 --- a/apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp +++ b/apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp @@ -178,7 +178,7 @@ int main(int argc, char* argv[]) intHelper.selectBlocks(); if (myid == 0) - VF_LOG_INFO("{}", Utilities::toString(grid, comm->getNumberOfProcesses())); + VF_LOG_INFO("{}", utilities::toString(grid, comm->getNumberOfProcesses())); // Generate grid SetKernelBlockVisitor kernelVisitor(kernel, viscosityLB); @@ -204,10 +204,10 @@ int main(int argc, char* argv[]) UBLOG(logINFO, "Preprocess - end"); - UBLOG(logINFO, "Total Physical Memory (RAM): " << Utilities::getTotalPhysMem() / 1e9 << " GB"); - UBLOG(logINFO, "Physical Memory currently used: " << Utilities::getPhysMemUsed() / 1e9 << " GB"); + UBLOG(logINFO, "Total Physical Memory (RAM): " << utilities::getTotalPhysMem() / 1e9 << " GB"); + UBLOG(logINFO, "Physical Memory currently used: " << utilities::getPhysMemUsed() / 1e9 << " GB"); UBLOG(logINFO, - "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1e9 << " GB"); + "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1e9 << " GB"); // Create coprocessor object for writing macroscopic quantities to VTK-file SPtr<UbScheduler> visSch(new UbScheduler(timeStepOut)); diff --git a/src/cpu/core/Connectors/CoarseToFineVectorConnector.h b/src/cpu/core/Connectors/CoarseToFineVectorConnector.h index b7becf19e5bf1ecb9e528ac1cb5508d2dbb30b0e..340b09433532c0723facce209f4d16aad6d5a446 100644 --- a/src/cpu/core/Connectors/CoarseToFineVectorConnector.h +++ b/src/cpu/core/Connectors/CoarseToFineVectorConnector.h @@ -806,11 +806,11 @@ void CoarseToFineVectorConnector<VectorTransmitter>::getLocalMinMax(const int &g if (dataDistribution) dCoef = 1; - if (Utilities::isOdd(gMax)) { + if (utilities::isOdd(gMax)) { halfEven = gMax / 2; halfOdd = gMax / 2; } - if (Utilities::isEven(gMax)) { + if (utilities::isEven(gMax)) { halfEven = gMax / 2; halfOdd = gMax / 2 - 1 + dCoef; } diff --git a/src/cpu/core/Connectors/FineToCoarseVectorConnector.h b/src/cpu/core/Connectors/FineToCoarseVectorConnector.h index 6c4f0a1ccdb7181ba749dc2a0245c5c8c4a5d1cc..af303e56b8f0483f30bdf5ca666e2d084616c814 100644 --- a/src/cpu/core/Connectors/FineToCoarseVectorConnector.h +++ b/src/cpu/core/Connectors/FineToCoarseVectorConnector.h @@ -845,7 +845,7 @@ void FineToCoarseVectorConnector<VectorTransmitter>::writeICellCtoData(vector_ty template <typename VectorTransmitter> void FineToCoarseVectorConnector<VectorTransmitter>::getLocalMinMaxCF(int gMax, int &lMin, int &lMax) { - if (Utilities::isOdd(gMax)) { + if (utilities::isOdd(gMax)) { if (connType == OddEvenSE || connType == OddOddNE) { lMin = 1; lMax = gMax; @@ -1447,10 +1447,10 @@ void FineToCoarseVectorConnector<VectorTransmitter>::getLocalMinMax(int &minX1, template <typename VectorTransmitter> void FineToCoarseVectorConnector<VectorTransmitter>::getLocalOffsets(const int &gMax, int &oMin) { - if (Utilities::isEven(gMax)) { + if (utilities::isEven(gMax)) { oMin = 0; } - if (Utilities::isOdd(gMax)) { + if (utilities::isOdd(gMax)) { oMin = -1; } } diff --git a/src/cpu/core/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp b/src/cpu/core/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp index 8a90d52321d0632657328a37dff9e92e2b203286..a941801e343bb33a7168cefe9e9f51b5296532db 100644 --- a/src/cpu/core/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp +++ b/src/cpu/core/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp @@ -155,7 +155,7 @@ void MPIIOMigrationBESimulationObserver::writeDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeDataSet start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } bool multiPhase1 = false; @@ -321,7 +321,7 @@ void MPIIOMigrationBESimulationObserver::writeDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeDataSet start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -460,7 +460,7 @@ void MPIIOMigrationBESimulationObserver::write4DArray(int step, Arrays arrayType if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write4DArray start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } for (int level = minInitLevel; level <= maxInitLevel; level++) @@ -511,7 +511,7 @@ void MPIIOMigrationBESimulationObserver::write4DArray(int step, Arrays arrayType if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write4DArray start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } // register new MPI-type depending on the block-specific information @@ -576,7 +576,7 @@ void MPIIOMigrationBESimulationObserver::write3DArray(int step, Arrays arrayType if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write3DArray start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } for (int level = minInitLevel; level <= maxInitLevel; level++) @@ -625,7 +625,7 @@ void MPIIOMigrationBESimulationObserver::write3DArray(int step, Arrays arrayType if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write3DArray start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } // register new MPI-type depending on the block-specific information @@ -672,7 +672,7 @@ void MPIIOMigrationBESimulationObserver::writeBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeBoundaryConds start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } int blocksCount = 0; // quantity of blocks, that belong to this process @@ -767,7 +767,7 @@ void MPIIOMigrationBESimulationObserver::writeBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeBoundaryConds start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -1034,7 +1034,7 @@ void MPIIOMigrationBESimulationObserver::readDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } bool multiPhase1 = false; @@ -1125,7 +1125,7 @@ void MPIIOMigrationBESimulationObserver::readDataSet(int step) finish = MPI_Wtime(); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet start of exchange of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } std::vector<real>* rawDataReceiveF = new std::vector<real>[size]; @@ -1155,7 +1155,7 @@ void MPIIOMigrationBESimulationObserver::readDataSet(int step) finish = MPI_Wtime(); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } //-------------------------------------- restore blocks --------------------------------- @@ -1263,7 +1263,7 @@ void MPIIOMigrationBESimulationObserver::readDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet end of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } //------------------------------------------------------------- @@ -1325,7 +1325,7 @@ void MPIIOMigrationBESimulationObserver::readArray(int step, Arrays arrType, std if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -1374,7 +1374,7 @@ void MPIIOMigrationBESimulationObserver::readArray(int step, Arrays arrType, std finish = MPI_Wtime(); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray start of exchange of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } std::vector<real> *rawDataReceive = new std::vector<real>[size]; @@ -1389,7 +1389,7 @@ void MPIIOMigrationBESimulationObserver::readArray(int step, Arrays arrType, std UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray end of exchange of data, rank = " << rank); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } //----------------------------- restore data --------------------------------- @@ -1473,7 +1473,7 @@ void MPIIOMigrationBESimulationObserver::readArray(int step, Arrays arrType, std if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray end of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } } @@ -1486,7 +1486,7 @@ void MPIIOMigrationBESimulationObserver::readBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -1533,7 +1533,7 @@ void MPIIOMigrationBESimulationObserver::readBoundaryConds(int step) finish = MPI_Wtime(); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds start of exchange of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } std::vector<int> *rawDataReceive = new std::vector<int>[size]; @@ -1614,7 +1614,7 @@ void MPIIOMigrationBESimulationObserver::readBoundaryConds(int step) UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds end of exchange of data, rank = " << rank); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } filename = path + "/mpi_io_cp/mpi_io_cp_" + ub_system::toString(step) + "/cpBC2.bin"; @@ -1726,7 +1726,7 @@ void MPIIOMigrationBESimulationObserver::readBoundaryConds(int step) finish = MPI_Wtime(); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds end of restore of data, rank = " << rank); UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds time: " << finish - start << " s"); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } } diff --git a/src/cpu/core/SimulationObservers/MPIIOMigrationSimulationObserver.cpp b/src/cpu/core/SimulationObservers/MPIIOMigrationSimulationObserver.cpp index fcac2f12a8f89b563da26d41ce5167554b559fd0..19c9bbf9dbea1ad24a3391091df57fafc70723b0 100644 --- a/src/cpu/core/SimulationObservers/MPIIOMigrationSimulationObserver.cpp +++ b/src/cpu/core/SimulationObservers/MPIIOMigrationSimulationObserver.cpp @@ -173,7 +173,7 @@ void MPIIOMigrationSimulationObserver::writeDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeDataSet start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } bool multiPhase1 = false; @@ -355,7 +355,7 @@ void MPIIOMigrationSimulationObserver::writeDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeDataSet start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } real start {0.}; @@ -502,7 +502,7 @@ void MPIIOMigrationSimulationObserver::write4DArray(int step, Arrays arrayType, if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write4DArray start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } bool firstBlock = true; @@ -564,7 +564,7 @@ void MPIIOMigrationSimulationObserver::write4DArray(int step, Arrays arrayType, if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write4DArray start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -632,7 +632,7 @@ void MPIIOMigrationSimulationObserver::write3DArray(int step, Arrays arrayType, if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write3DArray start collect data to file = " << fname); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } bool firstBlock = true; @@ -691,7 +691,7 @@ void MPIIOMigrationSimulationObserver::write3DArray(int step, Arrays arrayType, if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write3DArray start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -744,7 +744,7 @@ void MPIIOMigrationSimulationObserver::writeBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeBoundaryConds start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } int blocksCount = 0; // quantity of blocks, that belong to this process @@ -840,7 +840,7 @@ void MPIIOMigrationSimulationObserver::writeBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeBoundaryConds start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: "<< Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: "<< utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -954,7 +954,7 @@ void MPIIOMigrationSimulationObserver::readDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readDataSet start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } real start {0.}; @@ -1080,7 +1080,7 @@ void MPIIOMigrationSimulationObserver::readDataSet(int step) finish = MPI_Wtime(); UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readDataSet time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readDataSet start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } size_t index = 0; @@ -1184,7 +1184,7 @@ void MPIIOMigrationSimulationObserver::readDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readDataSet end of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } delete[] dataSetArray; @@ -1238,7 +1238,7 @@ void MPIIOMigrationSimulationObserver::readArray(int step, Arrays arrType, std:: if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readArray start fname = " << fname); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } real start {0.}; @@ -1300,7 +1300,7 @@ void MPIIOMigrationSimulationObserver::readArray(int step, Arrays arrType, std:: finish = MPI_Wtime(); UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readArray readArray: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readArray start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } //----------------------------- restore data --------------------------------- @@ -1374,7 +1374,7 @@ void MPIIOMigrationSimulationObserver::readArray(int step, Arrays arrType, std:: if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readArray end of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } delete[] dataSetSmallArray; @@ -1389,7 +1389,7 @@ void MPIIOMigrationSimulationObserver::readBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readBoundaryConds start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -1431,7 +1431,7 @@ void MPIIOMigrationSimulationObserver::readBoundaryConds(int step) finish = MPI_Wtime(); UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readBoundaryConds time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readBoundaryConds start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } MPI_File_read_at(file_handler, (MPI_Offset)0, &boundCondParamStr, 1, boundCondParamType, MPI_STATUS_IGNORE); @@ -1533,7 +1533,7 @@ void MPIIOMigrationSimulationObserver::readBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readBoundaryConds end of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } } diff --git a/src/cpu/core/SimulationObservers/MPIIORestartSimulationObserver.cpp b/src/cpu/core/SimulationObservers/MPIIORestartSimulationObserver.cpp index fd16fc338c200b0a646a346766dc668805756da9..e7088afc6912ec9615a33b49774c6ce4239bac04 100644 --- a/src/cpu/core/SimulationObservers/MPIIORestartSimulationObserver.cpp +++ b/src/cpu/core/SimulationObservers/MPIIORestartSimulationObserver.cpp @@ -178,7 +178,7 @@ void MPIIORestartSimulationObserver::writeDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::writeDataSet start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } bool multiPhase1 = false; @@ -362,7 +362,7 @@ void MPIIORestartSimulationObserver::writeDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::writeDataSet start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } // write to the file @@ -522,7 +522,7 @@ void MPIIORestartSimulationObserver::write4DArray(int step, Arrays arrayType, st if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::writeAverageDensityArray start collect data to file = " << fname); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } bool firstBlock = true; @@ -587,7 +587,7 @@ void MPIIORestartSimulationObserver::write4DArray(int step, Arrays arrayType, st if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::write4DArray start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } // write to the file @@ -673,7 +673,7 @@ void MPIIORestartSimulationObserver::write3DArray(int step, Arrays arrayType, st if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::write3DArray start collect data to file = " << fname); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } bool firstBlock = true; @@ -735,7 +735,7 @@ void MPIIORestartSimulationObserver::write3DArray(int step, Arrays arrayType, st if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::write3DArray start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } // write to the file @@ -809,7 +809,7 @@ void MPIIORestartSimulationObserver::writeBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::writeBoundaryConds start collect data rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } int blocksCount = 0; // quantity of blocks in the grid, max 2147483648 blocks! @@ -942,7 +942,7 @@ void MPIIORestartSimulationObserver::writeBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::writeBoundaryConds start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -1027,7 +1027,7 @@ void MPIIORestartSimulationObserver::readDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::readDataSet start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } @@ -1128,7 +1128,7 @@ void MPIIORestartSimulationObserver::readDataSet(int step) finish = MPI_Wtime(); UBLOG(logINFO, "MPIIORestartSimulationObserver::readDataSet time: " << finish - start << " s"); UBLOG(logINFO, "MPIIORestartSimulationObserver::readDataSet start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } size_t index = 0; @@ -1229,7 +1229,7 @@ void MPIIORestartSimulationObserver::readDataSet(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::readDataSet end of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } delete[] dataSetArray; @@ -1283,7 +1283,7 @@ void MPIIORestartSimulationObserver::readArray(int step, Arrays arrType, std::st if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::readArray start fname = " << fname); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } real start{ 0. }; @@ -1347,7 +1347,7 @@ void MPIIORestartSimulationObserver::readArray(int step, Arrays arrType, std::st finish = MPI_Wtime(); UBLOG(logINFO, "MPIIORestartSimulationObserver::readArray time: " << finish - start << " s"); UBLOG(logINFO, "MPIIORestartSimulationObserver::readArray start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } //----------------------------- restore data --------------------------------- @@ -1422,7 +1422,7 @@ void MPIIORestartSimulationObserver::readArray(int step, Arrays arrType, std::st if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::readArray end of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } delete[] dataSetSmallArray; @@ -1437,7 +1437,7 @@ void MPIIORestartSimulationObserver::readBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::readBoundaryConds start MPI IO rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } real start {0.}; @@ -1512,7 +1512,7 @@ void MPIIORestartSimulationObserver::readBoundaryConds(int step) finish = MPI_Wtime(); UBLOG(logINFO, "MPIIORestartSimulationObserver::readBoundaryConds time: " << finish - start << " s"); UBLOG(logINFO, "MPIIORestartSimulationObserver::readBoundaryConds start of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } int index = 0, index1 = 0, index2 = 0; @@ -1584,7 +1584,7 @@ void MPIIORestartSimulationObserver::readBoundaryConds(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIORestartSimulationObserver::readBoundaryConds end of restore of data, rank = " << rank); - UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + UBLOG(logINFO, "Physical Memory currently used by current process: " << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } } ////////////////////////////////////////////////////////////////////////// diff --git a/src/cpu/core/SimulationObservers/MPIIOSimulationObserver.cpp b/src/cpu/core/SimulationObservers/MPIIOSimulationObserver.cpp index 1ab7c063aa9108c385bb97968f8411ac4ebc7480..fdf79f84a2863c15795c13b85c9b49bcb873ac07 100644 --- a/src/cpu/core/SimulationObservers/MPIIOSimulationObserver.cpp +++ b/src/cpu/core/SimulationObservers/MPIIOSimulationObserver.cpp @@ -126,7 +126,7 @@ void MPIIOSimulationObserver::writeBlocks(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOSimulationObserver::writeBlocksToFile start collect data rank = " << rank); UBLOG(logINFO, "Physical Memory currently used by current process: " - << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } int blocksCount = 0; // quantity of all the blocks in the grid, max 2147483648 blocks! @@ -222,7 +222,7 @@ void MPIIOSimulationObserver::writeBlocks(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOSimulationObserver::writeBlocksToFile start MPI IO rank = " << rank); UBLOG(logINFO, "Physical Memory currently used by current process: " - << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } // write to the file @@ -272,7 +272,7 @@ void MPIIOSimulationObserver::readBlocks(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOSimulationObserver::readBlocks start MPI IO rank = " << rank); UBLOG(logINFO, "Physical Memory currently used by current process: " - << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } real start {0.}; @@ -312,7 +312,7 @@ void MPIIOSimulationObserver::readBlocks(int step) UBLOG(logINFO, "MPIIOSimulationObserver::readBlocks time: " << finish - start << " s"); UBLOG(logINFO, "MPIIOSimulationObserver::readBlocks start of restore of data, rank = " << rank); UBLOG(logINFO, "Physical Memory currently used by current process: " - << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } // clear the grid @@ -394,7 +394,7 @@ void MPIIOSimulationObserver::readBlocks(int step) if (comm->isRoot()) { UBLOG(logINFO, "MPIIOSimulationObserver::readBlocks end of restore of data, rank = " << rank); UBLOG(logINFO, "Physical Memory currently used by current process: " - << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); + << utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB"); } } diff --git a/src/cpu/core/Utilities/ChangeRandomQs.hpp b/src/cpu/core/Utilities/ChangeRandomQs.hpp index b10617ec2db38ecb93b96fb783397d6d5bcdc524..64c5349e29b9398a0f847d09eabbed247e115098 100644 --- a/src/cpu/core/Utilities/ChangeRandomQs.hpp +++ b/src/cpu/core/Utilities/ChangeRandomQs.hpp @@ -26,7 +26,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright © VirtualFluids Project contributors, see AUTHORS.md in root folder // -//! \addtogroup cpu_Utilities Utilities +//! \addtogroup cpu_Utilities utilities //! \ingroup cpu_core core //! \{ //! \author Konstantin Kutscher @@ -41,7 +41,7 @@ #include "BCArray3D.h" #include "BCSet.h" -namespace Utilities +namespace utilities { void ChangeRandomQs(SPtr<IntegrateValuesHelper> integrateValues) { diff --git a/src/cpu/core/Utilities/MathUtil.hpp b/src/cpu/core/Utilities/MathUtil.hpp index dce9ecca3cb5adfcd24275d905cdede9fa146e32..0da7de883ac06facfd6d5ffe81563fd3871bf580 100644 --- a/src/cpu/core/Utilities/MathUtil.hpp +++ b/src/cpu/core/Utilities/MathUtil.hpp @@ -26,7 +26,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright © VirtualFluids Project contributors, see AUTHORS.md in root folder // -//! \addtogroup cpu_Utilities Utilities +//! \addtogroup cpu_Utilities utilities //! \ingroup cpu_core core //! \{ #ifndef MATHUTIL_H @@ -35,7 +35,7 @@ #include <math.h> #include "muParser.h" -namespace Utilities +namespace utilities { static bool isEven( int integer ) { diff --git a/src/cpu/core/Utilities/MemoryUtil.h b/src/cpu/core/Utilities/MemoryUtil.h index c0140c3d7f34d8a20971e70d7ed27da279c324b3..67d318fabba18bfbd71e7a433b16f410bf31e297 100644 --- a/src/cpu/core/Utilities/MemoryUtil.h +++ b/src/cpu/core/Utilities/MemoryUtil.h @@ -26,7 +26,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright © VirtualFluids Project contributors, see AUTHORS.md in root folder // -//! \addtogroup cpu_Utilities Utilities +//! \addtogroup cpu_Utilities utilities //! \ingroup cpu_core core //! \{ //! \author Konstantin Kutscher @@ -72,7 +72,7 @@ ////////////////////////////////////////////////////////////////////////// // MemoryUtil ////////////////////////////////////////////////////////////////////////// -namespace Utilities +namespace utilities { ////////////////////////////////////////////////////////////////////////// static long long getTotalPhysMem() @@ -205,7 +205,7 @@ static std::string toString(SPtr<Grid3D> grid, int numberOfProcesses) return out.str(); } -} // namespace Utilities +} // namespace utilities #endif diff --git a/src/cpu/core/Utilities/VoxelMatrixUtil.hpp b/src/cpu/core/Utilities/VoxelMatrixUtil.hpp index ab337e35762ea1bdd808c4b915e01a7eaeb146e9..d54c31e46c97175d678bd29e0b52d08ae58d2d3e 100644 --- a/src/cpu/core/Utilities/VoxelMatrixUtil.hpp +++ b/src/cpu/core/Utilities/VoxelMatrixUtil.hpp @@ -26,7 +26,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright © VirtualFluids Project contributors, see AUTHORS.md in root folder // -//! \addtogroup cpu_Utilities Utilities +//! \addtogroup cpu_Utilities utilities //! \ingroup cpu_core core //! \{ //! \author Konstantin Kutscher @@ -43,7 +43,7 @@ #include "Grid3D.h" -namespace Utilities +namespace utilities { void voxelMatrixDiscretisation(SPtr<GbVoxelMatrix3D> matrix, std::string& pathname, int myid, int fileCounter, SPtr<Grid3D> grid, int bounceBackOption, bool vmFile) { diff --git a/src/cpu/core/Visitors/SetKernelBlockVisitor.cpp b/src/cpu/core/Visitors/SetKernelBlockVisitor.cpp index f6730647e5565e481ffba70d0d223bd040ac20f2..197b7c052b2044af316992b02eccf9bec9f2a0cd 100644 --- a/src/cpu/core/Visitors/SetKernelBlockVisitor.cpp +++ b/src/cpu/core/Visitors/SetKernelBlockVisitor.cpp @@ -111,7 +111,7 @@ void SetKernelBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block) void SetKernelBlockVisitor::throwExceptionIfNotEnoughMemory(const SPtr<Grid3D> &grid) { - auto availableMemory = Utilities::getTotalPhysMem(); + auto availableMemory = utilities::getTotalPhysMem(); auto requiredMemory = getRequiredPhysicalMemory(grid); if (requiredMemory > availableMemory) throw UbException(UB_EXARGS, "SetKernelBlockVisitor: Not enough memory!!! Rank = " + ub_system::toString(grid->getRank())); diff --git a/src/gpu/core/Utilities/ScalingUtilities.h b/src/gpu/core/Utilities/ScalingUtilities.h index c0cfe5f9d91db423394130694074919396c47b90..70275f43423e62ef0703eac85cdf8c002b8f239e 100644 --- a/src/gpu/core/Utilities/ScalingUtilities.h +++ b/src/gpu/core/Utilities/ScalingUtilities.h @@ -26,7 +26,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright © VirtualFluids Project contributors, see AUTHORS.md in root folder // -//! \addtogroup gpu_Utilities Utilities +//! \addtogroup gpu_Utilities utilities //! \ingroup gpu_core core //! \{ //! \author Martin Schoenherr, Anna Wellmann