Changeset 278 for XMLIO_V2/dev/common/src/xmlio/output/nc4_data_output.cpp

Timestamp:

09/21/11 09:42:30 (13 years ago)

Author:

hozdoba

Message:

Corrections

File:

• XMLIO_V2/dev/common/src/xmlio/output/nc4_data_output.cpp (modified) (11 diffs)

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

@@ -8 +8 @@
 #include "file.hpp"
 #include "calendar.hpp"
+#include "xios_manager.hpp"
+#include "context.hpp"
 
 namespace xmlioserver
@@ -75 +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");
 
@@ -84 +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)
@@ -104 +113 @@
                SuperClassWriter::addDimension(lonid_loc, domain->zoom_ni_loc.getValue());
                SuperClassWriter::addDimension(latid_loc, domain->zoom_nj_loc.getValue());
-               this->writeLocalAttributes(domain->zoom_ibegin_loc.getValue(),
-                                          domain->zoom_ni_loc.getValue(),
-                                          domain->zoom_jbegin_loc.getValue(),
-                                          domain->zoom_nj_loc.getValue(),
-                                          domid);
+               if (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+               {
+                  this->writeLocalAttributes(domain->zoom_ibegin_loc.getValue(),
+                                             domain->zoom_ni_loc.getValue(),
+                                             domain->zoom_jbegin_loc.getValue(),
+                                             domain->zoom_nj_loc.getValue(),
+                                             domid);
+               }
+               
                if (isCurvilinear)
                {
@@ -128 +141 @@
                dim0.push_back(lonid_loc);
 
-               SuperClassWriter::addVariable(maskid, NC_INT, dim0);
-
-               this->writeMaskAttributes(maskid,
-                  domain->data_dim.getValue()/*,
-                  domain->data_ni.getValue(),
-                  domain->data_nj.getValue(),
-                  domain->data_ibegin.getValue(),
-                  domain->data_jbegin.getValue()*/);
+               if (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+               {
+                  SuperClassWriter::addVariable(maskid, NC_INT, dim0);
+
+                  this->writeMaskAttributes(maskid,
+                     domain->data_dim.getValue()/*,
+                     domain->data_ni.getValue(),
+                     domain->data_nj.getValue(),
+                     domain->data_ibegin.getValue(),
+                     domain->data_jbegin.getValue()*/);
+               }
                   
                //SuperClassWriter::setDefaultValue(maskid, &dvm);
@@ -142 +158 @@
                SuperClassWriter::writeData(domain->latvalue.getValue(), latid, true, 0);
                SuperClassWriter::writeData(domain->lonvalue.getValue(), lonid, true, 0);
-               SuperClassWriter::writeData(mask, maskid);
+               if (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                  SuperClassWriter::writeData(mask, maskid);
                SuperClassWriter::definition_start();
 
@@ -169 +186 @@
          switch (SuperClass::type)
          {
+            case (ONE_FILE) :
             case (MULTI_FILE) :
             {
@@ -218 +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();
@@ -376 +398 @@
                              ? field->name.getValue() 
                              : field->getBaseFieldReference()->getId();
+         boost::shared_ptr<xmlioserver::tree::CContext> context =
+            CObjectFactory::GetObject<xmlioserver::tree::CContext>
+               (CObjectFactory::GetCurrentContextId());
+                             
+         StdOStringStream oss;
+         oss << "time_" << field->operation.getValue()
+             << "_" << field->getRelFile()->output_freq.getValue();
+             
          ARRAY(double, 1) field_data = field->getData();
+         ARRAY_CREATE(time_data, double, 1, [1]);
+         (*time_data)[0] = date::Time(*field->getLastWriteDate());
          
          if (grid->hasAxis()) // 3D
@@ -383 +415 @@
             grid->outputField(field_data, field_data3D);
             SuperClassWriter::writeData(field_data3D, fieldid, true, field->getNStep()-1);
+            SuperClassWriter::writeData(time_data, oss.str(), true, field->getNStep()-1);
             
          }
@@ -390 +423 @@
             grid->outputField(field_data,  field_data2D);
             SuperClassWriter::writeData(field_data2D, fieldid, true, field->getNStep()-1);
+            SuperClassWriter::writeData(time_data, oss.str(), true, field->getNStep()-1);
          }
       }