From 16192768252955790ea63bb9a803f00e297a2da7 Mon Sep 17 00:00:00 2001
From: gitpeterwind <peterw@met.no>
Date: Tue, 30 Apr 2024 17:26:49 +0200
Subject: [PATCH 1/2] bug fix dft energy printouts

---
 src/mrdft/MRDFT.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mrdft/MRDFT.cpp b/src/mrdft/MRDFT.cpp
index 8b16b814b..a06eff63a 100644
--- a/src/mrdft/MRDFT.cpp
+++ b/src/mrdft/MRDFT.cpp
@@ -78,15 +78,18 @@ mrcpp::FunctionTreeVector<3> MRDFT::evaluate(mrcpp::FunctionTreeVector<3> &inp)
     int n_start = (mrcpp::mpi::wrk_rank * nNodes) / mrcpp::mpi::wrk_size;
     int n_end = ((mrcpp::mpi::wrk_rank + 1) * nNodes) / mrcpp::mpi::wrk_size;
     DoubleVector XCenergy = DoubleVector::Zero(1);
+    double sum = 0.0;
 #pragma omp parallel
     {
-#pragma omp for schedule(guided)
+#pragma omp for schedule(guided) reduction (+: sum)
         for (int n = n_start; n < n_end; n++) {
             vector<mrcpp::FunctionNode<3> *> xcNodes = xc_utils::fetch_nodes(n, PotVec);
             functional().makepot(inp, xcNodes);
-            XCenergy[0] += xcNodes[0]->integrate();
+            sum += xcNodes[0]->integrate();
         }
     }
+    XCenergy[0] = sum;
+
     // each mpi only has part of the results. All send their results to bank and then fetch
     if(mrcpp::mpi::wrk_size > 1) {
         // sum up the energy contrbutions from all mpi

From df39ee27b149bab71d0ea3714a0a1fa9a1374d73 Mon Sep 17 00:00:00 2001
From: Stig Rune Jensen <stig.r.jensen@oceanbox.io>
Date: Wed, 1 May 2024 12:15:10 +0200
Subject: [PATCH 2/2] Fix failing macos ci pipeline

---
 .github/workflows/build-test.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 1198d5c85..ea760b382 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -21,7 +21,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        # setup-miniconda not compatible with macos-latest presently.
+        # https://github.com/conda-incubator/setup-miniconda/issues/344
+        os: [ubuntu-latest, macos-12]
 
     steps:
     - uses: actions/checkout@v2
@@ -35,7 +37,7 @@ jobs:
         key:
           ${{ matrix.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('.github/mrchem-gha.yml') }}
 
-    - uses: conda-incubator/setup-miniconda@v2
+    - uses: conda-incubator/setup-miniconda@v3
       with:
           auto-update-conda: true
           auto-activate-base: false