mirror of
https://github.com/cosmo-sims/MUSIC.git
synced 2024-09-19 17:03:46 +02:00
added new parameter 'tipsy_eps_gas' to set the force softening separately for the gas in the TIPSY/PKDgrav/Gasoline plugin
This commit is contained in:
parent
2de9c8e730
commit
99581697f0
1 changed files with 11 additions and 3 deletions
|
@ -80,7 +80,7 @@ protected:
|
|||
size_t npartmax_;
|
||||
bool bmorethan2bnd_;
|
||||
bool bmultimass_;
|
||||
double epsfac_, epsfac_coarse_;
|
||||
double epsfac_, epsfac_coarse_, epsfac_gas_;
|
||||
double boxsize_;
|
||||
double astart_;
|
||||
double omegam_;
|
||||
|
@ -231,6 +231,11 @@ protected:
|
|||
{
|
||||
return pow(m/omegam_,0.333333333333)*epsfac_coarse_;
|
||||
}
|
||||
|
||||
inline T_store mass2eps_gas( T_store& m )
|
||||
{
|
||||
return pow(m/omegab_,0.333333333333)*epsfac_gas_;
|
||||
}
|
||||
|
||||
void combine_components_for_coarse( void )
|
||||
{
|
||||
|
@ -459,7 +464,7 @@ protected:
|
|||
fwrite( &zero, sizeof(zero), 1, fp_); // rho
|
||||
fwrite( &temperature, sizeof(temperature), 1, fp_); // temp
|
||||
|
||||
T_store eps = mass2eps( tmp7[i] );
|
||||
T_store eps = mass2eps_gas( tmp7[i] );
|
||||
|
||||
fwrite( &eps, sizeof(eps), 1, fp_);
|
||||
fwrite( &zero, sizeof(zero), 1, fp_);
|
||||
|
@ -480,7 +485,7 @@ protected:
|
|||
xdr_dump(&xdrs, &zero ); // rho
|
||||
xdr_dump(&xdrs, &temperature ); // temp
|
||||
|
||||
T_store eps = mass2eps( tmp7[i] );
|
||||
T_store eps = mass2eps_gas( tmp7[i] );
|
||||
|
||||
xdr_dump(&xdrs, &eps ); // epsilon / hsmooth
|
||||
xdr_dump(&xdrs, &zero ); // metals
|
||||
|
@ -644,8 +649,11 @@ public:
|
|||
omegam_ = cf.getValue<double>("cosmology","Omega_m");
|
||||
omegab_ = cf.getValue<double>("cosmology","Omega_b");
|
||||
boxsize_ = cf.getValue<double>("setup","boxlength");
|
||||
|
||||
epsfac_ = cf.getValueSafe<double>("output","tipsy_eps",0.05);
|
||||
epsfac_coarse_ = cf.getValueSafe<double>("output","tipsy_eps_coarse",epsfac_);
|
||||
epsfac_gas_ = cf.getValueSafe<double>("output","tipsy_eps_gas",epsfac_);
|
||||
|
||||
H0_ = cf.getValue<double>("cosmology","H0");
|
||||
YHe_ = cf.getValueSafe<double>("cosmology","YHe",0.248);
|
||||
gamma_ = cf.getValueSafe<double>("cosmology","gamma",5.0/3.0);
|
||||
|
|
Loading…
Reference in a new issue