From f64418f29a4a39be2864b4b14b91ea8f5d8c92de Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 18 Sep 2014 15:23:11 +0000 Subject: [PATCH] removed multithreaded FFTW, does not make a big time difference and will simplify linking when using PETSc --- code/DAMASK_spectral_utilities.f90 | 5 ----- code/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/code/DAMASK_spectral_utilities.f90 b/code/DAMASK_spectral_utilities.f90 index 82a2b70da..bc31e9040 100644 --- a/code/DAMASK_spectral_utilities.f90 +++ b/code/DAMASK_spectral_utilities.f90 @@ -227,11 +227,6 @@ subroutine utilities_init() !-------------------------------------------------------------------------------------------------- ! general initialization of FFTW (see manual on fftw.org for more details) if (pReal /= C_DOUBLE .or. pInt /= C_INT) call IO_error(0_pInt,ext_msg='Fortran to C') ! check for correct precision in C -!$ if(DAMASK_NumThreadsInt > 0_pInt) then -!$ i = fftw_init_threads() ! returns 0 in case of problem -!$ if (i == 0_pInt) call IO_error(error_ID = 809_pInt) -!$ call fftw_plan_with_nthreads(DAMASK_NumThreadsInt) -!$ endif call fftw_set_timelimit(fftw_timelimit) ! set timelimit for plan creation !-------------------------------------------------------------------------------------------------- diff --git a/code/Makefile b/code/Makefile index e057a050f..0140c7d99 100644 --- a/code/Makefile +++ b/code/Makefile @@ -29,7 +29,7 @@ endif ifdef PETSC_DIR include $(PETSC_DIR)/conf/variables INCLUDE_DIRS :=$(PETSC_FC_INCLUDES) -DPETSc -I../lib -LIBRARIES :=$(PETSC_WITH_EXTERNAL_LIB) -lfftw3 +LIBRARIES :=$(PETSC_WITH_EXTERNAL_LIB) COMPILERNAME ?= $(FC) LINKERNAME ?= $(FLINKER) else @@ -84,7 +84,7 @@ IMKL_COMPILER_gfortran :=gf ifeq "$(OPENMP)" "ON" OPENMP_FLAG_ifort =-openmp -openmp-report0 -parallel OPENMP_FLAG_gfortran =-fopenmp -LIBRARIES +=-lfftw3_threads -lpthread +LIBRARIES +=-lpthread ifeq "$(F90)" "ifort" LIBRARIES +=-liomp5 endif