Changeset 2200 for XIOS/trunk/src/io/nc4_data_output.cpp

Timestamp:

08/19/21 13:28:53 (3 years ago)

Author:

ymipsl

Message:

Bugs fix for UGRID convention output

• global indexation was not taking into account
• coherence problem in connectivity for node, edge and face mesh
• add UGRID testcase based on sphere cube

YM

File:

• XIOS/trunk/src/io/nc4_data_output.cpp (modified) (5 diffs)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -556 +556 @@
       // The first domain for the same mesh that will be written is that with the highest value of nvertex.
       // Thus the entire mesh connectivity will be generated at once.
+
       if (isWrittenDomain(domid)) return ;
       else setWrittenDomain(domid);
@@ -570 +571 @@
       std::vector<StdString> dim0;
       StdString domainName = domain->name;
-      domain->assignMesh(domainName, domain->nvertex);
-      domain->mesh->createMeshEpsilon(server->intraComm, domain->lonvalue, domain->latvalue, domain->bounds_lonvalue, domain->bounds_latvalue);
 
       StdString node_x = domainName + "_node_x";
@@ -600 +599 @@
       SuperClassWriter::addAttribute("topology_dimension", 2, &domainName);
       SuperClassWriter::addAttribute("node_coordinates", node_x + " " + node_y, &domainName);
+
 
       try
@@ -810 +810 @@
                  startNodes[0] = domain->mesh->node_start;
                  countNodes[0] = domain->mesh->node_count;
+                 if (countNodes[0]==0) startNodes[0]=0 ; // for netcdf error
                  startEdgeNodes[0] = domain->ibegin;
                  startEdgeNodes[1] = 0;
@@ -846 +847 @@
                  startNodes[0] = domain->mesh->node_start;
                  countNodes[0] = domain->mesh->node_count;
+                 if (countNodes[0]==0) startNodes[0]=0;
+                 
                  startEdges[0] = domain->mesh->edge_start;
                  countEdges[0] = domain->mesh->edge_count;
+                 if (countEdges[0]==0) startEdges[0]=0 ; // for netcdf error
+                 
                  startEdgeNodes[0] = domain->mesh->edge_start;
+                 countEdgeNodes[0] = domain->mesh->edge_count;
+                 if (countEdgeNodes[0]==0) startEdgeNodes[0]=0; // for netcdf error
                  startEdgeNodes[1] = 0;
-                 countEdgeNodes[0] = domain->mesh->edge_count;
                  countEdgeNodes[1]= 2;
+
                  startEdgeFaces[0] = domain->mesh->edge_start;
+                 countEdgeFaces[0] = domain->mesh->edge_count;
+                 if (countEdgeFaces[0]==0) startEdgeFaces[0]=0 ; // for netcdf error
                  startEdgeFaces[1]= 0;
-                 countEdgeFaces[0] = domain->mesh->edge_count;
                  countEdgeFaces[1]= 2;
+                
                  startFaceConctv[0] = domain->ibegin;
+                 countFaceConctv[0] = domain->ni;
                  startFaceConctv[1] = 0;
-                 countFaceConctv[0] = domain->ni;
                  countFaceConctv[1] = domain->nvertex;
                }