From bf1f97ca75b942dd08506b88197cf0feaa1c694d Mon Sep 17 00:00:00 2001
From: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date: Wed, 27 Mar 2024 16:29:36 +1100
Subject: [PATCH] Depend on openmpi instead of nci-openmpi and add restart
 reproducibility (#49)

* Depend on openmpi instead of nci-openmpi
* versions.json: Updated spack-config to 2024.03.22 (uses system openmpi directly instead of nci-openmpi)
Requires: https://github.com/ACCESS-NRI/spack-packages/pull/66
Requires: https://github.com/ACCESS-NRI/spack-config/pull/26

* spack.yaml: Updated spack-packages to 2024.03.22, spack-config to 2024.02.1
* spack.yaml: Updated access-om2 package version from 2023.11.24 to 2024.03.0


---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tommy Gatti <tommy.gatti@anu.edu.au>
---
 config/versions.json |  4 ++--
 spack.yaml           | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/versions.json b/config/versions.json
index 5d237ed..db8e43b 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +1,5 @@
 {
     "$schema": "./versions.schema.json",
-    "spack-packages": "2023.11.01",
-    "spack-config": "2023.11.01"
+    "spack-packages": "2024.03.22",
+    "spack-config": "2024.03.22"
 }
\ No newline at end of file
diff --git a/spack.yaml b/spack.yaml
index 94136f7..0754065 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -5,7 +5,7 @@
 spack:
   # add package specs to the `specs` list
   specs:
-  - access-om2@git.2023.11.23
+    - access-om2@git.2024.03.0
   packages:
     cice5:
       require: '@git.2023.10.19'
@@ -21,7 +21,7 @@ spack:
       require: '@4.5.2'
     parallelio:
       require: '@2.5.2'
-    nci-openmpi:
+    openmpi:
       require: '@4.0.2'
     all:
       compiler: [intel@19.0.5.281]
@@ -31,29 +31,29 @@ spack:
   modules:
     default:
       enable:
-      - tcl
+        - tcl
       roots:
         tcl: $spack/../release/modules
         lmod: $spack/../release/lmod
       tcl:
         hash_length: 0
         include:
-        - access-om2
-        - mom5
-        - cice5
-        - libaccessom2
-        - oasis3-mct
+          - access-om2
+          - mom5
+          - cice5
+          - libaccessom2
+          - oasis3-mct
         exclude_implicits: true
         all:
           autoload: direct
           conflict:
-          - '{name}'
+            - '{name}'
           environment:
             set:
               'SPACK_{name}_ROOT': '{prefix}'
         projections:
           all: '{name}/{version}'
-          access-om2: '{name}/2023.11.23'
+          access-om2: '{name}/2024.03.0'
           cice5: '{name}/2023.10.19'
           mom5: '{name}/2023.11.09'
           libaccessom2: '{name}/2023.10.26'