Changeset 277 for XMLIO_V2/dev/dev_rv/src/xmlio/output

Timestamp:

09/20/11 18:10:41 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp (modified) (3 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp

@@ -77 +77 @@
          StdString lonid     = StdString("lon_").append(domid);
          StdString latid     = StdString("lat_").append(domid);
-         StdString lonid_loc = StdString("lon_").append(domid).append("_local");
-         StdString latid_loc = StdString("lat_").append(domid).append("_local");
+         StdString lonid_loc = (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                             ? StdString("lon_").append(domid).append("_local")
+                             : lonid;
+         StdString latid_loc = (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                             ? StdString("lat_").append(domid).append("_local")
+                             : latid;
          StdString maskid    = StdString("mask_").append(domid).append("_local");
 
@@ -86 +90 @@
          bool isCurvilinear = (domain->lonvalue.getValue()->size() == ssize);
 
-         SuperClassWriter::addDimension(lonid, domain->ni_glo.getValue());
-         SuperClassWriter::addDimension(latid, domain->nj_glo.getValue());
+         if (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+         {
+            SuperClassWriter::addDimension(lonid, domain->zoom_ni.getValue());
+            SuperClassWriter::addDimension(latid, domain->zoom_nj.getValue());
+         }
 
          if (isCurvilinear)
@@ -229 +236 @@
          StdString lonid     = StdString("lon_").append(domid);
          StdString latid     = StdString("lat_").append(domid);
-         StdString lonid_loc = StdString("lon_").append(domid).append("_local");
-         StdString latid_loc = StdString("lat_").append(domid).append("_local");
+         StdString lonid_loc = (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                             ? StdString("lon_").append(domid).append("_local")
+                             : lonid;
+         StdString latid_loc = (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                             ? StdString("lat_").append(domid).append("_local")
+                             : latid;
          StdString fieldid   = (!field->name.isEmpty())
                              ? field->name.getValue() : field->getBaseFieldReference()->getId();