From ae0e2a805b1181862555cd62ad08216b7fe20c86 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 4 Jan 2024 06:47:09 +0100 Subject: [PATCH 1/3] most recent PETSc --- .github/workflows/Fortran.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml index 24fd3bdc6..54bfee63a 100644 --- a/.github/workflows/Fortran.yml +++ b/.github/workflows/Fortran.yml @@ -2,7 +2,7 @@ name: Grid and Mesh Solver on: [push] env: - PETSC_VERSION: '3.20.1' + PETSC_VERSION: '3.20.3' HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker HOMEBREW_NO_AUTO_UPDATE: 'ON' HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON' From 24eee8d14c7e3fb94963304056a98331cf0c33fb Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 4 Jan 2024 07:13:49 +0100 Subject: [PATCH 2/3] run mesh test --- .github/workflows/Fortran.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml index 54bfee63a..55426489c 100644 --- a/.github/workflows/Fortran.yml +++ b/.github/workflows/Fortran.yml @@ -83,7 +83,7 @@ jobs: - name: DAMASK - Run run: | ./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -m material.yaml -w examples/grid - ./bin/DAMASK_mesh -h + ./bin/DAMASK_mesh -l tensionZ_3g.yaml -g cube_3grains.msh -m material.yaml -w examples/mesh intel: @@ -156,4 +156,4 @@ jobs: - name: DAMASK - Run run: | ./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -m material.yaml -w examples/grid - ./bin/DAMASK_mesh -h + ./bin/DAMASK_mesh -l tensionZ_3g.yaml -g cube_3grains.msh -m material.yaml -w examples/mesh From 9f6464319e01c734568dc2825e3f2df5a0ececa5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 4 Jan 2024 07:44:06 +0100 Subject: [PATCH 3/3] use LLVM compiler wrappers --- .github/workflows/Fortran.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml index 55426489c..7f0be0277 100644 --- a/.github/workflows/Fortran.yml +++ b/.github/workflows/Fortran.yml @@ -138,9 +138,9 @@ jobs: run: | cd petsc-${PETSC_VERSION} ./configure \ - --with-fc='mpiifort -fc=ifx' \ - --with-cc='mpiicc -cc=icx' \ - --with-cxx='mpiicpc -cxx=icpx' \ + --with-fc=mpiifx \ + --with-cc=mpiicx \ + --with-cxx=mpiicpx \ --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib make all