From e4be6719a0e08143a1425f60f3b622440dd26bbe Mon Sep 17 00:00:00 2001
From: David A Minton <daminton@purdue.edu>
Date: Thu, 21 Oct 2021 10:04:56 -0400
Subject: [PATCH 1/2] Streamlined compiler flags

---
 Makefile.Defines | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile.Defines b/Makefile.Defines
index 9b6ba65ce..443284a86 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -72,21 +72,20 @@ IMKL = -I$(MKLROOT)/include
 LMKL = -L$(MKLROOT)/lib/intel64 -qopt-matmul 
 
 FSTRICTFLAGS  = $(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)
 FORTRAN = ifort
 AR     = xiar
+CC    = icc
 
 #FORTRAN = gfortran
 #FFLAGS =  $(GDEBUG)  $(GMEM) #$(GPAR)
-#FFLAGS =  $(GPRODUCTION) #-g -fbacktrace -fcheck=all #-Wall 
-#FSTRICTFLAGS=  $(GPRODUCTION) #-g -fbacktrace -fcheck=all #-Wall 
-#AR     = ar # DO NOT include in CFLAGS the "-c" option to compile object only
+#FSTRICTFLAGS =  $(GDEBUG)  $(GMEM) #$(GPAR)
+#AR     = ar 
+#CC     = cc
+
+# DO NOT include in CFLAGS the "-c" option to compile object only
 # this is done explicitly as needed in the Makefile
 
-#CC              = icc
-CC              = cc
 CFLAGS          = -O3 -w -m64 -std=c99
 
 64_BIT_REALS    = -r8

From fc91ba21d6795523ef560fa84e2998a5da18f136 Mon Sep 17 00:00:00 2001
From: David A Minton <daminton@purdue.edu>
Date: Thu, 21 Oct 2021 10:08:24 -0400
Subject: [PATCH 2/2] Fixed time_chunk calculation for the situation in which
 the output dumps happen less frequently than the output writes

---
 src/io/io.f90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/io/io.f90 b/src/io/io.f90
index 99e33a7db..a866a51ee 100644
--- a/src/io/io.f90
+++ b/src/io/io.f90
@@ -2138,7 +2138,7 @@ module subroutine io_write_frame_system(self, param)
       else if ((param%out_type == NETCDF_FLOAT_TYPE) .or. (param%out_type == NETCDF_DOUBLE_TYPE)) then
 
          param%nciu%id_chunk = pl%nbody + tp%nbody
-         param%nciu%time_chunk = param%istep_out / param%istep_dump
+         param%nciu%time_chunk = max(param%istep_dump / param%istep_out, 1)
          if (lfirst) then
             inquire(file=param%outfile, exist=fileExists)