From db37aff8a75543f9dcc44093bd76ab98841241d3 Mon Sep 17 00:00:00 2001
From: dkunhamb <dipin.kunhambunair@ansys.com>
Date: Mon, 24 Jun 2024 10:45:06 -0500
Subject: [PATCH 01/12] split the workflow

---
 .github/workflows/geometry-mechanical-dpf.yml | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index 5fbf0baa..0c7bab30 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -80,8 +80,8 @@ jobs:
               docker rm $dockerContainers
           }
 
-  mech-dpf:
-    name: Mechanical - Dpf
+  mechanical:
+    name: Mechanical
     runs-on: ubuntu-latest-8-cores
     needs: geometry
     strategy:
@@ -131,6 +131,61 @@ jobs:
           xvfb-run mechanical-env python geometry-mechanical-dpf/02_mechanical.py > pymechlogs${{ matrix.ansys-release }}.txt 2>&1 || true
           cat pymechlogs${{ matrix.ansys-release }}.txt
 
+      - name: Store the outputs
+        uses: actions/upload-artifact@v4
+        with:
+          name: pymechanical-dpf-outputs-${{ matrix.ansys-release }}
+          path: geometry-mechanical-dpf/outputs
+
+      - name: Stop any remaining containers
+        if: always()
+        run: |
+          $dockerContainers = docker ps -a -q
+          if (-not [string]::IsNullOrEmpty($dockerContainers)) {
+              docker stop $dockerContainers
+              docker rm $dockerContainers
+          }
+
+
+  dpf:
+    name: Data Processing Framework
+    runs-on: ubuntu-latest-8-cores
+    needs: mechanical
+    strategy:
+      fail-fast: false
+      matrix:
+        ansys-release: [24.1, 24.2]
+    container:
+        image: 'ghcr.io/ansys/mechanical:${{ matrix.ansys-release }}.0'
+        options: --entrypoint /bin/bash
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: 'geometry-mechanical-dpf'
+
+      - name: Set up Python
+        run: |
+            apt update
+            apt install --reinstall ca-certificates
+            apt install software-properties-common -y
+            add-apt-repository ppa:deadsnakes/ppa -y
+            apt install -y python${{ env.MAIN_PYTHON_VERSION }} python${{ env.MAIN_PYTHON_VERSION }}-venv
+            python${{ env.MAIN_PYTHON_VERSION }} -m venv /env
+
+      - name: Install dependencies
+        run: |
+         . /env/bin/activate
+          python -m pip install --upgrade pip
+          pip install -r geometry-mechanical-dpf/requirements_${{ matrix.ansys-release }}.txt
+
+      - name: Check out the geometry outputs
+        uses: actions/download-artifact@v4
+        with:
+          name: geometry-outputs-${{ matrix.ansys-release }}
+          path: geometry-mechanical-dpf/outputs
+
       - name: Run the PyDPF script
         run: |
           . /env/bin/activate

From 9ce08655603e99f1af2011f278c51023da061ac3 Mon Sep 17 00:00:00 2001
From: dkunhamb <dipin.kunhambunair@ansys.com>
Date: Mon, 24 Jun 2024 10:47:16 -0500
Subject: [PATCH 02/12] remove containers after run

---
 .github/workflows/geometry-mechanical-dpf.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index 0c7bab30..a4e69c4d 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -197,3 +197,12 @@ jobs:
         with:
           name: pymechanical-dpf-outputs-${{ matrix.ansys-release }}
           path: geometry-mechanical-dpf/outputs
+
+      - name: Stop any remaining containers
+        if: always()
+        run: |
+          $dockerContainers = docker ps -a -q
+          if (-not [string]::IsNullOrEmpty($dockerContainers)) {
+              docker stop $dockerContainers
+              docker rm $dockerContainers
+          }

From c4f735c9554a89aaf591c89ccd3139b9a8b05a9c Mon Sep 17 00:00:00 2001
From: dkunhamb <dipin.kunhambunair@ansys.com>
Date: Mon, 24 Jun 2024 13:01:40 -0500
Subject: [PATCH 03/12] fix dpf

---
 geometry-mechanical-dpf/03_dpf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/geometry-mechanical-dpf/03_dpf.py b/geometry-mechanical-dpf/03_dpf.py
index 5d400c94..5499fe54 100644
--- a/geometry-mechanical-dpf/03_dpf.py
+++ b/geometry-mechanical-dpf/03_dpf.py
@@ -83,11 +83,11 @@ def find_files(directory, extension):
 # -- Transien thermal results --
 #
 # Create model
-model = dpf.Model(transient_rth_file[0])
-print(steady_state_model)
+transient_model = dpf.Model(transient_rth_file[0])
+print(transient_model)
 
 # Get temperature distribution
-temp = model.results.temperature.on_last_time_freq.eval()[0]
+temp = transient_model.results.temperature.on_last_time_freq.eval()[0]
 
 # Plot the the temperature for ic-1
 if GRAPHICS_BOOL:

From bcc74fb23579d44ac34338378b5cc153df9dbb14 Mon Sep 17 00:00:00 2001
From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com>
Date: Tue, 25 Jun 2024 08:04:31 +0200
Subject: [PATCH 04/12] Apply suggestions from code review

---
 .github/workflows/geometry-mechanical-dpf.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index a4e69c4d..24686318 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -140,11 +140,8 @@ jobs:
       - name: Stop any remaining containers
         if: always()
         run: |
-          $dockerContainers = docker ps -a -q
-          if (-not [string]::IsNullOrEmpty($dockerContainers)) {
-              docker stop $dockerContainers
-              docker rm $dockerContainers
-          }
+          docker stop $(docker ps -a -q)
+          docker rm $(docker ps -a -q)
 
 
   dpf:
@@ -201,8 +198,5 @@ jobs:
       - name: Stop any remaining containers
         if: always()
         run: |
-          $dockerContainers = docker ps -a -q
-          if (-not [string]::IsNullOrEmpty($dockerContainers)) {
-              docker stop $dockerContainers
-              docker rm $dockerContainers
-          }
+          docker stop $(docker ps -a -q)
+          docker rm $(docker ps -a -q)

From f4ee28861fb8a23afd4f3f8c1f4831568341c5d6 Mon Sep 17 00:00:00 2001
From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:30:08 +0200
Subject: [PATCH 05/12] Update .github/workflows/geometry-mechanical-dpf.yml

---
 .github/workflows/geometry-mechanical-dpf.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index 24686318..6f4aba9f 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -137,12 +137,6 @@ jobs:
           name: pymechanical-dpf-outputs-${{ matrix.ansys-release }}
           path: geometry-mechanical-dpf/outputs
 
-      - name: Stop any remaining containers
-        if: always()
-        run: |
-          docker stop $(docker ps -a -q)
-          docker rm $(docker ps -a -q)
-
 
   dpf:
     name: Data Processing Framework

From 030bf82fdfb0a0564ebf510243c67bed7fe43090 Mon Sep 17 00:00:00 2001
From: dkunhamb <dipin.kunhambunair@ansys.com>
Date: Tue, 25 Jun 2024 14:09:21 -0500
Subject: [PATCH 06/12] update dpf

---
 .github/workflows/geometry-mechanical-dpf.yml | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index 6f4aba9f..3429312f 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -109,7 +109,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-         . /env/bin/activate
+          . /env/bin/activate
           python -m pip install --upgrade pip
           pip install -r geometry-mechanical-dpf/requirements_${{ matrix.ansys-release }}.txt
 
@@ -134,21 +134,18 @@ jobs:
       - name: Store the outputs
         uses: actions/upload-artifact@v4
         with:
-          name: pymechanical-dpf-outputs-${{ matrix.ansys-release }}
+          name: mechanical-outputs-${{ matrix.ansys-release }}
           path: geometry-mechanical-dpf/outputs
 
 
   dpf:
     name: Data Processing Framework
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     needs: mechanical
     strategy:
       fail-fast: false
       matrix:
         ansys-release: [24.1, 24.2]
-    container:
-        image: 'ghcr.io/ansys/mechanical:${{ matrix.ansys-release }}.0'
-        options: --entrypoint /bin/bash
     steps:
 
       - name: Checkout code
@@ -156,41 +153,51 @@ jobs:
         with:
           sparse-checkout: 'geometry-mechanical-dpf'
 
-      - name: Set up Python
-        run: |
-            apt update
-            apt install --reinstall ca-certificates
-            apt install software-properties-common -y
-            add-apt-repository ppa:deadsnakes/ppa -y
-            apt install -y python${{ env.MAIN_PYTHON_VERSION }} python${{ env.MAIN_PYTHON_VERSION }}-venv
-            python${{ env.MAIN_PYTHON_VERSION }} -m venv /env
+      - name: Set up Python ${{ env.MAIN_PYTHON_VERSION }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.MAIN_PYTHON_VERSION }}
 
       - name: Install dependencies
         run: |
-         . /env/bin/activate
           python -m pip install --upgrade pip
+          python -m venv .venv
+          . .venv/bin/activate
           pip install -r geometry-mechanical-dpf/requirements_${{ matrix.ansys-release }}.txt
 
-      - name: Check out the geometry outputs
+      - name: Update ansys-version for DPF
+        run: |
+          echo ansys_version="${${{ matrix.ansys-release}}//"."}" >> $GITHUB_ENV
+
+      - name: display anys_version
+        run: |
+          echo $ansys_version
+
+      - name: "Install DPF server"
+        id: set-server-path
+        uses: ansys/pydpf-actions/install-dpf-server@v2.3
+        with:
+          dpf-standalone-TOKEN: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
+          ANSYS_VERSION : ${{env.ansys_version}}
+
+      - name: Check out the mechanical outputs
         uses: actions/download-artifact@v4
         with:
-          name: geometry-outputs-${{ matrix.ansys-release }}
+          name: mechanical-outputs-${{ matrix.ansys-release }}
           path: geometry-mechanical-dpf/outputs
 
       - name: Run the PyDPF script
         run: |
-          . /env/bin/activate
+          . .venv/bin/activate
           xvfb-run python geometry-mechanical-dpf/03_dpf.py > pydpflogs${{ matrix.ansys-release }}.txt 2>&1 || true
           cat pydpflogs${{ matrix.ansys-release }}.txt
 
       - name: Store the outputs
         uses: actions/upload-artifact@v4
         with:
-          name: pymechanical-dpf-outputs-${{ matrix.ansys-release }}
+          name: dpf-outputs-${{ matrix.ansys-release }}
           path: geometry-mechanical-dpf/outputs
 
-      - name: Stop any remaining containers
-        if: always()
-        run: |
-          docker stop $(docker ps -a -q)
-          docker rm $(docker ps -a -q)
+      - name: "Kill all servers"
+        uses: ansys/pydpf-actions/kill-dpf-servers@v2.3
+        if: always()
\ No newline at end of file

From 1efae3eea56709dd7f26c3e491101b1d3b7a9c49 Mon Sep 17 00:00:00 2001
From: dkunhamb <dipin.kunhambunair@ansys.com>
Date: Tue, 25 Jun 2024 14:46:31 -0500
Subject: [PATCH 07/12] test ansys-version

---
 .github/workflows/geometry-mechanical-dpf.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index 3429312f..8cbee5e8 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -141,7 +141,7 @@ jobs:
   dpf:
     name: Data Processing Framework
     runs-on: ubuntu-latest
-    needs: mechanical
+    # needs: mechanical
     strategy:
       fail-fast: false
       matrix:
@@ -167,7 +167,7 @@ jobs:
 
       - name: Update ansys-version for DPF
         run: |
-          echo ansys_version="${${{ matrix.ansys-release}}//"."}" >> $GITHUB_ENV
+          echo ansys_version=${${{matrix.ansys-release}}//.} >> $GITHUB_ENV
 
       - name: display anys_version
         run: |

From f612d56935d58a9be8be041631aa9b1619a27152 Mon Sep 17 00:00:00 2001
From: dkunhamb <dipin.kunhambunair@ansys.com>
Date: Tue, 25 Jun 2024 15:49:42 -0500
Subject: [PATCH 08/12] env

---
 .github/workflows/geometry-mechanical-dpf.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index 8cbee5e8..5ed0e8c6 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -167,11 +167,9 @@ jobs:
 
       - name: Update ansys-version for DPF
         run: |
-          echo ansys_version=${${{matrix.ansys-release}}//.} >> $GITHUB_ENV
-
-      - name: display anys_version
-        run: |
-          echo $ansys_version
+          ansys_version=${{ matrix.ansys-release }}
+          ansys_version_no_dot=${ansys_version//./}
+          echo ansys_version=$ansys_version_no_dot >> $GITHUB_ENV
 
       - name: "Install DPF server"
         id: set-server-path

From 9341647a4cb321cd51ec0b47b2565ad4a4764fae Mon Sep 17 00:00:00 2001
From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com>
Date: Wed, 26 Jun 2024 08:34:52 +0200
Subject: [PATCH 09/12] Apply suggestions from code review

---
 .github/workflows/geometry-mechanical-dpf.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index 5ed0e8c6..b336bbcc 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -141,7 +141,7 @@ jobs:
   dpf:
     name: Data Processing Framework
     runs-on: ubuntu-latest
-    # needs: mechanical
+    needs: mechanical
     strategy:
       fail-fast: false
       matrix:
@@ -161,8 +161,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m venv .venv
-          . .venv/bin/activate
           pip install -r geometry-mechanical-dpf/requirements_${{ matrix.ansys-release }}.txt
 
       - name: Update ansys-version for DPF
@@ -186,7 +184,6 @@ jobs:
 
       - name: Run the PyDPF script
         run: |
-          . .venv/bin/activate
           xvfb-run python geometry-mechanical-dpf/03_dpf.py > pydpflogs${{ matrix.ansys-release }}.txt 2>&1 || true
           cat pydpflogs${{ matrix.ansys-release }}.txt
 

From 1521624a4fb1b8dba3b87bc376a583df7662f154 Mon Sep 17 00:00:00 2001
From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com>
Date: Wed, 26 Jun 2024 08:35:09 +0200
Subject: [PATCH 10/12] Update .github/workflows/geometry-mechanical-dpf.yml

---
 .github/workflows/geometry-mechanical-dpf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index b336bbcc..d4265997 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -154,7 +154,7 @@ jobs:
           sparse-checkout: 'geometry-mechanical-dpf'
 
       - name: Set up Python ${{ env.MAIN_PYTHON_VERSION }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
 

From 828b609b90291416972075eda5b9110605a2cbb2 Mon Sep 17 00:00:00 2001
From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com>
Date: Wed, 26 Jun 2024 08:35:30 +0200
Subject: [PATCH 11/12] Update geometry-mechanical-dpf/03_dpf.py

---
 geometry-mechanical-dpf/03_dpf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geometry-mechanical-dpf/03_dpf.py b/geometry-mechanical-dpf/03_dpf.py
index 5bf9e08d..8cd4f21b 100644
--- a/geometry-mechanical-dpf/03_dpf.py
+++ b/geometry-mechanical-dpf/03_dpf.py
@@ -80,7 +80,7 @@ def find_files(directory, extension):
 if GRAPHICS_BOOL:
     temp.plot()
 
-# -- Transien thermal results --
+# -- Transient thermal results --
 #
 # Create model
 transient_model = dpf.Model(transient_rth_file[0])

From 4beb385285173b18c0c22318f3593d6aac7c4efb Mon Sep 17 00:00:00 2001
From: dkunhamb <dipin.kunhambunair@ansys.com>
Date: Thu, 27 Jun 2024 12:47:16 -0500
Subject: [PATCH 12/12] review change

---
 .github/workflows/geometry-mechanical-dpf.yml | 8 ++++----
 .github/workflows/geometry-mesh-fluent.yml    | 8 ++++----
 .github/workflows/geometry-mesh.yml           | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/geometry-mechanical-dpf.yml b/.github/workflows/geometry-mechanical-dpf.yml
index d4265997..ada19256 100644
--- a/.github/workflows/geometry-mechanical-dpf.yml
+++ b/.github/workflows/geometry-mechanical-dpf.yml
@@ -105,15 +105,15 @@ jobs:
             apt install software-properties-common -y
             add-apt-repository ppa:deadsnakes/ppa -y
             apt install -y python${{ env.MAIN_PYTHON_VERSION }} python${{ env.MAIN_PYTHON_VERSION }}-venv
-            python${{ env.MAIN_PYTHON_VERSION }} -m venv /env
+            python${{ env.MAIN_PYTHON_VERSION }} -m venv .venv
 
       - name: Install dependencies
         run: |
-          . /env/bin/activate
+          . .venv/bin/activate
           python -m pip install --upgrade pip
           pip install -r geometry-mechanical-dpf/requirements_${{ matrix.ansys-release }}.txt
 
-      - name: Check out the geometry outputs
+      - name: Download the geometry outputs
         uses: actions/download-artifact@v4
         with:
           name: geometry-outputs-${{ matrix.ansys-release }}
@@ -176,7 +176,7 @@ jobs:
           dpf-standalone-TOKEN: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
           ANSYS_VERSION : ${{env.ansys_version}}
 
-      - name: Check out the mechanical outputs
+      - name: Download the mechanical outputs
         uses: actions/download-artifact@v4
         with:
           name: mechanical-outputs-${{ matrix.ansys-release }}
diff --git a/.github/workflows/geometry-mesh-fluent.yml b/.github/workflows/geometry-mesh-fluent.yml
index 771702a6..b2c3f7b8 100644
--- a/.github/workflows/geometry-mesh-fluent.yml
+++ b/.github/workflows/geometry-mesh-fluent.yml
@@ -113,10 +113,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Download Fluent service container
+      - name: Pull Fluent docker image
         run: docker pull ${{ env.FLUENT_DOCKER_IMAGE }}:v${{ matrix.ansys-release }}.0
 
-      - name: Check out the geometry outputs
+      - name: Download the geometry outputs
         uses: actions/download-artifact@v4
         with:
           name: geometry-outputs-${{ matrix.ansys-release }}
@@ -168,10 +168,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Download Fluent service container
+      - name: Pull Fluent docker image
         run: docker pull ${{ env.FLUENT_DOCKER_IMAGE }}:v${{ matrix.ansys-release }}.0
 
-      - name: Check out the meshing outputs
+      - name: Download the meshing outputs
         uses: actions/download-artifact@v4
         with:
           name: fluent-mesh-outputs-${{ matrix.ansys-release }}
diff --git a/.github/workflows/geometry-mesh.yml b/.github/workflows/geometry-mesh.yml
index e74d913d..8d9e622b 100644
--- a/.github/workflows/geometry-mesh.yml
+++ b/.github/workflows/geometry-mesh.yml
@@ -113,10 +113,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Download PRIME service container
+      - name: Pull PRIME docker image
         run: docker pull ${{ env.PRIME_DOCKER_IMAGE }}:${{ matrix.ansys-release }}
 
-      - name: Check out the geometry outputs
+      - name: Download the geometry outputs
         uses: actions/download-artifact@v4
         with:
           name: geometry-outputs-${{ matrix.ansys-release }}