Changeset 1485

Timestamp:

04/17/18 11:55:51 (7 years ago)

Author:

oabramkina

Message:

Enforcing sequential I/O on the client side during reading of metadata by client processes. Parallel I/O can still be used in this case via setting file attribute "read_metadata_par" to true.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• config/file_attribute.conf (modified) (1 diff)
• io/inetcdf4.cpp (modified) (2 diffs)
• io/inetcdf4.hpp (modified) (1 diff)
• io/nc4_data_input.cpp (modified) (1 diff)
• io/nc4_data_input.hpp (modified) (1 diff)
• node/file.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/config/file_attribute.conf

@@ -21 +21 @@
 DECLARE_ATTRIBUTE(bool,      append)
 DECLARE_ENUM2(mode,          read, write)
+DECLARE_ATTRIBUTE(bool,      read_metadata_par)
 DECLARE_ENUM7(time_counter,  centered, instant, record, exclusive, centered_exclusive, instant_exclusive, none)
 DECLARE_ATTRIBUTE(StdString, time_counter_name)

XIOS/dev/XIOS_DEV_CMIP6/src/io/inetcdf4.cpp

@@ -7 +7 @@
 namespace xios
 {
-  CINetCDF4::CINetCDF4(const StdString& filename, const MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)
+  CINetCDF4::CINetCDF4(const StdString& filename, const MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/,
+                       bool readMetaDataPar /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
   {
     // Don't use parallel mode if there is only one process
@@ -17 +18 @@
         comm = NULL;
     }
-    mpi = comm && !multifile;
+    mpi = comm && !multifile && readMetaDataPar;
 
     // The file format will be detected automatically by NetCDF, it is safe to always set NC_MPIIO

XIOS/dev/XIOS_DEV_CMIP6/src/io/inetcdf4.hpp

@@ -23 +23 @@
       /// Constructors ///
       CINetCDF4(const StdString& filename, const MPI_Comm* comm = NULL, bool multifile = true,
-                const StdString& timeCounterName = "time_counter");
+                bool readMetaDataPar = false, const StdString& timeCounterName = "time_counter");
+
       CINetCDF4(const CINetCDF4& inetcdf4);       // Not implemented.
       CINetCDF4(const CINetCDF4* const inetcdf4); // Not implemented.

XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp

@@ -10 +10 @@
 namespace xios
 {
-  CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)
+  CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/,
+                               bool readMetaDataPar /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
     : SuperClass()
-    , SuperClassWriter(filename, &comm_file, multifile, timeCounterName)
+    , SuperClassWriter(filename, &comm_file, multifile, readMetaDataPar, timeCounterName)
     , comm_file(comm_file)
     , filename(filename)

XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.hpp

@@ -24 +24 @@
     /// Constructors ///
     CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective = true,
-                  const StdString& timeCounterName = "time_counter");
+                  bool readMetaDataPar = false, const StdString& timeCounterName = "time_counter");
     CNc4DataInput(const CNc4DataInput& dataInput);       // Not implemented.
     CNc4DataInput(const CNc4DataInput* const dataInput); // Not implemented.

XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp

@@ -657 +657 @@
 
       bool isCollective = par_access.isEmpty() || par_access == par_access_attr::collective;
+      bool readMetaDataPar = true;
+      if (!context->hasServer) readMetaDataPar = (read_metadata_par.isEmpty()) ? false : read_metadata_par;
 
       if (isOpen) data_out->closeFile();
-      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective));
-      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, time_counter_name));
+      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar));
+      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, time_counter_name));
       isOpen = true;
     }