Change the scheme for reductions. Before, reductions was done over the full

grid functions using CCTK_Reduce. Now, reductions are done alongside the
computations into local arrays and then these are reduced using
CCTK_ReduceLocArrayToArray1D. This is much more efficient. In addition
OpenMP directives are added to allow for mixed MPI/OpenMP usage.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/NoExcision/trunk@15 4ec1db94-0e4f-0410-ada3-8bed251432c9

1 files changed, 9 insertions, 1 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 824d112..28e4603 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,6 +1,8 @@
 # Schedule definitions for thorn NoExcision
 # $Header$
 
+STORAGE: reduction_mask
+
 SCHEDULE NoExcision_Overwrite IN ADMBase_PostInitial
 {
   LANG: Fortran
@@ -39,7 +41,13 @@ if (smooth_regions) {
 
     } "Conjugate Gradient smoothing"
 
-    SCHEDULE NoExcision_CGInit_1 IN NoExcision_CGSmoothing
+    SCHEDULE CopyMask IN NoExcision_CGSmoothing
+    {
+      LANG: C
+      OPTIONS: global loop-local
+    } "Copy the weight function from CarpetReduce"
+
+    SCHEDULE NoExcision_CGInit_1 IN NoExcision_CGSmoothing AFTER CopyMask
     {
       LANG: Fortran
     } "Initialise the conjugate gradient method 1"