Skip to content
Snippets Groups Projects
Commit d78afa03 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'isolated_galaxy_softenings' into 'master'

Update the softening lengths in the isolated galaxy examples to match more…

Closes #616

See merge request !943
parents 80307b7f 33fb192e
Branches
Tags
1 merge request!943Update the softening lengths in the isolated galaxy examples to match more…
...@@ -8,10 +8,10 @@ InternalUnitSystem: ...@@ -8,10 +8,10 @@ InternalUnitSystem:
# Parameters for the self-gravity scheme # Parameters for the self-gravity scheme
Gravity: Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration. eta: 0.025 # Constant dimensionless multiplier for time integration.
theta: 0.7 # Opening angle (Multipole acceptance criterion). theta: 0.7 # Opening angle (Multipole acceptance criterion).
max_physical_DM_softening: 0.1 # Physical softening length (in internal units). max_physical_DM_softening: 0.35 # Physical softening length (in internal units).
max_physical_baryon_softening: 0.1 # Physical softening length (in internal units). max_physical_baryon_softening: 0.35 # Physical softening length (in internal units).
# Parameters governing the time integration (Set dt_min and dt_max to the same value for a fixed time-step run.) # Parameters governing the time integration (Set dt_min and dt_max to the same value for a fixed time-step run.)
TimeIntegration: TimeIntegration:
...@@ -83,7 +83,7 @@ HernquistPotential: ...@@ -83,7 +83,7 @@ HernquistPotential:
diskfraction: 0.040 # Disk mass fraction diskfraction: 0.040 # Disk mass fraction
bulgefraction: 0.014 # Bulge mass fraction bulgefraction: 0.014 # Bulge mass fraction
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 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.1 # Softening size (internal units) epsilon: 0.35 # Softening size (internal units)
# EAGLE star formation parameters # EAGLE star formation parameters
EAGLEStarFormation: EAGLEStarFormation:
......
...@@ -10,8 +10,8 @@ InternalUnitSystem: ...@@ -10,8 +10,8 @@ InternalUnitSystem:
Gravity: Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration. eta: 0.025 # Constant dimensionless multiplier for time integration.
theta: 0.7 # Opening angle (Multipole acceptance criterion). theta: 0.7 # Opening angle (Multipole acceptance criterion).
max_physical_DM_softening: 0.1 # Physical softening length (in internal units). max_physical_DM_softening: 0.2 # Physical softening length (in internal units).
max_physical_baryon_softening: 0.1 # Physical softening length (in internal units). max_physical_baryon_softening: 0.2 # Physical softening length (in internal units).
# Parameters governing the time integration (Set dt_min and dt_max to the same value for a fixed time-step run.) # Parameters governing the time integration (Set dt_min and dt_max to the same value for a fixed time-step run.)
TimeIntegration: TimeIntegration:
...@@ -83,7 +83,7 @@ HernquistPotential: ...@@ -83,7 +83,7 @@ HernquistPotential:
diskfraction: 0.040 # Disk mass fraction diskfraction: 0.040 # Disk mass fraction
bulgefraction: 0.014 # Bulge mass fraction bulgefraction: 0.014 # Bulge mass fraction
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 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) epsilon: 0.2 # Softening size (internal units)
# EAGLE star formation parameters # EAGLE star formation parameters
EAGLEStarFormation: EAGLEStarFormation:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment