From 738848bacb6153c587d8cef13f89a0d80f13a9bb Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <schaller@strw.leidenuniv.nl>
Date: Thu, 18 Jun 2020 14:27:40 +0200
Subject: [PATCH] Updated all the examples to accept the new YAML parameters
---
.../ConstantCosmoVolume/constant_volume.yml | 6 ++++--
.../ZeldovichPancake_3D/zeldovichPancake.yml | 7 ++++---
.../EAGLE_DMO_low_z/EAGLE_DMO_100/eagle_100.yml | 8 +++++---
examples/EAGLE_DMO_low_z/EAGLE_DMO_12/eagle_12.yml | 8 +++++---
examples/EAGLE_DMO_low_z/EAGLE_DMO_25/eagle_25.yml | 8 +++++---
examples/EAGLE_DMO_low_z/EAGLE_DMO_50/eagle_50.yml | 8 +++++---
examples/EAGLE_ICs/EAGLE_12/eagle_12.yml | 9 +++++----
examples/EAGLE_ICs/EAGLE_25/eagle_25.yml | 9 +++++----
examples/EAGLE_ICs/EAGLE_50/eagle_50.yml | 9 +++++----
examples/EAGLE_low_z/EAGLE_100/eagle_100.yml | 9 +++++----
examples/EAGLE_low_z/EAGLE_12/eagle_12.yml | 11 ++++-------
examples/EAGLE_low_z/EAGLE_25/eagle_25.yml | 9 +++++----
examples/EAGLE_low_z/EAGLE_50/eagle_50.yml | 9 +++++----
examples/EAGLE_low_z/EAGLE_6/eagle_6.yml | 5 +----
examples/HydroTests/EvrardCollapse_3D/evrard.yml | 6 ++++--
.../IsolatedGalaxy_NFW_MN/isolated_galaxy.yml | 4 +++-
.../IsolatedGalaxy_dmparticles/isolated_galaxy.yml | 4 +++-
.../IsolatedGalaxy_feedback/isolated_galaxy.yml | 4 +++-
.../IsolatedGalaxy_potential/isolated_galaxy.yml | 4 +++-
.../isolated_galaxy.yml | 4 +++-
.../PMillennium/PMillennium-1536/p-mill-1536.yml | 4 +++-
examples/PMillennium/PMillennium-384/p-mill-384.yml | 6 ++++--
examples/PMillennium/PMillennium-768/p-mill-768.yml | 4 +++-
examples/Planetary/EarthImpact/earth_impact.yml | 5 ++++-
examples/QuickLymanAlpha/L050N0752/qla_50.yml | 10 ++++++----
.../SantaBarbara/SantaBarbara-128/santa_barbara.yml | 7 +++++--
.../SantaBarbara/SantaBarbara-256/santa_barbara.yml | 7 +++++--
.../SmallCosmoVolume_DM/small_cosmo_volume_dm.yml | 6 ++++--
.../small_cosmo_volume.yml | 6 ++++--
.../small_cosmo_volume.yml | 6 ++++--
.../SmallCosmoVolume_cooling/small_cosmo_volume.yml | 6 ++++--
.../SmallCosmoVolume_hydro/small_cosmo_volume.yml | 6 ++++--
.../SubgridTests/PressureFloor/pressureFloor.yml | 13 +++++++------
examples/nIFTyCluster/Baryonic/nifty.yml | 7 +++++--
examples/parameter_example.yml | 4 ++--
src/gravity_properties.c | 2 +-
36 files changed, 147 insertions(+), 93 deletions(-)
diff --git a/examples/Cosmology/ConstantCosmoVolume/constant_volume.yml b/examples/Cosmology/ConstantCosmoVolume/constant_volume.yml
index a6ff72555e..84764d333c 100644
--- a/examples/Cosmology/ConstantCosmoVolume/constant_volume.yml
+++ b/examples/Cosmology/ConstantCosmoVolume/constant_volume.yml
@@ -47,8 +47,10 @@ Scheduler:
Gravity:
mesh_side_length: 32
- eta: 0.025
- theta: 0.3
+ eta: 0.025
+ MAC: adaptive
+ theta_cr: 0.5
+ epsilon_fmm: 0.0001
comoving_DM_softening: 0.08 # 80 kpc = 1/25 of mean inter-particle separation
max_physical_DM_softening: 0.08 # 80 kpc = 1/25 of mean inter-particle separation
comoving_baryon_softening: 0.08 # 80 kpc = 1/25 of mean inter-particle separation
diff --git a/examples/Cosmology/ZeldovichPancake_3D/zeldovichPancake.yml b/examples/Cosmology/ZeldovichPancake_3D/zeldovichPancake.yml
index d43c78972b..5e904fbe07 100644
--- a/examples/Cosmology/ZeldovichPancake_3D/zeldovichPancake.yml
+++ b/examples/Cosmology/ZeldovichPancake_3D/zeldovichPancake.yml
@@ -48,9 +48,10 @@ Scheduler:
Gravity:
mesh_side_length: 32
- eta: 0.025
- theta: 0.3
- r_cut_max: 5.
+ eta: 0.025
+ MAC: adaptive
+ theta_cr: 0.5
+ epsilon_fmm: 0.0001
comoving_DM_softening: 0.001
max_physical_DM_softening: 0.001
comoving_baryon_softening: 0.001
diff --git a/examples/EAGLE_DMO_low_z/EAGLE_DMO_100/eagle_100.yml b/examples/EAGLE_DMO_low_z/EAGLE_DMO_100/eagle_100.yml
index f4c5316aa0..ef5c27b8b9 100644
--- a/examples/EAGLE_DMO_low_z/EAGLE_DMO_100/eagle_100.yml
+++ b/examples/EAGLE_DMO_low_z/EAGLE_DMO_100/eagle_100.yml
@@ -41,9 +41,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.85 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 512
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 256
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
diff --git a/examples/EAGLE_DMO_low_z/EAGLE_DMO_12/eagle_12.yml b/examples/EAGLE_DMO_low_z/EAGLE_DMO_12/eagle_12.yml
index f5a7c57458..c127384d00 100644
--- a/examples/EAGLE_DMO_low_z/EAGLE_DMO_12/eagle_12.yml
+++ b/examples/EAGLE_DMO_low_z/EAGLE_DMO_12/eagle_12.yml
@@ -41,9 +41,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 32
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 32
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
diff --git a/examples/EAGLE_DMO_low_z/EAGLE_DMO_25/eagle_25.yml b/examples/EAGLE_DMO_low_z/EAGLE_DMO_25/eagle_25.yml
index 15df02b2a0..75743434bf 100644
--- a/examples/EAGLE_DMO_low_z/EAGLE_DMO_25/eagle_25.yml
+++ b/examples/EAGLE_DMO_low_z/EAGLE_DMO_25/eagle_25.yml
@@ -41,9 +41,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 64
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 64
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
diff --git a/examples/EAGLE_DMO_low_z/EAGLE_DMO_50/eagle_50.yml b/examples/EAGLE_DMO_low_z/EAGLE_DMO_50/eagle_50.yml
index b9c7237b81..25a9e25559 100644
--- a/examples/EAGLE_DMO_low_z/EAGLE_DMO_50/eagle_50.yml
+++ b/examples/EAGLE_DMO_low_z/EAGLE_DMO_50/eagle_50.yml
@@ -40,9 +40,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 128
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 128
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
diff --git a/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml b/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
index ca539e3dcf..0a80d4abfa 100644
--- a/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_ICs/EAGLE_12/eagle_12.yml
@@ -37,14 +37,15 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 64
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric # Use the geometric opening angle condition
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 64
comoving_DM_softening: 0.003320 # Comoving softening for DM (3.32 ckpc)
max_physical_DM_softening: 0.001300 # Physical softening for DM (1.30 pkpc)
comoving_baryon_softening: 0.001790 # Comoving softening for baryons (1.79 ckpc)
max_physical_baryon_softening: 0.000700 # Physical softening for baryons (0.70 pkpc)
- dithering: 0
# Parameters for the hydrodynamics scheme
SPH:
diff --git a/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml b/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
index e598e96436..bff0d1caae 100644
--- a/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_ICs/EAGLE_25/eagle_25.yml
@@ -37,14 +37,15 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 128
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric # Use the geometric opening angle condition
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 128
comoving_DM_softening: 0.003320 # Comoving softening for DM (3.32 ckpc)
max_physical_DM_softening: 0.001300 # Physical softening for DM (1.30 pkpc)
comoving_baryon_softening: 0.001790 # Comoving softening for baryons (1.79 ckpc)
max_physical_baryon_softening: 0.000700 # Physical softening for baryons (0.70 pkpc)
- dithering: 0
# Parameters for the hydrodynamics scheme
SPH:
diff --git a/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml b/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
index 825669a8e2..7a89423aef 100644
--- a/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
+++ b/examples/EAGLE_ICs/EAGLE_50/eagle_50.yml
@@ -37,14 +37,15 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 256
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric # Use the geometric opening angle condition
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 256
comoving_DM_softening: 0.003320 # Comoving softening for DM (3.32 ckpc)
max_physical_DM_softening: 0.001300 # Physical softening for DM (1.30 pkpc)
comoving_baryon_softening: 0.001790 # Comoving softening for baryons (1.79 ckpc)
max_physical_baryon_softening: 0.000700 # Physical softening for baryons (0.70 pkpc)
- dithering: 0
# Parameters for the hydrodynamics scheme
SPH:
diff --git a/examples/EAGLE_low_z/EAGLE_100/eagle_100.yml b/examples/EAGLE_low_z/EAGLE_100/eagle_100.yml
index 12919bf5d5..5ef3d21716 100644
--- a/examples/EAGLE_low_z/EAGLE_100/eagle_100.yml
+++ b/examples/EAGLE_low_z/EAGLE_100/eagle_100.yml
@@ -43,10 +43,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.85 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 256
- dithering: 0
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 256
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
comoving_baryon_softening: 0.0026994 # Comoving DM softening length (in internal units).
diff --git a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
index 8c2b1b36f0..860c39ac78 100644
--- a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
@@ -44,18 +44,15 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- MAC: geometric
- theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
use_tree_below_softening: 1
- allow_truncation_in_mac: 1
- mesh_side_length: 32
- dithering: 0
+ mesh_side_length: 32
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
comoving_baryon_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_baryon_softening: 0.0007 # Max physical DM softening length (in internal units).
-
# Parameters for the hydrodynamics scheme
SPH:
diff --git a/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml b/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
index 622a60dd1c..0c5471941e 100644
--- a/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_low_z/EAGLE_25/eagle_25.yml
@@ -51,10 +51,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 64
- dithering: 0
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 64
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
comoving_baryon_softening: 0.0026994 # Comoving DM softening length (in internal units).
diff --git a/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml b/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
index 005fcf5660..4e2de4b143 100644
--- a/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
+++ b/examples/EAGLE_low_z/EAGLE_50/eagle_50.yml
@@ -43,10 +43,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 128
- dithering: 0
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 128
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
comoving_baryon_softening: 0.0026994 # Comoving DM softening length (in internal units).
diff --git a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
index b5c049fcc7..59650017d6 100644
--- a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
+++ b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
@@ -55,13 +55,10 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration.
- MAC: adaptive
- epsilon_fmm: 0.001
+ MAC: geometric
theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
use_tree_below_softening: 1
- allow_truncation_in_MAC: 1
mesh_side_length: 16
- dithering: 0
comoving_DM_softening: 0.0026994 # Comoving DM softening length (in internal units).
max_physical_DM_softening: 0.0007 # Max physical DM softening length (in internal units).
comoving_baryon_softening: 0.0026994 # Comoving DM softening length (in internal units).
diff --git a/examples/HydroTests/EvrardCollapse_3D/evrard.yml b/examples/HydroTests/EvrardCollapse_3D/evrard.yml
index ab43864638..7ca3c8ac21 100644
--- a/examples/HydroTests/EvrardCollapse_3D/evrard.yml
+++ b/examples/HydroTests/EvrardCollapse_3D/evrard.yml
@@ -31,8 +31,10 @@ SPH:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7
+ eta: 0.025
+ MAC: adaptive
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
max_physical_baryon_softening: 0.001 # Physical softening length (in internal units).
# Parameters related to the initial conditions
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_NFW_MN/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_NFW_MN/isolated_galaxy.yml
index d2ca7aae80..a66446dd32 100644
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_NFW_MN/isolated_galaxy.yml
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_NFW_MN/isolated_galaxy.yml
@@ -9,7 +9,9 @@ InternalUnitSystem:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion).
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion).
+ use_tree_below_softening: 1
max_physical_baryon_softening: 0.100 # 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.)
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_dmparticles/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_dmparticles/isolated_galaxy.yml
index 27ab01d984..aaa2f8bbac 100644
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_dmparticles/isolated_galaxy.yml
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_dmparticles/isolated_galaxy.yml
@@ -9,7 +9,9 @@ InternalUnitSystem:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion).
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion).
+ use_tree_below_softening: 1
max_physical_DM_softening: 0.7 # 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.)
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
index 0642e9312f..48b659c453 100644
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml
@@ -9,7 +9,9 @@ InternalUnitSystem:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion).
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion).
+ use_tree_below_softening: 1
max_physical_DM_softening: 0.35 # Physical softening length (in internal units).
max_physical_baryon_softening: 0.35 # Physical softening length (in internal units).
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_potential/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_potential/isolated_galaxy.yml
index 3bd743c2ec..d82c3544d6 100644
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_potential/isolated_galaxy.yml
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_potential/isolated_galaxy.yml
@@ -9,7 +9,9 @@ InternalUnitSystem:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion).
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion).
+ use_tree_below_softening: 1
max_physical_baryon_softening: 0.100 # 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.)
diff --git a/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml b/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml
index 1403e13afd..c2bbcac6aa 100644
--- a/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml
+++ b/examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml
@@ -9,7 +9,9 @@ InternalUnitSystem:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion).
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion).
+ use_tree_below_softening: 1
max_physical_DM_softening: 0.2 # Physical softening length (in internal units).
max_physical_baryon_softening: 0.2 # Physical softening length (in internal units).
diff --git a/examples/PMillennium/PMillennium-1536/p-mill-1536.yml b/examples/PMillennium/PMillennium-1536/p-mill-1536.yml
index f343650452..e2e8439a71 100644
--- a/examples/PMillennium/PMillennium-1536/p-mill-1536.yml
+++ b/examples/PMillennium/PMillennium-1536/p-mill-1536.yml
@@ -42,7 +42,9 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025
- theta: 0.5
+ MAC: adaptive
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
comoving_DM_softening: 0.0208333 # 20.8333 kpc = 1/25 mean inter-particle separation
max_physical_DM_softening: 0.0208333 # 20.8333 kpc = 1/25 mean inter-particle separation
mesh_side_length: 512
diff --git a/examples/PMillennium/PMillennium-384/p-mill-384.yml b/examples/PMillennium/PMillennium-384/p-mill-384.yml
index 0e68969d0b..0e058b5b83 100644
--- a/examples/PMillennium/PMillennium-384/p-mill-384.yml
+++ b/examples/PMillennium/PMillennium-384/p-mill-384.yml
@@ -41,8 +41,10 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025
- theta: 0.5
+ eta: 0.025
+ MAC: adaptive
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
comoving_DM_softening: 0.08333 # 83.333 kpc = 1/25 mean inter-particle separation
max_physical_DM_softening: 0.08333 # 83.333 kpc = 1/25 mean inter-particle separation
mesh_side_length: 128
diff --git a/examples/PMillennium/PMillennium-768/p-mill-768.yml b/examples/PMillennium/PMillennium-768/p-mill-768.yml
index 1cd9e63b1f..3a058c2db9 100644
--- a/examples/PMillennium/PMillennium-768/p-mill-768.yml
+++ b/examples/PMillennium/PMillennium-768/p-mill-768.yml
@@ -42,7 +42,9 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025
- theta: 0.5
+ MAC: adaptive
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
comoving_DM_softening: 0.041666 # 41.6666 kpc = 1/25 mean inter-particle separation
max_physical_DM_softening: 0.041666 # 41.6666 kpc = 1/25 mean inter-particle separation
mesh_side_length: 256
diff --git a/examples/Planetary/EarthImpact/earth_impact.yml b/examples/Planetary/EarthImpact/earth_impact.yml
index 336a0eb82d..9f147b0135 100644
--- a/examples/Planetary/EarthImpact/earth_impact.yml
+++ b/examples/Planetary/EarthImpact/earth_impact.yml
@@ -45,7 +45,10 @@ SPH:
# Parameters for the self-gravity scheme
Gravity:
eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
+ MAC: adaptive
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
+ use_tree_below_softening: 1
max_physical_baryon_softening: 0.003 # Physical softening length (in internal units).
# Parameters for the task scheduling
diff --git a/examples/QuickLymanAlpha/L050N0752/qla_50.yml b/examples/QuickLymanAlpha/L050N0752/qla_50.yml
index 9eeac77e73..0748fa112b 100644
--- a/examples/QuickLymanAlpha/L050N0752/qla_50.yml
+++ b/examples/QuickLymanAlpha/L050N0752/qla_50.yml
@@ -37,14 +37,16 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion)
- mesh_side_length: 256
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: adaptive
+ epsilon_fmm: 0.001
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion)
+ use_tree_below_softening: 1
+ mesh_side_length: 256
comoving_DM_softening: 0.003320 # Comoving softening for DM (3.32 ckpc)
max_physical_DM_softening: 0.001300 # Physical softening for DM (1.30 pkpc)
comoving_baryon_softening: 0.001790 # Comoving softening for baryons (1.79 ckpc)
max_physical_baryon_softening: 0.000700 # Physical softening for baryons (0.70 pkpc)
- dithering: 0
# Parameters for the hydrodynamics scheme
SPH:
diff --git a/examples/SantaBarbara/SantaBarbara-128/santa_barbara.yml b/examples/SantaBarbara/SantaBarbara-128/santa_barbara.yml
index 5ee17b5a58..d71394d189 100644
--- a/examples/SantaBarbara/SantaBarbara-128/santa_barbara.yml
+++ b/examples/SantaBarbara/SantaBarbara-128/santa_barbara.yml
@@ -41,8 +41,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025
- theta: 0.5
+ eta: 0.025
+ MAC: adpative
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
+ use_tree_below_softening: 1
comoving_DM_softening: 0.02 # 20 kpc = 1/25 mean inter-particle separation
max_physical_DM_softening: 0.00526 # 20 ckpc = 5.26 pkpc at z=2.8 (EAGLE-like evolution of softening).
comoving_baryon_softening: 0.02 # 20 kpc = 1/25 mean inter-particle separation
diff --git a/examples/SantaBarbara/SantaBarbara-256/santa_barbara.yml b/examples/SantaBarbara/SantaBarbara-256/santa_barbara.yml
index e83a136c21..e9a8549cee 100644
--- a/examples/SantaBarbara/SantaBarbara-256/santa_barbara.yml
+++ b/examples/SantaBarbara/SantaBarbara-256/santa_barbara.yml
@@ -41,8 +41,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025
- theta: 0.5
+ eta: 0.025
+ MAC: adpative
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
+ use_tree_below_softening: 1
comoving_DM_softening: 0.01 # 10 kpc = 1/25 mean inter-particle separation
max_physical_DM_softening: 0.00263 # 10 ckpc = 2.63 pkpc at z=2.8 (EAGLE-like evolution of softening).
comoving_baryon_softening: 0.01 # 10 kpc = 1/25 mean inter-particle separation
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_DM/small_cosmo_volume_dm.yml b/examples/SmallCosmoVolume/SmallCosmoVolume_DM/small_cosmo_volume_dm.yml
index 95991e9f1d..85abb33b38 100644
--- a/examples/SmallCosmoVolume/SmallCosmoVolume_DM/small_cosmo_volume_dm.yml
+++ b/examples/SmallCosmoVolume/SmallCosmoVolume_DM/small_cosmo_volume_dm.yml
@@ -21,8 +21,10 @@ TimeIntegration:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025
- theta: 0.5
+ eta: 0.025
+ MAC: adpative
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
comoving_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
max_physical_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
mesh_side_length: 64
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_Snipshots/small_cosmo_volume.yml b/examples/SmallCosmoVolume/SmallCosmoVolume_Snipshots/small_cosmo_volume.yml
index dc554e3dd8..5d297a3dc8 100644
--- a/examples/SmallCosmoVolume/SmallCosmoVolume_Snipshots/small_cosmo_volume.yml
+++ b/examples/SmallCosmoVolume/SmallCosmoVolume_Snipshots/small_cosmo_volume.yml
@@ -21,8 +21,10 @@ TimeIntegration:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025
- theta: 0.5
+ eta: 0.025
+ MAC: adpative
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
comoving_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
max_physical_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
comoving_baryon_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_VELOCIraptor/small_cosmo_volume.yml b/examples/SmallCosmoVolume/SmallCosmoVolume_VELOCIraptor/small_cosmo_volume.yml
index 0142e806db..2cd7e3efd8 100644
--- a/examples/SmallCosmoVolume/SmallCosmoVolume_VELOCIraptor/small_cosmo_volume.yml
+++ b/examples/SmallCosmoVolume/SmallCosmoVolume_VELOCIraptor/small_cosmo_volume.yml
@@ -21,8 +21,10 @@ TimeIntegration:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025
- theta: 0.5
+ eta: 0.025
+ MAC: adpative
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
comoving_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
max_physical_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
comoving_baryon_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_cooling/small_cosmo_volume.yml b/examples/SmallCosmoVolume/SmallCosmoVolume_cooling/small_cosmo_volume.yml
index 0d93406eeb..2528a81eea 100644
--- a/examples/SmallCosmoVolume/SmallCosmoVolume_cooling/small_cosmo_volume.yml
+++ b/examples/SmallCosmoVolume/SmallCosmoVolume_cooling/small_cosmo_volume.yml
@@ -21,8 +21,10 @@ TimeIntegration:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025
- theta: 0.3
+ eta: 0.025
+ MAC: adpative
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
comoving_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
max_physical_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
comoving_baryon_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
diff --git a/examples/SmallCosmoVolume/SmallCosmoVolume_hydro/small_cosmo_volume.yml b/examples/SmallCosmoVolume/SmallCosmoVolume_hydro/small_cosmo_volume.yml
index 250fdc653b..da08070bbc 100644
--- a/examples/SmallCosmoVolume/SmallCosmoVolume_hydro/small_cosmo_volume.yml
+++ b/examples/SmallCosmoVolume/SmallCosmoVolume_hydro/small_cosmo_volume.yml
@@ -21,8 +21,10 @@ TimeIntegration:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025
- theta: 0.5
+ eta: 0.025
+ MAC: adpative
+ theta_cr: 0.7
+ epsilon_fmm: 0.001
comoving_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
max_physical_DM_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
comoving_baryon_softening: 0.0889 # 1/25th of the mean inter-particle separation: 88.9 kpc
diff --git a/examples/SubgridTests/PressureFloor/pressureFloor.yml b/examples/SubgridTests/PressureFloor/pressureFloor.yml
index f9df74dcef..b20eb3a302 100644
--- a/examples/SubgridTests/PressureFloor/pressureFloor.yml
+++ b/examples/SubgridTests/PressureFloor/pressureFloor.yml
@@ -45,9 +45,10 @@ GEARPressureFloor:
# Parameters for the self-gravity scheme
Gravity:
- mesh_side_length: 12 # Number of cells along each axis for the periodic gravity mesh.
- eta: 2.5 # Constant dimensionless multiplier for time integration.
- theta: 0.7 # Opening angle (Multipole acceptance criterion).
- max_physical_DM_softening: 0.5 # Maximal Plummer-equivalent softening length in physical coordinates for DM particles (in internal units).
- max_physical_baryon_softening: 0.5 # Maximal Plummer-equivalent softening length in physical coordinates for baryon particles (in internal units).
- softening_ratio_background: 0.04 # Fraction of the mean inter-particle separation to use as Plummer-equivalent softening for the background DM particles.
+ mesh_side_length: 16 # Number of cells along each axis for the periodic gravity mesh.
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: geometric
+ theta_cr: 0.7 # Opening angle (Multipole acceptance criterion).
+ max_physical_DM_softening: 0.5 # Maximal Plummer-equivalent softening length in physical coordinates for DM particles (in internal units).
+ max_physical_baryon_softening: 0.5 # Maximal Plummer-equivalent softening length in physical coordinates for baryon particles (in internal units).
+ softening_ratio_background: 0.04 # Fraction of the mean inter-particle separation to use as Plummer-equivalent softening for the background DM particles.
diff --git a/examples/nIFTyCluster/Baryonic/nifty.yml b/examples/nIFTyCluster/Baryonic/nifty.yml
index 7b58c80009..501e9578bb 100644
--- a/examples/nIFTyCluster/Baryonic/nifty.yml
+++ b/examples/nIFTyCluster/Baryonic/nifty.yml
@@ -40,8 +40,11 @@ Statistics:
# Parameters for the self-gravity scheme
Gravity:
- eta: 0.025 # Constant dimensionless multiplier for time integration.
- theta: 0.5 # Opening angle (Multipole acceptance criterion)
+ eta: 0.025 # Constant dimensionless multiplier for time integration.
+ MAC: adaptive
+ epsilon_fmm: 0.001
+ theta_cr: 0.7
+ use_tree_below_softening: 1
comoving_DM_softening: 0.02 # Comoving softening length (in internal units).
comoving_baryon_softening: 0.02 # Comoving softening length (in internal units).
max_physical_DM_softening: 0.005 # Max physical softening length (in internal units).
diff --git a/examples/parameter_example.yml b/examples/parameter_example.yml
index 523139e450..86f3980d72 100644
--- a/examples/parameter_example.yml
+++ b/examples/parameter_example.yml
@@ -67,8 +67,8 @@ Gravity:
MAC: adaptive # Choice of mulitpole acceptance criterion: 'adaptive' OR 'geometric'.
epsilon_fmm: 0.001 # Tolerance parameter for the adaptive multipole acceptance criterion.
theta_cr: 0.7 # Opening angle for the purely gemoetric criterion.
- use_tree_below_softening: 1 # Can the gravity code use the multipole interactions below the softening scale?
- allow_truncation_in_MAC: 1 # Can the Multipole acceptance criterion use the truncated force estimator?
+ use_tree_below_softening: 0 # (Optional) Can the gravity code use the multipole interactions below the softening scale?
+ allow_truncation_in_MAC: 0 # (Optional) Can the Multipole acceptance criterion use the truncated force estimator?
comoving_DM_softening: 0.0026994 # Comoving Plummer-equivalent softening length for DM particles (in internal units).
max_physical_DM_softening: 0.0007 # Maximal Plummer-equivalent softening length in physical coordinates for DM particles (in internal units).
comoving_baryon_softening: 0.0026994 # Comoving Plummer-equivalent softening length for baryon particles (in internal units).
diff --git a/src/gravity_properties.c b/src/gravity_properties.c
index f0be3fd30f..a58e822ab8 100644
--- a/src/gravity_properties.c
+++ b/src/gravity_properties.c
@@ -121,7 +121,7 @@ void gravity_props_init(struct gravity_props *p, struct swift_params *params,
/* Consider truncated forces in the MAC? */
if (p->use_adaptive_tolerance)
p->consider_truncation_in_MAC =
- parser_get_param_int(params, "Gravity:allow_truncation_in_MAC");
+ parser_get_opt_param_int(params, "Gravity:allow_truncation_in_MAC", 0);
/* Are we allowing tree use below softening? */
p->use_tree_below_softening =
--
GitLab