Changeset ac6d04 for src/comm/domain_decomposition_mpi.cpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1666 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/comm/domain_decomposition_mpi.cpp (modified) (3 diffs)

src/comm/domain_decomposition_mpi.cpp

@@ -25 +25 @@
   GlobalIndices global_l;
   Index remainder, procs;
-  Index begin_finest, end_finest;
   Index last_procs = comm->GlobalProcs();
 
@@ -32 +31 @@
   for (unsigned int i=0; i<interface->Global().size(); ++i) {
 
-    global_l.BeginFinest() = interface->Global()[i].BeginFinest();
-    global_l.EndFinest() = interface->Global()[i].EndFinest();
-    global_l.SizeFinest() = interface->Global()[i].SizeFinest();
-    global_l.SizeGlobal() = interface->Global()[i].SizeGlobal();
-
+    /*
+     * Inherit global properties from interface
+     */
+    global_l.GlobalFinerBegin() = interface->Global()[i].GlobalFinerBegin();
+    global_l.GlobalFinerEnd() = interface->Global()[i].GlobalFinerEnd();
+    global_l.GlobalFinerSize() = interface->Global()[i].GlobalFinerSize();
+    global_l.FinestAbsBegin() = interface->Global()[i].FinestAbsBegin();
+    global_l.FinestAbsEnd() = interface->Global()[i].FinestAbsEnd();
+    global_l.FinestAbsSize() = interface->Global()[i].FinestAbsSize();
+    global_l.GlobalSize() = interface->Global()[i].GlobalSize();
     global_l.BoundaryType() = interface->Global()[i].BoundaryType();
 
-    if (IsActive(comm, global_l.SizeGlobal(), procs)) {
+    if (IsActive(comm, global_l.GlobalSize(), procs)) {
 
       if (i == 0) {
 
-        global_l.SizeLocal() = global_l.SizeGlobal() / procs;
-        remainder = global_l.SizeGlobal() % procs;
+        global_l.LocalSize() = global_l.GlobalSize() / procs;
 
+        remainder = global_l.GlobalSize() % procs;
         for (int j=0; j<3; ++j)
           if (comm->GlobalPos()[j] < remainder[j])
-            ++(global_l.SizeLocal()[j]);
+            ++(global_l.LocalSize()[j]);
 
-        global_l.BeginLocal() = comm->GlobalPos() * global_l.SizeLocal();
+        global_l.LocalBegin() = comm->GlobalPos() * global_l.LocalSize();
 
         for (int j=0; j<3; ++j)
           if (comm->GlobalPos()[j] >= remainder[j])
-          global_l.BeginLocal()[j] += remainder[j];
+            global_l.LocalBegin()[j] += remainder[j];
 
-        global_l.EndLocal() = global_l.BeginLocal() + global_l.SizeLocal();
+        global_l.LocalEnd() = global_l.LocalBegin() + global_l.LocalSize();
+
+        global_l.LocalFinerBegin() = 0;
+        global_l.LocalFinerEnd() = 0;
+        global_l.LocalFinerSize() = 0;
 
       }else {
@@ -64 +72 @@
           if (procs[j] == last_procs[j]) {
 
-            begin_finest[j] = (global.back().BeginFinest() +
-                               GridIndexTranslations::GlobalToFiner(global.back().BeginLocal(), i-1))[j];
-            end_finest[j] = (global.back().BeginFinest() +
-                             GridIndexTranslations::GlobalToFiner(global.back().EndLocal(), i-1))[j];
+            if (global.back().LocalBegin()[j] == 0)
+              global_l.LocalBegin()[j] = 0;
+            else
+              global_l.LocalBegin()[j] = global.back().LocalBegin()[j] / 2 + global_l.GlobalFinerBegin()[j];
 
-            if (global.back().BeginLocal()[j] == 0)
-              begin_finest[j] = global_l.BeginFinest()[j];
+            if (global.back().LocalEnd()[j] == global.back().GlobalSize()[j])
+              global_l.LocalEnd()[j] = global_l.GlobalSize()[j];
+            else
+              global_l.LocalEnd()[j] = global.back().LocalEnd()[j] / 2 + global_l.GlobalFinerBegin()[j];
 
-            if (global.back().EndLocal()[j] == global.back().SizeGlobal()[j])
-              end_finest[j] = global_l.EndFinest()[j];
-
-            begin_finest[j] -= global_l.BeginFinest()[j];
-            end_finest[j] -= global_l.BeginFinest()[j];
-
-            FineToCoarse(comm, begin_finest[j], end_finest[j], i);
-
-            global_l.BeginLocal()[j] = begin_finest[j];
-            global_l.EndLocal()[j] = end_finest[j];
-            global_l.SizeLocal()[j] = end_finest[j] - begin_finest[j];
+            global_l.LocalSize()[j] = global_l.LocalEnd()[j] - global_l.LocalBegin()[j];
 
           }else {
 
-            global_l.SizeLocal()[j] = global_l.SizeGlobal()[j] / procs[j];
-            remainder[j] = global_l.SizeGlobal()[j] % procs[j];
+            global_l.LocalSize()[j] = global_l.GlobalSize()[j] / procs[j];
 
+            remainder[j] = global_l.GlobalSize()[j] % procs[j];
+            if (comm->GlobalPos()[j] < remainder[j])
+              ++(global_l.LocalSize()[j]);
 
-            if (comm->GlobalPos()[j] < remainder[j])
-              ++(global_l.SizeLocal()[j]);
-
-            global_l.BeginLocal()[j] = comm->GlobalPos()[j] * global_l.SizeLocal()[j];
-
+            global_l.LocalBegin()[j] = comm->GlobalPos()[j] * global_l.LocalSize()[j];
 
             if (comm->GlobalPos()[j] >= remainder[j])
-              global_l.BeginLocal()[j] += remainder[j];
+              global_l.LocalBegin()[j] += remainder[j];
 
-            global_l.EndLocal()[j] = global_l.BeginLocal()[j] + global_l.SizeLocal()[j];
+            global_l.LocalEnd()[j] = global_l.LocalBegin()[j] + global_l.LocalSize()[j];
 
           }
         }
+
+        global_l.LocalFinerBegin() = global_l.LocalBegin().Clamp(global_l.GlobalFinerBegin(), global_l.GlobalFinerEnd());
+        global_l.LocalFinerEnd() = global_l.LocalEnd().Clamp(global_l.GlobalFinerBegin(), global_l.GlobalFinerEnd());
+        global_l.LocalFinerSize() = global_l.LocalFinerEnd() - global_l.LocalFinerBegin();
+
       }
+
     }else {
 
-      global_l.BeginLocal() = 0;
-      global_l.EndLocal() = 0;
-      global_l.SizeLocal() = 0;
+      global_l.LocalBegin() = 0;
+      global_l.LocalEnd() = 0;
+      global_l.LocalSize() = 0;
+      global_l.LocalFinerBegin() = 0;
+      global_l.LocalFinerEnd() = 0;
+      global_l.LocalFinerSize() = 0;
 
     }