Merge branch 'imp_meshgetgt4' into develop

Author: oehmke

src/Infrastructure/Mesh/include/ESMCI_Mesh.h

@@ -161,20 +161,43 @@ ESMCI::PointList *MeshToPointList(ESMC_MeshLoc_Flag meshLoc, ESMCI::InterArray<i
   int getOrigElemConnCount();
 
 
-  // Information for regenerating original creation info
-  //// TODO: make private with accessors
-  bool has_orig_info;
-  std::map<UInt,std::vector<MeshObj *> > orig_id_to_conn; // nullptr -> MESH_POLYBREAK_IND
-  std::map<UInt,double> orig_id_to_area;
+  // Set has orig nodes
+  void setHasOrigElemNodes() {has_orig_elem_nodes=true;}
+  
+  // Set original element nodes
+  // Uses elem_id, so it can be done before mesh is created and eventually
+  // can be a more direct method of mesh creation
+  void setOrigElemNodes(UInt elem_id, std::vector<MeshObj *> &nodes);
+
+  // Get element original connection information for an element
+  // TODO: wrap these with a version that takes an elem id
+  int getOrigElemNodesCount(MeshObj *elem);
+  void getOrigElemNodes(MeshObj *elem, std::vector<MeshObj *> &nodes);
+
+  // Set has original area
+  void setHasOrigElemArea() {has_orig_elem_area=true;}
+  
+  // Set original element area
+  // Uses elem_id, so it can be done before mesh is created and eventually
+  // can be a more direct method of mesh creation
+  void setOrigElemArea(UInt elem_id, double area);
+
+  // Get element original area information for an element
+  // TODO: wrap these with a version that takes an elem id
+  double getOrigElemArea(MeshObj *elem);
 
 
   private:
 
   // Information for regenerating what was originally used to create the Mesh
   // (E.g. before things were split into triangles)  
-
-   int origElemConnCount; // The original element connection count
+  int origElemConnCount; // The original element connection count
 
+  bool has_orig_elem_nodes;
+  std::map<UInt,std::vector<MeshObj *> > orig_id_to_conn; // nullptr -> MESH_POLYBREAK_IND
+
+  bool has_orig_elem_area;
+  std::map<UInt,double> orig_id_to_area;
 
 
 

src/Infrastructure/Mesh/src/ESMCI_Mesh.C

@@ -62,7 +62,8 @@ Mesh::Mesh() : MeshDB(), FieldReg(), CommReg(),
                sghost(NULL),
                committed(false),
                is_split(false),
-               has_orig_info(false),
+               has_orig_elem_nodes(false),
+               has_orig_elem_area(false),
                origElemConnCount(-1),
 	       ind(-1), side(-1),
                orig_comm(MPI_COMM_NULL)
@@ -2294,5 +2295,177 @@ void Mesh::resolve_cspec_delete_owners(UInt obj_type) {
    orig_comm=new_comm;
  }
 
+ // Records the set of original nodes used for this element
+ // Note that this copies the input vector, so the same vector can be used repreatedly
+ // TODO: eventually the mesh should just be created using these
+ void Mesh::setOrigElemNodes(UInt elem_id, std::vector<MeshObj *> &nodes) {
+
+   // Only record >4 sided, because the others can be retrieved from the mesh
+   if (nodes.size() > 4) {
+     
+     // Add new vector of size 0
+     auto emplace_out=orig_id_to_conn.emplace(elem_id,0);
+           
+     // If it wasn't added, then throw an error
+     if (!emplace_out.second) Throw() << "elem with id=",elem_id," could not be added because of an error (e.g. it is a duplicate of a previous id).";
+           
+     // Get reference to new vector
+     std::vector<MeshObj *> &conn_vec=emplace_out.first->second;
+           
+     // Set to input vector
+     conn_vec=nodes;
+   }
+ }
+
+
+ // Gets the original element node count (even if the mesh is split)
+ int Mesh::getOrigElemNodesCount(MeshObj *elem) {
+
+   // Error if split and we haven't recorded original elem conn.
+   if (is_split && !has_orig_elem_nodes) Throw() << "Original element connection information has not been set in this Mesh.";
+
+   // Get information depending on split status
+   if (is_split) {
+     
+     // Look for element id in map
+     auto oitc =  orig_id_to_conn.find(elem->get_id());
+
+     // If it's not there use the usual method
+     if (oitc == orig_id_to_conn.end()) {
+
+       // Get topology of elem
+       const ESMCI::MeshObjTopo *topo = ESMCI::GetMeshObjTopo(*elem);
+
+       // Return the number of nodes
+       return topo->num_nodes;
+       
+     } else { // If it is get info from vec
+            
+       // Get reference to conn vector
+       std::vector<MeshObj *> &conn_vec=oitc->second;
+
+       // Return size
+       return conn_vec.size();            
+     }
+     
+   } else {
+     // Get topology of elem
+     const ESMCI::MeshObjTopo *topo = ESMCI::GetMeshObjTopo(*elem);
+     
+     // Return the number of nodes
+     return topo->num_nodes;     
+   }
+   
+ }
+
+
+  // Copies the nodes attached to the original element into a vector
+  // The nodes are put into the vector in the order that they were originally specified (e.g. first node is first).
+ void Mesh::getOrigElemNodes(MeshObj *elem, std::vector<MeshObj *> &nodes) {
+
+   // Clear input vector
+   nodes.clear();
+   
+   // Error if split and we haven't recorded original elem conn.
+   if (is_split && !has_orig_elem_nodes) Throw() << "Original element connection information has not been set in this Mesh.";
+
+   // Get information depending on split status
+   if (is_split) {
+     
+     // Look for element id in map
+     auto oitc =  orig_id_to_conn.find(elem->get_id());
+
+     // If it's not there use the usual method
+     if (oitc == orig_id_to_conn.end()) {
+
+       // Get topology of elem
+       const ESMCI::MeshObjTopo *topo = ESMCI::GetMeshObjTopo(*elem);
+
+       // Reserve space
+       nodes.reserve(topo->num_nodes);
+       
+       // Loop getting the indices of the nodes surrouding elem
+       for (int n = 0; n < topo->num_nodes; n++){
+         MeshObj *node = elem->Relations[n].obj;
+         nodes.push_back(node);
+       }
+       
+     } else { // If it is get info from vec
+            
+       // Get reference to conn vector
+       std::vector<MeshObj *> &conn_vec=oitc->second;
+
+       // Set return vector
+       nodes=conn_vec;            
+     }
+     
+   } else {
+     
+      // Get topology of elem
+     const ESMCI::MeshObjTopo *topo = ESMCI::GetMeshObjTopo(*elem);
+     
+     // Reserve space
+     nodes.reserve(topo->num_nodes);
+
+     // Loop getting the indices of the nodes surrouding elem
+     for (int n = 0; n < topo->num_nodes; n++){
+       MeshObj *node = elem->Relations[n].obj;
+       nodes.push_back(node);
+     }    
+   }   
+ }
+
+ // Records the original area for the element
+ void Mesh::setOrigElemArea(UInt elem_id, double area) {
+
+   // Add new entry with area
+   auto emplace_out=orig_id_to_area.emplace(elem_id, area);
+   
+   // If it wasn't added, then throw an error
+   if (!emplace_out.second) Throw() << "elem with id=",elem_id," could not be added because of an error (e.g. it is a duplicate of a previous id).";
+
+ }
+
+ // Gets the original element area (even if the mesh is split)
+ double Mesh::getOrigElemArea(MeshObj *elem) {
+
+   // Get element area field
+   MEField<> *elem_area=GetField("elem_area");
+
+   // Error if elements don't have areas
+   if (!elem_area) Throw() << "Element area information has not been set in this Mesh.";
+
+   // Error if split and we haven't recorded original elem area
+   if (is_split && !has_orig_elem_area) Throw() << "Original element area information has not been set in this Mesh.";
+   
+   // Get information depending on split status
+   if (is_split) {
+     
+     // Look for element id in map
+     auto oita =  orig_id_to_area.find(elem->get_id());
+
+     // If it's not there use the usual method
+     if (oita == orig_id_to_area.end()) {
+
+       // Return the element's area
+       return elem_area->data(*elem);
+       
+     } else { // If it is get info from map
+            
+       // Return area from map
+       return oita->second;            
+     }
+     
+   } else {
+
+     // Return the element's area
+     return elem_area->data(*elem);
+   }
+   
+ }
+
+ 
+ 
+ 
 
 } // namespace