Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
elpa
elpa
Commits
9d602648
Unverified
Commit
9d602648
authored
Nov 11, 2015
by
Andreas Marek
Browse files
Merge error: mssing preprocessor switch
parent
ed162318
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/elpa2.F90
View file @
9d602648
...
...
@@ -5566,7 +5566,7 @@ contains
#if defined(WITH_COMPLEX_GENERIC_SIMPLE_KERNEL)
use
complex_generic_simple_kernel
,
only
:
single_hh_trafo_complex_generic_simple
#endif
#if defined(WITH_COMPLEX_GENERIC_
SIMPLE_
KERNEL)
#if defined(WITH_COMPLEX_GENERIC_KERNEL)
use
complex_generic_kernel
,
only
:
single_hh_trafo_complex_generic
#endif
#ifdef HAVE_DETAILED_TIMINGS
...
...
@@ -5655,6 +5655,7 @@ contains
#endif /* WITH_COMPLEX_GENERIC_SIMPLE_KERNEL */
#if defined(WITH_COMPLEX_GENERIC_KERNEL)
#if defined(WITH_NO_SPECIFIC_COMPLEX_KERNEL)
if
(
THIS_COMPLEX_ELPA_KERNEL
.eq.
COMPLEX_ELPA_KERNEL_GENERIC
.or.
&
THIS_COMPLEX_ELPA_KERNEL
.eq.
COMPLEX_ELPA_KERNEL_BGP
.or.
&
...
...
@@ -5673,7 +5674,7 @@ contains
#if defined(WITH_NO_SPECIFIC_COMPLEX_KERNEL)
endif
#endif /* WITH_NO_SPECIFIC_COMPLEX_KERNEL */
#endif /* WITH_COMPLEX_GENERIC_KERNEL */
#if defined(WITH_COMPLEX_SSE_KERNEL)
#if defined(WITH_NO_SPECIFIC_COMPLEX_KERNEL)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment