diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-01-20 01:28:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-01-20 01:28:00 +0000 |
| commit | 6393aa25647f733400c5baec2237b38f23aebb31 (patch) | |
| tree | 3a50956c857f8f6db08cb9fbda3c16ff94302053 | |
| parent | 8d4e2e1413bfa77ce220f42b442eefbfc2f2776f (diff) | |
CarpetLib: Make prolongation operator parallelisation compile on AIX
darcs-hash:20080120012827-dae7b-464a66c3cd12b0110a8d4982a7b8c6bcf2aea218.gz
| -rw-r--r-- | Carpet/CarpetLib/src/data.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc index f499b4c87..78e381299 100644 --- a/Carpet/CarpetLib/src/data.cc +++ b/Carpet/CarpetLib/src/data.cc @@ -37,13 +37,13 @@ template <typename T> static void call_operator (void - the_operator (T const * restrict const src, - ivect3 const & restrict srcext, - T * restrict const dst, - ivect3 const & restrict dstext, - ibbox3 const & restrict srcbbox, - ibbox3 const & restrict dstbbox, - ibbox3 const & restrict regbbox), + (* the_operator) (T const * restrict const src, + ivect3 const & restrict srcext, + T * restrict const dst, + ivect3 const & restrict dstext, + ibbox3 const & restrict srcbbox, + ibbox3 const & restrict dstbbox, + ibbox3 const & restrict regbbox), T const * restrict const src, ivect3 const & restrict srcext, T * restrict const dst, @@ -53,7 +53,7 @@ call_operator (void ibbox3 const & restrict regbbox) { #ifndef _OPENMP - the_operator (src, srcext, dst, dstext, srcbbox, dstbbox, regbbox); + (* the_operator) (src, srcext, dst, dstext, srcbbox, dstbbox, regbbox); #else # if ! defined (CARPET_OPTIMISE) ibset allregbboxes; @@ -80,7 +80,7 @@ call_operator (void regbbox.upper().replace (dir, my_last_point - stride), regbbox.stride()); if (not myregbbox.empty()) { - the_operator (src, srcext, dst, dstext, srcbbox, dstbbox, myregbbox); + (* the_operator) (src, srcext, dst, dstext, srcbbox, dstbbox, myregbbox); } # if ! defined (NDEBUG) && ! defined (CARPET_OPTIMISE) _Pragma ("omp critical") { @@ -569,7 +569,7 @@ transfer_prolongate (data const * const src, timer.start (); switch (order_space) { case 1: - call_operator<T> (prolongate_3d_o1_rf2, + call_operator<T> (& prolongate_3d_o1_rf2, static_cast <T const *> (src->storage()), src->shape(), static_cast <T *> (this->storage()), @@ -579,7 +579,7 @@ transfer_prolongate (data const * const src, box); break; case 3: - call_operator<T> (prolongate_3d_o3_rf2, + call_operator<T> (& prolongate_3d_o3_rf2, static_cast <T const *> (src->storage()), src->shape(), static_cast <T *> (this->storage()), @@ -589,7 +589,7 @@ transfer_prolongate (data const * const src, box); break; case 5: - call_operator<T> (prolongate_3d_o5_rf2, + call_operator<T> (& prolongate_3d_o5_rf2, static_cast <T const *> (src->storage()), src->shape(), static_cast <T *> (this->storage()), @@ -616,7 +616,7 @@ transfer_prolongate (data const * const src, "There is no stencil for op=\"ENO\" with order_space==1"); break; case 3: - call_operator<T> (prolongate_3d_eno, + call_operator<T> (& prolongate_3d_eno, static_cast <T const *> (src->storage()), src->shape(), static_cast <T *> (this->storage()), @@ -647,7 +647,7 @@ transfer_prolongate (data const * const src, "There is no stencil for op=\"WENO\" with order_space=3"); break; case 5: - call_operator<T> (prolongate_3d_eno, + call_operator<T> (& prolongate_3d_eno, static_cast <T const *> (src->storage()), src->shape(), static_cast <T *> (this->storage()), |