petsc - minor update for API change

Author: jeremylt

examples/fluids/navierstokes.h

@@ -21,6 +21,10 @@
 #error "PETSc v3.23 or later is required"
 #endif
 
+#if PETSC_VERSION_LT(3, 24, 0)
+#define DMSetCoordinateDisc(a, b, c, d) DMSetCoordinateDisc(a, b, d)
+#endif
+
 // -----------------------------------------------------------------------------
 // Enums
 // -----------------------------------------------------------------------------

examples/fluids/src/dm_utils.c

@@ -456,7 +456,7 @@ PetscErrorCode DMSetupByOrderBegin_FEM(PetscBool setup_faces, PetscBool setup_co
     if (coord_order != PETSC_DECIDE) fe_coord_order = coord_order;
     PetscCall(PetscFECreateLagrange(comm, dim, num_comp_coord, is_simplex, fe_coord_order, q_order, &fe_coord_new));
     if (setup_faces) PetscCall(PetscFEGetHeightSubspace(fe_coord_new, 1, &fe_coord_face_new));
-    PetscCall(DMSetCoordinateDisc(dm, fe_coord_new, PETSC_TRUE));
+    PetscCall(DMSetCoordinateDisc(dm, fe_coord_new, PETSC_FALSE, PETSC_TRUE));
     PetscCall(PetscFEDestroy(&fe_coord_new));
   }
   PetscFunctionReturn(PETSC_SUCCESS);

examples/petsc/include/petscutils.h

@@ -14,6 +14,10 @@
 
 #include "structs.h"
 
+#if PETSC_VERSION_LT(3, 24, 0)
+#define DMSetCoordinateDisc(a, b, c, d) DMSetCoordinateDisc(a, b, d)
+#endif
+
 CeedMemType      MemTypeP2C(PetscMemType mtype);
 PetscErrorCode   VecP2C(Vec X_petsc, PetscMemType *mem_type, CeedVector x_ceed);
 PetscErrorCode   VecC2P(CeedVector x_ceed, PetscMemType mem_type, Vec X_petsc);

examples/petsc/src/petscutils.c

@@ -151,23 +151,26 @@ PetscErrorCode SetupDMByDegree(DM dm, PetscInt p_degree, PetscInt q_extra, Petsc
     // create FE field for coordinates
     PetscFE  fe_coords;
     PetscInt num_comp_coord;
+
     PetscCall(DMGetCoordinateDim(dm, &num_comp_coord));
     PetscCall(PetscFECreateLagrange(comm, dim, num_comp_coord, is_simplex, 1, q_degree, &fe_coords));
-    PetscCall(DMSetCoordinateDisc(dm, fe_coords, PETSC_TRUE));
+    PetscCall(DMSetCoordinateDisc(dm, fe_coords, PETSC_FALSE, PETSC_TRUE));
     PetscCall(PetscFEDestroy(&fe_coords));
   }
 
   // Setup Dirichlet BC
   // Note bp1, bp2 are projection and we don't need to apply BC
-  // For bp3,bp4, the target function is zero on the boundaries
+  // For bp3, bp4, the target function is zero on the boundaries
   // So we pass bcFunc = NULL in DMAddBoundary function
   if (enforce_bc) {
     PetscBool has_label;
+
     PetscCall(DMHasLabel(dm, "marker", &has_label));
     if (!has_label) {
       PetscCall(CreateBCLabel(dm, "marker"));
     }
     DMLabel label;
+
     PetscCall(DMGetLabel(dm, "marker", &label));
     PetscCall(DMAddBoundary(dm, DM_BC_ESSENTIAL, "wall", label, 1, marker_ids, 0, 0, NULL, NULL, NULL, NULL, NULL));
     PetscCall(DMSetOptionsPrefix(dm, "final_"));
@@ -176,6 +179,7 @@ PetscErrorCode SetupDMByDegree(DM dm, PetscInt p_degree, PetscInt q_extra, Petsc
 
   if (!is_simplex) {
     DM dm_coord;
+
     PetscCall(DMGetCoordinateDM(dm, &dm_coord));
     PetscCall(DMPlexSetClosurePermutationTensor(dm, PETSC_DETERMINE, NULL));
     PetscCall(DMPlexSetClosurePermutationTensor(dm_coord, PETSC_DETERMINE, NULL));

examples/solids/include/setup-dm.h

@@ -11,6 +11,10 @@
 
 #include "../include/structs.h"
 
+#if PETSC_VERSION_LT(3, 24, 0)
+#define DMSetCoordinateDisc(a, b, c, d) DMSetCoordinateDisc(a, b, d)
+#endif
+
 // -----------------------------------------------------------------------------
 // Setup DM
 // -----------------------------------------------------------------------------

examples/solids/src/setup-dm.c

@@ -86,7 +86,7 @@ PetscErrorCode SetupDMByDegree(DM dm, AppCtx app_ctx, PetscInt order, PetscBool
     PetscInt num_comp_coord;
     PetscCall(DMGetCoordinateDim(dm, &num_comp_coord));
     PetscCall(PetscFECreateLagrange(comm, dim, num_comp_coord, PETSC_FALSE, 1, 1, &fe_coords));
-    PetscCall(DMSetCoordinateDisc(dm, fe_coords, PETSC_TRUE));
+    PetscCall(DMSetCoordinateDisc(dm, fe_coords, PETSC_FALSE, PETSC_TRUE));
     PetscCall(PetscFEDestroy(&fe_coords));
   }