Merge branch 'debug'

Makefile.Defines

@@ -41,14 +41,20 @@ SWIFTEST_HOME    = $(ROOT_DIR)
 USER_MODULES    =
 COLLRESOLVE_HOME = $(ROOT_DIR)/collresolve/
 
+#NETCDF_FORTRAN_HOME = /home/daminton/local
+
+
 # Compiler definitions
 
 # DO NOT include in FFLAGS the "-c" option to compile object only
 # this is done explicitly as needed in the Makefile
+ADVIXE_FLAGS = -g -O2 -qopt-report=5 -vecabi=cmdtarget -simd -shared-intel -debug inline-debug-info -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -xhost -traceback -parallel-source-info=2 
+#Be sure to set the environment variable KMP_FORKJOIN_FRAMES=1 for OpenMP debuging in vtune
+
 IDEBUG = -O0 -init=snan,arrays  -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -qopt-matmul -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin 
 STRICTREAL = -fp-model=precise -prec-div -prec-sqrt -assume protect-parens 
 SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdtarget -fp-model no-except -fma
-PAR = -qopenmp -parallel 
+PAR = -qopenmp -parallel -parallel-source-info=2 
 HEAPARR = -heap-arrays 4194304 
 OPTREPORT = -qopt-report=5 
 IPRODUCTION = -no-wrap-margin -O3 -qopt-prefetch=0 -qopt-matmul -sox $(PAR) $(SIMDVEC) #$(HEAPARR)
@@ -60,11 +66,13 @@ GMEM =  -fsanitize-address-use-after-scope -fstack-check  -fsanitize=bounds-stri
 GWARNINGS = -Wall -Warray-bounds  -Wimplicit-interface -Wextra -Warray-temporaries
 GPRODUCTION = -O3 -ffree-line-length-none $(GPAR)
 
-INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include 
-LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib  -lswiftest -lnetcdf -lnetcdff -qopt-matmul $(PAR)
+INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include
+LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib -lswiftest -lnetcdf -lnetcdff -qopt-matmul #$(PAR)
 
-FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) 
-FFLAGS  = $(IPRODUCTION) -fp-model=fast
+FSTRICTFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR) $(HEAPARR)
+FFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR) $(HEAPARR)
+#FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) -g -traceback
+#FFLAGS  = $(IPRODUCTION) -fp-model=fast -g -traceback
 
 FORTRAN = ifort
 AR     = xiar

examples/symba_energy_momentum/param.sun.in

@@ -1,26 +1,24 @@
 !Parameter file for the SyMBA-RINGMOONS test
 T0             0.0 
-TSTOP          3.0e-2
+TSTOP          3.0e-1
 DT             1e-3
 CB_IN          cb.in
 PL_IN          sun.in
 TP_IN          tp.in
 IN_TYPE        ASCII
 ISTEP_OUT      1
 ISTEP_DUMP     1
-BIN_OUT        bin.sun.dat
+BIN_OUT        bin.sun.nc
 PARTICLE_OUT   particle.sun.dat
-OUT_TYPE       REAL8
-OUT_FORM       XV                ! osculating element output
+OUT_TYPE       NETCDF_DOUBLE
+OUT_FORM       XVEL              ! osculating element output
 OUT_STAT       REPLACE
 ISTEP_DUMP     1                 ! system dump cadence
 CHK_CLOSE      yes               ! check for planetary close encounters
 CHK_RMIN       0.005
 CHK_RMAX       1e2
 CHK_EJECT      -1.0              ! ignore this check
 CHK_QMIN       -1.0              ! ignore this check
-ENC_OUT        enc.sun.dat
-DISCARD_OUT    discard.sun.dat
 EXTRA_FORCE    no                ! no extra user-defined forces
 BIG_DISCARD    no                ! output all planets if anything discarded
 RHILL_PRESENT  no                ! Hill's sphere radii in input file
@@ -30,6 +28,5 @@ MU2KG          1.98908e30
 TU2S           3.1556925e7
 DU2M           1.49598e11
 ENERGY         yes
-ENERGY_OUT     energy.sun.out
 ROTATION       yes
 SEED           8 1230834 2346113 123409874 -123121105 -767545 -534058022 343309814 -12535638 

examples/symba_swifter_comparison/8pl_16tp_encounters/cb.in

@@ -1,5 +1,5 @@
 Sun
 0.00029591220819207774
 0.004650467260962157
-4.7535806948127355e-12
--2.2473967953572827e-18
+0.0
+0.0

examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in

@@ -1,5 +1,5 @@
 Sun
 0.00029591220819207774
 0.004650467260962157
-4.7535806948127355e-12
--2.2473967953572827e-18
+0.0
+0.0

examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in

@@ -32,6 +32,7 @@ FRAGMENTATION    NO
 ROTATION         NO
 TIDES            NO
 ENERGY           NO
-GR               NO
+GR               YES
 GMTINY           1e-12
-ENCOUNTER_CHECK  SORTSWEEP
+ENCOUNTER_CHECK  TRIANGULAR
+INTERACTION_LOOPS TRIANGULAR

src/symba/symba_step.f90

@@ -71,22 +71,26 @@ module subroutine symba_step_interp_system(self, param, t, dt)
                   call pl%vh2vb(cb)
                   call pl%lindrift(cb, dth, lbeg=.true.)
                   call pl%kick(system, param, t, dth, lbeg=.true.)
+                  if (param%lgr) call pl%gr_pos_kick(param, dth)
                   call pl%drift(system, param, dt)
 
                   call tp%vh2vb(vbcb = -cb%ptbeg)
                   call tp%lindrift(cb, dth, lbeg=.true.)
                   call tp%kick(system, param, t, dth, lbeg=.true.)
+                  if (param%lgr) call tp%gr_pos_kick(param, dth)
                   call tp%drift(system, param, dt)
 
                   call system%recursive_step(param, t, 0)
 
                   call pl%kick(system, param, t, dth, lbeg=.false.)
-                  call pl%vb2vh(cb)
+                  if (param%lgr) call pl%gr_pos_kick(param, dth)
                   call pl%lindrift(cb, dth, lbeg=.false.)
+                  call pl%vb2vh(cb)
 
                   call tp%kick(system, param, t, dth, lbeg=.false.)
-                  call tp%vb2vh(vbcb = -cb%ptend)
+                  if (param%lgr) call tp%gr_pos_kick(param, dth)
                   call tp%lindrift(cb, dth, lbeg=.false.)
+                  call tp%vb2vh(vbcb = -cb%ptend)
                end select
             end select
          end select