Updated all the examples to accept the new YAML parameters

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

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

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).
 

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).
 

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).
 

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).
 

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:

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:

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:

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).

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:

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).

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).

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).

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

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.)

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.)

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).
 

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.)

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).