From 1b127d5b7212b31aad7c17fe90f82cea417410bd Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 17 Jun 2020 16:26:57 +0200
Subject: Stop using API removed in MPI 2.0

---
 Carpet/CarpetInterp2/src/fasterp.cc | 2 +-
 Carpet/CarpetLib/src/dh.cc          | 4 ++--
 Carpet/CarpetLib/src/dist.cc        | 2 +-
 Carpet/CarpetLib/src/gdata.cc       | 2 +-
 Carpet/CarpetLib/src/region.cc      | 4 ++--
 Carpet/CarpetLib/src/vect.cc        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Carpet/CarpetInterp2/src/fasterp.cc b/Carpet/CarpetInterp2/src/fasterp.cc
index 5cc4818d8..f3a28af0f 100644
--- a/Carpet/CarpetInterp2/src/fasterp.cc
+++ b/Carpet/CarpetInterp2/src/fasterp.cc
@@ -99,7 +99,7 @@ namespace CarpetInterp2 {
 #endif
         ENTRY(int, ind3d),
         ENTRY(CCTK_REAL, offset),
-        {1, sizeof(s), MPI_UB, "MPI_UB", "MPI_UB"}
+        //{1, sizeof(s), MPI_UB, "MPI_UB", "MPI_UB"}
       };
 #undef ENTRY
       newtype =
diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc
index 7f914e1f6..e3fe5815f 100644
--- a/Carpet/CarpetLib/src/dh.cc
+++ b/Carpet/CarpetLib/src/dh.cc
@@ -2371,7 +2371,7 @@ mpi_datatype (dh::light_dboxes const &)
       ENTRY(dh::light_dboxes::size_type, exterior_size),
       ENTRY(dh::light_dboxes::size_type, owned_size),
       ENTRY(dh::light_dboxes::size_type, active_size),
-      {1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
+      //{1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
     };
 #undef ENTRY
     newtype =
@@ -2427,7 +2427,7 @@ mpi_datatype (dh::fast_dboxes const &)
       ENTRY (dh::srpvect, fast_ref_refl_prol_sendrecv_1_1),
       ENTRY (dh::srpvect, fast_ref_refl_prol_sendrecv_2_0),
       ENTRY (dh::srpvect, fast_ref_refl_prol_sendrecv_2_1),
-      {1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
+   //   {1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
     };
 #undef ENTRY
     newtype =
diff --git a/Carpet/CarpetLib/src/dist.cc b/Carpet/CarpetLib/src/dist.cc
index 8546ca6ca..21db4fdef 100644
--- a/Carpet/CarpetLib/src/dist.cc
+++ b/Carpet/CarpetLib/src/dist.cc
@@ -278,7 +278,7 @@ namespace dist {
       types        [n] = descr[n].type;
     }
     MPI_Datatype newtype;
-    MPI_Type_struct (count, blocklengths, displacements, types, &newtype);
+    MPI_Type_create_struct (count, blocklengths, displacements, types, &newtype);
     MPI_Type_commit (&newtype);
     if (verbose) {
       CCTK_VInfo (CCTK_THORNSTRING,
diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc
index 23c5aaead..0268a97db 100644
--- a/Carpet/CarpetLib/src/gdata.cc
+++ b/Carpet/CarpetLib/src/gdata.cc
@@ -62,7 +62,7 @@ MPI_Datatype mpi_datatype (slab<T,D> const&)
         }
     dist::mpi_struct_descr_t const descr[] = {
       ENTRY(avect, offset),
-      {1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
+      //{1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
     };
 #undef ENTRY
     ostringstream buf;
diff --git a/Carpet/CarpetLib/src/region.cc b/Carpet/CarpetLib/src/region.cc
index 99d8c1697..b4e5c6022 100644
--- a/Carpet/CarpetLib/src/region.cc
+++ b/Carpet/CarpetLib/src/region.cc
@@ -422,7 +422,7 @@ mpi_datatype (pseudoregion_t const &)
     dist::mpi_struct_descr_t const descr[] = {
       ENTRY(int, extent),
       ENTRY(int, component),
-      {1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
+      //{1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
     };
 #undef ENTRY
     newtype =
@@ -451,7 +451,7 @@ mpi_datatype (sendrecv_pseudoregion_t const &)
     dist::mpi_struct_descr_t const descr[] = {
       ENTRY(pseudoregion_t, send),
       ENTRY(pseudoregion_t, recv),
-      {1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
+      //{1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
     };
 #undef ENTRY
     newtype =
diff --git a/Carpet/CarpetLib/src/vect.cc b/Carpet/CarpetLib/src/vect.cc
index d2de5b52e..2cc990606 100644
--- a/Carpet/CarpetLib/src/vect.cc
+++ b/Carpet/CarpetLib/src/vect.cc
@@ -63,7 +63,7 @@ MPI_Datatype vect<T,D>::mpi_datatype () const
         }
     dist::mpi_struct_descr_t const descr[] = {
       ENTRY(T, elt),
-      {1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
+      //{1, sizeof s, MPI_UB, "MPI_UB", "MPI_UB"}
     };
 #undef ENTRY
     ostringstream buf;
-- 
cgit v1.2.3