Changeset 1138 for XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp

Timestamp:

05/18/17 17:40:03 (7 years ago)

Author:

yushan

Message:

test_remap back to work. No thread for now

File:

• XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp (modified) (3 diffs)

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

@@ -12 +12 @@
 #include "exception.hpp"
 #include "uuid.hpp"
+// mpi.hpp
 
 namespace xios
@@ -28 +29 @@
       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)
@@ -463 +464 @@
       StdString domainName = domain->name;
       domain->assignMesh(domainName, domain->nvertex);
-      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);
+      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";