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

Timestamp:

04/01/15 17:53:02 (9 years ago)

Author:

mhnguyen

Message:

Fixing some bugs on writting non-distributed data

+) Implement scalar grid: Allow to send scalar real data
+) Modify the way to compute the mapping of buffer size from one client to a server
+) Fix a bug of writting axis on one_file mode
+) Make some changes in test_new_features.f90 and test_complete.f90

Test
+) On Curie,
+) test_client and test_complete pass and results are correct

File:

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

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -118 +118 @@
                  if (server->intraCommSize > 1)
                  {
+
   //                 SuperClassWriter::addDimension(lonid, domain->zoom_ni.getValue());
   //                 SuperClassWriter::addDimension(latid, domain->zoom_nj.getValue());
@@ -485 +486 @@
          StdSize zoom_size_srv=axis->zoom_size_srv;
          StdSize zoom_begin_srv=axis->zoom_begin_srv;
+         StdSize zoom_size  = (MULTI_FILE == SuperClass::type) ? zoom_size_srv
+                                                              : axis->zoom_size;
+         StdSize zoom_begin = (MULTI_FILE == SuperClass::type) ? zoom_begin_srv
+                                                              : axis->zoom_begin;
 
 
@@ -492 +497 @@
          try
          {
-           SuperClassWriter::addDimension(axisid, zoom_size_srv);
+           SuperClassWriter::addDimension(axisid, zoom_size);
            dims.push_back(axisid);
 
@@ -527 +532 @@
                  SuperClassWriter::definition_end();
 
-                 CArray<double,1> axis_value(zoom_size_srv) ;
+                 CArray<double,1> axis_value(zoom_size) ;
                  for(StdSize i = 0 ; i < zoom_size_srv ; i++) axis_value(i)=axis->value(i+zoom_begin_srv) ;
                  SuperClassWriter::writeData(axis_value, axisid, isCollective, 0);
@@ -1235 +1240 @@
                 }
 
-                 SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep()-1,&start,&count );
-                 if (wtime)
-                 {
-                   SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep()-1,isRoot );
-                   SuperClassWriter::writeTimeAxisData(time_counter, string("time_counter"), isCollective, field->getNStep()-1,isRoot );
-                   SuperClassWriter::writeTimeAxisData(time_counter_bound, timeBoundId, isCollective, field->getNStep()-1, isRoot );
-                   SuperClassWriter::writeTimeAxisData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep()-1, isRoot);
-                 }
-                 break;
+                SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep()-1,&start,&count );
+                if (wtime)
+                {
+                  SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep()-1,isRoot );
+                  SuperClassWriter::writeTimeAxisData(time_counter, string("time_counter"), isCollective, field->getNStep()-1,isRoot );
+                  SuperClassWriter::writeTimeAxisData(time_counter_bound, timeBoundId, isCollective, field->getNStep()-1, isRoot );
+                  SuperClassWriter::writeTimeAxisData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep()-1, isRoot);
+                }
+
+                break;
               }
             }