Fixed some very small problems.

AMDiS/src/parallel/MeshPartitioner.cc

@@ -30,15 +30,28 @@ namespace AMDiS {
 
     // === Check for reading ARH meta file to create initial partitioning. ===
     
-    map<int, int> arhElInRank;
+    map<int, int> mapElInRank;
     map<int, int> arhElCodeSize;
-    string arhMetaFile = "";
-    Parameters::get("parallel->partitioner->read meta arh", arhMetaFile);
-    bool partitioningArhBased = (arhMetaFile != "");
-    if (partitioningArhBased) {
-      int nProc = ArhReader::readMetaData(arhMetaFile, arhElInRank, arhElCodeSize);
-      if (nProc != mpiSize)
-	partitioningArhBased = false;
+
+    string partitioningFile = "";
+    Parameters::get("parallel->initial partitioning file", partitioningFile);
+    if (partitioningFile != "") {           
+      ifstream file;
+      file.open(partitioningFile.c_str());
+      int nElements = 0;
+      file >> nElements;
+      for (int i = 0; i < nElements; i++)
+	file >> mapElInRank[i];
+      file.close();
+    } else {
+      string arhMetaFile = "";
+      Parameters::get("parallel->partitioner->read meta arh", arhMetaFile);
+      bool partitioningArhBased = (arhMetaFile != "");
+      if (partitioningArhBased) {
+	int nProc = ArhReader::readMetaData(arhMetaFile, mapElInRank, arhElCodeSize);
+	if (nProc != mpiSize)
+	  partitioningArhBased = false;
+      }
     }
     
 
@@ -70,11 +83,11 @@ namespace AMDiS {
 	// In standard mode assign to each macro element an arbitrary but unique
 	// rank number.
 
-	int elInRank = 0;
-	if (!partitioningArhBased)
+	int elInRank = 0;	
+	if (mapElInRank.empty())
 	  elInRank = std::min(elIndex / elPerRank, mpiSize - 1);
  	else
- 	  elInRank = arhElInRank[elIndex];
+ 	  elInRank = mapElInRank[elIndex];
 
 	elementInRank[elIndex] = (elInRank == mpiRank);
 	partitionMap[elIndex] = elInRank;