follow petsc adapt interface changes

firedrakeproject · Aug 25, 2020 · e64f5fe · e64f5fe
1 parent 4eb4f85
commit e64f5fe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/PETSc/DM.pyx b/src/PETSc/DM.pyx
@@ -411,14 +411,22 @@ cdef class DM(Object):
         CHKERR( DMAdaptLabel(self.dm, clbl, &newdm.dm) )
         return newdm
 
-    def adaptMetric(self, Vec metric, label=None):
-        cdef const char *cval = NULL
-        cdef PetscDMLabel clbl = NULL
-        label = str2bytes(label, &cval)
+    def adaptMetric(self, Vec metric, bdlabel=None, rglabel=None):
+	    # boundary tags
+        cdef const_char *cval = NULL
+        cdef PetscDMLabel cbdlbl = NULL
+        label = str2bytes(bdlabel, &cval)
         if cval == NULL: cval = b"" # XXX Should be fixed upstream
-        CHKERR( DMGetLabel(self.dm, cval, &clbl) )
+        CHKERR( DMGetLabel(self.dm, cval, &cbdlbl) )
+		# cell tags
+        cdef const_char *cval2 = NULL
+        cdef PetscDMLabel crglbl = NULL
+        label = str2bytes(rglabel, &cval2)
+        if cval2 == NULL: cval2 = b"" # XXX Should be fixed upstream
+        CHKERR( DMGetLabel(self.dm, cval2, &crglbl) )
+		#
         cdef DM newdm = DMPlex()
-        CHKERR( DMAdaptMetric(self.dm, metric.vec, clbl, &newdm.dm) )
+        CHKERR( DMAdaptMetric(self.dm, metric.vec, cbdlbl, crglbl, &newdm.dm) )
         return newdm
 
     def getLabel(self, name):

diff --git a/src/PETSc/petscdm.pxi b/src/PETSc/petscdm.pxi
@@ -100,7 +100,7 @@ cdef extern from * nogil:
     int DMGetCoarsenLevel(PetscDM,PetscInt*)
 
     int DMAdaptLabel(PetscDM,PetscDMLabel,PetscDM*)
-    int DMAdaptMetric(PetscDM,PetscVec,PetscDMLabel,PetscDM*)
+    int DMAdaptMetric(PetscDM,PetscVec,PetscDMLabel,PetscDMLabel,PetscDM*)
 
     int DMGlobalToLocalBegin(PetscDM,PetscVec,PetscInsertMode,PetscVec)
     int DMGlobalToLocalEnd(PetscDM,PetscVec,PetscInsertMode,PetscVec)