--- trunk/gadget/ecosystem.cc 2015/09/01 19:14:33 15 +++ trunk/gadget/ecosystem.cc 2015/10/13 11:29:01 16 @@ -1,11 +1,11 @@ #include "ecosystem.h" #include "runid.h" #include "global.h" -#ifndef NO_OPENMP +#ifdef _OPENMP #include #endif -#ifndef NO_OPENMP +#ifdef _OPENMP extern Ecosystem** EcoSystems; //extern StochasticData* data; #endif @@ -111,7 +111,7 @@ void Ecosystem::Optimise() { int i; for (i = 0; i < optvec.Size(); i++) { -#ifndef NO_OPENMP +#ifdef _OPENMP int j, numThr = omp_get_max_threads ( ); DoubleVector v = this->getValues(); for (j = 0; j < numThr; j++) @@ -169,7 +169,7 @@ tmpvec[i] = likevec[i]->getUnweightedLikelihood(); int iters = 0; -#ifndef NO_OPENMP +#ifdef _OPENMP int numThr = omp_get_max_threads ( ); for (i = 0; i < numThr; i++) iters += EcoSystems[i]->getFuncEval();