diff --git a/physics/rrtmgp_lw_cloud_optics.F90 b/physics/rrtmgp_lw_cloud_optics.F90
index 6bdfc7b6e..821135b4f 100644
--- a/physics/rrtmgp_lw_cloud_optics.F90
+++ b/physics/rrtmgp_lw_cloud_optics.F90
@@ -95,7 +95,7 @@ subroutine rrtmgp_lw_cloud_optics_init(Model, mpicomm, mpirank, mpiroot, lw_clou
     integer,parameter :: max_strlen=256
 #ifdef MPI
     integer :: ierr
-#ebdif
+#endif
 
     ! Initialize
     errmsg = ''
diff --git a/physics/rrtmgp_lw_gas_optics.F90 b/physics/rrtmgp_lw_gas_optics.F90
index 80ab8f0e2..b8e4ca145 100644
--- a/physics/rrtmgp_lw_gas_optics.F90
+++ b/physics/rrtmgp_lw_gas_optics.F90
@@ -116,7 +116,7 @@ subroutine rrtmgp_lw_gas_optics_init(Model, mpicomm, mpirank, mpiroot, lw_gas_pr
     integer,parameter :: max_strlen=256
 #ifdef MPI
     integer :: ierr
-#ebdif
+#endif
 
     ! Initialize
     errmsg = ''
diff --git a/physics/rrtmgp_sw_cloud_optics.F90 b/physics/rrtmgp_sw_cloud_optics.F90
index aa6888cbc..54696cb54 100644
--- a/physics/rrtmgp_sw_cloud_optics.F90
+++ b/physics/rrtmgp_sw_cloud_optics.F90
@@ -93,7 +93,7 @@ subroutine rrtmgp_sw_cloud_optics_init(Model,mpicomm, mpirank, mpiroot, sw_cloud
     character(len=264) :: sw_cloud_props_file
 #ifdef MPI
     integer :: ierr
-#ebdif
+#endif
     ! Initialize
     errmsg = ''
     errflg = 0
diff --git a/physics/rrtmgp_sw_gas_optics.F90 b/physics/rrtmgp_sw_gas_optics.F90
index a4080a837..a6a5a844b 100644
--- a/physics/rrtmgp_sw_gas_optics.F90
+++ b/physics/rrtmgp_sw_gas_optics.F90
@@ -110,7 +110,7 @@ subroutine rrtmgp_sw_gas_optics_init(Model,  mpicomm, mpirank, mpiroot, sw_gas_p
     character(len=264) :: sw_gas_props_file
 #ifdef MPI
     integer :: ierr
-#ebdif
+#endif
 
     ! Initialize
     errmsg = ''
@@ -153,9 +153,11 @@ subroutine rrtmgp_sw_gas_optics_init(Model,  mpicomm, mpirank, mpiroot, sw_gas_p
           status = nf90_close(ncid_sw)
        endif
     endif
-
+    
     ! Broadcast dimensions to all processors
 #ifdef MPI
+    call MPI_BARRIER(mpicomm, ierr)
+    write(*,*) "ierr0a: ",ierr
     write(*,*) "mpiroot: ",mpiroot
     write(*,*) "mpicomm: ",mpicomm
     call MPI_BCAST(ntemps_sw,                          1, MPI_INTEGER, mpiroot, mpicomm, ierr)
@@ -332,6 +334,8 @@ subroutine rrtmgp_sw_gas_optics_init(Model,  mpicomm, mpirank, mpiroot, sw_gas_p
 
     ! Broadcast arrays to all processors
 #ifdef MPI
+    call MPI_BARRIER(mpicomm, ierr)
+    write(*,*) "ierr0b: ",ierr
     write (*,*) 'Broadcasting RRTMGP shortwave k-distribution data ... '
     call MPI_BCAST(minor_limits_gpt_upper_sw, size(minor_limits_gpt_upper_sw), MPI_INTEGER, mpiroot, mpicomm, ierr)
     write(*,*) "ierr15: ",ierr