Changeset 616

Timestamp:

06/11/15 15:25:47 (9 years ago)

Author:

rlacroix

Message:

Cosmetics: Remove old unstructured code.

Location:

XIOS

Files:

• branchs/xios-1.0/src/output/nc4_data_output.cpp (modified) (5 diffs)
• trunk/src/output/nc4_data_output.cpp (modified) (4 diffs)

XIOS/branchs/xios-1.0/src/output/nc4_data_output.cpp

@@ -92 +92 @@
              dimXid     = StdString("lon").append(appendDomid);
              dimYid     = StdString("lat").append(appendDomid);
-             break;
-           case CDomain::type_attr::unstructured :
-             dimXid     = StdString("cell").append(appendDomid);
              break;
          }
@@ -136 +133 @@
                      dim1.push_back(dimXid);
                      break;
-                   case CDomain::type_attr::unstructured :
-                     lonid = StdString("lon").append(appendDomid);
-                     latid = StdString("lat").append(appendDomid);
-                     bounds_lonid=string("bounds_lon").append(appendDomid);
-                     bounds_latid=string("bounds_lat").append(appendDomid);
-                     dim0.push_back(dimXid);
-                     break;
-                 }
-
-                 if (domain->type == CDomain::type_attr::unstructured)
-                 {
-                   SuperClassWriter::addDimension(dimXid, domain->nj_glo);
-                 }
-                 else
-                 {
-                   SuperClassWriter::addDimension(dimXid, domain->zoom_ni_srv);
-                   SuperClassWriter::addDimension(dimYid, domain->zoom_nj_srv);
-                 }
+                 }
+
+                 SuperClassWriter::addDimension(dimXid, domain->zoom_ni_srv);
+                 SuperClassWriter::addDimension(dimYid, domain->zoom_nj_srv);
 
                  if (server->intraCommSize > 1)
                  {
-                    if (domain->type != CDomain::type_attr::unstructured)
-                    {
-                      this->writeLocalAttributes(domain->zoom_ibegin_srv,
-                                                 domain->zoom_ni_srv,
-                                                 domain->zoom_jbegin_srv,
-                                                 domain->zoom_nj_srv,
-                                                 appendDomid);
-
-                      if (singleDomain) this->writeLocalAttributes_IOIPSL(domain->zoom_ibegin_srv,
+                   this->writeLocalAttributes(domain->zoom_ibegin_srv,
+                                              domain->zoom_ni_srv,
+                                              domain->zoom_jbegin_srv,
+                                              domain->zoom_nj_srv,
+                                              appendDomid);
+
+                   if (singleDomain) this->writeLocalAttributes_IOIPSL(domain->zoom_ibegin_srv,
                                                  domain->zoom_ni_srv,
                                                  domain->zoom_jbegin_srv,
@@ -171 +152 @@
                                                  domain->ni_glo,domain->nj_glo,
                                                  server->intraCommRank,server->intraCommSize);
-                   }
                  }
 
@@ -184 +164 @@
                       SuperClassWriter::addVariable(lonid, NC_FLOAT, dim1);
                       break ;
-                    case CDomain::type_attr::unstructured :
-                      SuperClassWriter::addVariable(latid, NC_FLOAT, dim0);
-                      SuperClassWriter::addVariable(lonid, NC_FLOAT, dim0);
                  }
 
@@ -193 +170 @@
 
                  dim0.clear();
-                 if (domain->type != CDomain::type_attr::unstructured) dim0.push_back(dimYid);
+                 dim0.push_back(dimYid);
                  dim0.push_back(dimXid);
 

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -93 +93 @@
              dimXid     = StdString("lon").append(appendDomid);
              dimYid     = StdString("lat").append(appendDomid);
-             break;
-           case CDomain::type_attr::unstructured :
-             dimXid     = StdString("cell").append(appendDomid);
              break;
          }
@@ -137 +134 @@
                      dim1.push_back(dimXid);
                      break;
-                   case CDomain::type_attr::unstructured :
-                     lonid = StdString("lon").append(appendDomid);
-                     latid = StdString("lat").append(appendDomid);
-                     bounds_lonid=string("bounds_lon").append(appendDomid);
-                     bounds_latid=string("bounds_lat").append(appendDomid);
-                     dim0.push_back(dimXid);
-                     break;
                  }
 
-                 if (domain->type == CDomain::type_attr::unstructured)
-                 {
-                   SuperClassWriter::addDimension(dimXid, domain->nj_glo);
-                 }
-                 else
-                 {
-                   SuperClassWriter::addDimension(dimXid, domain->zoom_ni_srv);
-                   SuperClassWriter::addDimension(dimYid, domain->zoom_nj_srv);
-                 }
+                 SuperClassWriter::addDimension(dimXid, domain->zoom_ni_srv);
+                 SuperClassWriter::addDimension(dimYid, domain->zoom_nj_srv);
 
                  if (server->intraCommSize > 1)
                  {
-                    if (domain->type != CDomain::type_attr::unstructured)
-                    {
-                      this->writeLocalAttributes(domain->zoom_ibegin_srv,
-                                                 domain->zoom_ni_srv,
-                                                 domain->zoom_jbegin_srv,
-                                                 domain->zoom_nj_srv,
-                                                 appendDomid);
-
-                      if (singleDomain) this->writeLocalAttributes_IOIPSL(domain->zoom_ibegin_srv,
-                                                 domain->zoom_ni_srv,
-                                                 domain->zoom_jbegin_srv,
-                                                 domain->zoom_nj_srv,
-                                                 domain->ni_glo,domain->nj_glo,
-                                                 server->intraCommRank,server->intraCommSize);
-                   }
+                   this->writeLocalAttributes(domain->zoom_ibegin_srv,
+                                              domain->zoom_ni_srv,
+                                              domain->zoom_jbegin_srv,
+                                              domain->zoom_nj_srv,
+                                              appendDomid);
+
+                   if (singleDomain) this->writeLocalAttributes_IOIPSL(domain->zoom_ibegin_srv,
+                                              domain->zoom_ni_srv,
+                                              domain->zoom_jbegin_srv,
+                                              domain->zoom_nj_srv,
+                                              domain->ni_glo,domain->nj_glo,
+                                              server->intraCommRank,server->intraCommSize);
                  }
 
@@ -185 +165 @@
                       SuperClassWriter::addVariable(lonid, NC_FLOAT, dim1);
                       break ;
-                    case CDomain::type_attr::unstructured :
-                      SuperClassWriter::addVariable(latid, NC_FLOAT, dim0);
-                      SuperClassWriter::addVariable(lonid, NC_FLOAT, dim0);
                  }
 
@@ -194 +171 @@
 
                  dim0.clear();
-                 if (domain->type != CDomain::type_attr::unstructured) dim0.push_back(dimYid);
+                 dim0.push_back(dimYid);
                  dim0.push_back(dimXid);