Changeset 335 for XIOS/trunk/src/output/nc4_data_output.cpp

Timestamp:

03/30/12 15:37:54 (12 years ago)

Author:

ymipsl

Message:

Change namespace xmlioserver -> xios

YM

File:

• XIOS/trunk/src/output/nc4_data_output.cpp (modified) (12 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -11 +11 @@
 #include "context_server.hpp"
 
-namespace xmlioserver
+namespace xios
 {
    namespace io
@@ -29 +29 @@
 
       CNc4DataOutput::CNc4DataOutput
-         (const StdString & filename, bool exist, MPI_Comm comm_server,bool multifile)
+         (const StdString & filename, bool exist, MPI_Comm comm_server,bool multifile, bool isCollective)
             : SuperClass()
             , SuperClassWriter(filename, exist, &comm_server,multifile)
             , comm_server(comm_server)
             , filename(filename)
+            , isCollective(isCollective)
       {
          StdString timeid = StdString("time_counter");
@@ -158 +159 @@
 
                SuperClassWriter::definition_end();
-               SuperClassWriter::writeData(domain->latvalue_srv, latid, true, 0);
-               SuperClassWriter::writeData(domain->lonvalue_srv, lonid, true, 0);
+               SuperClassWriter::writeData(domain->latvalue_srv, latid, isCollective, 0);
+               SuperClassWriter::writeData(domain->lonvalue_srv, lonid, isCollective, 0);
 // supress mask               if (server->intraCommSize > 1) SuperClassWriter::writeData(mask, maskid);
                SuperClassWriter::definition_start();
@@ -206 +207 @@
                }
                
-               SuperClassWriter::writeData(domain->latvalue_srv, latid, true, 0,&start,&count);
-               SuperClassWriter::writeData(domain->lonvalue_srv, lonid, true, 0,&start,&count);
+               SuperClassWriter::writeData(domain->latvalue_srv, latid, isCollective, 0,&start,&count);
+               SuperClassWriter::writeData(domain->lonvalue_srv, lonid, isCollective, 0,&start,&count);
                SuperClassWriter::definition_start();
 
@@ -255 +256 @@
 
                SuperClassWriter::definition_end();
-               SuperClassWriter::writeData(axis->value.getValue(), axisid, true, 0);
+               SuperClassWriter::writeData(axis->value.getValue(), axisid, isCollective, 0);
                SuperClassWriter::definition_start();
 
@@ -425 +426 @@
          StdString description = (!file->description.isEmpty())
                                ? file->description.getValue()
-                               : StdString("Created by xmlioserver");
+                               : StdString("Created by xios");
          this->writeFileAttributes(filename, description,
                                    StdString ("CF-1.1"),
@@ -470 +471 @@
          boost::shared_ptr<CDomain> domain = grid->domain ;
          
-         if(SuperClass::type==MULTI_FILE) if (domain->isEmpty()) return;
+         if(SuperClass::type==MULTI_FILE || !isCollective) if (domain->isEmpty()) return;
 
 
@@ -497 +498 @@
               case (MULTI_FILE) :
               {
-                 SuperClassWriter::writeData(field_data3D, fieldid, true, field->getNStep()-1);
-                 SuperClassWriter::writeData(time_data, oss.str(), true, field->getNStep()-1);
+                 SuperClassWriter::writeData(field_data3D, fieldid, isCollective, field->getNStep()-1);
+                 SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);
                  break ;
               }
@@ -516 +517 @@
                    count[2]=domain->zoom_ni_srv ; count[1]=domain->zoom_nj_srv ; count[0] = axis->size.getValue();
                  }
-                 SuperClassWriter::writeData(field_data3D, fieldid, true, field->getNStep()-1,&start,&count );
-                 SuperClassWriter::writeData(time_data, oss.str(), true, field->getNStep()-1 );
+                 SuperClassWriter::writeData(field_data3D, fieldid, isCollective, field->getNStep()-1,&start,&count );
+                 SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1 );
                  break;
               }
@@ -531 +532 @@
               case (MULTI_FILE) :
               {
-                SuperClassWriter::writeData(field_data2D, fieldid, true, field->getNStep()-1);
-                SuperClassWriter::writeData(time_data, oss.str(), true, field->getNStep()-1);
+                SuperClassWriter::writeData(field_data2D, fieldid, isCollective, field->getNStep()-1);
+                SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);
                 break;
               }
@@ -550 +551 @@
                  }
 
-                 SuperClassWriter::writeData(field_data2D, fieldid, true, field->getNStep()-1,&start,&count);
-                 SuperClassWriter::writeData(time_data, oss.str(), true, field->getNStep()-1);
+                 SuperClassWriter::writeData(field_data2D, fieldid, isCollective, field->getNStep()-1,&start,&count);
+                 SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);
                  break;
               
@@ -670 +671 @@
 
    } // namespace io
-} // namespace xmlioserver
+} // namespace xios