Added store and load functions for more map types, ref idaholab#8225

jessecarterMOOSE · Dec 19, 2016 · 4fdc546 · 4fdc546
1 parent f31b00a
commit 4fdc546
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 2 deletions.
diff --git a/framework/include/restart/DataIO.h b/framework/include/restart/DataIO.h
@@ -20,6 +20,7 @@
 #include "HashMap.h"
 #include "MooseError.h"
 #include "Backup.h"
+#include "MooseRandom.h"
 
 // libMesh includes
 #include "libmesh/vector_value.h"
@@ -82,6 +83,12 @@ inline void storeHelper(std::ostream & stream, std::set<P> & data, void * contex
 template<typename P, typename Q>
 inline void storeHelper(std::ostream & stream, std::map<P,Q> & data, void * context);
 
+/**
+ * Unordered_map helper routine
+ */
+template<typename P, typename Q>
+inline void storeHelper(std::ostream & stream, std::unordered_map<P,Q> & data, void * context);
+
 /**
  * HashMap helper routine
  */
@@ -124,6 +131,12 @@ inline void loadHelper(std::istream & stream, std::set<P> & data, void * context
 template<typename P, typename Q>
 inline void loadHelper(std::istream & stream, std::map<P,Q> & data, void * context);
 
+/**
+ * Unordered_map helper routine
+ */
+template<typename P, typename Q>
+inline void loadHelper(std::istream & stream, std::unordered_map<P,Q> & data, void * context);
+
 /**
  * Hashmap helper routine
  */
@@ -254,6 +267,27 @@ dataStore(std::ostream & stream, std::map<T,U> & m, void * context)
   }
 }
 
+template<typename T, typename U>
+inline void
+dataStore(std::ostream & stream, std::unordered_map<T,U> & m, void * context)
+{
+  // First store the size of the map
+  unsigned int size = m.size();
+  stream.write((char *) &size, sizeof(size));
+
+  typename std::unordered_map<T,U>::iterator it = m.begin();
+  typename std::unordered_map<T,U>::iterator end = m.end();
+
+  for (; it != end; ++it)
+  {
+    T & key = const_cast<T&>(it->first);
+
+    storeHelper(stream, key, context);
+
+    storeHelper(stream, it->second, context);
+  }
+}
+
 template<typename T, typename U>
 inline void
 dataStore(std::ostream & stream, HashMap<T,U> & m, void * context)
@@ -290,6 +324,7 @@ template<> void dataStore(std::ostream & stream, Elem * & e, void * context);
 template<> void dataStore(std::ostream & stream, Node * & n, void * context);
 template<> void dataStore(std::ostream & stream, std::stringstream & s, void * context);
 template<> void dataStore(std::ostream & stream, std::stringstream * & s, void * context);
+template<> void dataStore(std::ostream & stream, MooseRandom & v, void * context);
 
 // global load functions
 
@@ -398,6 +433,26 @@ dataLoad(std::istream & stream, std::map<T,U> & m, void * context)
   }
 }
 
+template<typename T, typename U>
+inline void
+dataLoad(std::istream & stream, std::unordered_map<T,U> & m, void * context)
+{
+  m.clear();
+
+  // First read the size of the map
+  unsigned int size = 0;
+  stream.read((char *) &size, sizeof(size));
+
+  for (unsigned int i = 0; i < size; i++)
+  {
+    T key;
+    loadHelper(stream, key, context);
+
+    U & value = m[key];
+    loadHelper(stream, value, context);
+  }
+}
+
 
 template<typename T, typename U>
 inline void
@@ -432,6 +487,7 @@ template<> void dataLoad(std::istream & stream, Elem * & e, void * context);
 template<> void dataLoad(std::istream & stream, Node * & e, void * context);
 template<> void dataLoad(std::istream & stream, std::stringstream & s, void * context);
 template<> void dataLoad(std::istream & stream, std::stringstream * & s, void * context);
+template<> void dataLoad(std::istream & stream, MooseRandom & v, void * context);
 
 // Scalar Helper Function
 template<typename P>
@@ -481,6 +537,14 @@ storeHelper(std::ostream & stream, std::map<P,Q> & data, void * context)
   dataStore(stream, data, context);
 }
 
+// Unordered_map Helper Function
+template<typename P, typename Q>
+inline void
+storeHelper(std::ostream & stream, std::unordered_map<P,Q> & data, void * context)
+{
+  dataStore(stream, data, context);
+}
+
 // HashMap Helper Function
 template<typename P, typename Q>
 inline void
@@ -537,6 +601,14 @@ loadHelper(std::istream & stream, std::map<P,Q> & data, void * context)
   dataLoad(stream, data, context);
 }
 
+// Unordered_map Helper Function
+template<typename P, typename Q>
+inline void
+loadHelper(std::istream & stream, std::unordered_map<P,Q> & data, void * context)
+{
+  dataLoad(stream, data, context);
+}
+
 // HashMap Helper Function
 template<typename P, typename Q>
 inline void

diff --git a/framework/include/utils/MooseRandom.h b/framework/include/utils/MooseRandom.h
@@ -167,6 +167,11 @@ class MooseRandom
       it->second.first = it->second.second;
   }
 
+  LIBMESH_BEST_UNORDERED_MAP<unsigned int, std::pair<mt_state, mt_state> > getStates() { return _states; }
+
+  void setStates(LIBMESH_BEST_UNORDERED_MAP<unsigned int, std::pair<mt_state, mt_state> > states) { _states = states; }
+
+
 private:
 
   /**

diff --git a/framework/src/restart/DataIO.C b/framework/src/restart/DataIO.C
@@ -201,6 +201,15 @@ dataStore(std::ostream & stream, std::stringstream * & s, void * context)
   dataStore(stream, *s, context);
 }
 
+template<>
+void
+dataStore(std::ostream & stream, MooseRandom & v, void * context)
+{
+  Moose::out << "dataStore(std::ostream & stream, MooseRandom & v, void * context)" << std::endl;
+  LIBMESH_BEST_UNORDERED_MAP<unsigned int, std::pair<mt_state, mt_state> > states = v.getStates();
+  storeHelper(stream, states, context);
+}
+
 // global load functions
 
 template<>
@@ -416,3 +425,13 @@ dataLoad(std::istream & stream, std::stringstream * & s, void * context)
 {
   dataLoad(stream, *s, context);
 }
+
+template<>
+void
+dataLoad(std::istream & stream, MooseRandom & v, void * context)
+{
+  Moose::out << "dataStore(std::istream & stream, MooseRandom & v, void * context)" << std::endl;
+  LIBMESH_BEST_UNORDERED_MAP<unsigned int, std::pair<mt_state, mt_state> > states;
+  LoadHelper(stream, states, context);
+  v.setStates(states);
+}
diff --git a/test/include/postprocessors/RandomPostprocessor.h b/test/include/postprocessors/RandomPostprocessor.h
@@ -41,7 +41,7 @@ class RandomPostprocessor : public GeneralPostprocessor
 
   const unsigned int _generator_id;
 
-  MooseRandom _random;
+  MooseRandom & _random;
 };
 
 #endif //RANDOMPOSTPROCESSOR_H
diff --git a/test/src/postprocessors/RandomPostprocessor.C b/test/src/postprocessors/RandomPostprocessor.C
@@ -28,7 +28,8 @@ InputParameters validParams<RandomPostprocessor>()
 
 RandomPostprocessor::RandomPostprocessor(const InputParameters & parameters) :
     GeneralPostprocessor(parameters),
-    _generator_id(getParam<unsigned int>("generator"))
+    _generator_id(getParam<unsigned int>("generator")),
+    _random(declareRestartableData<MooseRandom>("random_pps"))
 {
   _random.seed(_generator_id,getParam<unsigned int>("seed"));
 }