Updates to singularity scripts and also added apptainer scripts

apptainer/.gitignore

@@ -0,0 +1,5 @@
+!bin/
+!bin/swiftest_driver
+!bin/swiftest_python
+!install.sh
+!setenv.sh

apptainer/bin/swiftest_driver

@@ -0,0 +1,2 @@
+#!/bin/sh --
+apptainer exec --bind $(pwd):$(pwd) --env OMP_NUM_THREADS=${OMP_NUM_THREADS},FOR_COARRAY_NUM_IMAGES=${FOR_COARRAY_NUM_IMAGES} ${SWIFTEST_SIF} swiftest_driver "$@"

apptainer/bin/swiftest_python

@@ -0,0 +1,2 @@
+#!/bin/sh --
+apptainer run --bind $(pwd):$(pwd) --env OMP_NUM_THREADS=${OMP_NUM_THREADS},FOR_COARRAY_NUM_IMAGES=${FOR_COARRAY_NUM_IMAGES} ${SWIFTEST_SIF} swiftest_driver "$@"

apptainer/install.sh

@@ -0,0 +1,10 @@
+#!/bin/sh --
+# This will install the Singularity container version of the swiftest_driver in place of the native compiled version into ../bin. 
+# In order to use the executable script, the SWIFTEST_SIF environment variable must be set to point to the location of swiftest_driver.sif, which requires this script to be called via source:
+# $ . ./install.sh
+# 
+tag=${1:-latest}
+echo "Installing swiftest_driver.sif Singularity container and executable script from swiftest_driver:${tag} Docker container"
+apptainer pull --force swiftest.sif docker://daminton/swiftest:${tag}
+cp -rf bin/swiftest_driver ../bin/
+source ./setenv.sh

apptainer/setenv.sh

@@ -0,0 +1,4 @@
+#!/bin/sh --
+# This will set the SWIFTEST_SIF environment variable as long as it is executed by source.
+# $ . ./setenv.sh
+export SWIFTEST="${PWD}/swiftest.sif"

singularity/.gitignore

@@ -1,4 +1,5 @@
 !bin/
 !bin/swiftest_driver
+!bin/swiftest_python
 !install.sh
 !setenv.sh

singularity/bin/swiftest_driver

@@ -1,2 +1,2 @@
 #!/bin/sh --
-singularity run --bind $(pwd):$(pwd) exec --env OMP_NUM_THREADS=${OMP_NUM_THREADS},FOR_COARRAY_NUM_IMAGES=${FOR_COARRAY_NUM_IMAGES} ${SWIFTEST_SIF} swiftest_driver "$@"
+singularity exec --bind $(pwd):$(pwd) --env OMP_NUM_THREADS=${OMP_NUM_THREADS},FOR_COARRAY_NUM_IMAGES=${FOR_COARRAY_NUM_IMAGES} ${SWIFTEST_SIF} swiftest_driver "$@"

singularity/bin/swiftest_python

@@ -0,0 +1,2 @@
+#!/bin/sh --
+singularity run --bind $(pwd):$(pwd) --env OMP_NUM_THREADS=${OMP_NUM_THREADS},FOR_COARRAY_NUM_IMAGES=${FOR_COARRAY_NUM_IMAGES} ${SWIFTEST_SIF} swiftest_driver "$@"