From 38f3f6a658db46e15837215b939558399d5fa0fe Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Wed, 25 Oct 2023 10:02:31 +0100
Subject: [PATCH 01/29] Fixed typos in linear_goland_flutter.ipynb

---
 .../example_notebooks/linear_goland_flutter.ipynb      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/source/content/example_notebooks/linear_goland_flutter.ipynb b/docs/source/content/example_notebooks/linear_goland_flutter.ipynb
index f3ddf9490..63cd87273 100644
--- a/docs/source/content/example_notebooks/linear_goland_flutter.ipynb
+++ b/docs/source/content/example_notebooks/linear_goland_flutter.ipynb
@@ -23,7 +23,7 @@
     "* Evaluate the stability of the linearised aeroelastic system at different velocities and plot the results.\n",
     "\n",
     "## Wing properties\n",
-    "Span: b=20 ft., chord: c=6 ft., weight: 4 psi., radius of gyration about CG: .25c, elastic axis: 0.33c,, centre of gravity: 0.43c\n",
+    "Span: b=20 ft., chord: c=6 ft., weight: 4 psi., radius of gyration about CG: .25c, elastic axis: 0.33c, centre of gravity: 0.43c\n",
     "\n",
     "### References\n",
     "\n",
@@ -79,7 +79,7 @@
    "outputs": [],
    "source": [
     "u_inf = 1.\n",
-    "alpha_deg = 2.  # Define antle of attack for static aeroelastic analsis.\n",
+    "alpha_deg = 2.  # Define angle of attack for static aeroelastic analysis.\n",
     "rho = 1.02      # Air density."
    ]
   },
@@ -100,8 +100,8 @@
    "source": [
     "M = 16             # Number of chordwise panels\n",
     "N = 32             # Number of spanwise panels\n",
-    "M_star_fact = 10   # Length of the  chords in chords.\n",
-    "num_modes =  8     # Mumber of vibration modes retained in the structural model."
+    "M_star_fact = 10   # Length of the wake in chords.\n",
+    "num_modes =  8     # Number of vibration modes retained in the structural model."
    ]
   },
   {
@@ -531,7 +531,7 @@
    "source": [
     "### Stability \n",
     "\n",
-    "The stability of the Goland wing is now analysed under changing free stream velocity. The flutter modes involves the two lowest frequency modes near the imaginar axis (1st bending and 1st torsion if aerodynamics is removed). The two modes are seen quite separated at 100 m/s. As speed is increased, the damping of the torsion mode decreases until it crosses the imaginary axis onto the right hand plane and flutter begins."
+    "The stability of the Goland wing is now analysed under changing free stream velocity. The flutter modes involves the two lowest frequency modes near the imaginary axis (1st bending and 1st torsion if aerodynamics is removed). The two modes are seen quite separated at 100 m/s. As speed is increased, the damping of the torsion mode decreases until it crosses the imaginary axis onto the right hand plane and flutter begins."
    ]
   },
   {

From b8222dde0b8a3907442270b852eb7fd6e6b0b9a9 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 16:26:59 +0100
Subject: [PATCH 02/29] Change GitHub workflow to use macOS

---
 .github/workflows/sharpy_tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index d5dff4462..55662add9 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -15,7 +15,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     strategy:
       matrix:
         python-version: [3.10.8]

From e3f7c3b321fa7378067caaa6fafbff9fa6038e22 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 16:28:21 +0100
Subject: [PATCH 03/29] Update sharpy_no_test_needed.yaml to use macOS

---
 .github/workflows/sharpy_no_test_needed.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sharpy_no_test_needed.yaml b/.github/workflows/sharpy_no_test_needed.yaml
index 7f49b9995..1811ae022 100644
--- a/.github/workflows/sharpy_no_test_needed.yaml
+++ b/.github/workflows/sharpy_no_test_needed.yaml
@@ -13,6 +13,6 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: macos_latest
     steps:
       - run: 'echo "No changes to python files, submodules or workflows, no run required" '

From f69cf836a70de63c83e7c8f2a41a595eea69976e Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 16:31:01 +0100
Subject: [PATCH 04/29] Update sharpy_no_test_needed.yaml

---
 .github/workflows/sharpy_no_test_needed.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sharpy_no_test_needed.yaml b/.github/workflows/sharpy_no_test_needed.yaml
index 1811ae022..e42fdf488 100644
--- a/.github/workflows/sharpy_no_test_needed.yaml
+++ b/.github/workflows/sharpy_no_test_needed.yaml
@@ -13,6 +13,6 @@ on:
 
 jobs:
   build:
-    runs-on: macos_latest
+    runs-on: macos-latest
     steps:
       - run: 'echo "No changes to python files, submodules or workflows, no run required" '

From 631af3585a7e8e4e610ee77f46d39a825f02695e Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 16:39:51 +0100
Subject: [PATCH 05/29] Update sharpy_no_test_needed.yaml

---
 .github/workflows/sharpy_no_test_needed.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sharpy_no_test_needed.yaml b/.github/workflows/sharpy_no_test_needed.yaml
index e42fdf488..f11553516 100644
--- a/.github/workflows/sharpy_no_test_needed.yaml
+++ b/.github/workflows/sharpy_no_test_needed.yaml
@@ -13,6 +13,6 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-latest-large
     steps:
       - run: 'echo "No changes to python files, submodules or workflows, no run required" '

From 456bb8353370d4a826ca27fbdef36bbe30ab33bb Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 16:40:07 +0100
Subject: [PATCH 06/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index 55662add9..bf9924089 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -15,7 +15,7 @@ on:
 jobs:
   build:
 
-    runs-on: macos-latest
+    runs-on: macos-latest-large
     strategy:
       matrix:
         python-version: [3.10.8]

From 25756d6011f06a9dd2b0940b472c0bf05bb10a04 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 17:03:50 +0100
Subject: [PATCH 07/29] Update docker_build.yaml

---
 .github/workflows/docker_build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml
index a66cce5b4..f41ccaeb8 100644
--- a/.github/workflows/docker_build.yaml
+++ b/.github/workflows/docker_build.yaml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   build-and-push-image:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     permissions:
       contents: read
       packages: write

From 4dcdb0480e5b2fd086bbab90d0874e887268fa15 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 17:04:18 +0100
Subject: [PATCH 08/29] Update docker_build_test.yaml

---
 .github/workflows/docker_build_test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker_build_test.yaml b/.github/workflows/docker_build_test.yaml
index d901192b1..9d59d4cbd 100644
--- a/.github/workflows/docker_build_test.yaml
+++ b/.github/workflows/docker_build_test.yaml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   test_image_build:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     name: Test Docker image build
     permissions:
       contents: read

From 53eceb145890e54d3caece3dd16fcf6c51a3eaf0 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 17:19:16 +0100
Subject: [PATCH 09/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index bf9924089..ec0bf7d66 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -28,9 +28,9 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Set up GCC
         uses: egor-tensin/setup-gcc@v1
-        with:
-          version: 10
-          platform: x64
+        #with:
+        #  version: 10
+        #  platform: x64
       - name: Setup conda
         uses: s-weigand/setup-conda@v1
         with:

From c0cc6b49eeb1082087d0dd08edd69991e30b9de7 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Fri, 27 Oct 2023 17:22:18 +0100
Subject: [PATCH 10/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index ec0bf7d66..55c2aa481 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -26,8 +26,8 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Set up GCC
-        uses: egor-tensin/setup-gcc@v1
+      #- name: Set up GCC
+      #  uses: egor-tensin/setup-gcc@v1
         #with:
         #  version: 10
         #  platform: x64
@@ -37,6 +37,7 @@ jobs:
           python-version: 3.9
       - name: Pre-Install dependencies
         run: |
+          brew install gcc-12
           gfortran --version
           wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
           # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh -O miniconda.sh;

From d8e5087666fa1aaf8f60de2c6859d069d0134854 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:12:03 +0000
Subject: [PATCH 11/29] Update docker_build.yaml

---
 .github/workflows/docker_build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml
index f41ccaeb8..a66cce5b4 100644
--- a/.github/workflows/docker_build.yaml
+++ b/.github/workflows/docker_build.yaml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   build-and-push-image:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write

From 060501b97b975d07cafa48b926cf03fd6587f11b Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:12:22 +0000
Subject: [PATCH 12/29] Update docker_build_test.yaml

---
 .github/workflows/docker_build_test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker_build_test.yaml b/.github/workflows/docker_build_test.yaml
index 9d59d4cbd..d901192b1 100644
--- a/.github/workflows/docker_build_test.yaml
+++ b/.github/workflows/docker_build_test.yaml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   test_image_build:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     name: Test Docker image build
     permissions:
       contents: read

From 758c0721e6ce67d143ac4d24c95f27ae87421e5d Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:12:42 +0000
Subject: [PATCH 13/29] Update sharpy_no_test_needed.yaml

---
 .github/workflows/sharpy_no_test_needed.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sharpy_no_test_needed.yaml b/.github/workflows/sharpy_no_test_needed.yaml
index f11553516..7f49b9995 100644
--- a/.github/workflows/sharpy_no_test_needed.yaml
+++ b/.github/workflows/sharpy_no_test_needed.yaml
@@ -13,6 +13,6 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest-large
+    runs-on: ubuntu-latest
     steps:
       - run: 'echo "No changes to python files, submodules or workflows, no run required" '

From 50f9c9bc56ffc0e7cf01f3f79d99a7ef660216de Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:14:06 +0000
Subject: [PATCH 14/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index 55c2aa481..d5dff4462 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -15,7 +15,7 @@ on:
 jobs:
   build:
 
-    runs-on: macos-latest-large
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.10.8]
@@ -26,18 +26,17 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      #- name: Set up GCC
-      #  uses: egor-tensin/setup-gcc@v1
-        #with:
-        #  version: 10
-        #  platform: x64
+      - name: Set up GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
       - name: Setup conda
         uses: s-weigand/setup-conda@v1
         with:
           python-version: 3.9
       - name: Pre-Install dependencies
         run: |
-          brew install gcc-12
           gfortran --version
           wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
           # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh -O miniconda.sh;

From 438d884ea893ea60eced2a670d2c56bb172e4294 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:27:50 +0000
Subject: [PATCH 15/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index d5dff4462..445e72cfc 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -31,10 +31,14 @@ jobs:
         with:
           version: 10
           platform: x64
-      - name: Setup conda
+      - name: Set up Conda
         uses: s-weigand/setup-conda@v1
         with:
           python-version: 3.9
+      - name: Setup Mamba
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          python-version: 3.9
       - name: Pre-Install dependencies
         run: |
           gfortran --version
@@ -43,16 +47,17 @@ jobs:
           bash miniconda.sh -b -p $HOME/miniconda
           export PATH="$HOME/miniconda/bin:$PATH"
           hash -r
-          conda config --set always_yes yes --set changeps1 no
-          # conda config --append channels conda-forge
-          conda update --name base conda
-          conda list --name base conda
-          conda init bash
+          conda install mamba -n base -c conda-forge
+          mamba config --set always_yes yes --set changeps1 no
+          # mamba config --append channels mamba-forge
+          mamba update --name base mamba
+          mamba list --name base mamba
+          mamba init bash
           hash -r
           export QT_QPA_PLATFORM='offscreen'
           sudo apt install libeigen3-dev
-          conda env create -f utils/environment.yml
-          conda init bash
+          mamba env create -f utils/environment.yml
+          mamba init bash
           source activate sharpy
           git submodule init
           git submodule update

From e55b102eb0acd4ae46b17ae4a6207eec54d3a603 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:49:04 +0000
Subject: [PATCH 16/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index 445e72cfc..4e85d6c10 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -31,10 +31,6 @@ jobs:
         with:
           version: 10
           platform: x64
-      - name: Set up Conda
-        uses: s-weigand/setup-conda@v1
-        with:
-          python-version: 3.9
       - name: Setup Mamba
         uses: mamba-org/setup-micromamba@v1
         with:
@@ -42,12 +38,13 @@ jobs:
       - name: Pre-Install dependencies
         run: |
           gfortran --version
-          wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+          wget -O Mambaforge.sh <https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$>(uname -m).sh
+          # wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
           # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh -O miniconda.sh;
-          bash miniconda.sh -b -p $HOME/miniconda
-          export PATH="$HOME/miniconda/bin:$PATH"
+          bash Mambaforge.sh -b -p $HOME/mambaforge
+          source mambaforge/bin/activate
+          export PATH="$HOME/mambaforge/bin:$PATH"
           hash -r
-          conda install mamba -n base -c conda-forge
           mamba config --set always_yes yes --set changeps1 no
           # mamba config --append channels mamba-forge
           mamba update --name base mamba

From db7b747df64fed3330d291f048845bc568e161af Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:51:50 +0000
Subject: [PATCH 17/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index 4e85d6c10..445e72cfc 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -31,6 +31,10 @@ jobs:
         with:
           version: 10
           platform: x64
+      - name: Set up Conda
+        uses: s-weigand/setup-conda@v1
+        with:
+          python-version: 3.9
       - name: Setup Mamba
         uses: mamba-org/setup-micromamba@v1
         with:
@@ -38,13 +42,12 @@ jobs:
       - name: Pre-Install dependencies
         run: |
           gfortran --version
-          wget -O Mambaforge.sh <https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$>(uname -m).sh
-          # wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+          wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
           # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh -O miniconda.sh;
-          bash Mambaforge.sh -b -p $HOME/mambaforge
-          source mambaforge/bin/activate
-          export PATH="$HOME/mambaforge/bin:$PATH"
+          bash miniconda.sh -b -p $HOME/miniconda
+          export PATH="$HOME/miniconda/bin:$PATH"
           hash -r
+          conda install mamba -n base -c conda-forge
           mamba config --set always_yes yes --set changeps1 no
           # mamba config --append channels mamba-forge
           mamba update --name base mamba

From af449567fc30e88f58e23e41260777dd5d288a48 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 09:32:06 +0000
Subject: [PATCH 18/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index 445e72cfc..d52191bc1 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -31,23 +31,24 @@ jobs:
         with:
           version: 10
           platform: x64
-      - name: Set up Conda
-        uses: s-weigand/setup-conda@v1
-        with:
-          python-version: 3.9
+     # - name: Set up Conda
+      #  uses: s-weigand/setup-conda@v1
+       # with:
+        #  python-version: 3.9
       - name: Setup Mamba
         uses: mamba-org/setup-micromamba@v1
-        with:
-          python-version: 3.9
+      #  with:
+       #   python-version: 3.9
       - name: Pre-Install dependencies
         run: |
           gfortran --version
-          wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+          # wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
           # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh -O miniconda.sh;
-          bash miniconda.sh -b -p $HOME/miniconda
-          export PATH="$HOME/miniconda/bin:$PATH"
+           wget --no-check-certificate https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O mamba.sh
+          bash mamba.sh -b -p $HOME/mamba
+          export PATH="$HOME/mamba/bin:$PATH"
           hash -r
-          conda install mamba -n base -c conda-forge
+          # conda install mamba -n base -c conda-forge
           mamba config --set always_yes yes --set changeps1 no
           # mamba config --append channels mamba-forge
           mamba update --name base mamba

From 4d15e1e7e2ca78739d92438c15ca4a0e85eae708 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 09:48:36 +0000
Subject: [PATCH 19/29] Update sharpy_tests.yaml

---
 .github/workflows/sharpy_tests.yaml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index d52191bc1..e67df041a 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -31,26 +31,16 @@ jobs:
         with:
           version: 10
           platform: x64
-     # - name: Set up Conda
-      #  uses: s-weigand/setup-conda@v1
-       # with:
-        #  python-version: 3.9
       - name: Setup Mamba
         uses: mamba-org/setup-micromamba@v1
-      #  with:
-       #   python-version: 3.9
       - name: Pre-Install dependencies
         run: |
           gfortran --version
-          # wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-          # wget https://repo.anaconda.com/archive/Anaconda3-2022.10-Linux-x86_64.sh -O miniconda.sh;
-           wget --no-check-certificate https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O mamba.sh
+          wget --no-check-certificate https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O mamba.sh
           bash mamba.sh -b -p $HOME/mamba
           export PATH="$HOME/mamba/bin:$PATH"
           hash -r
-          # conda install mamba -n base -c conda-forge
           mamba config --set always_yes yes --set changeps1 no
-          # mamba config --append channels mamba-forge
           mamba update --name base mamba
           mamba list --name base mamba
           mamba init bash

From 78093c15a8dac358394a13d149ebe1c306bb2528 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 09:54:20 +0000
Subject: [PATCH 20/29] Update Dockerfile

---
 Dockerfile | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 90c0450d7..178f43bd7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,31 +17,36 @@ RUN yum groupinstall "Development Tools" -y --nogpgcheck && \
     yum install -y --nogpgcheck mesa-libGL libXt libXt-devel wget gcc-gfortran lapack vim tmux && \
     yum clean all
 
-# Install miniconda
-RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /miniconda.sh && \
-    chmod +x /miniconda.sh && \
-    /miniconda.sh -b -p /miniconda3/ && \
-    rm /miniconda.sh && hash -r
+# Install Conda
+#RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /miniconda.sh && \
+#    chmod +x /miniconda.sh && \
+#    /miniconda.sh -b -p /miniconda3/ && \
+#    rm /miniconda.sh && hash -r
+
+# Install Mamba
+RUN wget --no-check-certificate https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O /mamba.sh && \
+    chmod +x /mamba.sh && \
+    rm /mamba.sh && hash -r
 
 ADD / /sharpy_dir/
 
 # Update conda and make it run with no user interaction
 # Cleanup conda installation
-RUN conda init bash && \
-    conda config --set always_yes yes --set changeps1 no && \
-    conda update -q conda && \
-    conda config --set auto_activate_base false && \
-    conda env create -f /sharpy_dir/utils/environment.yml && conda clean -afy && \
+RUN mamba init bash && \
+    mamba config --set always_yes yes --set changeps1 no && \
+    mamba update -q conda && \
+    mamba config --set auto_activate_base false && \
+    mamba env create -f /sharpy_dir/utils/environment.yml && conda clean -afy && \
 
-    find /miniconda3/ -follow -type f -name '*.a' -delete && \
-    find /miniconda3/ -follow -type f -name '*.pyc' -delete && \
-    find /miniconda3/ -follow -type f -name '*.js.map' -delete
+    find /mamba/ -follow -type f -name '*.a' -delete && \
+    find /mamba/ -follow -type f -name '*.pyc' -delete && \
+    find /mamba/ -follow -type f -name '*.js.map' -delete
 
 #COPY /utils/docker/* /root/
 RUN ln -s /sharpy_dir/utils/docker/* /root/
 
 RUN cd sharpy_dir && \
-    conda activate sharpy && \
+    mamba activate sharpy && \
     git submodule update --init --recursive && \
     mkdir build && \
     cd build && \

From b6cb9dea018d7bf3aea517e0d71e212dd2e0cb87 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:00:26 +0000
Subject: [PATCH 21/29] Update Dockerfile

---
 Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 178f43bd7..c1bea6316 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,11 +32,11 @@ ADD / /sharpy_dir/
 
 # Update conda and make it run with no user interaction
 # Cleanup conda installation
-RUN mamba init bash && \
-    mamba config --set always_yes yes --set changeps1 no && \
-    mamba update -q conda && \
-    mamba config --set auto_activate_base false && \
-    mamba env create -f /sharpy_dir/utils/environment.yml && conda clean -afy && \
+RUN mamba init bash 
+RUN mamba config --set always_yes yes --set changeps1 no
+RUN mamba update -q conda
+RUN mamba config --set auto_activate_base false
+RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \
 
     find /mamba/ -follow -type f -name '*.a' -delete && \
     find /mamba/ -follow -type f -name '*.pyc' -delete && \

From 2851b56a71cfd667b1d072fa89d6aa440391f5f3 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:15:53 +0000
Subject: [PATCH 22/29] Update Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index c1bea6316..17c5732c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,7 @@ RUN yum groupinstall "Development Tools" -y --nogpgcheck && \
 # Install Mamba
 RUN wget --no-check-certificate https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O /mamba.sh && \
     chmod +x /mamba.sh && \
+    /mamba.sh -b -p /mamba/ && \
     rm /mamba.sh && hash -r
 
 ADD / /sharpy_dir/

From c7a378db3264bfbb3353cd7abbbbddb596c1ac88 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:20:50 +0000
Subject: [PATCH 23/29] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 17c5732c1..ced645a09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,9 +33,9 @@ ADD / /sharpy_dir/
 
 # Update conda and make it run with no user interaction
 # Cleanup conda installation
-RUN mamba init bash 
+RUN mamba init
 RUN mamba config --set always_yes yes --set changeps1 no
-RUN mamba update -q conda
+#RUN mamba update -q conda
 RUN mamba config --set auto_activate_base false
 RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \
 

From 5a1b2da0195a1be1d2e1c88f11071a8f1000ab61 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:23:06 +0000
Subject: [PATCH 24/29] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ced645a09..5fd24a953 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,7 @@ ADD / /sharpy_dir/
 
 # Update conda and make it run with no user interaction
 # Cleanup conda installation
-RUN mamba init
+#RUN mamba init
 RUN mamba config --set always_yes yes --set changeps1 no
 #RUN mamba update -q conda
 RUN mamba config --set auto_activate_base false

From ac2f321ac2eebed82d1b6beef9ad4b3509e1db9c Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:27:15 +0000
Subject: [PATCH 25/29] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5fd24a953..42370125d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,9 +34,9 @@ ADD / /sharpy_dir/
 # Update conda and make it run with no user interaction
 # Cleanup conda installation
 #RUN mamba init
-RUN mamba config --set always_yes yes --set changeps1 no
+#RUN mamba config --set always_yes yes --set changeps1 no
 #RUN mamba update -q conda
-RUN mamba config --set auto_activate_base false
+#RUN mamba config --set auto_activate_base false
 RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \
 
     find /mamba/ -follow -type f -name '*.a' -delete && \

From 9291783600505d80a4a83bc0077bf7d0d8d0861a Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 10:50:51 +0000
Subject: [PATCH 26/29] Update Dockerfile

---
 Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 42370125d..2bde8959a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:8
 ENV PYTHONDONTWRITEBYTECODE=true
 ENV BASH_ENV ~/.bashrc
 SHELL ["/bin/bash", "-c"]
-ENV PATH=${PATH}:/miniconda3/bin
+ENV PATH=${PATH}:/mamba/bin
 
 # CENTOS 8 has reached end of life - Not yet an updated Docker base for CentOS stream
 # Point to the CentOS 8 vault in order to download dependencies
@@ -33,10 +33,10 @@ ADD / /sharpy_dir/
 
 # Update conda and make it run with no user interaction
 # Cleanup conda installation
-#RUN mamba init
-#RUN mamba config --set always_yes yes --set changeps1 no
-#RUN mamba update -q conda
-#RUN mamba config --set auto_activate_base false
+RUN mamba init bash
+RUN mamba config --set always_yes yes --set changeps1 no
+RUN mamba update -q conda
+RUN mamba config --set auto_activate_base false
 RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \
 
     find /mamba/ -follow -type f -name '*.a' -delete && \

From a46fe1226f7c3ad458cfcca7f910711a70152fd7 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Tue, 31 Oct 2023 11:08:24 +0000
Subject: [PATCH 27/29] Finalise changing Github runner from conda to mamba

---
 Dockerfile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2bde8959a..c5b594a55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,12 +17,6 @@ RUN yum groupinstall "Development Tools" -y --nogpgcheck && \
     yum install -y --nogpgcheck mesa-libGL libXt libXt-devel wget gcc-gfortran lapack vim tmux && \
     yum clean all
 
-# Install Conda
-#RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /miniconda.sh && \
-#    chmod +x /miniconda.sh && \
-#    /miniconda.sh -b -p /miniconda3/ && \
-#    rm /miniconda.sh && hash -r
-
 # Install Mamba
 RUN wget --no-check-certificate https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O /mamba.sh && \
     chmod +x /mamba.sh && \
@@ -31,8 +25,8 @@ RUN wget --no-check-certificate https://github.com/conda-forge/miniforge/release
 
 ADD / /sharpy_dir/
 
-# Update conda and make it run with no user interaction
-# Cleanup conda installation
+# Update mamba and make it run with no user interaction
+# Cleanup mamba installation
 RUN mamba init bash
 RUN mamba config --set always_yes yes --set changeps1 no
 RUN mamba update -q conda

From 2c944522660a8a0ded4644e05d5a4798508f149b Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:42:34 +0000
Subject: [PATCH 28/29] Added note for Mamba change

---
 .github/workflows/sharpy_tests.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/sharpy_tests.yaml b/.github/workflows/sharpy_tests.yaml
index e67df041a..5b8b1d546 100644
--- a/.github/workflows/sharpy_tests.yaml
+++ b/.github/workflows/sharpy_tests.yaml
@@ -31,6 +31,7 @@ jobs:
         with:
           version: 10
           platform: x64
+        #Swapped from Conda to Mamba due to Github runner memory constraint
       - name: Setup Mamba
         uses: mamba-org/setup-micromamba@v1
       - name: Pre-Install dependencies

From 2ca74b371fec62297f683512b2b373f0c6689784 Mon Sep 17 00:00:00 2001
From: Ben Preston <144227999+ben-l-p@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:43:24 +0000
Subject: [PATCH 29/29] Added note about change to Mamba

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index c5b594a55..e6ca1d9df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,7 @@ RUN yum groupinstall "Development Tools" -y --nogpgcheck && \
     yum clean all
 
 # Install Mamba
+# Swapped from Conda to Mamba due to Github runner memory constraint
 RUN wget --no-check-certificate https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O /mamba.sh && \
     chmod +x /mamba.sh && \
     /mamba.sh -b -p /mamba/ && \