From e776f8f80e791f611783caf37bcfcff94d233891 Mon Sep 17 00:00:00 2001
From: Gaurav Dhingra <gauravdhingra.gxyd@gmail.com>
Date: Wed, 19 Mar 2025 17:20:00 +0530
Subject: [PATCH] refactor: move MPI_Finalize C wrapper to pure Fortran

---
 src/mpi.f90            | 15 ++++++++-------
 src/mpi_c_bindings.f90 |  5 ++---
 src/mpi_wrapper.c      |  4 ----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/mpi.f90 b/src/mpi.f90
index d498c91..1d9621e 100644
--- a/src/mpi.f90
+++ b/src/mpi.f90
@@ -147,14 +147,15 @@ subroutine MPI_Finalize_proc(ierr)
         use mpi_c_bindings, only: c_mpi_finalize
         use iso_c_binding, only: c_int
         integer, optional, intent(out) :: ierr
-        integer :: local_ierr
+        integer(c_int) :: local_ierr
+
+        !> assigns the status code to integer of kind 'c_int'
+        local_ierr = c_mpi_finalize()
         if (present(ierr)) then
-            call c_mpi_finalize(ierr)
-        else
-            call c_mpi_finalize(local_ierr)
-            if (local_ierr /= 0) then
-                print *, "MPI_Finalize failed with error code: ", local_ierr
-            end if
+            !> we need to cast it to a Fortran integer, hence the use of 'int'
+            ierr = int(local_ierr)
+        else if (local_ierr /= 0) then
+            print *, "MPI_Finalize failed with error code: ", int(local_ierr)
         end if
     end subroutine
 
diff --git a/src/mpi_c_bindings.f90 b/src/mpi_c_bindings.f90
index c7ca2cf..ca628e0 100644
--- a/src/mpi_c_bindings.f90
+++ b/src/mpi_c_bindings.f90
@@ -14,10 +14,9 @@ subroutine c_mpi_init_thread(required, provided, ierr) bind(C, name="mpi_init_th
             integer(c_int), intent(out) :: ierr
         end subroutine c_mpi_init_thread
 
-        subroutine c_mpi_finalize(ierr) bind(C, name="mpi_finalize_wrapper")
+        integer(c_int) function c_mpi_finalize() bind(C, name="MPI_Finalize")
             use iso_c_binding, only : c_int
-            integer(c_int), intent(out) :: ierr
-        end subroutine c_mpi_finalize
+        end function c_mpi_finalize
 
         subroutine c_mpi_comm_size(comm, size, ierr) bind(C, name="mpi_comm_size_wrapper")
             use iso_c_binding, only: c_int
diff --git a/src/mpi_wrapper.c b/src/mpi_wrapper.c
index 4ab4ee8..fec20bc 100644
--- a/src/mpi_wrapper.c
+++ b/src/mpi_wrapper.c
@@ -18,10 +18,6 @@ void mpi_init_thread_wrapper(int *required, int *provided, int *ierr) {
     *ierr = MPI_Init_thread(&argc, &argv, thread_support, provided);
 }
 
-void mpi_finalize_wrapper(int *ierr) {
-    *ierr = MPI_Finalize();
-}
-
 void mpi_comm_size_wrapper(int *comm_f, int *size, int *ierr) {
     MPI_Comm comm = MPI_Comm_f2c(*comm_f);
     *ierr = MPI_Comm_size(comm, size);