fix(openmp): parallel for should use signed type

ViennaTools · Mar 17, 2024 · a5330e4 · a5330e4
1 parent 48245c1
commit a5330e4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/include/viennaps/cellSet/csDenseCellSet.hpp b/include/viennaps/cellSet/csDenseCellSet.hpp
@@ -569,7 +569,7 @@ template <class T, int D> class csDenseCellSet {
     }
 
 #pragma omp parallel for
-    for (unsigned cellIdx = 0; cellIdx < numCells; cellIdx++) {
+    for (int cellIdx = 0; cellIdx < numCells; cellIdx++) {
       auto coord = nodes[cells[cellIdx][0]];
       for (int i = 0; i < D; i++) {
         coord[i] += gridDelta / 2.;
@@ -669,7 +669,7 @@ template <class T, int D> class csDenseCellSet {
     auto numMaterials = materialMap->size();
 
 #pragma omp parallel for
-    for (size_t i = 0; i < matIds->size(); i++) {
+    for (ssize_t i = 0; i < matIds->size(); i++) {
       int materialId = static_cast<int>(matIds->at(i));
       if (!cellSetAboveSurface)
         materialId--;

diff --git a/include/viennaps/cellSet/csSegmentCells.hpp b/include/viennaps/cellSet/csSegmentCells.hpp
@@ -37,7 +37,7 @@ template <class NumericType, int D> class csSegmentCells {
     auto materials = cellSet->getScalarData("Material");
 
 #pragma omp parallel for
-    for (unsigned i = 0; i < materials->size(); ++i) {
+    for (int i = 0; i < materials->size(); ++i) {
       if (!psMaterialMap::isMaterial(materials->at(i), bulkMaterial)) {
         auto neighbors = cellSet->getNeighbors(i);
         for (auto n : neighbors) {

diff --git a/include/viennaps/cellSet/csTracing.hpp b/include/viennaps/cellSet/csTracing.hpp
@@ -140,7 +140,7 @@ template <class T, int D> class csTracing {
     std::vector<T> average(data->size(), 0.);
 
 #pragma omp parallel for
-    for (size_t i = 0; i < data->size(); i++) {
+    for (ssize_t i = 0; i < data->size(); i++) {
       if (data->at(i) < 0) {
         average[i] = -1.;
         continue;
@@ -177,7 +177,7 @@ template <class T, int D> class csTracing {
     }
 
 #pragma omp parallel for
-    for (size_t i = 0; i < data->size(); i++) {
+    for (ssize_t i = 0; i < data->size(); i++) {
       data->at(i) = average[i];
     }
   }
@@ -190,7 +190,7 @@ template <class T, int D> class csTracing {
     std::vector<T> average(data->size(), 0.);
 
 #pragma omp parallel for
-    for (size_t i = 0; i < data->size(); i++) {
+    for (ssize_t i = 0; i < data->size(); i++) {
       if (materialIds->at(i) != materialId)
         continue;
 
@@ -220,7 +220,7 @@ template <class T, int D> class csTracing {
     }
 
 #pragma omp parallel for
-    for (size_t i = 0; i < data->size(); i++) {
+    for (ssize_t i = 0; i < data->size(); i++) {
       data->at(i) = average[i];
     }
   }

diff --git a/include/viennaps/psMeanFreePath.hpp b/include/viennaps/psMeanFreePath.hpp
@@ -185,7 +185,7 @@ template <class NumericType, int D> class psMeanFreePath {
     std::vector<NumericType> result(numCells, 0);
     for (const auto &data : threadLocalData) {
 #pragma omp parallel for
-      for (unsigned i = 0; i < numCells; ++i) {
+      for (int i = 0; i < numCells; ++i) {
         result[i] += data[i];
       }
     }
@@ -194,14 +194,14 @@ template <class NumericType, int D> class psMeanFreePath {
     std::vector<NumericType> hitCounts(numCells, 0);
     for (const auto &data : threadLocalHitCount) {
 #pragma omp parallel for
-      for (unsigned i = 0; i < numCells; ++i) {
+      for (int i = 0; i < numCells; ++i) {
         hitCounts[i] += data[i];
       }
     }
 
     // normalize data
 #pragma omp parallel for
-    for (unsigned i = 0; i < numCells; ++i) {
+    for (int i = 0; i < numCells; ++i) {
       if (hitCounts[i] > 0)
         result[i] = result[i] / hitCounts[i];
       else
@@ -212,7 +212,7 @@ template <class NumericType, int D> class psMeanFreePath {
     auto finalResult = cellSet->addScalarData("MeanFreePath");
     materialIds = cellSet->getScalarData("Material");
 #pragma omp parallel for
-    for (unsigned i = 0; i < numCells; i++) {
+    for (int i = 0; i < numCells; i++) {
       if (!psMaterialMap::isMaterial(materialIds->at(i), material))
         continue;