Merge branch 'debug' into oblate_coord_rot

.gitignore

@@ -40,6 +40,7 @@ _dependencies
 
 
 #Documentation
+!mkdocs.yml
 !docs/*
 !docs/*/*
 !docs/*/*/*
@@ -61,4 +62,5 @@ zlib-*
 
 actions-runner*
 
-env/**
+env/**
+venv/**

README_tables/add_body_kwargs.md

@@ -15,7 +15,7 @@
 | ```Gmass```     | Gravitational mass value(s) of bodies. Only for massive bodies. Only  ```mass``` **OR** ```Gmass``` may be set.                         | float or array-like of floats
 | ```radius```    | Radius value(s) of bodies. Only for massive bodies.                                                                                     | float or array-like of floats
 | ```rhill```     | Hill Radius value(s) of bodies. Only for massive bodies.                                                                                | float or array-like of floats
-| ```rot```       | Rotation rate vector(s) of bodies in radians/sec. Only for massive bodies. Only used if ```rotation``` is set to ```True```.                           | (n,3) array-like of floats
+| ```rot```       | Rotation rate vector(s) of bodies in degrees/sec. Only for massive bodies. Only used if ```rotation``` is set to ```True```.                           | (n,3) array-like of floats
 | ```Ip```        | Principal axes moments of inertia vector(s) of bodies. Only for massive bodies. Only used if ```rotation``` is set to ```True```.       | (n,3) array-like of floats
 | ```J2```        | The unitless value of the spherical harmonic term equal to J2*R^2 where R is the radius of the central body.                                                                                                     | float or array-like of floats
 | ```J4```        | The unitless value of the spherical harmonic term equal to J4*R^4 where R is the radius of the central body.                                                                                                     | float or array-like of floats

buildscripts/get_lomp.sh

@@ -23,6 +23,10 @@ TARGET_REV=`echo $MACOSX_DEPLOYMENT_TARGET | cut -d. -f3`
 
 #Figure out which version to get
 case $TARGET_MAJOR in
+   14)
+      OMPVER="16.0.4"
+      DVER="20"
+      ;;
    13)
       OMPVER="14.0.6"
       DVER="20"

cmake/Modules/SetSwiftestFlags.cmake

@@ -420,12 +420,14 @@ IF (CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "TESTING" )
             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 

docs/index.md

@@ -0,0 +1,17 @@
+# Welcome to MkDocs
+
+For full documentation visit [mkdocs.org](https://www.mkdocs.org).
+
+## Commands
+
+* `mkdocs new [dir-name]` - Create a new project.
+* `mkdocs serve` - Start the live-reloading docs server.
+* `mkdocs build` - Build the documentation site.
+* `mkdocs -h` - Print help message and exit.
+
+## Project layout
+
+    mkdocs.yml    # The configuration file.
+    docs/
+        index.md  # The documentation homepage.
+        ...       # Other markdown pages, images and other files.

mkdocs.yml

@@ -0,0 +1,6 @@
+site_name: MkLorum
+site_url: https://example.com/
+nav:
+  - Home: index.md
+  - About: about.md
+theme: readthedocs

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "swiftest"
-version = "2023.10.2"
+version = "2023.11.0"
 authors=[
     {name = 'David A. Minton', email='daminton@purdue.edu'},
     {name = 'Carlisle Wishard'},
@@ -38,6 +38,7 @@ dependencies = [
     'astroquery>=0.4.6',
     'tqdm>=4.66',
     'cython>=3.0.0',
+    'mkdocs>=1.5.3'
 ]
 
 [project.urls]
@@ -47,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.2" !! 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)