Merge branch 'main' into jmm/template-lambda

lanl · Apr 23, 2024 · 1336455 · 1336455
2 parents e533122 + c75b6ca
commit 1336455
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -126,7 +126,7 @@ default:
     - rm -rf ${SPACK_USER_CACHE_PATH} ${DEVEL_SPACK_ROOT}
     - |
       if [[ -z "${PROJECT_TMP_SPACK_DIR}" ]]; then
-        export PROJECT_SPACK_ROOT=${XCAP_PROJECT_DIR}/spack
+        export PROJECT_SPACK_ROOT="${XCAP_PROJECT_DIR}/spack-${TESTING_CLUSTER}"
       else
         export PROJECT_SPACK_ROOT="${XCAP_PROJECT_DIR}/${PROJECT_TMP_SPACK_DIR}-${TESTING_CLUSTER}"
       fi

diff --git a/joss-paper/paper.md b/joss-paper/paper.md
@@ -13,7 +13,7 @@ authors:
     affiliation: "1, 2"
     corresponding: true
   - name: Daniel A. Holladay
-  - orcid: 0000-0002-0673-9741
+    orcid: 0000-0002-0673-9741
     affiliation: "2, 3"
   - name: Jeffrey H. Peterson
     orcid: 0000-0001-9425-4674
@@ -68,6 +68,7 @@ affiliations:
   - name: Department of Physics, Florida State University, USA
     index: 10
   - name: XCP-4, Continuum Models and Numerical Methods, Los Alamos National Laboratory, USA
+    index: 11
 date: 13 April 2024
 bibliography: refs.bib