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

Merge branch 'master' of bitbucket.org:cosmicvoids/void_identification

Browse source
This commit is contained in:
Guilhem Lavaux 2013-03-31 17:07:36 -04:00
commit 311ac50344
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
c_tools/mock/loaders/sdf_loader.cpp
View file

@ -216,11 +216,14 @@ SimulationLoader *sdfLoader(const std::string& snapshot, int flags,
hdr = new SimuData; hdr = new SimuData;
SDFgetintOrDefault(sdfp, "version", &fileversion, 1); SDFgetintOrDefault(sdfp, "version", &fileversion, 1);
double h0;
if (fileversion == 1) if (fileversion == 1)
{ {
SDFgetfloatOrDie(sdfp, "Omega0", &hdr->Omega_M); SDFgetfloatOrDie(sdfp, "Omega0", &hdr->Omega_M);
SDFgetfloatOrDie(sdfp, "Lambda_prime", &hdr->Omega_Lambda); SDFgetfloatOrDie(sdfp, "Lambda_prime", &hdr->Omega_Lambda);
SDFgetfloatOrDie(sdfp, "H0", &hdr->Hubble); SDFgetfloatOrDie(sdfp, "H0", &hdr->Hubble);
hdr->Hubble *= 1000.*(one_kpc/one_Gyr);
h0 = hdr->Hubble / 100.;
} }
else else
{ {
@ -232,12 +235,10 @@ SimulationLoader *sdfLoader(const std::string& snapshot, int flags,
hdr->Omega_M += Or; hdr->Omega_M += Or;
hdr->Omega_Lambda += Of; hdr->Omega_Lambda += Of;
SDFgetfloatOrDie(sdfp, "H0", &hdr->Hubble); SDFgetfloatOrDie(sdfp, "h_100", &hdr->Hubble);
hdr->Hubble *= 100.;
h0 = hdr->Hubble / 100.;
} }
double h0;
hdr->Hubble *= 1000.0*(one_kpc/one_Gyr);
h0 = hdr->Hubble/100.;
if (SDFhasname("R0", sdfp)) if (SDFhasname("R0", sdfp))
{ {