conflict?

comp-physics · Jun 22, 2024 · 75a65b7 · 75a65b7
1 parent e8da17e
commit 75a65b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/phoenix.yml b/.github/workflows/phoenix.yml
@@ -24,7 +24,7 @@ jobs:
  # will stop on any errors
  - name: Compile Cases
  run: |
- ml gcc mvapich2 mkl python/3.9.12-rkxvr6 netcdf-fortran fftw cmake
+ ml gcc mvapich2 python/3.9.12-rkxvr6 netcdf-fortran fftw cmake
  set -e -x
  export PETSC_DIR=`pwd`/packages/petsc-3.19.6
  export PETSC_ARCH=arch-linux-c-opt

diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ libcommon.a
 .vscode
 field
 packages
+packages2
 traction
 build
 spherocytes