Commit 827974ce authored by Andreas Marek's avatar Andreas Marek

Prepare merge with master

Similiar to commits 2998fac3 and 9710bf08 split elpa1.F90 and elpa2.F90
to make merge easier
parent c3b698f2
......@@ -10,6 +10,8 @@ lib_LTLIBRARIES = libelpa@SUFFIX@.la
libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
libelpa@SUFFIX@_la_SOURCES = src/elpa_utilities.F90 \
src/elpa1_compute.F90 \
src/elpa2_compute.F90 \
src/elpa1.F90 \
src/elpa2_utilities.F90 \
src/check_for_gpu.F90 \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -140,7 +140,7 @@ module ELPA2_utilities
#endif /* WITH_ONE_SPECIFIC_REAL_KERNEL */
#else / * WITH_REAL_AVX_BLOCK2_KERNEL */
#else /* WITH_REAL_AVX_BLOCK2_KERNEL */
#ifndef WITH_ONE_SPECIFIC_REAL_KERNEL
integer, parameter :: DEFAULT_REAL_ELPA_KERNEL = REAL_ELPA_KERNEL_GENERIC
......@@ -176,7 +176,7 @@ module ELPA2_utilities
#endif /* WITH_ONE_SPECIFIC_REAL_KERNEL */
#endif / * WITH_REAL_AVX_BLOCK2_KERNEL */
#endif /* WITH_REAL_AVX_BLOCK2_KERNEL */
character(35), parameter, dimension(number_of_real_kernels) :: &
REAL_ELPA_KERNEL_NAMES = (/"REAL_ELPA_KERNEL_GENERIC ", &
......
......@@ -40,7 +40,7 @@
!
!
module elpa_pdgeqrf
use elpa1_compute
use elpa1
use elpa_pdlarfb
use qr_utils_mod
......
......@@ -40,7 +40,7 @@
!
!
module elpa_pdlarfb
use elpa1_compute
use elpa1
use qr_utils_mod
......
......@@ -40,7 +40,7 @@
!
!
module qr_utils_mod
use elpa1_compute
implicit none
PRIVATE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment