Changeset 881 for XIOS/trunk/src/io/nc4_data_output.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/io/nc4_data_output.cpp (modified) (5 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)