Update copyright lines for 2022.

[simgrid.git] / src / smpi / colls / allgather / allgather-2dmesh.cpp

diff --git a/src/smpi/colls/allgather/allgather-2dmesh.cpp b/src/smpi/colls/allgather/allgather-2dmesh.cpp
index 0cfecd0..1189a1d 100644 (file)
--- a/src/smpi/colls/allgather/allgather-2dmesh.cpp
+++ b/src/smpi/colls/allgather/allgather-2dmesh.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team.
+/* Copyright (c) 2013-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  * Function: is_2dmesh
 
- * Return: int
+ * Return: bool
 
  * Inputs:
      num: the number of processors in a communicator
@@ -62,14 +62,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  * Descp: takes a number and tries to find a factoring of x, y mesh out of it
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
  ****************************************************************************/
 #ifndef TWOD
 #define TWOD
-static int is_2dmesh(int num, int *i, int *j)
+static bool is_2dmesh(int num, int* i, int* j)
 {
   int x, max = num / 2;
-  x = sqrt(num);
+  x = sqrt(double(num));
 
   while (x <= max) {
     if ((num % x) == 0) {
@@ -82,11 +82,11 @@ static int is_2dmesh(int num, int *i, int *j)
         *j = x;
       }
 
-      return 1;
+      return true;
     }
     x++;
   }
-  return 0;
+  return false;
 }
 #endif
 /*****************************************************************************
@@ -103,7 +103,7 @@ static int is_2dmesh(int num, int *i, int *j)
  * algorithm. Allgather ommunication occurs first in the x dimension then in
  * the y dimension.  The communication in each dimension follows
  * "simple"
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 ****************************************************************************/
 
 namespace simgrid{
@@ -111,9 +111,9 @@ namespace smpi{
 
 
 int
-Coll_allgather_2dmesh::allgather(const void *send_buff, int send_count, MPI_Datatype
-                                 send_type, void *recv_buff, int recv_count,
-                                 MPI_Datatype recv_type, MPI_Comm comm)
+allgather__2dmesh(const void *send_buff, int send_count, MPI_Datatype
+                  send_type, void *recv_buff, int recv_count,
+                  MPI_Datatype recv_type, MPI_Comm comm)
 {
   MPI_Aint extent;
 
@@ -130,7 +130,7 @@ Coll_allgather_2dmesh::allgather(const void *send_buff, int send_count, MPI_Data
   block_size = extent * send_count;
 
   if (not is_2dmesh(num_procs, &X, &Y))
-    THROWF(arg_error,0, "allgather_2dmesh algorithm can't be used with this number of processes! ");
+    throw std::invalid_argument("allgather_2dmesh algorithm can't be used with this number of processes!");
 
   my_row_base = (rank / Y) * Y;
   my_col_base = rank % Y;
@@ -139,7 +139,7 @@ Coll_allgather_2dmesh::allgather(const void *send_buff, int send_count, MPI_Data
   if (Y > X)
     num_reqs = Y;
 
-  MPI_Request* req     = new MPI_Request[num_reqs];
+  auto* req            = new MPI_Request[num_reqs];
   MPI_Request* req_ptr = req;
 
   // do local allgather/local copy