From 4e8def60721b372e53e9b6ad03cc8a825cb783f9 Mon Sep 17 00:00:00 2001
From: David Minton <daminton@purdue.edu>
Date: Tue, 30 Jan 2024 09:15:29 -0500
Subject: [PATCH] Fixed typos in environment variables and made sure the
 -fno-underscoring flag gets set when building SHTOOLS with gfortran

---
 buildscripts/build_shtools.sh         | 5 +++--
 buildscripts/set_compilers.sh         | 2 +-
 buildscripts/set_environment_macos.sh | 2 +-
 pyproject.toml                        | 4 ++--
 src/whm/whm_kick.f90                  | 2 --
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/buildscripts/build_shtools.sh b/buildscripts/build_shtools.sh
index eb37d2a8c..c016b9d90 100755
--- a/buildscripts/build_shtools.sh
+++ b/buildscripts/build_shtools.sh
@@ -19,6 +19,7 @@ printf "*********************************************************\n"
 printf "*               BUILDING SHTOOLS LIBRARY                   *\n"
 printf "*********************************************************\n"
 printf "LIBS: ${LIBS}\n"
+printf "FFLAGS: ${FFLAGS}\n"
 printf "CFLAGS: ${CFLAGS}\n"
 printf "CPPFLAGS: ${CPPFLAGS}\n"
 printf "CPATH: ${CPATH}\n"
@@ -27,8 +28,8 @@ printf "LDFLAGS: ${LDFLAGS}\n"
 printf "*********************************************************\n"
 
 cd SHTOOLS
-make F95="${FC}" CXX="${CXX}" fortran
-make F95="${FC}" CXX="${CXX}" fortran-mp
+make F95="${FC}" CXX="${CXX}" F95FLAGS="-m64 -fPIC -O3 -std=gnu -ffast-math ${FFLAGS}" fortran
+make F95="${FC}" CXX="${CXX}" F95FLAGS="-m64 -fPIC -O3 -std=gnu -ffast-math ${FFLAGS}" fortran-mp
 if [ -w ${PREFIX} ]; then
     make PREFIX="${PREFIX}" install
 else
diff --git a/buildscripts/set_compilers.sh b/buildscripts/set_compilers.sh
index 70dd9f71e..eb7322334 100755
--- a/buildscripts/set_compilers.sh
+++ b/buildscripts/set_compilers.sh
@@ -39,7 +39,7 @@ case $OS in
         . ${SCRIPT_DIR}/set_environment_macos.sh
         FC=${HOMEBREW_PREFIX}/bin/gfortran-12
         CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -Wno-deprecated-non-prototype -arch ${ARCH}"
-        FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH}"
+        FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH} -fno-underscoring"
         FFLAGS=$FCFLAGS
         LD_LIBRARY_PATH=""
         CPATH=""
diff --git a/buildscripts/set_environment_macos.sh b/buildscripts/set_environment_macos.sh
index 03a333c8e..6c255c65c 100755
--- a/buildscripts/set_environment_macos.sh
+++ b/buildscripts/set_environment_macos.sh
@@ -13,7 +13,7 @@ CPPFLAGS="-isystem ${PREFIX}/include -isystem /usr/local/include -Xclang -fopenm
 LIBS="-lomp"
 CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -Wno-deprecated-non-prototype -arch ${ARCH}"
 FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -fno-underscoring"
-FFFLAGS="${FCFLAGS}"
+FFLAGS="${FCFLAGS}"
 CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype"
 CXXFLAGS="${CFLAGS}"
 HDF5_ROOT="${PREFIX}"
diff --git a/pyproject.toml b/pyproject.toml
index dc34c49c5..1ec45f7e0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -91,8 +91,8 @@ LDFLAGS="-Wl,-rpath,${ROOT_DIR}/lib  -Wl,-no_compact_unwind -L${PREFIX}/lib -L${
 CPATH="/usr/local/include:${PREFIX}/include:${HOMEBREW_PREFIX}/include:${ROOT_DIR}/include"
 CPPFLAGS="-isystem ${PREFIX}/include -isystem /usr/local/include"
 LIBS="-lomp"
-FCFLAGS="-mmacos-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH}"
-FFFLAGS="${FCFLAGS}"
+FCFLAGS="-mmacos-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH} -fno-underscoring"
+FFLAGS="${FCFLAGS}"
 CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype -arch ${ARCH}"
 CXXFLAGS="${CFLAGS}"
 HDF5_ROOT="${PREFIX}"
diff --git a/src/whm/whm_kick.f90 b/src/whm/whm_kick.f90
index 2b37e4b98..e0bb2e70f 100644
--- a/src/whm/whm_kick.f90
+++ b/src/whm/whm_kick.f90
@@ -239,7 +239,6 @@ module subroutine whm_kick_vh_pl(self, nbody_system, param, t, dt, lbeg)
       logical,                      intent(in)    :: lbeg   !! Logical flag indicating whether this is the beginning of the half step or not. 
       ! Internals
       integer(I4B) :: i, npl
-      real(DP) :: tmp ! to check the acceleration kick due to the CB
 
       associate(pl => self, cb => nbody_system%cb)
          npl = self%nbody
@@ -263,7 +262,6 @@ module subroutine whm_kick_vh_pl(self, nbody_system, param, t, dt, lbeg)
          do concurrent(i = 1:npl, pl%lmask(i))
 #endif
             pl%vh(:, i) = pl%vh(:, i) + pl%ah(:, i) * dt
-            ! tmp = .mag.(pl%ah(:, i) - pl%aobl(:, i))
          end do
       end associate