Optimised scatter_list, started introducing separate pbh module.

glatterf42 · Jan 7, 2022 · deeb343 · deeb343
1 parent 628e3e8
commit deeb343
Show file tree

Hide file tree

Showing 7 changed files with 191 additions and 154 deletions.
diff --git a/Makefile b/Makefile
@@ -222,7 +222,7 @@ SUBDIRS += data
 OBJS    += data/mymalloc.o data/allvars.o data/test_symtensors.o
 INCL    += data/allvars.h data/dtypes.h data/mymalloc.h data/idstorage.h data/symtensors.h \
            data/intposconvert.h data/constants.h data/simparticles.h \
-           data/macros.h data/particle_data.h data/sph_particle_data.h \
+           data/macros.h data/particle_data.h data/pbh_particle_data.h data/sph_particle_data.h \
            data/lightcone_particle_data.h data/lightcone_massmap_data.h data/lcparticles.h data/mmparticles.h
 
 
@@ -254,6 +254,11 @@ OBJS    += mpi_utils/hypercube_allgatherv.o mpi_utils/mpi_types.o mpi_utils/mpi_
            mpi_utils/allreduce_debugcheck.o mpi_utils/shared_mem_handler.o 
 INCL    += mpi_utils/mpi_utils.h mpi_utils/generic_comm.h mpi_utils/shared_mem_handler.h
 
+#For a later decoupling of sph and pbh calculations
+#SUBDIRS += pbh_efd
+#OBJS    += pbh_efd/pbh_density.o pbh_efd/pbh_scatter.o
+#INCL    += pbh_efd/pbh_kernel.h pbh_efd/pbh_efd.h
+
 
 SUBDIRS += pm
 OBJS    += pm/pm_nonperiodic.o pm/pm_periodic.o \

diff --git a/defines_extra b/defines_extra
@@ -99,6 +99,9 @@ MERGERTREE_H
 NGENIC_H
 CONVERT_H
 LGALAXIES_GALTREE_IO_H
+PBH_EFD_H
+PBH_KERNEL_H
+PBHPARTDATA_H
 
 #system defines
 _MSC_FULL_VER

diff --git a/examples/DM-L50-N128/Config.sh b/examples/DM-L50-N128/Config.sh
@@ -7,7 +7,7 @@
 
 # Gravity options
 
-    PMGRID=64
+    PMGRID=128
     TREEPM_NOTIMESPLIT
     ASMTH=2.0
 
@@ -35,4 +35,4 @@
 
 # Time integration options
 
-	FORCE_EQUAL_TIMESTEPS
+#	FORCE_EQUAL_TIMESTEPS
diff --git a/src/data/sph_particle_data.h b/src/data/sph_particle_data.h
@@ -76,7 +76,8 @@ struct sph_particle_data : public sph_particle_data_hydrocore
   MyFloat CurrentMaxTiStep;
 
 #ifdef PBH_EFD
-  bool scatter_occurrence;
+  bool scatter_occurrence; /*!< distinguishes particles that experience scattering in the current time step */
+  MyFloat PbhVel[3]; /*!< velocity change due to pbh scatter interactions */
 #endif
 
 #ifdef PRESSURE_ENTROPY_SPH