Merge pull request #498 from CEED/jed/petsc-bps-avoid-redundant-zero

Jed/petsc bps avoid redundant zero

Author: jedbrown

examples/petsc/bps.c

@@ -311,7 +311,6 @@ int main(int argc, char **argv) {
     ierr = KSPSetTolerances(ksp, 1e-10, PETSC_DEFAULT, PETSC_DEFAULT,
                             PETSC_DEFAULT); CHKERRQ(ierr);
   }
-  ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);
   ierr = KSPSetOperators(ksp, matO, matO); CHKERRQ(ierr);
 
   // First run, if benchmarking
@@ -332,6 +331,7 @@ int main(int argc, char **argv) {
       CHKERRQ(ierr);
     }
   }
+  ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);
 
   // Timed solve
   ierr = VecZeroEntries(X); CHKERRQ(ierr);

examples/petsc/bpsraw.c

@@ -288,7 +288,6 @@ static PetscErrorCode MatMult_Mass(Mat A, Vec X, Vec Y) {
                          SCATTER_REVERSE); CHKERRQ(ierr);
   ierr = VecScatterEnd(user->ltog, X, user->Xloc, INSERT_VALUES,
                        SCATTER_REVERSE); CHKERRQ(ierr);
-  ierr = VecZeroEntries(user->Yloc); CHKERRQ(ierr);
 
   // Setup libCEED vectors
   ierr = user->VecGetArrayRead(user->Xloc, (const PetscScalar **)&x);
@@ -335,7 +334,6 @@ static PetscErrorCode MatMult_Diff(Mat A, Vec X, Vec Y) {
   ierr = VecScatterEnd(user->ltog0, X, user->Xloc, INSERT_VALUES,
                        SCATTER_REVERSE);
   CHKERRQ(ierr);
-  ierr = VecZeroEntries(user->Yloc); CHKERRQ(ierr);
 
   // Setup libCEED vectors
   ierr = user->VecGetArrayRead(user->Xloc, (const PetscScalar **)&x);
@@ -872,7 +870,6 @@ int main(int argc, char **argv) {
     ierr = KSPSetTolerances(ksp, 1e-10, PETSC_DEFAULT, PETSC_DEFAULT,
                             PETSC_DEFAULT); CHKERRQ(ierr);
   }
-  ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);
   ierr = KSPSetOperators(ksp, mat, mat); CHKERRQ(ierr);
   // First run, if benchmarking
   if (benchmark_mode) {
@@ -892,6 +889,7 @@ int main(int argc, char **argv) {
       CHKERRQ(ierr);
     }
   }
+  ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);
 
   // Timed solve
   ierr = VecZeroEntries(X); CHKERRQ(ierr);

examples/petsc/setup.h

@@ -738,7 +738,6 @@ static PetscErrorCode ApplyLocal_Ceed(Vec X, Vec Y, UserO user) {
 
   // Global-to-local
   ierr = DMGlobalToLocal(user->dm, X, INSERT_VALUES, user->Xloc); CHKERRQ(ierr);
-  ierr = VecZeroEntries(user->Yloc); CHKERRQ(ierr);
 
   // Setup libCEED vectors
   ierr = user->VecGetArrayRead(user->Xloc, (const PetscScalar **)&x);
@@ -808,7 +807,6 @@ static PetscErrorCode MatMult_Prolong(Mat A, Vec X, Vec Y) {
   ierr = VecZeroEntries(user->locvecc); CHKERRQ(ierr);
   ierr = DMGlobalToLocal(user->dmc, X, INSERT_VALUES, user->locvecc);
   CHKERRQ(ierr);
-  ierr = VecZeroEntries(user->locvecf); CHKERRQ(ierr);
 
   // Setup libCEED vectors
   ierr = user->VecGetArrayRead(user->locvecc, (const PetscScalar **)&c);
@@ -854,7 +852,6 @@ static PetscErrorCode MatMult_Restrict(Mat A, Vec X, Vec Y) {
   ierr = VecZeroEntries(user->locvecf); CHKERRQ(ierr);
   ierr = DMGlobalToLocal(user->dmf, X, INSERT_VALUES, user->locvecf);
   CHKERRQ(ierr);
-  ierr = VecZeroEntries(user->locvecc); CHKERRQ(ierr);
 
   // Multiplicity
   ierr = VecPointwiseMult(user->locvecf, user->locvecf, user->multvec);