Merge branch 'master' into debug

Makefile.Defines

@@ -41,20 +41,14 @@ 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 -parallel-source-info=2 
+PAR = -qopenmp -parallel 
 HEAPARR = -heap-arrays 4194304 
 OPTREPORT = -qopt-report=5 
 IPRODUCTION = -no-wrap-margin -O3 -qopt-prefetch=0 -qopt-matmul -sox $(PAR) $(SIMDVEC) #$(HEAPARR)
@@ -66,13 +60,11 @@ 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  = $(IDEBUG) #$(SIMDVEC) $(PAR) $(HEAPARR)
-FFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR) $(HEAPARR)
-#FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) -g -traceback
-#FFLAGS  = $(IPRODUCTION) -fp-model=fast -g -traceback
+FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) 
+FFLAGS  = $(IPRODUCTION) -fp-model=fast
 
 FORTRAN = ifort
 AR     = xiar

src/discard/discard.f90

@@ -247,7 +247,7 @@ subroutine discard_pl_tp(tp, system, param)
                      write(idstrj, *) pl%id(j)
                      write(timestr, *) param%t
                      write(*, *) "Test particle " // trim(adjustl(tp%info(i)%name)) // " ("  // trim(adjustl(idstri)) // ")" &
-                                                  // "  too close to massive body " // trim(adjustl(pl%info(i)%name)) // " ("  // trim(adjustl(idstrj)) &
+                                                  // "  too close to massive body " // trim(adjustl(pl%info(j)%name)) // " ("  // trim(adjustl(idstrj)) // ")" &
                                                   // " at t = " // trim(adjustl(timestr))
                      tp%ldiscard(i) = .true.
                      call tp%info(i)%set_value(status="DISCARDED_PLR", discard_time=param%t, discard_xh=tp%xh(:,i), discard_vh=tp%vh(:,i), discard_body_id=pl%id(j))