Commit 1e8dac63 authored by Quentin Khan's avatar Quentin Khan

compilation fix: remove openmp calls from tests that don't use them

Those fixes are needed when FTic does not rely on OpenMP timer.
parent f2662f42
......@@ -83,12 +83,6 @@ int main(int argc, char* argv[])
const unsigned int NbThreads = FParameters::getValue(argc, argv, FParameterDefinitions::NbThreads.options, 1);
const int PeriodicDeep = FParameters::getValue(argc,argv,FParameterDefinitions::PeriodicityNbLevels.options, 3);
#ifdef _OPENMP
omp_set_num_threads(NbThreads);
std::cout << "\n>> Using " << omp_get_max_threads() << " threads.\n" << std::endl;
#else
std::cout << "\n>> Sequential version.\n" << std::endl;
#endif
//
std::cout << "Parameters "<< std::endl
<< "\t Octree Depth \t"<< TreeHeight <<std::endl
......
......@@ -98,20 +98,11 @@ int main(int argc, char* argv[])
const std::string filename(FParameters::getStr(argc,argv,FParameterDefinitions::InputFile.options, "../Data/UTest/unitCubeRef20kDouble.bfma"));
const unsigned int TreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeHeight.options, 5);
const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2);
const unsigned int NbThreads = FParameters::getValue(argc, argv, FParameterDefinitions::NbThreads.options, omp_get_max_threads());
//
#ifdef _OPENMP
omp_set_num_threads(NbThreads);
#else
std::cout << "\n>> Sequential version.\n" << std::
#endif
std::cout << "Parameters "<< std::endl
<< " Octree Depth \t"<< TreeHeight <<std::endl
<< " SubOctree depth \t"<< SubTreeHeight <<std::endl
<< " Input file name: \t" <<filename <<std::endl
<< " Thread number: \t" << NbThreads <<std::endl
<<std::endl;
// init timer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment