examples/petsc: give KSPSetFromOptions precedence over -benchmark

jedbrown · jedbrown · commit debcf9199d37 · 2020-03-29T14:51:14.000-07:00
diff --git a/examples/petsc/bps.c b/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);
diff --git a/examples/petsc/bpsraw.c b/examples/petsc/bpsraw.c
@@ -872,7 +872,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 +891,7 @@ int main(int argc, char **argv) {
       CHKERRQ(ierr);
     }
   }
+  ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);
 
   // Timed solve
   ierr = VecZeroEntries(X); CHKERRQ(ierr);

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,6 @@ int main(int argc, char **argv) {`
`311`	`311`	`ierr = KSPSetTolerances(ksp, 1e-10, PETSC_DEFAULT, PETSC_DEFAULT,`
`312`	`312`	`PETSC_DEFAULT); CHKERRQ(ierr);`
`313`	`313`	`}`
`314`		`- ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);`
`315`	`314`	`ierr = KSPSetOperators(ksp, matO, matO); CHKERRQ(ierr);`
`316`	`315`
`317`	`316`	`// First run, if benchmarking`
`@@ -332,6 +331,7 @@ int main(int argc, char **argv) {`
`332`	`331`	`CHKERRQ(ierr);`
`333`	`332`	`}`
`334`	`333`	`}`
	`334`	`+ ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);`
`335`	`335`
`336`	`336`	`// Timed solve`
`337`	`337`	`ierr = VecZeroEntries(X); CHKERRQ(ierr);`
Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,6 @@ int main(int argc, char **argv) {`
`872`	`872`	`ierr = KSPSetTolerances(ksp, 1e-10, PETSC_DEFAULT, PETSC_DEFAULT,`
`873`	`873`	`PETSC_DEFAULT); CHKERRQ(ierr);`
`874`	`874`	`}`
`875`		`- ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);`
`876`	`875`	`ierr = KSPSetOperators(ksp, mat, mat); CHKERRQ(ierr);`
`877`	`876`	`// First run, if benchmarking`
`878`	`877`	`if (benchmark_mode) {`
`@@ -892,6 +891,7 @@ int main(int argc, char **argv) {`
`892`	`891`	`CHKERRQ(ierr);`
`893`	`892`	`}`
`894`	`893`	`}`
	`894`	`+ ierr = KSPSetFromOptions(ksp); CHKERRQ(ierr);`
`895`	`895`
`896`	`896`	`// Timed solve`
`897`	`897`	`ierr = VecZeroEntries(X); CHKERRQ(ierr);`