fix(examples): Update examples for latest PETSc changes

Author: jrwrigh

examples/fluids/navierstokes.h

@@ -17,8 +17,8 @@
 #include "./include/petsc_ops.h"
 #include "qfunctions/newtonian_types.h"
 
-#if PETSC_VERSION_LT(3, 23, 0)
-#error "PETSc v3.23 or later is required"
+#if PETSC_VERSION_LT(3, 24, 0)
+#error "PETSc v3.24 or later is required"
 #endif
 
 // -----------------------------------------------------------------------------

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/fluids/src/turb_spanstats.c

@@ -71,8 +71,8 @@ PetscErrorCode CreateStatsDM(User user, ProblemData problem, PetscInt degree) {
     }
 
     PetscCall(DMPlexLabelComplete(user->dm, label));
-    PetscCall(DMPlexFilter(user->dm, label, 1, PETSC_FALSE, PETSC_FALSE, NULL, &user->spanstats.dm));
-    PetscCall(DMSetCoordinateDisc(user->spanstats.dm, NULL, PETSC_TRUE));  // Ensure that a coordinate FE exists
+    PetscCall(DMPlexFilter(user->dm, label, 1, PETSC_FALSE, PETSC_FALSE, PetscObjectComm((PetscObject)user->dm), NULL, &user->spanstats.dm));
+    PetscCall(DMSetCoordinateDisc(user->spanstats.dm, NULL, PETSC_FALSE, PETSC_TRUE));  // Ensure that a coordinate FE exists
 
     PetscCall(DMPlexDistribute(user->spanstats.dm, 0, NULL, &parent_distributed_dm));
     PetscCallMPI(MPI_Comm_size(comm, &size));

examples/petsc/dmswarm.c

@@ -154,7 +154,7 @@ int main(int argc, char **argv) {
       PetscFE fe_coord;
 
       PetscCall(PetscFECreateLagrange(comm, dim, dim, PETSC_FALSE, mesh_order, solution_order + q_extra, &fe_coord));
-      PetscCall(DMSetCoordinateDisc(dm_mesh, fe_coord, PETSC_TRUE));
+      PetscCall(DMSetCoordinateDisc(dm_mesh, fe_coord, PETSC_FALSE, PETSC_TRUE));
       PetscCall(PetscFEDestroy(&fe_coord));
     }
 

examples/petsc/include/petscversion.h

@@ -9,6 +9,6 @@
 /// Petsc version check
 #pragma once
 
-#if PETSC_VERSION_LT(3, 23, 0)
-#error "PETSc v3.23 or later is required"
+#if PETSC_VERSION_LT(3, 24, 0)
+#error "PETSc v3.24 or later is required"
 #endif

examples/petsc/src/petscutils.c

@@ -153,7 +153,7 @@ PetscErrorCode SetupDMByDegree(DM dm, PetscInt p_degree, PetscInt q_extra, Petsc
     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));
   }
 

examples/solids/elasticity.c

@@ -507,7 +507,7 @@ int main(int argc, char **argv) {
         // ---------- Smoother KSP
         PetscCall(PCMGGetSmoother(pc, level, &ksp_smoother));
         PetscCall(KSPSetDM(ksp_smoother, level_dms[level]));
-        PetscCall(KSPSetDMActive(ksp_smoother, PETSC_FALSE));
+        PetscCall(KSPSetDMActive(ksp_smoother, KSP_DMACTIVE_ALL, PETSC_FALSE));
 
         // ---------- Chebyshev options
         PetscCall(KSPSetType(ksp_smoother, KSPCHEBYSHEV));

examples/solids/elasticity.h

@@ -21,6 +21,6 @@
 #include "include/utils.h"
 #include "problems/problems.h"
 
-#if PETSC_VERSION_LT(3, 23, 0)
-#error "PETSc v3.23 or later is required"
+#if PETSC_VERSION_LT(3, 24, 0)
+#error "PETSc v3.24 or later is required"
 #endif

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));
   }