From 09b959b0fda2d50608bab9f1dc40a4bc81b04b44 Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Thu, 19 Oct 2023 14:49:54 -0400 Subject: [PATCH] Updated version and added the beginnings of the readthedocs files --- .gitignore | 4 +++- buildscripts/get_lomp.sh | 4 ++++ docs/index.md | 17 +++++++++++++++++ mkdocs.yml | 6 ++++++ pyproject.toml | 3 ++- src/globals/globals_module.f90 | 2 +- version.txt | 2 +- 7 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 docs/index.md create mode 100644 mkdocs.yml diff --git a/.gitignore b/.gitignore index 3b52904fb..06fee4819 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ _dependencies #Documentation +!mkdocs.yml !docs/* !docs/*/* !docs/*/*/* @@ -61,4 +62,5 @@ zlib-* actions-runner* -env/** \ No newline at end of file +env/** +venv/** diff --git a/buildscripts/get_lomp.sh b/buildscripts/get_lomp.sh index 6b56e5b3c..d72213dbc 100755 --- a/buildscripts/get_lomp.sh +++ b/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" diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 000000000..000ea3455 --- /dev/null +++ b/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. diff --git a/mkdocs.yml b/mkdocs.yml new file mode 100644 index 000000000..d15a0315d --- /dev/null +++ b/mkdocs.yml @@ -0,0 +1,6 @@ +site_name: MkLorum +site_url: https://example.com/ +nav: + - Home: index.md + - About: about.md +theme: readthedocs \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 0e7fe3767..0424270c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "swiftest" -version = "2023.10.2" +version = "2023.10.3" 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] diff --git a/src/globals/globals_module.f90 b/src/globals/globals_module.f90 index d7d00e085..d1a466d29 100644 --- a/src/globals/globals_module.f90 +++ b/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.10.3" !! Swiftest version !> Symbolic name for integrator types character(*), parameter :: UNKNOWN_INTEGRATOR = "UKNOWN INTEGRATOR" diff --git a/version.txt b/version.txt index d0d0c6122..e668262f6 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2023.10.2 \ No newline at end of file +2023.10.3 \ No newline at end of file