Changeset 142 for XMLIO_V2/dev/dev_rv/src

Timestamp:

03/22/11 16:31:10 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src

Files:

• manager/mpi_manager.hpp (modified) (1 diff)
• output/nc4_data_output.cpp (modified) (1 diff)
• output/nc4_data_output.hpp (modified) (1 diff)
• output/onetcdf4.cpp (modified) (2 diffs)
• output/onetcdf4.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/src/manager/mpi_manager.hpp

@@ -17 +17 @@
    {
       /// ////////////////////// Déclarations ////////////////////// ///
-      typedef int     MPIComm;
-      typedef int    MPIGroup;
-      typedef int  MPIRequest;
-      typedef int  *MPIStatus;
-      typedef int MPIDataType;
+      typedef MPI_Fint     MPIComm;
+      typedef MPI_Fint    MPIGroup;
+      typedef MPI_Fint  MPIRequest;
+      typedef MPI_Fint  *MPIStatus;
+      typedef MPI_Fint MPIDataType;
 
       class CMPIManager

XMLIO_V2/dev/dev_rv/src/output/nc4_data_output.cpp

@@ -39 +39 @@
 
       CNc4DataOutput::CNc4DataOutput
-         (const StdString & filename, bool exist, bool multigroup, comm::MPIComm comm_server)
+         (const StdString & filename, bool exist, bool multigroup, comm::MPIComm comm_server, bool)
             : SuperClass()
             , SuperClassWriter(filename, exist, &comm_server)

XMLIO_V2/dev/dev_rv/src/output/nc4_data_output.hpp

@@ -29 +29 @@
                (const StdString & filename, bool exist, bool multigroup, MPI_Comm comm_server);
             CNc4DataOutput
-               (const StdString & filename, bool exist, bool multigroup, comm::MPIComm comm_server);
+               (const StdString & filename, bool exist, bool multigroup, comm::MPIComm comm_server, bool);
 
             CNc4DataOutput(const CNc4DataOutput & dataoutput);       // Not implemented.

XMLIO_V2/dev/dev_rv/src/output/onetcdf4.cpp

@@ -16 +16 @@
 
       CONetCDF4::CONetCDF4
-         (const StdString & filename, bool exist, const comm::MPIComm * comm)
+         (const StdString & filename, bool exist, const comm::MPIComm * comm, bool)
          : path()
       {
@@ -25 +25 @@
          else
          {
-            MPI_Comm comm_c = MPI_Comm_f2c(*comm);
+            MPI_Comm comm_c = (MPI_Comm)MPI_Comm_f2c(*comm);
             this->initialize(filename, exist, &comm_c);
          }

XMLIO_V2/dev/dev_rv/src/output/onetcdf4.hpp

@@ -32 +32 @@
             /// Constructeurs ///
             CONetCDF4(const StdString & filename, bool exist, const MPI_Comm * comm = NULL);
-            CONetCDF4(const StdString & filename, bool exist, const comm::MPIComm * comm);
+            CONetCDF4(const StdString & filename, bool exist, const comm::MPIComm * comm, bool);
 
             CONetCDF4(const CONetCDF4 & onetcdf4);       // Not implemented.