Changeset 855

Timestamp:

05/25/16 12:21:03 (8 years ago)

Author:

mhnguyen

Message:

Fixing a bug during compilation on PGI

+) Remove some codes which contain mismatch-type error

Test
+) On Curie with compiler Intel.
+) All tests pass

Location:

XIOS/trunk/src

Files:

• policy.cpp (modified) (1 diff)
• policy.hpp (modified) (1 diff)

XIOS/trunk/src/policy.cpp

@@ -13 +13 @@
 namespace xios
 {
-/*!
-  Calculate MPI communicator for each level of hierarchy.
-  \param[in] mpiCommRoot MPI communicator of the level 0 (usually communicator of all clients)
-  \param[in] levels number of level in hierarchy
-*/
-void DivideCommByTwo::computeMPICommLevel(const MPI_Comm& mpiCommRoot, int levels)
-{
-  int nbProc;
-  MPI_Comm_size(mpiCommRoot,&nbProc);
-  if (levels > nbProc) levels = std::log10(nbProc) * 3.3219; // log2(x) = log2(10) * log10(x); stupid C++98
-  else if (1 > levels) levels = 1;
-
-  commLevel_.push_back(mpiCommRoot);
-  divideMPICommLevel(mpiCommRoot, levels);
-}
-
-/*!
-  Divide each MPI communicator into sub-communicator. Recursive function
-  \param [in] mpiCommLevel MPI communicator of current level
-  \param [in] level current level
-*/
-void DivideCommByTwo::divideMPICommLevel(const MPI_Comm& mpiCommLevel, int level)
-{
-  int clientRank;
-  MPI_Comm_rank(mpiCommLevel,&clientRank);
-
-   --level;
-  if (0 < level)
-  {
-   int color = clientRank % 2;
-   commLevel_.push_back(MPI_Comm());
-   MPI_Comm_split(mpiCommLevel, color, 0, &(commLevel_.back()));
-   divideMPICommLevel(commLevel_.back(), level);
-  }
-}
+///*!
+//  Calculate MPI communicator for each level of hierarchy.
+//  \param[in] mpiCommRoot MPI communicator of the level 0 (usually communicator of all clients)
+//  \param[in] levels number of level in hierarchy
+//*/
+//void DivideCommByTwo::computeMPICommLevel(const MPI_Comm& mpiCommRoot, int levels)
+//{
+//  int nbProc;
+//  MPI_Comm_size(mpiCommRoot,&nbProc);
+//  if (levels > nbProc) levels = std::log10(nbProc) * 3.3219; // log2(x) = log2(10) * log10(x); stupid C++98
+//  else if (1 > levels) levels = 1;
+//
+//  commLevel_.push_back(mpiCommRoot);
+//  divideMPICommLevel(mpiCommRoot, levels);
+//}
+//
+///*!
+//  Divide each MPI communicator into sub-communicator. Recursive function
+//  \param [in] mpiCommLevel MPI communicator of current level
+//  \param [in] level current level
+//*/
+//void DivideCommByTwo::divideMPICommLevel(const MPI_Comm& mpiCommLevel, int level)
+//{
+//  int clientRank;
+//  MPI_Comm_rank(mpiCommLevel,&clientRank);
+//
+//   --level;
+//  if (0 < level)
+//  {
+//   int color = clientRank % 2;
+//   commLevel_.push_back(MPI_Comm());
+//   MPI_Comm_split(mpiCommLevel, color, 0, &(commLevel_.back()));
+//   divideMPICommLevel(commLevel_.back(), level);
+//  }
+//}
 
 DivideAdaptiveComm::DivideAdaptiveComm(const MPI_Comm& mpiComm)

XIOS/trunk/src/policy.hpp

@@ -16 +16 @@
 namespace xios
 {
-class DivideCommByTwo
-{
-protected:
-  void computeMPICommLevel(const MPI_Comm& mpiCommRoot, int levels);
-
-protected:
-  std::vector<MPI_Comm> commLevel_;
-private:
-  // Divide MPI communicator on each level recursively
-  void divideMPICommLevel(const MPI_Comm& mpiCommLevel, int level);
-};
+//class DivideCommByTwo
+//{
+//protected:
+//  void computeMPICommLevel(const MPI_Comm& mpiCommRoot, int levels);
+//
+//protected:
+//  std::vector<MPI_Comm> commLevel_;
+//private:
+//  // Divide MPI communicator on each level recursively
+//  void divideMPICommLevel(const MPI_Comm& mpiCommLevel, int level);
+//};
 
 class DivideAdaptiveComm