Call DMSetUp! inside DMDACreateXd

Author: Jeremy E Kozdon

examples/ksp/ex50.jl

@@ -163,8 +163,6 @@ function main(petsclib; comm = MPI.COMM_WORLD, options...)
         opts...,
     )
 
-    PETSc.DMSetUp!(da)
-
     ksp = PETSc.KSP(da; opts...)
 
     PETSc.KSPSetComputeRHS!(ksp, rhs!)

src/dm.jl

@@ -9,15 +9,16 @@ mutable struct DM{PetscLib} <: AbstractDM{PetscLib}
 end
 
 """
-    DMSetUp!(da::DM)
+    DMSetUp!(da::DM, opts=da.opts)
 
 # External Links
+$(_doc_external("DM/DMSetFromOptions"))
 $(_doc_external("DM/DMSetUp"))
 """
 function DMSetUp! end
 
-@for_petsc function DMSetUp!(da::DM{$PetscLib})
-    with(da.opts) do
+@for_petsc function DMSetUp!(da::DM{$PetscLib}, opts::Options=da.opts)
+    with(opts) do
         @chk ccall(
             (:DMSetFromOptions, $petsc_library),
             PetscErrorCode,

src/dmda.jl

@@ -22,12 +22,15 @@ end
         dof_per_node,
         stencil_width,
         points_per_proc::Union{Nothing, Vector{PetscInt}};
+        dmsetup=true,
         options...
     )
 
 Creates a 1-D distributed array with the options specified using keyword
 arguments.
 
+If keyword argument `dmsetup == true` then `DMSetUp!` is also called.
+
 # External Links
 $(_doc_external("DMDA/DMDACreate1d"))
 """
@@ -41,6 +44,7 @@ function DMDACreate1d end
     dof_per_node,
     stencil_width,
     points_per_proc::Union{Nothing, Vector{$PetscInt}};
+    dmsetup=true,
     options...,
 )
     opts = Options($petsclib, options...)
@@ -73,6 +77,7 @@ function DMDACreate1d end
             da,
         )
     end
+    dmsetup && DMSetUp!(da)
     # We can only let the garbage collect finalize when we do not need to
     # worry about MPI (since garbage collection is asyncronous)
     if comm == MPI.COMM_SELF
@@ -121,6 +126,7 @@ function DMDACreate2d end
     stencil_width,
     points_per_proc_x::Union{Nothing, Vector{$PetscInt}},
     points_per_proc_y::Union{Nothing, Vector{$PetscInt}};
+    dmsetup=true,
     options...,
 )
     opts = Options($petsclib, options...)
@@ -171,6 +177,7 @@ function DMDACreate2d end
             da,
         )
     end
+    dmsetup && DMSetUp!(da)
     # We can only let the garbage collect finalize when we do not need to
     # worry about MPI (since garbage collection is asyncronous)
     if comm == MPI.COMM_SELF
@@ -228,6 +235,7 @@ function DMDACreate3d end
     points_per_proc_x::Union{Nothing, Vector{$PetscInt}},
     points_per_proc_y::Union{Nothing, Vector{$PetscInt}},
     points_per_proc_z::Union{Nothing, Vector{$PetscInt}};
+    dmsetup=true,
     options...,
 )
     opts = Options($petsclib, options...)
@@ -292,6 +300,7 @@ function DMDACreate3d end
             da,
         )
     end
+    dmsetup && DMSetUp!(da)
     # We can only let the garbage collect finalize when we do not need to
     # worry about MPI (since garbage collection is asyncronous)
     if comm == MPI.COMM_SELF

test/dmda.jl

@@ -41,7 +41,6 @@ PETSc.initialize()
                     stencil_width,
                     points_per_proc,
                 )
-                PETSc.DMSetUp!(da)
 
                 @test PETSc.gettype(da) == "da"
                 @test PETSc.DMGetDimension(da) == 1
@@ -83,7 +82,6 @@ PETSc.initialize()
                     nothing;
                     da_refine = da_refine,
                 )
-                PETSc.DMSetUp!(da)
                 @test PETSc.gettype(da) == "da"
                 @test PETSc.DMGetDimension(da) == 1
 
@@ -157,7 +155,6 @@ end
                     nothing,
                     nothing,
                 )
-                PETSc.DMSetUp!(da)
                 @test PETSc.gettype(da) == "da"
                 @test PETSc.DMGetDimension(da) == 2
 
@@ -189,7 +186,6 @@ end
                     nothing;
                     da_refine = da_refine,
                 )
-                PETSc.DMSetUp!(da)
                 @test PETSc.gettype(da) == "da"
                 @test PETSc.DMGetDimension(da) == 2
 
@@ -271,7 +267,6 @@ end
                     nothing,
                     nothing,
                 )
-                PETSc.DMSetUp!(da)
                 @test PETSc.gettype(da) == "da"
                 @test PETSc.DMGetDimension(da) == 3
 
@@ -308,7 +303,6 @@ end
                     nothing;
                     da_refine = da_refine,
                 )
-                PETSc.DMSetUp!(da)
                 @test PETSc.gettype(da) == "da"
                 @test PETSc.DMGetDimension(da) == 3
 
@@ -369,7 +363,6 @@ end
             stencil_width,
             points_per_proc,
         )
-        PETSc.DMSetUp!(da)
         mat = PETSc.DMCreateMatrix(da)
 
         # Build the 1-D Laplacian FD matrix
@@ -426,7 +419,6 @@ end
             stencil_width,
             points_per_proc,
         )
-        PETSc.DMSetUp!(da)
 
         corners = PETSc.DMDAGetCorners(da)