Merge branch 'updated_MAC' into 'master'

Improved multipole acceptance criterion (MAC) See merge request !1077

Merge branch 'updated_MAC' into 'master'
Improved multipole acceptance criterion (MAC) See merge request !1077
c5e1d7a0 · Matthieu Schaller · dead2668 · 3ecb5787 · c5e1d7a0 · c5e1d7a0
Commit c5e1d7a0 authored Jun 19, 2020 by Matthieu Schaller
--- a/.gitignore
+++ b/.gitignore
@@ -114,8 +114,11 @@ tests/testReading
 tests/testSingle
 tests/testTimeIntegration
 tests/testSPHStep
+tests/testExp
+tests/testErfc
 tests/testKernel
 tests/testKernelGrav
+tests/testKernelLongGrav
 tests/testFFT
 tests/testInteractions
 tests/testInteractions.sh
@@ -154,6 +157,7 @@ tests/testDump
 tests/testLogger
 tests/benchmarkInteractions
 tests/testGravityDerivatives
+tests/testGravitySpeed
 tests/testPotentialSelf
 tests/testPotentialPair
 tests/testEOS
@@ -184,6 +188,7 @@ theory/Multipoles/potential.pdf
 theory/Multipoles/potential_long.pdf
 theory/Multipoles/potential_short.pdf
 theory/Multipoles/force_short.pdf
+theory/Multipoles/mac_potential.pdf
 theory/Cosmology/cosmology.pdf
 theory/Cooling/eagle_cooling.pdf
 theory/Gizmo/gizmo-implementation-details/gizmo-implementation-details.pdf

--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ AM_CONFIG_HEADER(config.h)
 AX_CHECK_ENABLE_DEBUG
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_OPENMP

 # If debug is selected then we also define SWIFT_DEVELOP_MODE to control
 # any developer code options.
@@ -2319,7 +2320,7 @@ AC_MSG_RESULT([
   Compiler             : $CC
    - vendor            : $ax_cv_c_compiler_vendor
    - version           : $ax_cv_c_compiler_version
-    - flags             : $CFLAGS
+    - flags             : $CFLAGS $OPENMP_CFLAGS
   MPI enabled          : $enable_mpi
   HDF5 enabled         : $with_hdf5
    - parallel          : $have_parallel_hdf5

--- a/examples/Cooling/CoolingRates/Makefile.am
+++ b/examples/Cooling/CoolingRates/Makefile.am
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # Add the source directory and the non-standard paths to the included library headers to CFLAGS
-AM_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/examples $(HDF5_CPPFLAGS) $(GSL_INCS) $(FFTW_INCS) $(NUMA_INCS)
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/examples $(HDF5_CPPFLAGS) $(GSL_INCS) $(FFTW_INCS) $(NUMA_INCS) $(OPENMP_CFLAGS)

 AM_LDFLAGS = $(HDF5_LDFLAGS) $(HDF5_LIBS) $(FFTW_LIBS) $(NUMA_LIBS) $(TCMALLOC_LIBS) $(JEMALLOC_LIBS) $(TBBMALLOC_LIBS) $(GRACKLE_LIBS) $(GSL_LIBS) $(PROFILER_LIBS)


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

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

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


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


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


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


--- 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:

--- 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:

--- 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:

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

--- a/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_low_z/EAGLE_12/eagle_12.yml
@@ -44,15 +44,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:       32
-  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:         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:

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

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

--- a/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
+++ b/examples/EAGLE_low_z/EAGLE_6/eagle_6.yml
@@ -54,10 +54,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:       16
-  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:         16
  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).

--- a/examples/GEAR/AgoraDisk/agora_disk.yml
+++ b/examples/GEAR/AgoraDisk/agora_disk.yml
@@ -39,8 +39,10 @@ Statistics:

 # Parameters for the self-gravity scheme
 Gravity:
-  eta:                    0.05    # Constant dimensionless multiplier for time integration.
-  theta:                  0.7     # Opening angle (Multipole acceptance criterion)
+  eta:                       0.05    # Constant dimensionless multiplier for time integration.
+  MAC:                       geometric
+  theta_cr:                  0.7     
+  use_tree_below_softening:  1
  comoving_DM_softening:     0.08 # Comoving softening length (in internal units).
  max_physical_DM_softening: 0.08    # Physical softening length (in internal units).
  comoving_baryon_softening:     0.08 # Comoving softening length (in internal units).

--- a/examples/GEAR/ZoomIn/zoom_in.yml
+++ b/examples/GEAR/ZoomIn/zoom_in.yml
@@ -40,8 +40,11 @@ Statistics:
  delta_time:          1.05 # Time between statistics output

 Gravity:
-  eta:                    0.002    # Constant dimensionless multiplier for time integration.
-  theta:                  0.6     # Opening angle (Multipole acceptance criterion)
+  eta:                       0.002    # Constant dimensionless multiplier for time integration.
+  MAC:                       adaptive
+  theta_cr:                  0.7
+  epsilon_fmm:               0.001
+  use_tree_below_softening:  1
  comoving_DM_softening:     0.1278 # Comoving softening length (in internal units).
  max_physical_DM_softening: 0.03365    # Physical softening length (in internal units).
  comoving_baryon_softening:     0.03365 # Comoving softening length (in internal units).

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