From 8bef144f36641ef774dec70d87d2a1c28a32ae33 Mon Sep 17 00:00:00 2001
From: David A Minton <daminton@purdue.edu>
Date: Tue, 1 Mar 2022 10:39:30 -0500
Subject: [PATCH 1/2] Set new debug flags on the debug branch

---
 Makefile.Defines | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile.Defines b/Makefile.Defines
index 15f8fe262..6b43d109e 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -51,7 +51,7 @@ SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdta
 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)
+IPRODUCTION = -no-wrap-margin -O1 -qopt-prefetch=0 -qopt-matmul -sox $(PAR) $(SIMDVEC) #$(HEAPARR)
 
 #gfortran flags
 GDEBUG = -g -Og -fbacktrace -fbounds-check -ffree-line-length-none
@@ -61,13 +61,11 @@ GWARNINGS = -Wall -Warray-bounds  -Wimplicit-interface -Wextra -Warray-temporari
 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)
+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) $(PAR) $(SIMDVEC)
+FFLAGS  = $(IDEBUG) $(PAR) $(SIMDVEC)
 
-FSTRICTFLAGS = $(ADVIXE_FLAGS) $(PAR) $(SIMDVEC) $(STRICTREAL) 
-FFLAGS = $(ADVIXE_FLAGS) $(PAR) $(SIMDVEC)  -fp-model=fast 
 FORTRAN = ifort
 AR     = xiar
 CC    = icc

From 5f3a0797c9843e989c0ae1708db9f69dac30a9c6 Mon Sep 17 00:00:00 2001
From: David A Minton <daminton@purdue.edu>
Date: Tue, 1 Mar 2022 14:01:31 -0500
Subject: [PATCH 2/2] Removed ntp==0 check to allow the discard code to run the
 coordinate conversions even if there are no test particles

---
 src/discard/discard.f90 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/discard/discard.f90 b/src/discard/discard.f90
index 0fe86e8fa..558b8b899 100644
--- a/src/discard/discard.f90
+++ b/src/discard/discard.f90
@@ -78,7 +78,6 @@ module subroutine discard_tp(self, system, param)
       associate(tp => self, cb => system%cb, pl => system%pl)
          ntp = tp%nbody
          npl = pl%nbody
-         if ((ntp == 0) .or. (npl ==0)) return 
 
          if ((param%rmin >= 0.0_DP) .or. (param%rmax >= 0.0_DP) .or. &
              (param%rmaxu >= 0.0_DP) .or. ((param%qmin >= 0.0_DP) .and. (param%qmin_coord == "BARY"))) then