Changeset 881 for XIOS/trunk/src/node/mesh.cpp

Timestamp:

07/04/16 19:21:28 (8 years ago)

Author:

oabramkina

Message:

Commit for UGRID norms: bad allocations have been taken care of.

File:

• XIOS/trunk/src/node/mesh.cpp (modified) (5 diffs)

XIOS/trunk/src/node/mesh.cpp

@@ -26 +26 @@
   }
 
-  std::map <StdString, CMesh*> CMesh::meshList = std::map <StdString, CMesh*>();
-  CMesh* CMesh::getMesh;
+  std::map <StdString, CMesh> CMesh::meshList = std::map <StdString, CMesh>();
+  //CMesh* CMesh::getMesh;
 
 ///---------------------------------------------------------------
 /*!
- * \fn bool CMesh::isWritten (StdString meshName)
- * Checks if a mesh has been written, updates the list of meshes stored in meshList
+ * \fn bool CMesh::getMesh (StdString meshName)
+ * Returns a pointer to a mesh. If a mesh has not been created, creates it and adds its name to the list of meshes meshList.
  * \param [in] meshName  The name of a mesh ("name" attribute of a domain).
  */
-  bool CMesh::isWritten (StdString meshName)
-  {
-    if ( CMesh::meshList.begin() != CMesh::meshList.end() )
-    {
-      if ( CMesh::meshList.find(meshName) != CMesh::meshList.end() )
-      {
-        CMesh::getMesh = meshList[meshName];
-        return true;
-      }
-      else
-      {
-        CMesh::meshList.insert( make_pair(meshName, this) );
-        return false;
-      }
-    }
-    else
-    {
-      CMesh::meshList.insert( make_pair(meshName, this) );
-      return false;
-    }
+  CMesh::CMesh* CMesh::getMesh (StdString meshName)
+  {
+    if ( CMesh::meshList.find(meshName) == CMesh::meshList.end() )
+    {
+      CMesh::CMesh newMesh;
+      CMesh::meshList.insert( make_pair(meshName, newMesh) );
+
+    }
+    return &meshList[meshName];
   }
 
@@ -71 +60 @@
  * Precision check is implemented with two hash values for each dimension, longitude and latitude.
  * \param [in] lon Node longitude in degrees.
- * \param [in] lat Node latitude in degress ranged from 0 to 360.
+ * \param [in] lat Node latitude in degrees ranged from 0 to 360.
  * \return node index if a node exists; -1 otherwise
  */
@@ -145 +134 @@
  * Creates two hash values for each dimension, longitude and latitude.
  * \param [in] lon Node longitude in degrees.
- * \param [in] lat Node latitude in degress ranged from 0 to 360.
+ * \param [in] lat Node latitude in degrees ranged from 0 to 360.
  */
+
   void hashDblDbl (double lon, double lat)
   {
@@ -217 +207 @@
  * \param [in] latvalue  Array of latitudes.
  * \param [in] bounds_lon Array of boundary longitudes. Its size depends on the element type.
- * \param [in] bounds_lat Array of boundarry latitudes. Its size depends on the element type.
+ * \param [in] bounds_lat Array of boundary latitudes. Its size depends on the element type.
  */
   void CMesh::createMesh(const CArray<double, 1>& lonvalue, const CArray<double, 1>& latvalue,
@@ -357 +347 @@
  * \param [in] latvalue  Array of latitudes.
  * \param [in] bounds_lon Array of boundary longitudes. Its size depends on the element type.
- * \param [in] bounds_lat Array of boundarry latitudes. Its size depends on the element type.
+ * \param [in] bounds_lat Array of boundary latitudes. Its size depends on the element type.
  */
   void CMesh::createMeshEpsilon(const CArray<double, 1>& lonvalue, const CArray<double, 1>& latvalue,