From 4c5159823a60aca3c9ec9e31cfe17557063e5502 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <guilhem.lavaux@gmail.com>
Date: Fri, 30 Nov 2012 07:39:11 -0500
Subject: [PATCH] Removed cubic, Use cube from CosmoTool

---
 c_tools/mock/generateMock.cpp             | 6 ++----
 c_tools/mock/loaders/multidark_loader.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/c_tools/mock/generateMock.cpp b/c_tools/mock/generateMock.cpp
index f1832a4..6dd3ef8 100644
--- a/c_tools/mock/generateMock.cpp
+++ b/c_tools/mock/generateMock.cpp
@@ -11,6 +11,7 @@
 #include <CosmoTool/loadSimu.hpp>
 #include <CosmoTool/interpolate.hpp>
 #include <CosmoTool/fortran.hpp>
+#include <CosmoTool/algo.hpp>
 #include "generateMock_conf.h"
 #include "gslIntegrate.hpp"
 #include <netcdfcpp.h>
@@ -23,9 +24,6 @@ using boost::format;
 #define LIGHT_SPEED 299792.458
 
 typedef boost::function2<void, SimuData*, double*> MetricFunctor;
-{
-  return a*a*a;
-}
 
 struct TotalExpansion
 {
@@ -33,7 +31,7 @@ struct TotalExpansion
 
   double operator()(double z)
   {
-    return 1/sqrt(Omega_M*cubic(1+z) + Omega_L);
+    return 1/sqrt(Omega_M*cube(1+z) + Omega_L);
   }
 };
 
diff --git a/c_tools/mock/loaders/multidark_loader.cpp b/c_tools/mock/loaders/multidark_loader.cpp
index b37e4ef..9509c64 100644
--- a/c_tools/mock/loaders/multidark_loader.cpp
+++ b/c_tools/mock/loaders/multidark_loader.cpp
@@ -41,7 +41,7 @@ public:
       return 0;
 
     ifstream fp(darkname.c_str());
-    SimuData *simu;
+    SimuData *simu = new SimuData;
 
     fp >> simu->BoxSize >> simu->Omega_M >> simu->Hubble >> simu->time >> simu->NumPart;
     simu->time = 1./(1.+simu->time); // convert to scale factor