Changeset 7ff84e0

Timestamp:

08/26/16 20:03:03 (8 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

95f86a3

Parents:

fc4fc2f

git-author:

Hal Finkel <hfinkel@…> (08/26/16 20:03:03)

git-committer:

Hal Finkel <hfinkel@…> (08/26/16 20:03:03)

Message:

When rewriting, allow for redistribution; preserve topology info when a cart comm can be created

File:

• GenericIORewrite.cxx (modified) (2 diffs)

GenericIORewrite.cxx

@@ -39 +39 @@
 
     GenericIO GIO(MPI_COMM_WORLD, FileName, Method);
-    GIO.openAndReadHeader(GenericIO::MismatchDisallowed);
+    GIO.openAndReadHeader(GenericIO::MismatchRedistribute);
+
+    int NR = GIO.readNRanks();
+    if (!Rank && NR != NRanks) {
+      cout << "Redistributing data from " << NR << " ranks to " << NRanks <<
+              " ranks; dropping rank topology information!\n";
+    }
 
     vector<GenericIO::VariableInfo> VI;
@@ -58 +64 @@
     GIO.readData(-1, false);
 
-    GenericIO NewGIO(MPI_COMM_WORLD, NewFileName);
+    MPI_Comm Comm = MPI_COMM_WORLD;
+    if (NR == NRanks) {
+      int Periods[3] = { 0, 0, 0 };
+      int Dims[3];
+      GIO.readDims(Dims);
+      MPI_Cart_create(Comm, 3, Dims, Periods, 0, &Comm);
+    }
+
+    GenericIO NewGIO(Comm, NewFileName);
     NewGIO.setNumElems(NElem);