Merge branch 'debug'

cmake/Modules/SetSwiftestFlags.cmake

@@ -412,21 +412,19 @@ IF (CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "TESTING" )
         SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
             Fortran "-Wno-unused-dummy-argument" # GNU
         )
-        # Tells the compiler to issue compile-time messages for nonstandard language elements (Fortran 2018).    
-        SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
-            Fortran "-fstd=f2018" # GNU
-        )  
         # Traceback
         SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
             Fortran "-fbacktrace"  # GNU (gfortran)
         )
         # Sanitize
-        SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
-            Fortran "-fsanitize=address, undefined"  # Gnu 
-        )
-        SET_COMPILE_FLAG(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}"
-            C "-fsanitize=address, undefined"  # Gnu 
-        )
+        IF (NOT APPLE)
+            SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
+                Fortran "-fsanitize=address, undefined"  # Gnu 
+            )
+            SET_COMPILE_FLAG(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}"
+                C "-fsanitize=address, undefined"  # Gnu 
+            )
+        ENDIF()
         # Check everything
         SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}"
             Fortran "-fcheck=all" # GNU 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "swiftest"
-version = "2023.10.3"
+version = "2023.11.0"
 authors=[
     {name = 'David A. Minton', email='daminton@purdue.edu'},
     {name = 'Carlisle Wishard'},
@@ -48,6 +48,7 @@ Repository = 'https://github.itap.purdue.edu/MintonGroup/swiftest'
 requires = [
     "scikit-build-core",
     "cython>=3.0.0",
+    "pyproject_metadata",
     "pytest",
 ]
 build-backend = "scikit_build_core.build"

src/globals/globals_module.f90

@@ -48,7 +48,7 @@ module globals
    integer(I4B), parameter :: UPPERCASE_OFFSET = iachar('A') - iachar('a') !! ASCII character set parameter for lower to upper 
                                                                            !! conversion - offset between upper and lower
 
-   character(*), parameter :: VERSION = "2023.10.3" !! Swiftest version
+   character(*), parameter :: VERSION = "2023.11.0" !! Swiftest version
 
    !> Symbolic name for integrator types
    character(*), parameter :: UNKNOWN_INTEGRATOR = "UKNOWN INTEGRATOR"

src/rmvs/rmvs_step.f90

@@ -28,7 +28,7 @@ module subroutine rmvs_step_system(self, param, t, dt)
       logical :: lencounter, lfirstpl
       real(DP), dimension(:,:), allocatable :: rbeg, rend, vbeg
 
-      if (self%tp%nbody == 0) then
+      if ((self%tp%nbody == 0) .or. (self%pl%nbody == 0)) then
          call whm_step_system(self, param, t, dt)
       else
          select type(cb => self%cb)