Changeset 881 for XIOS

Timestamp:

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

Author:

oabramkina

Message:

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

Location:

XIOS/trunk/src

Files:

• io/nc4_data_output.cpp (modified) (5 diffs)
• node/domain.cpp (modified) (2 diffs)
• node/domain.hpp (modified) (1 diff)
• node/mesh.cpp (modified) (5 diffs)
• node/mesh.hpp (modified) (2 diffs)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -50 +50 @@
       void CNc4DataOutput::writeDomain_(CDomain* domain)
       {
-         if (domain->type == CDomain::type_attr::unstructured)
-         {
-       if (SuperClassWriter::useCFConvention)
-        writeUnstructuredDomain(domain) ;
-      else
-        writeUnstructuredDomainUgrid(domain) ;
-           return ;
-         }
+        if (domain->type == CDomain::type_attr::unstructured)
+        {
+          if (SuperClassWriter::useCFConvention)
+            writeUnstructuredDomain(domain) ;
+          else
+            writeUnstructuredDomainUgrid(domain) ;
+          return ;
+        }
 
          CContext* context = CContext::getCurrent() ;
@@ -66 +66 @@
 
          if (domain->isEmpty())
-           if (SuperClass::type==MULTI_FILE) return ;
+           if (SuperClass::type==MULTI_FILE) return;
 
          std::vector<StdString> dim0, dim1;
@@ -449 +449 @@
       StdString domid = domain->getDomainOutputName();
       StdString domainName = domain->name;
-
-      if (domain->mesh->isWritten(domainName)) domain->mesh = CMesh::getMesh;
-
+      domain->assignMesh(domainName);
       //domain->mesh->createMesh(domain->lonvalue_srv, domain->latvalue_srv, domain->bounds_lon_srv, domain->bounds_lat_srv);
       domain->mesh->createMeshEpsilon(domain->lonvalue_srv, domain->latvalue_srv, domain->bounds_lon_srv, domain->bounds_lat_srv);
@@ -650 +648 @@
               if (domain->nvertex == 1)
               {
-                                if ( (!domain->mesh->edgesAreWritten) && (!domain->mesh->facesAreWritten) )
+                if ( (!domain->mesh->edgesAreWritten) && (!domain->mesh->facesAreWritten) )
                 {
                   SuperClassWriter::writeData(domain->mesh->node_lat, node_y, isCollective, 0);
@@ -658 +656 @@
               if (domain->nvertex == 2)
               {
-                                if (!domain->mesh->facesAreWritten)
+                if (!domain->mesh->facesAreWritten)
                 {
                   if (!domain->mesh->nodesAreWritten)

XIOS/trunk/src/node/domain.cpp

@@ -36 +36 @@
       , isRedistributed_(false)
    {
-           mesh = new CMesh();
+           //mesh = new CMesh();
         }
 
@@ -47 +47 @@
       , isRedistributed_(false)
    {
-           mesh = new CMesh();
+           //mesh = new CMesh();
         }
 
    CDomain::~CDomain(void)
    {
-           delete mesh;
+           //delete mesh;
    }
 
    ///---------------------------------------------------------------
+
+   void CDomain::assignMesh(const StdString meshName)
+   {
+     mesh = CMesh::getMesh(meshName);
+   }
 
    CDomain* CDomain::createDomain()

XIOS/trunk/src/node/domain.hpp

@@ -67 +67 @@
          
          CMesh* mesh;
+         void assignMesh(const StdString);
         
          virtual void parse(xml::CXMLNode & node);

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,

XIOS/trunk/src/node/mesh.hpp

@@ -9 +9 @@
  
 #include "array_new.hpp"
+#include "client_client_dht_template.hpp"
 
 namespace xios {
@@ -53 +54 @@
             const CArray<double, 2>&, const CArray<double, 2>& );
                         
-      void createMeshEpsilon(const CArray<double, 1>&, const CArray<double, 1>&, 
+      void createMeshEpsilon(const CArray<double, 1>&, const CArray<double, 1>&,
             const CArray<double, 2>&, const CArray<double, 2>& );
             
-      bool isWritten (StdString);    
-      static CMesh* getMesh;
-          
-       private:
+      static CMesh* getMesh(StdString);
 
-      static std::map <StdString, CMesh*> meshList;
+    private:
+
+      static std::map <StdString, CMesh> meshList;
 
       size_t nodeIndex (double, double);