Merge branch 'master' into andrew/perf-log

OP2 · Jul 21, 2021 · cb3b7aa · cb3b7aa
2 parents 63615b8 + dd5d060
commit cb3b7aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,11 +6,9 @@ PyOP2.egg-info
 *.py[cdo]
 
 # Extension modules
-computeind.c
-computeind.so
-sparsity.cpp
 sparsity.so
-
+sparsity.c
+sparsity.cpython*.so
 # Docs
 pyop2.coffee.rst
 pyop2.rst

diff --git a/pyop2/utils.py b/pyop2/utils.py
@@ -327,8 +327,11 @@ def get_petsc_dir():
         return (dir, dir + arch)
     except KeyError:
         try:
-            import petsc
-            return (petsc.get_petsc_dir(), )
+            import petsc4py
+            config = petsc4py.get_config()
+            petsc_dir = config["PETSC_DIR"]
+            petsc_arch = config["PETSC_ARCH"]
+            return petsc_dir, petsc_dir + petsc_arch
         except ImportError:
             sys.exit("""Error: Could not find PETSc library.