Merge pull request #11 from L2Program/master

Master
CS-Swansea · Jul 5, 2016 · 6efa14a · 6efa14a
2 parents baf67c1 + 2006aa4
commit 6efa14a
Show file tree

Hide file tree

Showing 4 changed files with 629 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -243,3 +243,4 @@ pip-log.txt
 #Mr Developer
 .mr.developer.cfg
 
+*.ipgset
diff --git a/MEL.hpp b/MEL.hpp
@@ -2432,7 +2432,7 @@ namespace MEL {
 	 * \return			Returns a handle to a new Op
 	 */
     template<typename T, T(*F)(T&, T&)>
-    inline Op CreateOp(bool commute = true) {
+	inline Op OpCreate(bool commute = true) {
         MPI_Op op;
         MEL_THROW( MPI_Op_create((void(*)(void*, void*, int*, MPI_Datatype*)) Functor::ARRAY_OP_FUNC<T, F>, commute, (MPI_Op*) &op), "Op::CreatOp" );
         return Op(op);
@@ -2446,7 +2446,7 @@ namespace MEL {
 	 * \return			Returns a handle to a new Op
 	 */
     template<typename T, T(*F)(T&, T&, Datatype)>
-    inline Op CreateOp(bool commute = true) {
+	inline Op OpCreate(bool commute = true) {
         MPI_Op op;
         MEL_THROW( MPI_Op_create((void(*)(void*, void*, int*, MPI_Datatype*)) Functor::ARRAY_OP_FUNC<T, F>, commute, (MPI_Op*) &op), "Op::CreatOp" );
         return Op(op);
@@ -2460,7 +2460,7 @@ namespace MEL {
 	 * \return			Returns a handle to a new Op
 	 */
     template<typename T, void(*F)(T*, T*, int)>
-    inline Op CreateOp(bool commute = true) {
+	inline Op OpCreate(bool commute = true) {
         MPI_Op op;
         MEL_THROW( MPI_Op_create((void(*)(void*, void*, int*, MPI_Datatype*)) Functor::ARRAY_OP_FUNC<T, F>, commute, (MPI_Op*) &op), "Op::CreatOp" );
         return Op(op);
@@ -2474,7 +2474,7 @@ namespace MEL {
 	 * \return			Returns a handle to a new Op
 	 */
     template<typename T, void(*F)(T*, T*, int, Datatype)>
-    inline Op CreateOp(bool commute = true) {
+	inline Op OpCreate(bool commute = true) {
         MPI_Op op;
         MEL_THROW( MPI_Op_create((void(*)(void*, void*, int*, MPI_Datatype*)) Functor::ARRAY_OP_FUNC<T, F>, commute, (MPI_Op*) &op), "Op::CreatOp" );
         return Op(op);
@@ -2488,7 +2488,7 @@ namespace MEL {
 	 * \return			Returns a handle to a new Op
 	 */
     template<typename T, void(*F)(T*, T*, int*, MPI_Datatype*)>
-    inline Op CreateOp(bool commute = true) {
+	inline Op OpCreate(bool commute = true) {
         MPI_Op op;
         MEL_THROW( MPI_Op_create((void(*)(void*, void*, int*, MPI_Datatype*)) F, commute, (MPI_Op*) &op), "Op::CreatOp" );
         return Op(op);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -243,3 +243,4 @@ pip-log.txt
		#Mr Developer
		.mr.developer.cfg

		*.ipgset