Merge branch jedwards4b/jpe_add_mpi_type_create_hvector (PR #2)

add mpi_type_create_hvector
MCSclimate · Apr 25, 2017 · 99df320 · 99df320
2 parents 6d736e2 + 0a44baa
commit 99df320
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/mpi.h b/mpi.h
@@ -1,4 +1,3 @@
-
 #ifndef _MPI_H_
 #define _MPI_H_
 
@@ -411,6 +410,9 @@ extern int MPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old
 extern int MPI_Type_hvector(int count, int blocklen, MPI_Aint stride,
                             MPI_Datatype oldtype, MPI_Datatype *newtype);
 
+extern int MPI_Type_create_hvector(int count, int blocklen, MPI_Aint stride,
+                            MPI_Datatype oldtype, MPI_Datatype *newtype);
+
 extern int MPI_Type_indexed(int count, int *blocklens, int *displacements,
                             MPI_Datatype oldtype, MPI_Datatype *newtype);
 

diff --git a/type.c b/type.c
@@ -448,6 +448,23 @@ int MPI_Type_hvector(int count, int blocklen, MPI_Aint stride,
   return Type_hvector(count, blocklen, stride, old_ptr, new_ptr);
 }
 
+FC_FUNC( mpi_type_create_hvector, MPI_TYPE_CREATE_HVECTOR )
+         (int * count,   long * blocklen, long * stride,
+          int * oldtype, int * newtype,   int * ierr)
+{
+  *ierr = MPI_Type_create_hvector(*count, *blocklen, *stride, *oldtype, newtype);
+}
+
+int MPI_Type_create_hvector(int count, int blocklen, MPI_Aint stride,
+                     MPI_Datatype oldtype, MPI_Datatype * newtype)
+{
+  Datatype old_ptr = *(Datatype*) mpi_handle_to_datatype(oldtype);
+  Datatype * new_ptr;
+
+  mpi_alloc_handle(newtype, (void**) &new_ptr);
+  return Type_hvector(count, blocklen, stride, old_ptr, new_ptr);
+}
+
 
 int Type_hvector(int count, int blocklen, MPI_Aint stride,
                       Datatype oldtype, Datatype *newtype)