Merge pull request #313 from LLNL/feature/bassett4/nodelist-index

Added NodeList index to DataBase

Author: brbass

src/DataBase/DataBase.cc

@@ -840,6 +840,20 @@ haveNodeList(const NodeList<Dimension>& nodeList) const {
   return itr != nodeListEnd();
 }
 
+//------------------------------------------------------------------------------
+// Get the NodeList index for the given NodeList
+//------------------------------------------------------------------------------
+template<typename Dimension>
+int
+DataBase<Dimension>::
+nodeListIndex(const NodeList<Dimension>& nodeList) const {
+  ConstNodeListIterator itr = find(nodeListBegin(),
+                                   nodeListEnd(),
+                                   &nodeList);
+  VERIFY(itr != nodeListEnd());
+  return std::distance(nodeListBegin(), itr);
+}
+
 //------------------------------------------------------------------------------
 // Return the const list of NodeList pointers.
 //------------------------------------------------------------------------------

src/DataBase/DataBase.hh

@@ -198,6 +198,7 @@ public:
   void deleteNodeList(NodeList<Dimension>& nodeList);
 
   bool haveNodeList(const NodeList<Dimension>& nodeList) const;
+  int nodeListIndex(const NodeList<Dimension>& nodeList) const;
 
   // Allow const access to the list of NodeList pointers.
   const std::vector<NodeList<Dimension>*>& nodeListPtrs() const;

src/Distributed/fakempi.py

@@ -7,6 +7,8 @@
 MIN = -1
 MAX = -2
 SUM = -3
+MINLOC = -4
+MAXLOC = -5
 
 def is_fake_mpi():
     return True

src/Distributed/mpi_mpi4py.py

@@ -29,6 +29,8 @@
 MIN = MPI.MIN
 MAX = MPI.MAX
 SUM = MPI.SUM
+MINLOC = MPI.MINLOC
+MAXLOC = MPI.MAXLOC
 
 #-------------------------------------------------------------------------------
 # Prepare files to keep the stdout and stderr streams in.