Fixed size_t issue

sphexa-org · Jun 12, 2023 · a7d7d74 · a7d7d74
1 parent f4d8ea3
commit a7d7d74
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/domain/test/unit_cuda/traversal/groups.cu b/domain/test/unit_cuda/traversal/groups.cu
@@ -142,7 +142,7 @@ TEST(TargetGroups, makeSplits)
             ret[1] = b;
             return ret;
         }
-        else { return SplitType{(b << 32) + a}; } // NOLINT
+        else { return SplitType{GpuConfig::ThreadMask(b << 32) + a}; } // NOLINT
     };
 
     {

diff --git a/main/src/io/ifile_io_ascii.hpp b/main/src/io/ifile_io_ascii.hpp
@@ -67,7 +67,7 @@ class AsciiWriterNew : public IFileWriter
 
     void stepAttribute(const std::string& key, FieldType val, int64_t /*size*/) override
     {
-        if (key == "iteration") { iterationStep_ = *std::get<const size_t*>(val); }
+        if (key == "iteration") { iterationStep_ = *std::get<const int64_t*>(val); }
     }
 
     void writeField(const std::string& /*key*/, FieldType field, int col) override
@@ -124,11 +124,11 @@ class AsciiWriterNew : public IFileWriter
 
 private:
     MPI_Comm                       comm_;
-    size_t                         firstIndexStep_, lastIndexStep_;
+    int64_t                        firstIndexStep_, lastIndexStep_;
     std::string                    pathStep_;
     std::vector<int>               columns_;
     std::vector<Base::FieldVector> stepBuffer_;
-    size_t                         iterationStep_;
+    int64_t                        iterationStep_;
 };
 
 } // namespace sphexa
diff --git a/main/src/sphexa/sphexa.cpp b/main/src/sphexa/sphexa.cpp
@@ -127,10 +127,10 @@ int main(int argc, char** argv)
     if (rank == 0 && writeEnabled) { fileWriter->constants(simInit->constants(), outFile); }
     if (rank == 0) { std::cout << "Data generated for " << d.numParticlesGlobal << " global particles\n"; }
 
-    size_t bucketSizeFocus = 64;
+    uint64_t bucketSizeFocus = 64;
     // we want about 100 global nodes per rank to decompose the domain with +-1% accuracy
-    size_t bucketSize = std::max(bucketSizeFocus, d.numParticlesGlobal / (100 * numRanks));
-    Domain domain(rank, numRanks, bucketSize, bucketSizeFocus, theta, box);
+    uint64_t bucketSize = std::max(bucketSizeFocus, d.numParticlesGlobal / (100 * numRanks));
+    Domain   domain(rank, numRanks, bucketSize, bucketSizeFocus, theta, box);
 
     propagator->sync(domain, simData);
     if (rank == 0) std::cout << "Domain synchronized, nLocalParticles " << d.x.size() << std::endl;

diff --git a/sph/include/sph/particles_data.hpp b/sph/include/sph/particles_data.hpp
@@ -77,8 +77,8 @@ class ParticlesData : public cstone::FieldStates<ParticlesData<T, KeyType_, AccT
     ParticlesData()                     = default;
     ParticlesData(const ParticlesData&) = delete;
 
-    size_t iteration{1};
-    size_t numParticlesGlobal;
+    uint64_t iteration{1};
+    uint64_t numParticlesGlobal;
 
     //! @brief default mean desired number of neighbors per particle, can be overriden per test case or input file
     unsigned ng0{100};
@@ -147,7 +147,7 @@ class ParticlesData : public cstone::FieldStates<ParticlesData<T, KeyType_, AccT
     }
 
     //! @brief non-stateful variables for statistics
-    size_t totalNeighbors;
+    uint64_t totalNeighbors;
 
     /*! @brief Particle fields
      *