Changeset 605 for XIOS/branchs

Timestamp:

06/03/15 15:06:24 (9 years ago)

Author:

rlacroix

Message:

Don't enable NETCDF parallel mode when only one server is used.

File:

• XIOS/branchs/xios-1.0/src/output/onetcdf4.cpp (modified) (2 diffs)

XIOS/branchs/xios-1.0/src/output/onetcdf4.cpp

@@ -13 +13 @@
          (const StdString & filename, bool exist, const MPI_Comm * comm, bool multifile)
             : path()
-      {
-         this->wmpi = (comm != NULL) && !multifile;
+            , wmpi(false)
+      {
          this->initialize(filename, exist, comm,multifile);
       }
@@ -31 +31 @@
          (const StdString & filename, bool exist, const MPI_Comm * comm, bool multifile)
       {
+         // Don't use parallel mode if there is only one process
+         if (comm)
+         {
+            int commSize = 0;
+            MPI_Comm_size(*comm, &commSize);
+            if (commSize <= 1)
+               comm = NULL;
+         }
+         wmpi = comm && !multifile;
+
          if (!exist)
          {
-            if (comm != NULL)
-            {
-               if (!multifile) (CNetCdfInterface::createPar(filename, NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, (this->ncidp)));
-               else (CNetCdfInterface::create(filename, NC_NETCDF4, this->ncidp));
-            }
-            else (CNetCdfInterface::create(filename, NC_NETCDF4, this->ncidp));
+            if (wmpi)
+               CNetCdfInterface::createPar(filename, NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, this->ncidp);
+            else
+               CNetCdfInterface::create(filename, NC_NETCDF4, this->ncidp);
          }
          else
          {
-            if (comm != NULL)
-            {
-               if (!multifile) (CNetCdfInterface::openPar(filename, NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, this->ncidp));
-               else (CNetCdfInterface::open(filename, NC_NETCDF4, this->ncidp));
-            }
-            else  (CNetCdfInterface::open(filename, NC_NETCDF4, this->ncidp));
+            if (wmpi)
+               CNetCdfInterface::openPar(filename, NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, this->ncidp);
+            else
+               CNetCdfInterface::open(filename, NC_NETCDF4, this->ncidp);
          }
       }