Merge branch 'rljacob/from-cime' (PR #70)

Bring over some changes that were made directly to mpeu
m_ioutil: assume flush is always present. J.Edwards
m_inpak90: increase size of i90_MXDEP J. Wolfe

Author: rljacob

mct/m_MCTWorld.F90

@@ -191,6 +191,7 @@ subroutine initm_(ncomps,globalcomm,mycomms,myids)
 ! !REVISION HISTORY:
 ! 20Sep07 - T. Craig migrated code from initd routine
 ! 20Sep07 - T. Craig - made mycomms an array
+! 03Nov19 - J. Edwards - Add barrier to improve peformance on high proc counts
 !EOP ___________________________________________________________________
 !
   character(len=*),parameter :: myname_=myname//'::initm_'
@@ -315,6 +316,7 @@ subroutine initm_(ncomps,globalcomm,mycomms,myids)
 !
 ! allocate space to hold global ids
 ! only needed on root, but allocate everywhere to avoid complaints.
+! Don't allocate large size on non-root.
       if (myLid==0) then
          allocate(Gprocids(mysize),stat=ier)
       else
@@ -323,10 +325,12 @@ subroutine initm_(ncomps,globalcomm,mycomms,myids)
       if(ier/=0) call die(myname_,'allocate(Gprocids)',ier)
 ! gather over the LOCAL comm
       call MPI_GATHER(myGid,1,MP_INTEGER,Gprocids,1,MP_INTEGER,0,mycomms(i),ier)
-      call MPI_Barrier(mycomms(i), ier)
-
       if(ier/=0) call die(myname_,'MPI_GATHER Gprocids',ier)
 
+! This barrier needed for good performance on high-processor counts.
+      call MPI_Barrier(mycomms(i), ier)
+      if(ier/=0) call die(myname_,'MPI_Barrier Gprocids',ier)
+
       if(myLid == 0) then
         call MPI_SEND(Gprocids,mysize,MP_INTEGER,0,myids(i),globalcomm,ier)
         if(ier /= 0) call MP_perr_die(myname_,'MPI_SEND(Gprocids)',ier)

mpeu/m_inpak90.F90

@@ -297,7 +297,7 @@ module m_inpak90
   character(len=*),parameter :: myname='MCT(MPEU)::m_inpak90'
 !-----------------------------------------------------------------------
 
-    integer,parameter :: i90_MXDEP = 4
+    integer,parameter :: i90_MXDEP = 5
     integer,save      :: i90_depth = 0
     type(inpak90),save,pointer :: i90_now
 

mpeu/m_ioutil.F90

@@ -410,6 +410,7 @@ subroutine luflush(unit)
 !       08Jul02 - E. Ong <[email protected]> - added flush support for nag95
 !  2001-11-08  Jace A Mogill <[email protected]>  - Flush is not part of
 !              the F90 standard.  Default is NO unit flush.
+!  2020-08-03 - J. Edwards - flush is now supported by all fortran compilers
 !EOP
 !_______________________________________________________________________
   character(len=*),parameter :: myname_=myname//'::luflush'
@@ -423,15 +424,7 @@ subroutine luflush(unit)
   if(present(unit)) lu=unit
   if(lu < 0) return
 
-	! The following call may be system dependent.
-
-#if SYSIRIX64 || CPRNAG || SYSUNICOS
-  call flush(lu,ier)
-#elif  SYSAIX || CPRXLF
-  call flush_(lu)      ! Function defined in xlf reference document.
-#elif SYSLINUX || SYSOSF1 || SYSSUNOS || SYST3E || SYSUNIXSYSTEMV || SYSSUPERUX
   call flush(lu)
-#endif
 
 end subroutine luflush
 !-----------------------------------------------------------------------