From 690d63734a369166e0b905805ebc24270f881e20 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 25 Nov 2023 20:39:39 +0100 Subject: [PATCH 1/2] avoid message about unused parameters --- src/grid/spectral_utilities.f90 | 2 -- src/mesh/FEM_utilities.f90 | 2 -- src/parallelization.f90 | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/grid/spectral_utilities.f90 b/src/grid/spectral_utilities.f90 index de9518b8c..c5481e6c5 100644 --- a/src/grid/spectral_utilities.f90 +++ b/src/grid/spectral_utilities.f90 @@ -174,8 +174,6 @@ subroutine spectral_utilities_init() num_grid => num_solver%get_dict('grid',defaultVal=emptyDict) num_grid_fft => num_grid%get_dict('FFT',defaultVal=emptyDict) - call PetscOptionsClear(PETSC_NULL_OPTIONS,err_PETSc) - CHKERRQ(err_PETSc) call PetscOptionsInsertString(PETSC_NULL_OPTIONS,& num_grid%get_asStr('PETSc_options',defaultVal=''),err_PETSc) CHKERRQ(err_PETSc) diff --git a/src/mesh/FEM_utilities.f90 b/src/mesh/FEM_utilities.f90 index 3af7b77ea..b1c218172 100644 --- a/src/mesh/FEM_utilities.f90 +++ b/src/mesh/FEM_utilities.f90 @@ -120,8 +120,6 @@ subroutine FEM_utilities_init(num_mesh) call IO_error(821,ext_msg='integration order (p_i) out of bounds') flush(IO_STDOUT) - call PetscOptionsClear(PETSC_NULL_OPTIONS,err_PETSc) - CHKERRQ(err_PETSc) petsc_options = misc_prefixOptions('-snes_type newtonls & &-snes_linesearch_type cp -snes_ksp_ew & diff --git a/src/parallelization.f90 b/src/parallelization.f90 index 46b94af53..153c7fc17 100644 --- a/src/parallelization.f90 +++ b/src/parallelization.f90 @@ -88,6 +88,9 @@ subroutine parallelization_init() #endif CHKERRQ(err_PETSc) + call PetscOptionsClear(PETSC_NULL_OPTIONS,err_PETSc) + CHKERRQ(err_PETSc) + call MPI_Comm_rank(MPI_COMM_WORLD,worldrank,err_MPI) if (err_MPI /= 0_MPI_INTEGER_KIND) & error stop 'Could not determine worldrank' From 4749b36ae9e8b7c5288b0d7df9052b2ca6cee00e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 26 Nov 2023 12:23:37 +0100 Subject: [PATCH 2/2] simplified --- src/parallelization.f90 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/parallelization.f90 b/src/parallelization.f90 index 153c7fc17..20ab75336 100644 --- a/src/parallelization.f90 +++ b/src/parallelization.f90 @@ -62,8 +62,9 @@ subroutine parallelization_init() !$ integer :: got_env, threadLevel !$ integer(pI32) :: OMP_NUM_THREADS !$ character(len=6) NumThreadsString - PetscErrorCode :: err_PETSc + + #ifdef _OPENMP ! If openMP is enabled, check if the MPI libary supports it and initialize accordingly. call MPI_Init_Thread(MPI_THREAD_FUNNELED,threadLevel,err_MPI) @@ -74,11 +75,7 @@ subroutine parallelization_init() if (err_MPI /= 0_MPI_INTEGER_KIND) error stop 'MPI init failed' #endif -#if defined(DEBUG) - call PetscInitialize(PETSC_NULL_CHARACTER,err_PETSc) -#else call PetscInitializeNoArguments(err_PETSc) -#endif CHKERRQ(err_PETSc) #if defined(DEBUG) && defined(__INTEL_COMPILER)