Merge branch 'FastEncounterCheck' into debug

MintonGroup · Oct 8, 2021 · a51584b · a51584b
2 parents bfc7ffd + b958476
commit a51584b
Show file tree

Hide file tree

Showing 54 changed files with 139,476 additions and 1,116 deletions.
diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ SWIFTEST_MODULES =   swiftest_globals.f90 \
                      swiftest_operators.f90 \
 							lambda_function.f90\
                      swiftest_classes.f90 \
+							encounter_classes.f90 \
                      fraggle_classes.f90 \
                      whm_classes.f90 \
                      rmvs_classes.f90 \

diff --git a/Makefile.Defines b/Makefile.Defines
@@ -66,11 +66,10 @@ GMEM =  -fsanitize-address-use-after-scope -fstack-check  -fsanitize=bounds-stri
 GWARNINGS = -Wall -Warray-bounds  -Wimplicit-interface -Wextra -Warray-temporaries
 GPRODUCTION = -O2 -ffree-line-length-none $(GPAR)
 
-
-#FFLAGS  = $(IDEBUG)  #$(SIMDVEC) $(PAR)
-#FFASTFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR)
-FSTRICTFLAGS = $(IPRODUCTION) $(STRICTREAL) $(OPTREPORT) #$(ADVIXE_FLAGS)
-FFLAGS = $(IPRODUCTION) -fp-model=fast $(OPTREPORT) #$(ADVIXE_FLAGS)
+#FFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR)
+#FFASTFLAGS  = $(IDEBUG) $(SIMDVEC) $(PAR)
+FSTRICTFLAGS = $(IPRODUCTION) $(STRICTREAL) $(OPTREPORT)  #$(ADVIXE_FLAGS)
+FFLAGS = $(IPRODUCTION) -fp-model=fast $(OPTREPORT)  #$(ADVIXE_FLAGS)
 FORTRAN = ifort
 AR     = xiar
 

diff --git a/examples/rmvs_swifter_comparison/8pl_16tp_encounters/param.swiftest.in b/examples/rmvs_swifter_comparison/8pl_16tp_encounters/param.swiftest.in
@@ -33,3 +33,4 @@ ROTATION         NO
 TIDES            NO
 ENERGY           NO
 GR               NO
+ENCOUNTER_CHECK SORTSWEEP
diff --git a/examples/rmvs_swifter_comparison/8pl_16tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb b/examples/rmvs_swifter_comparison/8pl_16tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb
diff --git a/examples/symba_chambers_2013/param.in b/examples/symba_chambers_2013/param.in
@@ -36,3 +36,5 @@ GR               NO
 ENERGY_OUT       energy.dat
 GMTINY           1.1053539394491336e-08
 MIN_GMFRAG       1.1053539394491336e-10
+ENCOUNTER_CHECK  ADAPTIVE
+INTERACTION_LOOPS ADAPTIVE
diff --git a/examples/symba_clement_2018/param.in b/examples/symba_clement_2018/param.in
@@ -1,9 +1,9 @@
 ! VERSION        Swiftest parameter input from file param.in
 T0               0.0
-TSTOP            100000000.0
+TSTOP            1.000e2
 DT               0.016
-ISTEP_OUT        6250
-ISTEP_DUMP       6250
+ISTEP_OUT        100
+ISTEP_DUMP       1000
 OUT_FORM         XVEL
 OUT_TYPE         NETCDF_DOUBLE
 OUT_STAT         REPLACE
@@ -35,3 +35,5 @@ ENERGY           YES
 GR               NO
 GMTINY           2.96336237e-09
 MIN_GMFRAG       2.96336237e-11
+ENCOUNTER_CHECK  ADAPTIVE
+INTERACTION_LOOPS FLAT
diff --git a/examples/symba_mars_disk/param.in b/examples/symba_mars_disk/param.in
@@ -1,14 +1,14 @@
 !Parameter file for the SyMBA-RINGMOONS test
 T0             0.0 
-TSTOP          12000.0
+TSTOP          6000.00
 DT             600.0
 CB_IN          cb.in
 PL_IN          mars.in
 TP_IN          tp.in
 IN_TYPE        ASCII
-ISTEP_OUT      20
-ISTEP_DUMP     20
-BIN_OUT        bin.nc
+ISTEP_OUT      1
+ISTEP_DUMP     1
+BIN_OUT        bin.nc 
 PARTICLE_OUT   particle.dat
 OUT_TYPE       NETCDF_DOUBLE
 OUT_FORM       XVEL
@@ -22,13 +22,14 @@ CHK_QMIN_COORD HELIO
 CHK_QMIN_RANGE 3389500.0 338950000000.0
 EXTRA_FORCE    no
 RHILL_PRESENT  yes
-GMTINY         10000.0
-MIN_GMFRAG     1000.0
+GMTINY         1.4e5
+MIN_GMFRAG     1.0e4
 ENERGY         yes
 FRAGMENTATION  yes 
 ROTATION       yes
 MU2KG          1.0
 DU2M           1.0
 TU2S           1.0
 SEED           2 3080983 2220830
-INTERACTION_LOOPS ADAPTIVE
+INTERACTION_LOOPS FLAT
+ENCOUNTER_CHECK ADAPTIVE
diff --git a/examples/symba_pl02k/Jul27_2k_fully.in b/examples/symba_pl02k/Jul27_2k_fully.in
diff --git a/examples/symba_pl02k/cb.in b/examples/symba_pl02k/cb.in
@@ -0,0 +1,5 @@
+Sun
+39.476926408897626
+0.005
+0.0
+0.0
diff --git a/examples/symba_pl02k/param.in b/examples/symba_pl02k/param.in
@@ -0,0 +1,35 @@
+!
+!Parameter file for the Entire Solar System for the Terrestrial Disk
+!
+T0              0.0e0                           !starting time in years
+TSTOP           0.100                      !simulation length in years
+DT              0.001                           !step size in years
+CB_IN           cb.in
+PL_IN           Jul27_2k_fully.in
+TP_IN           tp.in
+IN_TYPE         ASCII                           !format of input file
+IN_FORM         XV                              !format of input file
+ISTEP_OUT       100                       !output cadence 
+ISTEP_DUMP      100                      !keep same as ISTEP_OUT
+BIN_OUT         bin.nc                          !output file
+OUT_TYPE        NETCDF_DOUBLE                   !double precision real output
+OUT_FORM        XVEL                            !output type in XV OR EL
+OUT_STAT        REPLACE
+CHK_CLOSE       yes                             !check for planetary close encounters
+CHK_RMAX        10000.0                         !drop things from the simulation in AU
+CHK_EJECT       -1.0                            !turns this off
+CHK_QMIN        -1.0                            !turns this off
+EXTRA_FORCE     no                              !this would be user defined forces
+BIG_DISCARD     no                              !output all planets if anything is discarded
+RHILL_PRESENT   yes                             !Rhill is definted in the input file
+FRAGMENTATION   no                              !Turns fragmentation model on
+ROTATION        no
+TIDES           no
+GR              no
+MU2KG           5.038e30                        !Conversion from mass unit to grams (M_sun*G --> kg where G=4pi^2 AU^3/(y^2*M_sun))
+DU2M            1.5e11                     		!Conversion from distance unit to centimeters (AU --> m)
+TU2S            3.16e7                          !Conversion from time unit to seconds (years --> seconds)
+GMTINY           1e-20						!(G*M)
+ENERGY          no
+INTERACTION_LOOPS ADAPTIVE
+ENCOUNTER_CHECK ADAPTIVE
diff --git a/examples/symba_pl02k/runjob.sh b/examples/symba_pl02k/runjob.sh
@@ -0,0 +1,28 @@
+#!/bin/zsh -l
+#SBATCH -A standby
+#SBATCH --time=4:00:00
+#SBATCH --nodes=1
+#SBATCH --ntasks=1
+#SBATCH --ntasks-per-node=1
+#SBATCH --job-name=swiftest-2k
+#SBATCH --cpus-per-task=128
+#SBATCH --mem-per-cpu=MaxMemPerCPU
+#SBATCH -o %x.out
+#SBATCH -e %x.err
+
+cd $SLURM_SUBMIT_DIR
+filename="${SLURM_SUBMIT_DIR}/swiftest-2k-timehist.log"
+rm ${filename}
+echo "N cores,wall time(s)" > ${filename}
+
+count=1
+while [ $count -lt 129 ]
+do
+  export OMP_NUM_THREADS=${count}
+  ./swiftest_driver symba param.in > term${count}.out
+  grep Integration term${count}.out | tail -n1 | awk -v NTHREADS=$OMP_NUM_THREADS '{print NTHREADS,",",$6}' | sed 's/.$//' >> ${filename} 
+  mv interaction_timer.log interaction_timer${count}.log
+  mv encounter_check_timer.log encounter_check_timer${count}.log
+  count=`expr $count + 1`
+done
+
diff --git a/examples/symba_pl02k/tp.in b/examples/symba_pl02k/tp.in
@@ -0,0 +1 @@
+0