diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-12-01 18:29:36 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:25:38 +0000 |
| commit | f07d15af7016099e3c550f934eec1a2a19dd63db (patch) | |
| tree | 4be83fa54535f8f72418afea4f251f05c8f5baa0 /Carpet/LoopControl/src/loopcontrol.c | |
| parent | eb6f949dec570d440ffffe8429d5213675c697e4 (diff) | |
LoopControl: Override the flesh CCTK_LOOP macros
Override the flesh CCTK_LOOP macros, so that one can use CCTK_LOOP instead of LC_LOOP.
Remove some outdated vectorisation code.
Ensure the LC_LOOP and LC_ENDLOOP macros match in pairs.
Diffstat (limited to 'Carpet/LoopControl/src/loopcontrol.c')
| -rw-r--r-- | Carpet/LoopControl/src/loopcontrol.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Carpet/LoopControl/src/loopcontrol.c b/Carpet/LoopControl/src/loopcontrol.c index a0bbe564b..fa2761717 100644 --- a/Carpet/LoopControl/src/loopcontrol.c +++ b/Carpet/LoopControl/src/loopcontrol.c @@ -1,3 +1,7 @@ +#include <cctk.h> +#include <cctk_Arguments.h> +#include <cctk_Parameters.h> + #include <assert.h> #include <errno.h> #include <float.h> @@ -12,9 +16,6 @@ # include <omp.h> #endif -#include <cctk.h> -#include <cctk_Parameters.h> - /* #ifdef HAVE_TGMATH_H */ /* # include <tgmath.h> */ /* #endif */ @@ -854,12 +855,6 @@ lc_control_init (lc_control_t * restrict const lc, lc->jjjstep = (lc->jjjmax - lc->jjjmin + lt->jnthreads-1) / lt->jnthreads; lc->kkkstep = (lc->kkkmax - lc->kkkmin + lt->knthreads-1) / lt->knthreads; -#if 0 - /* Correct threading for vectorisation (cache line size) */ - lc->iiistep = - (lc->iiistep + LC_VECTORSIZE - 1) / LC_VECTORSIZE * LC_VECTORSIZE; -#endif - /* Find location of current thread */ lc->thread_num = omp_get_thread_num(); int c = lc->thread_num; @@ -886,11 +881,6 @@ lc_control_init (lc_control_t * restrict const lc, lc->jjstep = lt->jnpoints; lc->kkstep = lt->knpoints; -#if 0 - /* Correct tiling for vectorisation (cache line size) */ - lc->iistep = (lc->iistep + LC_VECTORSIZE - 1) / LC_VECTORSIZE * LC_VECTORSIZE; -#endif - /*** Inner threads **********************************************************/ |