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
mpim-sw
cdo
Commits
c7c50b76
Commit
c7c50b76
authored
Mar 25, 2016
by
Uwe Schulzweida
Browse files
OpenMP installation error [Bug #6523]
parent
2ff82d83
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
c7c50b76
...
...
@@ -3,6 +3,10 @@
* using CDI library version 1.7.2
* Version 1.7.2 released
2016-03-25 Uwe Schulzweida
* OpenMP installation error [Bug #6523]
2016-03-18 Uwe Schulzweida
* New operator: settbounds - Set time bounds
...
...
src/cdo.c
View file @
c7c50b76
...
...
@@ -1410,11 +1410,13 @@ int main(int argc, char *argv[])
fprintf
(
stderr
,
"OMP num procs = %d
\n
"
,
omp_get_num_procs
());
fprintf
(
stderr
,
"OMP max threads = %d
\n
"
,
omp_get_max_threads
());
fprintf
(
stderr
,
"OMP num threads = %d
\n
"
,
omp_get_num_threads
());
#if defined(HAVE_OPENMP3)
fprintf
(
stderr
,
"OMP thread limit = %d
\n
"
,
omp_get_thread_limit
());
omp_sched_t
kind
;
int
modifer
;
omp_get_schedule
(
&
kind
,
&
modifer
);
fprintf
(
stderr
,
"OMP schedule = %d (1:static; 2:dynamic; 3:guided; 4:auto)
\n
"
,
(
int
)
kind
);
#endif
#if defined(HAVE_OPENMP4)
fprintf
(
stderr
,
"OMP proc bind = %d (0:false; 1:true; 2:master; 3:close; 4:spread)
\n
"
,
(
int
)
omp_get_proc_bind
());
#if !defined(__ICC)
...
...
src/cdo_int.h
View file @
c7c50b76
...
...
@@ -42,9 +42,22 @@
#include
"util.h"
#include
"datetime.h"
#define OPENMP4 201307
#if defined(_OPENMP) && defined(OPENMP4) && _OPENMP >= OPENMP4
#define HAVE_OPENMP4 1
#if defined(_OPENMP)
#define OPENMP3 200805
#define OPENMP4 201307
#define OPENMP45 201511
#if _OPENMP >= OPENMP3
#define HAVE_OPENMP3 1
#endif
#if _OPENMP >= OPENMP4
#define HAVE_OPENMP4 1
#endif
#if _OPENMP >= OPENMP45
#define HAVE_OPENMP45 1
#endif
#endif
...
...
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