From 28822994045176644d970fefecc79be13de0c79a Mon Sep 17 00:00:00 2001
From: David A Minton <daminton@purdue.edu>
Date: Wed, 22 Sep 2021 08:52:44 -0400
Subject: [PATCH] Rearranged Makefiles to put everything except kick
 subroutines in the fast category. Made a separate strict category for them.

---
 Makefile         | 118 ++++++++++++++++++++---------------------------
 Makefile.Defines |   4 +-
 2 files changed, 53 insertions(+), 69 deletions(-)

diff --git a/Makefile b/Makefile
index ef02313c2..34df2b87a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 #                              library, Swifter drivers and tools
 #                (2) mod     : builds modules
 #                (3) lib     : builds entire Swifter library
-#                (4) libdir  : compiles local directory source and adds the
+#                (4) fastdir  : compiles local directory source and adds the
 #                              resulting objects to the Swifter library
 #                (5) drivers : builds Swifter drivers
 #                (6) tools   : builds Swifter tools
@@ -36,7 +36,7 @@
 #    Terminal  : status messages
 #    File      : none
 #
-#  Invocation  : make [all|mod|lib|libdir|drivers|tools|bin|clean]
+#  Invocation  : make [all|mod|lib|fastdir|drivers|tools|bin|clean]
 #
 #  Notes       : The use of the above arguments as phony targets inside the
 #                makefile precludes their use as base names of Swifter drivers
@@ -65,7 +65,7 @@ LMKL = -L$(MKLROOT)/lib/intel64 -qopt-matmul
 
 MODULES         = $(SWIFTEST_MODULES) $(USER_MODULES) 
 
-.PHONY : all mod lib fast drivers bin clean force 
+.PHONY : all mod fast strict drivers bin clean force 
 
 % : %.f90 force
 	$(FORTRAN) $(FFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) $< -o $@ \
@@ -76,8 +76,8 @@ MODULES         = $(SWIFTEST_MODULES) $(USER_MODULES)
 all:
 	cd $(SWIFTEST_HOME); \
 	  make mod; \
-	  make lib; \
 	  make fast; \
+	  make strict; \
 	  make drivers; \
 
 mod:
@@ -87,152 +87,136 @@ mod:
 	  $(INSTALL_DATA) *.mod *.smod $(SWIFTEST_HOME)/include; \
 	  rm -f *.o *.mod  *.smod
 
-lib:
+fast:
 	cd $(SWIFTEST_HOME)/src/discard; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/gr; \
-	  rm -f Makefile.Defines Makefile; \
-	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
-	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/io; \
-	  rm -f Makefile.Defines Makefile; \
-	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
-	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/kick; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/drift; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/netcdf; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/fraggle; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/obl; \
+	  make fastdir	  
+	cd $(SWIFTEST_HOME)/src/gr; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/setup; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/helio; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/tides; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/io; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/whm; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/netcdf; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/rmvs; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/obl; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/helio; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/operators; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/symba; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/orbel; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/user; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/rmvs; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-	cd $(SWIFTEST_HOME)/src/walltime; \
+	  make fastdir	
+	cd $(SWIFTEST_HOME)/src/setup; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make libdir
-
-fast:
-	cd $(SWIFTEST_HOME)/src/operators; \
+	  make fastdir
+	cd $(SWIFTEST_HOME)/src/symba; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
 	  make fastdir
-	cd $(SWIFTEST_HOME)/src/fraggle; \
+	cd $(SWIFTEST_HOME)/src/tides; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
 	  make fastdir
-	cd $(SWIFTEST_HOME)/src/util; \
+	cd $(SWIFTEST_HOME)/src/user; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
 	  make fastdir
-	cd $(SWIFTEST_HOME)/src/orbel; \
+	cd $(SWIFTEST_HOME)/src/util; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make fastdir
-	cd $(SWIFTEST_HOME)/src/drift; \
+	  make fastdir	
+	cd $(SWIFTEST_HOME)/src/walltime; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
 	  make fastdir
-
-	cd $(SWIFTEST_HOME)/src/orbel; \
+	cd $(SWIFTEST_HOME)/src/whm; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
 	  make fastdir
 
-	cd $(SWIFTEST_HOME)/src/drift; \
+strict:
+	cd $(SWIFTEST_HOME)/src/kick; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
-	  make fastdir
-
+	  make strictdir
 	cd $(SWIFTEST_HOME)/src/helio; \
-		$(FORTRAN) $(FFASTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c helio_drift.f90; \
-		$(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \
-		$(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \
-		rm -f *.o *.smod	
-
-	cd $(SWIFTEST_HOME)/src/rmvs; \
-		$(FORTRAN) $(FFASTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c rmvs_encounter_check.f90; \
+		$(FORTRAN) $(FSTRICTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c helio_kick.f90; \
 		$(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \
 		$(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \
 		rm -f *.o *.smod	
-
 	cd $(SWIFTEST_HOME)/src/symba; \
-		$(FORTRAN) $(FFASTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c symba_encounter_check.f90; \
+		$(FORTRAN) $(FSTRICTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c symba_kick.f90; \
 		$(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \
 		$(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \
 		rm -f *.o *.smod
-
-	cd $(SWIFTEST_HOME)/src/helio; \
-		$(FORTRAN) $(FFASTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c helio_drift.f90; \
+	cd $(SWIFTEST_HOME)/src/rmvs; \
+		$(FORTRAN) $(FSTRICTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c rmvs_kick.f90; \
+		$(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \
+		$(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \
+		rm -f *.o *.smod	
+	cd $(SWIFTEST_HOME)/src/whm; \
+		$(FORTRAN) $(FSTRICTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c whm_kick.f90; \
 		$(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \
 		$(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \
 		rm -f *.o *.smod
 
-libdir:
+fastdir:
 	$(FORTRAN) $(FFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c *.f90; \
 	$(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \
 	$(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \
 	rm -f *.o *.smod
 
-fastdir:
-	$(FORTRAN) $(FFASTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c *.f90; \
+strictdir:
+	$(FORTRAN) $(FSTRICTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c *.f90; \
 	$(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \
 	$(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \
-	rm -f *.o *.smod
+	rm -f *.o *.smo	
 
 drivers:
 	cd $(SWIFTEST_HOME)/src/main; \
diff --git a/Makefile.Defines b/Makefile.Defines
index 838038524..2d534ef21 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -69,8 +69,8 @@ GPRODUCTION = -O2 -ffree-line-length-none $(GPAR)
 
 #FFLAGS  = $(IDEBUG)  #$(SIMDVEC) $(PAR)
 #FFASTFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR)
-FFLAGS = $(IPRODUCTION) $(STRICTREAL) $(OPTREPORT) #$(ADVIXE_FLAGS)
-FFASTFLAGS = $(IPRODUCTION) -fp-model fast $(OPTREPORT) #$(ADVIXE_FLAGS)
+FSTRICTFLAGS = $(IPRODUCTION) $(STRICTREAL) $(OPTREPORT) #$(ADVIXE_FLAGS)
+FFLAGS = $(IPRODUCTION) -fp-model fast $(OPTREPORT) #$(ADVIXE_FLAGS)
 FORTRAN = ifort
 AR     = xiar