Changeset 1160 for XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp

Timestamp:

06/06/17 19:06:45 (7 years ago)

Author:

yushan

Message:

fix bad commit. Back to R1155 branch not merged

File:

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

XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp

@@ -11 +11 @@
 #include "netCdfException.hpp"
 #include "exception.hpp"
-#include "timer.hpp"
 #include "uuid.hpp"
 // mpi.hpp
@@ -1833 +1832 @@
 
          singleDomain = (file->nbDomains == 1);
-         StdString conv_str ;
-         if (file->convention_str.isEmpty())
-         {
-            if (SuperClassWriter::useCFConvention) conv_str="CF-1.6" ;
-            else conv_str="UGRID" ;
-         }
-         else conv_str=file->convention_str ;
-
-
          try
          {
-           this->writeFileAttributes(filename, description,
-                                      conv_str,
-                                      StdString("An IPSL model"),
-                                      this->getTimeStamp());
+       if (SuperClassWriter::useCFConvention)
+             this->writeFileAttributes(filename, description,
+                                       StdString("CF-1.6"),
+                                       StdString("An IPSL model"),
+                                       this->getTimeStamp());
+           else
+             this->writeFileAttributes(filename, description,
+                                       StdString("UGRID"),
+                                       StdString("An IPSL model"),
+                                       this->getTimeStamp());
+
 
            if (!appendMode)
@@ -1992 +1989 @@
         CGrid* grid = field->grid;
 
-        if (field->getNStep()<1) 
-        {
-          return;
-        }
+        if (field->getNStep()<1) return ;
         
         if (!grid->doGridHaveDataToWrite())
-          if (SuperClass::type == MULTI_FILE || !isCollective)
-          {
-            return;
-          }
-
-          
+          if (SuperClass::type == MULTI_FILE || !isCollective) return;
+
         StdString fieldid = field->getFieldOutputName();
 
@@ -2128 +2118 @@
               case (MULTI_FILE) :
               {
-                 CTimer::get("Files : writing data").resume();
                  SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep() - 1);
-                 CTimer::get("Files : writing data").suspend();
                  if (wtime)
                  {
-                   CTimer::get("Files : writing time axis").resume();
                    if ( wtimeData)
                    {
-//                     SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1);
-//                     SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1);
-                       SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep() - 1, isRoot);
-                       SuperClassWriter::writeTimeAxisDataBounds(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1, isRoot);
-                  }
+                     SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1);
+                     SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1);
+                   }
                    if (wtimeCounter)
                    {
-//                     SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1);
-//                     if (timeCounterType!=record) SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1);
-                     SuperClassWriter::writeTimeAxisData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1,isRoot);
-                     if (timeCounterType!=record) SuperClassWriter::writeTimeAxisDataBounds(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1, isRoot);
+                     SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1);
+                     if (timeCounterType!=record) SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1);
                    }
-                   CTimer::get("Files : writing time axis").suspend();
                  }
                  break;
@@ -2274 +2256 @@
                 }
 
-                CTimer::get("Files : writing data").resume();
                 SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep() - 1, &start, &count);
-                CTimer::get("Files : writing data").suspend();
-
                  if (wtime)
                  {
-                   CTimer::get("Files : writing time axis").resume();
                    if ( wtimeData)
                    {
-//                     SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1);
-//                     SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1);
-                     SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep() - 1, isRoot);
-                     SuperClassWriter::writeTimeAxisDataBounds(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1, isRoot);
+                     SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1);
+                     SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1);
                    }
                    if (wtimeCounter)
                    {
-//                     SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1);
-//                     if (timeCounterType!=record) SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1);
-                     SuperClassWriter::writeTimeAxisData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1,isRoot);
-                     if (timeCounterType!=record) SuperClassWriter::writeTimeAxisDataBounds(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1, isRoot);
-
+                     SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1);
+                     if (timeCounterType!=record) SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1);
                    }
-                   CTimer::get("Files : writing time axis").suspend();  
                  }