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

Timestamp:

06/06/17 17:09:31 (7 years ago)

Author:

yushan

Message:

branch re-merged with trunk @1156

File:

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

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

@@ -1833 +1833 @@
 
          singleDomain = (file->nbDomains == 1);
-
          StdString conv_str ;
          if (file->convention_str.isEmpty())
@@ -1841 +1840 @@
          }
          else conv_str=file->convention_str ;
-           
+
+
          try
          {
@@ -2274 +2274 @@
                 }
 
-
                 CTimer::get("Files : writing data").resume();
                 SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep() - 1, &start, &count);