Changeset 1639 for XIOS/trunk/src/io

Timestamp:

01/22/19 16:43:32 (5 years ago)

Author:

yushan

Message:

revert erroneous commit on trunk

Location:

XIOS/trunk/src/io

Files:

• inetcdf4.cpp (modified) (3 diffs)
• inetcdf4.hpp (modified) (1 diff)
• nc4_data_input.cpp (modified) (1 diff)
• nc4_data_input.hpp (modified) (2 diffs)
• nc4_data_output.cpp (modified) (1 diff)
• nc4_data_output.hpp (modified) (2 diffs)
• netCdfInterface.cpp (modified) (3 diffs)
• netCdfInterface.hpp (modified) (2 diffs)
• onetcdf4.cpp (modified) (5 diffs)
• onetcdf4.hpp (modified) (2 diffs)

XIOS/trunk/src/io/inetcdf4.cpp

@@ -7 +7 @@
 namespace xios
 {
-  CINetCDF4::CINetCDF4(const StdString& filename, const ep_lib::MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/,
+  CINetCDF4::CINetCDF4(const StdString& filename, const MPI_Comm* comm /*= NULL*/, bool multifile /*= true*/,
                        bool readMetaDataPar /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
   {
@@ -14 +14 @@
     {
       int commSize = 0;
-      ep_lib::MPI_Comm_size(*comm, &commSize);
+      MPI_Comm_size(*comm, &commSize);
       if (commSize <= 1)
         comm = NULL;
@@ -23 +23 @@
     // even if Parallel NetCDF ends up being used.
     if (mpi)
-      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, *comm, EP_INFO_NULL, this->ncidp);
+      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, *comm, MPI_INFO_NULL, this->ncidp);
     else
       CNetCdfInterface::open(filename, NC_NOWRITE, this->ncidp);

XIOS/trunk/src/io/inetcdf4.hpp

@@ -22 +22 @@
     public:
       /// Constructors ///
-      CINetCDF4(const StdString& filename, const ep_lib::MPI_Comm* comm = NULL, bool multifile = true,
+      CINetCDF4(const StdString& filename, const MPI_Comm* comm = NULL, bool multifile = true,
                 bool readMetaDataPar = false, const StdString& timeCounterName = "time_counter");
 

XIOS/trunk/src/io/nc4_data_input.cpp

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

XIOS/trunk/src/io/nc4_data_input.hpp

@@ -23 +23 @@
 
     /// Constructors ///
-    CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective = true,
+    CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective = true,
                   bool readMetaDataPar = false, bool ugridConvention = false, const StdString& timeCounterName = "time_counter");
     CNc4DataInput(const CNc4DataInput& dataInput);       // Not implemented.
@@ -70 +70 @@
   private:
     /// Private attributes ///
-    ep_lib::MPI_Comm comm_file;
+    MPI_Comm comm_file;
     const StdString filename;
     bool isCollective;

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -28 +28 @@
       CNc4DataOutput::CNc4DataOutput
          (CFile* file, const StdString & filename, bool exist, bool useClassicFormat, bool useCFConvention,
-          ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective, const StdString& timeCounterName)
+          MPI_Comm comm_file, bool multifile, bool isCollective, const StdString& timeCounterName)
             : SuperClass()
             , SuperClassWriter(filename, exist, useClassicFormat, useCFConvention, &comm_file, multifile, timeCounterName)

XIOS/trunk/src/io/nc4_data_output.hpp

@@ -27 +27 @@
                (CFile* file, const StdString & filename, bool exist, bool useClassicFormat,
                 bool useCFConvention,
-                ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective = true,
+                MPI_Comm comm_file, bool multifile, bool isCollective = true,
                 const StdString& timeCounterName = "time_counter");
 
@@ -117 +117 @@
 
             /// Propriétés privées ///
-            ep_lib::MPI_Comm comm_file;
+            MPI_Comm comm_file;
             const StdString filename;
             std::map<Time, StdSize> timeToRecordCache;

XIOS/trunk/src/io/netCdfInterface.cpp

@@ -10 +10 @@
 #include "netCdfInterface.hpp"
 #include "netCdfException.hpp"
-#include "ep_mpi.hpp"
+
 namespace xios
 {
@@ -47 +47 @@
 \return Status code
 */
-int CNetCdfInterface::createPar(const StdString& fileName, int cMode, ep_lib::MPI_Comm comm, ep_lib::MPI_Info info, int& ncId)
-{
-  #ifdef _usingMPI
+int CNetCdfInterface::createPar(const StdString& fileName, int cMode, MPI_Comm comm, MPI_Info info, int& ncId)
+{
   int status = xios::nc_create_par(fileName.c_str(), cMode, comm, info, &ncId);
-  #elif _usingEP
-  int status = xios::nc_create_par(fileName.c_str(), cMode, to_mpi_comm(comm->mpi_comm), to_mpi_info(info), &ncId);
-  #endif
   if (NC_NOERR != status)
   {
@@ -104 +100 @@
 \return Status code
 */
-int CNetCdfInterface::openPar(const StdString& fileName, int oMode, ep_lib::MPI_Comm comm, ep_lib::MPI_Info info, int& ncId)
-{
-  #ifdef _usingMPI
+int CNetCdfInterface::openPar(const StdString& fileName, int oMode, MPI_Comm comm, MPI_Info info, int& ncId)
+{
   int status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId);
-  #elif _usingEP
-  int status = xios::nc_open_par(fileName.c_str(), oMode, to_mpi_comm(comm->mpi_comm), to_mpi_info(info), &ncId);
-  #endif
   if (NC_NOERR != status)
   {

XIOS/trunk/src/io/netCdfInterface.hpp

@@ -32 +32 @@
 
     //! Create a netcdf file on a parallel file system
-    static int createPar(const StdString& path, int cmode, ep_lib::MPI_Comm comm, ep_lib::MPI_Info info, int& ncId);
+    static int createPar(const StdString& path, int cmode, MPI_Comm comm, MPI_Info info, int& ncId);
 
     //! Open a netcdf file
@@ -38 +38 @@
 
     //! Open a netcdf file
-    static int openPar(const StdString& path, int cmode, ep_lib::MPI_Comm comm, ep_lib::MPI_Info info, int& ncId);
+    static int openPar(const StdString& path, int cmode, MPI_Comm comm, MPI_Info info, int& ncId);
 
     //! Close a netcdf file

XIOS/trunk/src/io/onetcdf4.cpp

@@ -15 +15 @@
       CONetCDF4::CONetCDF4(const StdString& filename, bool append, bool useClassicFormat,
                                                         bool useCFConvention,
-                           const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
+                           const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
         : path()
         , wmpi(false)
@@ -33 +33 @@
 
       void CONetCDF4::initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention, 
-                                 const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
+                                 const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
       {
          this->useClassicFormat = useClassicFormat;
@@ -44 +44 @@
          {
             int commSize = 0;
-            ep_lib::MPI_Comm_size(*comm, &commSize);
+            MPI_Comm_size(*comm, &commSize);
             if (commSize <= 1)
                comm = NULL;
@@ -58 +58 @@
             CTimer::get("Files : create").resume();
             if (wmpi)
-               CNetCdfInterface::createPar(filename, mode, *comm, EP_INFO_NULL, this->ncidp);
+               CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);
             else
                CNetCdfInterface::create(filename, mode, this->ncidp);
@@ -70 +70 @@
             CTimer::get("Files : open").resume();
             if (wmpi)
-               CNetCdfInterface::openPar(filename, mode, *comm, EP_INFO_NULL, this->ncidp);
+               CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);
             else
                CNetCdfInterface::open(filename, mode, this->ncidp);

XIOS/trunk/src/io/onetcdf4.hpp

@@ -28 +28 @@
             CONetCDF4(const StdString& filename, bool append, bool useClassicFormat = false,
                           bool useCFConvention = true,
-                      const ep_lib::MPI_Comm* comm = NULL, bool multifile = true,
+                      const MPI_Comm* comm = NULL, bool multifile = true,
                       const StdString& timeCounterName = "time_counter");
 
@@ -37 +37 @@
             /// Initialisation ///
             void initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention,
-                            const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName);
+                            const MPI_Comm* comm, bool multifile, const StdString& timeCounterName);
             void close(void);
             void sync(void);