Change the type of mpi communicator in few more files

DusanJovic-NOAA · Feb 7, 2024 · bac1994 · bac1994
1 parent 47d4bff
commit bac1994
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/physics/MP/Ferrier_Aligo/mp_fer_hires.F90 b/physics/MP/Ferrier_Aligo/mp_fer_hires.F90
@@ -36,6 +36,7 @@ subroutine mp_fer_hires_init(ncol, nlev, dtp, imp_physics,         &
                                   mpicomm, mpirank,mpiroot,             &
                                   threads, errmsg, errflg)
 
+      USE mpi_f08
       USE machine,             ONLY : kind_phys
       USE MODULE_MP_FER_HIRES, ONLY : FERRIER_INIT_HR
       implicit none
@@ -45,7 +46,7 @@ subroutine mp_fer_hires_init(ncol, nlev, dtp, imp_physics,         &
       real(kind_phys),                intent(in)    :: dtp
       integer,                        intent(in)    :: imp_physics
       integer,                        intent(in)    :: imp_physics_fer_hires
-      integer,                        intent(in)    :: mpicomm
+      type(MPI_Comm),                 intent(in)    :: mpicomm
       integer,                        intent(in)    :: mpirank
       integer,                        intent(in)    :: mpiroot
       integer,                        intent(in)    :: threads

diff --git a/physics/MP/NSSL/mp_nssl.F90 b/physics/MP/NSSL/mp_nssl.F90
@@ -40,7 +40,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
 
         use module_mp_nssl_2mom, only: nssl_2mom_init, nssl_2mom_init_const
 #ifdef MPI 
-        use mpi
+        use mpi_f08
 #endif
 
         implicit none
@@ -56,7 +56,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
 
          integer,                   intent(in)    :: mpirank
          integer,                   intent(in)    :: mpiroot
-         integer,                   intent(in)    :: mpicomm
+         type(MPI_Comm),            intent(in)    :: mpicomm
          integer,                   intent(in)    :: imp_physics
          integer,                   intent(in)    :: imp_physics_nssl
          real(kind_phys),           intent(in)    :: nssl_cccn, nssl_alphah, nssl_alphahl

diff --git a/physics/MP/NSSL/mp_nssl.meta b/physics/MP/NSSL/mp_nssl.meta
@@ -68,7 +68,7 @@
   long_name = MPI communicator
   units = index
   dimensions = ()
-  type = integer
+  type = MPI_Comm
   intent = in
 [qc]
   standard_name = cloud_liquid_water_mixing_ratio

diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.F90 b/physics/smoke_dust/rrfs_smoke_wrapper.F90
@@ -4,6 +4,7 @@
 
  module rrfs_smoke_wrapper
 
+   use mpi_f90
    use machine ,              only : kind_phys
    use rrfs_smoke_config,     only : kemit, dust_opt, seas_opt, do_plumerise,           &
                                      addsmoke_flag, plumerisefire_frq, wetdep_ls_opt,   &
@@ -225,7 +226,7 @@ subroutine rrfs_smoke_wrapper_run(im, kte, kme, ktau, dt, garea, land, jdate,
     integer :: i, j, k, kp, n
 ! MPI variables
     integer :: mpiid
-    integer, intent(in) :: mpicomm
+    type(MPI_comm), intent(in) :: mpicomm
     integer, intent(in) :: mpirank
     integer, intent(in) :: mpiroot
 

diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.meta b/physics/smoke_dust/rrfs_smoke_wrapper.meta
@@ -774,7 +774,7 @@
   long_name = MPI communicator
   units = index
   dimensions = ()
-  type = integer
+  type = MPI_Comm
   intent = in
 [mpirank]
   standard_name = mpi_rank