Changeset 1134 for XIOS/dev/branch_yushan_merged/src/node/mesh.cpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/node/mesh.cpp (modified) (7 diffs)

XIOS/dev/branch_yushan_merged/src/node/mesh.cpp

@@ -34 +34 @@
   std::map <StdString, vector<int> > CMesh::domainList = std::map <StdString, vector<int> >();
 
+  std::map <StdString, CMesh> *CMesh::meshList_ptr = 0;
+  std::map <StdString, vector<int> > *CMesh::domainList_ptr = 0;
+
+
 ///---------------------------------------------------------------
 /*!
@@ -41 +45 @@
  * \param [in] nvertex Number of verteces (1 for nodes, 2 for edges, 3 and up for faces).
  */
+
+/* bkp
   CMesh* CMesh::getMesh (StdString meshName, int nvertex)
   {
@@ -64 +70 @@
       CMesh::meshList.insert( make_pair(meshName, newMesh) );
       return &meshList[meshName];
+    }
+  }
+*/
+
+  CMesh* CMesh::getMesh (StdString meshName, int nvertex)
+  {
+    if(CMesh::domainList_ptr == NULL) CMesh::domainList_ptr = new std::map <StdString, vector<int> >();
+    if(CMesh::meshList_ptr == NULL)   CMesh::meshList_ptr   = new std::map <StdString, CMesh>();
+
+    (*CMesh::domainList_ptr)[meshName].push_back(nvertex);
+
+    if ( (*CMesh::meshList_ptr).begin() != (*CMesh::meshList_ptr).end() )
+    {
+      for (std::map<StdString, CMesh>::iterator it=(*CMesh::meshList_ptr).begin(); it!=(*CMesh::meshList_ptr).end(); ++it)
+      {
+        if (it->first == meshName)
+          return &((*CMesh::meshList_ptr)[meshName]);
+        else
+        {
+          CMesh newMesh;
+          (*CMesh::meshList_ptr).insert( make_pair(meshName, newMesh) );
+          return &((*CMesh::meshList_ptr)[meshName]);
+        }
+      }
+    }
+    else
+    {
+      CMesh newMesh;
+      (*CMesh::meshList_ptr).insert( make_pair(meshName, newMesh) );
+      return &((*CMesh::meshList_ptr)[meshName]);
     }
   }
@@ -488 +524 @@
  * \param [in] bounds_lat Array of boundary latitudes. Its size depends on the element type.
  */
-  void CMesh::createMeshEpsilon(const MPI_Comm& comm,
+  void CMesh::createMeshEpsilon(const ep_lib::MPI_Comm& comm,
                                 const CArray<double, 1>& lonvalue, const CArray<double, 1>& latvalue,
                                 const CArray<double, 2>& bounds_lon, const CArray<double, 2>& bounds_lat)
@@ -1688 +1724 @@
    */
 
-  void CMesh::getGloNghbFacesNodeType(const MPI_Comm& comm, const CArray<int, 1>& face_idx,
+  void CMesh::getGloNghbFacesNodeType(const ep_lib::MPI_Comm& comm, const CArray<int, 1>& face_idx,
                                const CArray<double, 2>& bounds_lon, const CArray<double, 2>& bounds_lat,
                                CArray<int, 2>& nghbFaces)
@@ -1844 +1880 @@
    */
 
-  void CMesh::getGloNghbFacesEdgeType(const MPI_Comm& comm, const CArray<int, 1>& face_idx,
+  void CMesh::getGloNghbFacesEdgeType(const ep_lib::MPI_Comm& comm, const CArray<int, 1>& face_idx,
                                const CArray<double, 2>& bounds_lon, const CArray<double, 2>& bounds_lat,
                                CArray<int, 2>& nghbFaces)
@@ -2025 +2061 @@
    */
 
-  void CMesh::getGlobalNghbFaces(const int nghbType, const MPI_Comm& comm,
+  void CMesh::getGlobalNghbFaces(const int nghbType, const ep_lib::MPI_Comm& comm,
                                  const CArray<int, 1>& face_idx,
                                  const CArray<double, 2>& bounds_lon, const CArray<double, 2>& bounds_lat,