From d788be62e32a9adcf8dcd00a8bfa1bcae38ea6d0 Mon Sep 17 00:00:00 2001
From: Berenger Bramas <Berenger.Bramas@inria.fr>
Date: Thu, 5 Mar 2015 10:26:42 +0100
Subject: [PATCH] Add a way to test using particles from random or file
---
Tests/noDist/testBlockedChebyshev.cpp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/Tests/noDist/testBlockedChebyshev.cpp b/Tests/noDist/testBlockedChebyshev.cpp
index 676b4c80e..53f487b05 100644
--- a/Tests/noDist/testBlockedChebyshev.cpp
+++ b/Tests/noDist/testBlockedChebyshev.cpp
@@ -80,19 +80,28 @@ int main(int argc, char* argv[]){
// Get params
const int NbLevels = FParameters::getValue(argc,argv,FParameterDefinitions::OctreeHeight.options, 5);
const int groupSize = FParameters::getValue(argc,argv,LocalOptionBlocSize.options, 250);
- const char* const filename = FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, "../Data/test20k.fma");
// Load the particles
- //FRandomLoader loader(FParameters::getValue(argc,argv,FParameterDefinitions::NbParticles.options, 20), 1.0, FPoint(0,0,0), 0);
+//#define RANDOM_PARTICLES
+#ifdef RANDOM_PARTICLES
+ FRandomLoader loader(FParameters::getValue(argc,argv,FParameterDefinitions::NbParticles.options, 2000), 1.0, FPoint(0,0,0), 0);
+#else
+ const char* const filename = FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, "../Data/test20k.fma");
FFmaGenericLoader loader(filename);
+#endif
FAssertLF(loader.isOpen());
FTic timer;
FP2PParticleContainer<> allParticles;
for(int idxPart = 0 ; idxPart < loader.getNumberOfParticles() ; ++idxPart){
- FReal physicalValue;
FPoint particlePosition;
+ FReal physicalValue;
+#ifdef RANDOM_PARTICLES
+ physicalValue = 0.10;
+ loader.fillParticle(&particlePosition);
+#else
loader.fillParticle(&particlePosition, &physicalValue);
+#endif
allParticles.push(particlePosition, physicalValue);
}
std::cout << "Particles loaded in " << timer.tacAndElapsed() << "s\n";
--
GitLab