--- trunk/gadget/gadget.cc	2015/07/23 19:00:38	11
+++ trunk/gadget/gadget.cc	2015/07/24 18:36:24	12
@@ -6,12 +6,11 @@
 #include "stochasticdata.h"
 #include "interrupthandler.h"
 #include "global.h"
-#ifdef GADGET_OPENMP
+#ifndef NO_OPENMP
 #include <omp.h>
 #endif
 
 Ecosystem* EcoSystem;
-//FIXME need?
 StochasticData* data = 0;
 Ecosystem** EcoSystems;
 
@@ -150,40 +149,18 @@
 		  EcoSystem->writeStatus(main.getPrintInitialFile());
 	  	  }
 
-	  if (main.runOmp())
-	  {
-#ifdef GADGET_OPENMP
-		  int numThr = omp_get_max_threads ( );
-		  //FIXME OJO! ml
-		  EcoSystems = new Ecosystem*[numThr];
-		  int i;
-		  //EcoSystems[0] = EcoSystem;
-		  for (i=0; i<numThr; i++)
-		  {
-			  EcoSystems[i] = new Ecosystem(main);
-			  EcoSystems[i]->Update(data);
-			  EcoSystems[i]->Initialise();
-		  }
-		  EcoSystem->OptimiseOMP();
-		  //////optimiseOMP main.runPrint()
-#endif
-
-	  } else {
 #ifndef NO_OPENMP
-		  int numThr = omp_get_max_threads ( );
-		  //FIXME OJO! ml
-		  EcoSystems = new Ecosystem*[numThr];
-		  int i;
-		  //EcoSystems[0] = EcoSystem;
-		  for (i=0; i<numThr; i++)
-		  {
-			  EcoSystems[i] = new Ecosystem(main);
-			  EcoSystems[i]->Update(data);
-			  EcoSystems[i]->Initialise();
-		  }
-#endif
-		EcoSystem->Optimise();
+	  int numThr = omp_get_max_threads ( );
+	  EcoSystems = new Ecosystem*[numThr];
+	  int i;
+	  for (i=0; i<numThr; i++)
+	  {
+		  EcoSystems[i] = new Ecosystem(main);
+		  EcoSystems[i]->Update(data);
+		  EcoSystems[i]->Initialise();
 	  }
+#endif
+	  EcoSystem->Optimise();
 	  delete data;
 	  if (main.getForcePrint())
 		  EcoSystem->Simulate(main.getForcePrint());