Changeset 1053 for XIOS/dev/branch_yushan/src/io

Timestamp:

02/17/17 17:55:37 (7 years ago)

Author:

yushan

Message:

ep_lib namespace specified when netcdf involved

Location:

XIOS/dev/branch_yushan/src/io

Files:

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

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

@@ -18 +18 @@
     }
     mpi = comm && !multifile;
+    MPI_Info m_info;
 
     // The file format will be detected automatically by NetCDF, it is safe to always set NC_MPIIO
     // even if Parallel NetCDF ends up being used.
     if (mpi)
-      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, *comm, MPI_INFO_NULL, this->ncidp);
+      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, *comm, m_info, this->ncidp);
     else
       CNetCdfInterface::open(filename, NC_NOWRITE, this->ncidp);

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

@@ -7 +7 @@
 #include "array_new.hpp"
 
-#include "mpi.hpp"
+#include "mpi_std.hpp"
 #include "netcdf.hpp"
 

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

@@ -26 +26 @@
       CNc4DataOutput::CNc4DataOutput
          (const StdString & filename, bool exist, bool useClassicFormat, bool useCFConvention,
-          MPI_Comm comm_file, bool multifile, bool isCollective, const StdString& timeCounterName)
+          ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective, const StdString& timeCounterName)
             : SuperClass()
             , SuperClassWriter(filename, exist, useClassicFormat, useCFConvention, &comm_file, multifile, timeCounterName)
@@ -450 +450 @@
       StdString domainName = domain->name;
       domain->assignMesh(domainName, domain->nvertex);
-      domain->mesh->createMeshEpsilon(server->intraComm, domain->lonvalue_srv, domain->latvalue_srv, domain->bounds_lon_srv, domain->bounds_lat_srv);
+      domain->mesh->createMeshEpsilon(static_cast<MPI_Comm>(server->intraComm.mpi_comm), domain->lonvalue_srv, domain->latvalue_srv, domain->bounds_lon_srv, domain->bounds_lat_srv);
 
       StdString node_x = domainName + "_node_x";

XIOS/dev/branch_yushan/src/io/nc4_data_output.hpp

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

XIOS/dev/branch_yushan/src/io/netCdfInterface.hpp

@@ -16 +16 @@
 #endif
 
-#include "mpi.hpp"
-//#include <mpi.h>
+#include "mpi_std.hpp"
 #include "netcdf.hpp"
 

XIOS/dev/branch_yushan/src/io/netcdf.hpp

@@ -1 +1 @@
 #ifndef __XIOS_NETCDF_HPP__
 #define __XIOS_NETCDF_HPP__
-#include "mpi.hpp"
+#include "mpi_std.hpp"
 #define MPI_INCLUDED
 #include <netcdf.h>
@@ -18 +18 @@
 extern "C"
 {
-#  include <netcdf_par.h>
+  #include <netcdf_par.h>
 }
 #  endif
@@ -30 +30 @@
 namespace xios
 {
-  inline int nc_create_par(const char *path, int cmode, MPI_Comm comm, MPI_Info info,int *ncidp)
+  inline int nc_create_par(const char *path, int cmode, ep_lib::MPI_Comm comm, MPI_Info info,int *ncidp)
   {
 #if defined(USING_NETCDF_PAR)
-    return ::nc_create_par(path, cmode, comm, info, ncidp) ;
+    return ::nc_create_par(path, cmode, static_cast<MPI_Comm>(comm.mpi_comm), info, ncidp) ;
 #else
     ERROR("int nc_create_par(const char *path, int cmode, MPI_Comm comm, MPI_Info info,int *ncidp)",
@@ -41 +41 @@
   }
 
-  inline int nc_open_par(const char *path, int mode, MPI_Comm comm, MPI_Info info,int *ncidp)
+  inline int nc_open_par(const char *path, int mode, ep_lib::MPI_Comm comm, MPI_Info info,int *ncidp)
   {
 #if defined(USING_NETCDF_PAR)
-    return ::nc_open_par(path, mode, comm, info, ncidp) ;
+    return ::nc_open_par(path, mode, static_cast<MPI_Comm>(comm.mpi_comm), info, ncidp) ;
 #else
     ERROR("int nc_open_par(const char *path, int mode, MPI_Comm comm, MPI_Info info,int *ncidp)",

XIOS/dev/branch_yushan/src/io/onetcdf4.cpp

@@ -3 +3 @@
 #include "onetcdf4.hpp"
 #include "group_template.hpp"
-//#include "mpi_std.hpp"
 #include "netcdf.hpp"
 #include "netCdfInterface.hpp"
@@ -12 +11 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      CONetCDF4::CONetCDF4(const StdString& filename, bool append, bool useClassicFormat,
-                                                        bool useCFConvention,
-                           const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
+      CONetCDF4::CONetCDF4(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention, 
+                           const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
         : path()
         , wmpi(false)
@@ -32 +30 @@
 
       void CONetCDF4::initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention, 
-                                 const MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
+                                 const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName)
       {
          this->useClassicFormat = useClassicFormat;
@@ -58 +56 @@
          {
             if (wmpi)
-               CNetCdfInterface::createPar(filename, mode, *comm, info_null, this->ncidp);
+            {
+               CNetCdfInterface::createPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), info_null, this->ncidp);
+               printf("creating file with createPar\n");
+            }
             else
+            {
                CNetCdfInterface::create(filename, mode, this->ncidp);
+               printf("creating file with create\n");  
+            }  
+               
 
             this->appendMode = false;
@@ -68 +73 @@
             mode |= NC_WRITE;
             if (wmpi)
-               CNetCdfInterface::openPar(filename, mode, *comm, info_null, this->ncidp);
+            {
+               CNetCdfInterface::openPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), info_null, this->ncidp);
+               printf("opening file with openPar\n");
+            }
             else
+            {
                CNetCdfInterface::open(filename, mode, this->ncidp);
+               printf("opening file with open\n");
+            }
 
             this->appendMode = true;

XIOS/dev/branch_yushan/src/io/onetcdf4.hpp

@@ -7 +7 @@
 #include "data_output.hpp"
 #include "array_new.hpp"
-#include "mpi.hpp"
-//#include <mpi.h>
+#include "mpi_std.hpp"
 #include "netcdf.hpp"
 
@@ -29 +28 @@
             CONetCDF4(const StdString& filename, bool append, bool useClassicFormat = false,
                           bool useCFConvention = true,
-                      const MPI_Comm* comm = NULL, bool multifile = true,
+                      const ep_lib::MPI_Comm* comm = NULL, bool multifile = true,
                       const StdString& timeCounterName = "time_counter");
 
@@ -38 +37 @@
             /// Initialisation ///
             void initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention,
-                            const MPI_Comm* comm, bool multifile, const StdString& timeCounterName);
+                            const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName);
             void close(void);
             void sync(void);