diff --git a/configure.ac b/configure.ac index b3c55ff1f84b80ce98e79cf7e5eb3075310d75c8..ac4a3e8f19c27b157ab0522862de645d2882e03d 100644 --- a/configure.ac +++ b/configure.ac @@ -2135,6 +2135,9 @@ case "$with_potential" in nfw) AC_DEFINE([EXTERNAL_POTENTIAL_NFW], [1], [Navarro-Frenk-White external potential]) ;; + nfw_mn) + AC_DEFINE([EXTERNAL_POTENTIAL_NFW_MN], [1], [Navarro-Frenk-White + Miyamoto-Nagai disk external potential]) + ;; disc-patch) AC_DEFINE([EXTERNAL_POTENTIAL_DISC_PATCH], [1], [Disc-patch external potential]) ;; diff --git a/examples/parameter_example.yml b/examples/parameter_example.yml index c05a8285fc1fdb0860089137701f7ac9877009aa..b5179809aeb3a7b802ce7647d415796c2077e56a 100644 --- a/examples/parameter_example.yml +++ b/examples/parameter_example.yml @@ -310,6 +310,19 @@ NFWPotential: critical_density: 127.4 # Critical density (internal units). timestep_mult: 0.01 # Dimensionless pre-factor for the time-step condition, basically determines fraction of orbital time we need to do an integration step +# NFW + Miyamoto-Nagai disk potential +NFW_MNPotential: + useabspos: 0 # 0 -> positions based on centre, 1 -> absolute positions + position: [0.,0.,0.] # Location of centre of isothermal potential with respect to centre of the box (if 0) otherwise absolute (if 1) (internal units) + timestep_mult: 0.01 # Dimensionless pre-factor for the time-step condition, basically determines the fraction of the orbital time we use to do the time integration + epsilon: 0.01 # Softening size (internal units) + concentration: 10.0 # concentration of the Halo + M_200: 150.0 # M200 of the galaxy disk (internal units) + critical_density: 1.37E-8 # Critical density of the Universe (internal units) + Mdisk: 3.0 # Mass of the disk (internal units) + Rdisk: 4.0 # Effective radius of the disk (internal units) + Zdisk: 0.4704911 # Scale-height of the disk (internal units) + # Disk-patch potential parameters. The potential is along the x-axis. DiscPatchPotential: surface_density: 10. # Surface density of the disc (internal units)