guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-05 07:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed cubic, Use cube from CosmoTool

Browse source
This commit is contained in:
Guilhem Lavaux 2012-11-30 07:39:11 -05:00
parent 5783109225
commit 4c5159823a
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
c_tools/mock/generateMock.cpp
View file

@ -11,6 +11,7 @@
#include <CosmoTool/loadSimu.hpp> #include <CosmoTool/loadSimu.hpp>
#include <CosmoTool/interpolate.hpp> #include <CosmoTool/interpolate.hpp>
#include <CosmoTool/fortran.hpp> #include <CosmoTool/fortran.hpp>
#include <CosmoTool/algo.hpp>
#include "generateMock_conf.h" #include "generateMock_conf.h"
#include "gslIntegrate.hpp" #include "gslIntegrate.hpp"
#include <netcdfcpp.h> #include <netcdfcpp.h>
@ -23,9 +24,6 @@ using boost::format;
#define LIGHT_SPEED 299792.458 #define LIGHT_SPEED 299792.458
typedef boost::function2<void, SimuData*, double*> MetricFunctor; typedef boost::function2<void, SimuData*, double*> MetricFunctor;
{
return a*a*a;
}
struct TotalExpansion struct TotalExpansion
{ {
@ -33,7 +31,7 @@ struct TotalExpansion
double operator()(double z) double operator()(double z)
{ {
return 1/sqrt(Omega_M*cubic(1+z) + Omega_L); return 1/sqrt(Omega_M*cube(1+z) + Omega_L);
} }
}; };

2
c_tools/mock/loaders/multidark_loader.cpp
View file

@ -41,7 +41,7 @@ public:
return 0; return 0;
ifstream fp(darkname.c_str()); ifstream fp(darkname.c_str());
SimuData *simu; SimuData *simu = new SimuData;
fp >> simu->BoxSize >> simu->Omega_M >> simu->Hubble >> simu->time >> simu->NumPart; fp >> simu->BoxSize >> simu->Omega_M >> simu->Hubble >> simu->time >> simu->NumPart;
simu->time = 1./(1.+simu->time); // convert to scale factor simu->time = 1./(1.+simu->time); // convert to scale factor