aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschnetter <schnetter@1d96b42b-98df-4a6a-9d84-1b24288d4588>2009-11-11 18:43:35 +0000
committerschnetter <schnetter@1d96b42b-98df-4a6a-9d84-1b24288d4588>2009-11-11 18:43:35 +0000
commit1ce4b1d39ead7888675a6313103fea35129f56ae (patch)
tree6d89fc5782f945336ed2ed83bc9957f5e69b0369
parent904235fc23bdb8ec754bfd81722ba006b606d171 (diff)
Support PETSc >= 3.0.0HEADsvnmaster
git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllPETSc/trunk@107 1d96b42b-98df-4a6a-9d84-1b24288d4588
-rw-r--r--src/petsc_confmetric_solver.c4
-rw-r--r--src/petsc_flat_solver.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/petsc_confmetric_solver.c b/src/petsc_confmetric_solver.c
index c22c051..5a3d8a6 100644
--- a/src/petsc_confmetric_solver.c
+++ b/src/petsc_confmetric_solver.c
@@ -851,7 +851,11 @@ int petsc_confmetric_solver(cGH *GH, int *MetricPsiI, int MetricPsiISize,
ierr = MatAssemblyEnd(A[0],MAT_FINAL_ASSEMBLY); CHKERRQ(ierr);
ierr = VecAssemblyEnd(soln); CHKERRQ(ierr);
ierr = VecAssemblyEnd(b); CHKERRQ(ierr);
+#if PETSC_VERSION_MAJOR < 3
ierr = MatSetOption(A[0],MAT_NO_NEW_NONZERO_LOCATIONS); CHKERRQ(ierr);
+#else
+ ierr = MatSetOption(A[0],MAT_NEW_NONZERO_LOCATIONS,PETSC_FALSE); CHKERRQ(ierr);
+#endif
if (nabla_form == 3) {
if (verbose)
diff --git a/src/petsc_flat_solver.c b/src/petsc_flat_solver.c
index 646f385..21e0066 100644
--- a/src/petsc_flat_solver.c
+++ b/src/petsc_flat_solver.c
@@ -476,7 +476,11 @@ int petsc_flat(cGH *GH, int FieldIndex, int MIndex, int NIndex,
ierr = MatAssemblyEnd(A[0],MAT_FINAL_ASSEMBLY); CHKERRQ(ierr);
ierr = VecAssemblyEnd(soln); CHKERRQ(ierr);
ierr = VecAssemblyEnd(b); CHKERRQ(ierr);
+#if PETSC_VERSION_MAJOR < 3
ierr = MatSetOption(A[0],MAT_NO_NEW_NONZERO_LOCATIONS); CHKERRQ(ierr);
+#else
+ ierr = MatSetOption(A[0],MAT_NEW_NONZERO_LOCATIONS,PETSC_FALSE); CHKERRQ(ierr);
+#endif
if (trips==0)
{