223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'early-PetscOptionsClear' into 'development' 

Early petsc options clear

See merge request damask/DAMASK!862
This commit is contained in:
Sharan Roongta 2023-12-07 11:13:29 +00:00
parent 224ee5afdc 4749b36ae9
commit b5f71d2328
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/grid/spectral_utilities.f90
View File

@ -174,8 +174,6 @@ subroutine spectral_utilities_init()
num_grid => num_solver%get_dict('grid',defaultVal=emptyDict) num_grid => num_solver%get_dict('grid',defaultVal=emptyDict)
num_grid_fft => num_grid%get_dict('FFT',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,& call PetscOptionsInsertString(PETSC_NULL_OPTIONS,&
num_grid%get_asStr('PETSc_options',defaultVal=''),err_PETSc) num_grid%get_asStr('PETSc_options',defaultVal=''),err_PETSc)
CHKERRQ(err_PETSc) CHKERRQ(err_PETSc)

2
src/mesh/FEM_utilities.f90
View File

@ -120,8 +120,6 @@ subroutine FEM_utilities_init(num_mesh)
call IO_error(821,ext_msg='integration order (p_i) out of bounds') call IO_error(821,ext_msg='integration order (p_i) out of bounds')
flush(IO_STDOUT) flush(IO_STDOUT)
call PetscOptionsClear(PETSC_NULL_OPTIONS,err_PETSc)
CHKERRQ(err_PETSc)
petsc_options = misc_prefixOptions('-snes_type newtonls & petsc_options = misc_prefixOptions('-snes_type newtonls &
&-snes_linesearch_type cp -snes_ksp_ew & &-snes_linesearch_type cp -snes_ksp_ew &

10
src/parallelization.f90
View File

@ -62,8 +62,9 @@ subroutine parallelization_init()
!$ integer :: got_env, threadLevel !$ integer :: got_env, threadLevel
!$ integer(pI32) :: OMP_NUM_THREADS !$ integer(pI32) :: OMP_NUM_THREADS
!$ character(len=6) NumThreadsString !$ character(len=6) NumThreadsString
PetscErrorCode :: err_PETSc PetscErrorCode :: err_PETSc
#ifdef _OPENMP #ifdef _OPENMP
! If openMP is enabled, check if the MPI libary supports it and initialize accordingly. ! If openMP is enabled, check if the MPI libary supports it and initialize accordingly.
call MPI_Init_Thread(MPI_THREAD_FUNNELED,threadLevel,err_MPI) 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' if (err_MPI /= 0_MPI_INTEGER_KIND) error stop 'MPI init failed'
#endif #endif
#if defined(DEBUG)
call PetscInitialize(PETSC_NULL_CHARACTER,err_PETSc)
#else
call PetscInitializeNoArguments(err_PETSc) call PetscInitializeNoArguments(err_PETSc)
#endif
CHKERRQ(err_PETSc) CHKERRQ(err_PETSc)
#if defined(DEBUG) && defined(__INTEL_COMPILER) #if defined(DEBUG) && defined(__INTEL_COMPILER)
@ -88,6 +85,9 @@ subroutine parallelization_init()
#endif #endif
CHKERRQ(err_PETSc) CHKERRQ(err_PETSc)
call PetscOptionsClear(PETSC_NULL_OPTIONS,err_PETSc)
CHKERRQ(err_PETSc)
call MPI_Comm_rank(MPI_COMM_WORLD,worldrank,err_MPI) call MPI_Comm_rank(MPI_COMM_WORLD,worldrank,err_MPI)
if (err_MPI /= 0_MPI_INTEGER_KIND) & if (err_MPI /= 0_MPI_INTEGER_KIND) &
error stop 'Could not determine worldrank' error stop 'Could not determine worldrank'