mirror of
https://github.com/cosmo-sims/MUSIC.git
synced 2024-09-19 17:03:46 +02:00
minor fixes to constraints (experimental feature, still not documented)
This commit is contained in:
parent
24984e5ffa
commit
92524a211e
1 changed files with 4 additions and 2 deletions
|
@ -170,6 +170,7 @@ constraint_set::constraint_set( config_file& cf, transfer_function *ptf )
|
|||
|
||||
unsigned i=0;
|
||||
|
||||
double astart = 1.0/(1.0+pcf_->getValue<unsigned>("setup","zstart"));
|
||||
unsigned levelmin = pcf_->getValue<unsigned>("setup","levelmin");
|
||||
unsigned levelmin_TF = pcf_->getValueSafe<unsigned>("setup","levelmin_TF",levelmin);
|
||||
constr_level_ = pcf_->getValueSafe<unsigned>("constraints","level",levelmin_TF);
|
||||
|
@ -177,7 +178,7 @@ constraint_set::constraint_set( config_file& cf, transfer_function *ptf )
|
|||
constr_level_ = std::max(constr_level_,levelmin_TF);
|
||||
|
||||
double omegam = pcf_->getValue<double>("cosmology","Omega_m");
|
||||
double rhom = omegam*2.77519737e11; //... mean matter density
|
||||
double rhom = omegam*2.77519737e11; //... mean matter density in Msun/Mpc^3
|
||||
|
||||
//... use EdS density for estimation
|
||||
//double rhom = 2.77519737e11;
|
||||
|
@ -218,7 +219,8 @@ constraint_set::constraint_set( config_file& cf, transfer_function *ptf )
|
|||
new_c.Rg = pow((mass/pow(2.*M_PI,1.5)/rhom),1./3.);
|
||||
|
||||
new_c.sigma = 1.686/(pccalc_->CalcGrowthFactor(1./(1.+zcoll))/pccalc_->CalcGrowthFactor(1.0));
|
||||
|
||||
LOGINFO("sigma of constraint : %g", new_c.sigma );
|
||||
new_c.sigma *=pccalc_->CalcGrowthFactor(astart)/pccalc_->CalcGrowthFactor(1.0);
|
||||
LOGINFO("Constraint %d : halo with %g h-1 M_o",i,pow(2.*M_PI,1.5)*rhom*pow(new_c.Rg,3));
|
||||
}
|
||||
else if( new_c.type == peak )
|
||||
|
|
Loading…
Reference in a new issue