From 71e2c3f203a43da166f9e6d4f80e3cbe7a572560 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 14 Feb 2017 22:33:27 +0100 Subject: [PATCH] switching to PETSc 3.7.x --- code/spectral_utilities.f90 | 9 +++++---- installation/patch/README.md | 2 -- installation/patch/petsc3.7 | 22 ---------------------- 3 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 installation/patch/petsc3.7 diff --git a/code/spectral_utilities.f90 b/code/spectral_utilities.f90 index 34eb0eab0..a33c7a9f5 100644 --- a/code/spectral_utilities.f90 +++ b/code/spectral_utilities.f90 @@ -227,12 +227,13 @@ subroutine utilities_init() trim(PETScDebug), & ' add more using the PETSc_Options keyword in numerics.config '; flush(6) - call PetscOptionsClear(ierr); CHKERRQ(ierr) - if(debugPETSc) call PetscOptionsInsertString(trim(PETSCDEBUG),ierr) + call PetscOptionsClear(PETSC_NULL_OBJECT,ierr) CHKERRQ(ierr) - call PetscOptionsInsertString(trim(petsc_defaultOptions),ierr) + if(debugPETSc) call PetscOptionsInsertString(PETSC_NULL_OBJECT,trim(PETSCDEBUG),ierr) CHKERRQ(ierr) - call PetscOptionsInsertString(trim(petsc_options),ierr) + call PetscOptionsInsertString(PETSC_NULL_OBJECT,trim(petsc_defaultOptions),ierr) + CHKERRQ(ierr) + call PetscOptionsInsertString(PETSC_NULL_OBJECT,trim(petsc_options),ierr) CHKERRQ(ierr) grid1Red = grid(1)/2_pInt + 1_pInt diff --git a/installation/patch/README.md b/installation/patch/README.md index 86ed44f0d..f5b9f9706 100644 --- a/installation/patch/README.md +++ b/installation/patch/README.md @@ -13,5 +13,3 @@ patch -p1 < installation/patch/nameOfPatch * **fwbw_derivative** switches the default spatial derivative from continuous to forward/backward difference. This generally reduces spurious oscillations in the result as the spatial accuracy of the derivative is then compatible with the underlying solution grid. - * **petsc3.7** adapts to API changes introduced between PETSc 3.6.x and 3.7.x for setting PETSc options. - Use this patch if your system runs PETSc 3.7.x. diff --git a/installation/patch/petsc3.7 b/installation/patch/petsc3.7 deleted file mode 100644 index b5fd696fb..000000000 --- a/installation/patch/petsc3.7 +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/code/spectral_utilities.f90 b/code/spectral_utilities.f90 -index 34eb0ea..a33c7a9 100644 ---- a/code/spectral_utilities.f90 -+++ b/code/spectral_utilities.f90 -@@ -227,12 +227,13 @@ subroutine utilities_init() - trim(PETScDebug), & - ' add more using the PETSc_Options keyword in numerics.config '; flush(6) - -- call PetscOptionsClear(ierr); CHKERRQ(ierr) -- if(debugPETSc) call PetscOptionsInsertString(trim(PETSCDEBUG),ierr) -+ call PetscOptionsClear(PETSC_NULL_OBJECT,ierr) - CHKERRQ(ierr) -- call PetscOptionsInsertString(trim(petsc_defaultOptions),ierr) -+ if(debugPETSc) call PetscOptionsInsertString(PETSC_NULL_OBJECT,trim(PETSCDEBUG),ierr) - CHKERRQ(ierr) -- call PetscOptionsInsertString(trim(petsc_options),ierr) -+ call PetscOptionsInsertString(PETSC_NULL_OBJECT,trim(petsc_defaultOptions),ierr) -+ CHKERRQ(ierr) -+ call PetscOptionsInsertString(PETSC_NULL_OBJECT,trim(petsc_options),ierr) - CHKERRQ(ierr) - - grid1Red = grid(1)/2_pInt + 1_pInt