feature/mpi_abort Update mpi_abort calls for global_cycle.

Issue ufs-community#140.
GeorgeGayno-NOAA · Sep 11, 2020 · db5ea48 · db5ea48
1 parent 7770042
commit db5ea48
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/sorc/global_cycle.fd/cycle.f90 b/sorc/global_cycle.fd/cycle.f90
@@ -563,7 +563,7 @@ SUBROUTINE ADJUST_NSST(RLA,RLO,SLMSK_TILE,SLMSK_FG_TILE,SKINT_TILE,&
  INTEGER                  :: ISTART, IEND, JSTART, JEND
  INTEGER                  :: MASK_TILE, MASK_FG_TILE
  INTEGER                  :: ITILE, JTILE
- INTEGER                  :: MAX_SEARCH, J
+ INTEGER                  :: MAX_SEARCH, J, IERR
  INTEGER                  :: IGAUSP1, JGAUSP1
  integer                  :: nintp,nsearched,nice,nland
  integer                  :: nfill,nfill_tice,nfill_clm
@@ -617,7 +617,7 @@ SUBROUTINE ADJUST_NSST(RLA,RLO,SLMSK_TILE,SLMSK_FG_TILE,SKINT_TILE,&
 
  IF (NRET /= (IDIM_GAUS*JDIM_GAUS)) THEN
    PRINT*,'FATAL ERROR: PROBLEM IN GDSWZD. STOP.'
-   CALL MPI_ABORT(MPI_COMM_WORLD, 12)
+   CALL MPI_ABORT(MPI_COMM_WORLD, 12, IERR)
  ENDIF
 
  DEALLOCATE (XPTS, YPTS)

diff --git a/sorc/global_cycle.fd/read_write_data.f90 b/sorc/global_cycle.fd/read_write_data.f90
@@ -901,7 +901,7 @@ SUBROUTINE READ_LAT_LON_OROG(RLA,RLO,OROG,OROG_UF,&
  IF ((NX/2) /= IDIM .OR. (NY/2) /= JDIM) THEN
    PRINT*,'FATAL ERROR: DIMENSIONS IN FILE: ',(NX/2),(NY/2)
    PRINT*,'DO NOT MATCH GRID DIMENSIONS: ',IDIM,JDIM
-   CALL MPI_ABORT(MPI_COMM_WORLD, 130)
+   CALL MPI_ABORT(MPI_COMM_WORLD, 130, ERROR)
  ENDIF
 
  ALLOCATE(GEOLON(NX+1,NY+1))
@@ -992,13 +992,14 @@ SUBROUTINE NETCDF_ERR( ERR, STRING )
  INTEGER, INTENT(IN) :: ERR
  CHARACTER(LEN=*), INTENT(IN) :: STRING
  CHARACTER(LEN=80) :: ERRMSG
+ INTEGER :: IRET
 
  IF( ERR == NF90_NOERR )RETURN
  ERRMSG = NF90_STRERROR(ERR)
  PRINT*,''
  PRINT*,'FATAL ERROR: ', TRIM(STRING), ': ', TRIM(ERRMSG)
  PRINT*,'STOP.'
- CALL MPI_ABORT(MPI_COMM_WORLD, 999)
+ CALL MPI_ABORT(MPI_COMM_WORLD, 999, IRET)
 
  RETURN
  END SUBROUTINE NETCDF_ERR
@@ -1123,7 +1124,7 @@ SUBROUTINE READ_DATA(TSFFCS,SMCFCS,SNOFCS,STCFCS, &
 
  INTEGER                   :: ERROR, NCID, MYRANK
  INTEGER                   :: IDIM, JDIM, ID_DIM
- INTEGER                   :: ID_VAR
+ INTEGER                   :: ID_VAR, IERR
 
  REAL(KIND=8), ALLOCATABLE :: DUMMY(:,:), DUMMY3D(:,:,:)
 
@@ -1151,7 +1152,7 @@ SUBROUTINE READ_DATA(TSFFCS,SMCFCS,SNOFCS,STCFCS, &
 
  IF ((IDIM*JDIM) /= LENSFC) THEN
    PRINT*,'FATAL ERROR: DIMENSIONS WRONG.'
-   CALL MPI_ABORT(MPI_COMM_WORLD, 88)
+   CALL MPI_ABORT(MPI_COMM_WORLD, 88, IERR)
  ENDIF
 
  ALLOCATE(DUMMY(IDIM,JDIM))
@@ -1560,7 +1561,7 @@ subroutine read_tf_clim_grb(file_sst,sst,rlats_sst,rlons_sst,mlat_sst,mlon_sst,m
 
   integer :: nlat_sst,nlon_sst
   integer :: iret,ni,nj
-  integer :: mscan,kb1
+  integer :: mscan,kb1,ierr
   integer :: jincdir,i,iincdir,kb2,kb3,kf,kg,k,j,jf
   integer, dimension(22):: jgds,kgds
   integer, dimension(25):: jpds,kpds
@@ -1575,7 +1576,7 @@ subroutine read_tf_clim_grb(file_sst,sst,rlats_sst,rlons_sst,mlat_sst,mlon_sst,m
   call baopenr(lu_sst,trim(file_sst),iret)
   if (iret /= 0 ) then
      write(6,*)'read_tf_clm_grb:  ***error*** opening sst file'
-     CALL MPI_ABORT(MPI_COMM_WORLD, 111)
+     CALL MPI_ABORT(MPI_COMM_WORLD, 111, ierr)
   endif
 
 ! define sst variables for read
@@ -1603,14 +1604,14 @@ subroutine read_tf_clim_grb(file_sst,sst,rlats_sst,rlons_sst,mlat_sst,mlon_sst,m
   if (iret /= 0) then
      write(6,*)'read_tf_clm_grb:  ***error*** reading sst analysis data record'
      deallocate(lb,f)
-     CALL MPI_ABORT(MPI_COMM_WORLD, 111)
+     CALL MPI_ABORT(MPI_COMM_WORLD, 111, ierr)
   endif
 
   if ( (nlat_sst /= mlat_sst) .or. (nlon_sst /= mlon_sst) ) then
      write(6,*)'read_rtg_org:  inconsistent dimensions.  mlat_sst,mlon_sst=',&
           mlat_sst,mlon_sst,' -versus- nlat_sst,nlon_sst=',nlat_sst,nlon_sst
      deallocate(lb,f)
-     CALL MPI_ABORT(MPI_COMM_WORLD, 111)
+     CALL MPI_ABORT(MPI_COMM_WORLD, 111, ierr)
   endif
 
 !
@@ -1665,7 +1666,7 @@ subroutine read_tf_clim_grb(file_sst,sst,rlats_sst,rlons_sst,mlat_sst,mlon_sst,m
   call baclose(lu_sst,iret)
   if (iret /= 0 ) then
      write(6,*)'read_tf_clm_grb:  ***error*** close sst file'
-     CALL MPI_ABORT(MPI_COMM_WORLD, 121)
+     CALL MPI_ABORT(MPI_COMM_WORLD, 121, ierr)
   endif
 
 end subroutine read_tf_clim_grb
@@ -1703,7 +1704,7 @@ subroutine get_tf_clm_dim(file_sst,mlat_sst,mlon_sst)
 
   integer :: iret
   integer :: mscan,kb1
-  integer :: kf,kg,k,j
+  integer :: kf,kg,k,j,ierr
   integer, dimension(22):: jgds,kgds
   integer, dimension(25):: jpds,kpds
 
@@ -1713,7 +1714,7 @@ subroutine get_tf_clm_dim(file_sst,mlat_sst,mlon_sst)
   call baopenr(lu_sst,trim(file_sst),iret)
   if (iret /= 0 ) then
      write(6,*)'get_tf_clm_dim:  ***error*** opening sst file'
-     CALL MPI_ABORT(MPI_COMM_WORLD, 111)
+     CALL MPI_ABORT(MPI_COMM_WORLD, 111, ierr)
   endif
 
 ! define sst variables for read
@@ -1733,7 +1734,7 @@ subroutine get_tf_clm_dim(file_sst,mlat_sst,mlon_sst)
   call baclose(lu_sst,iret)
   if (iret /= 0 ) then
      write(6,*)'get_tf_clm_dim:  ***error*** close sst file'
-     CALL MPI_ABORT(MPI_COMM_WORLD, 121)
+     CALL MPI_ABORT(MPI_COMM_WORLD, 121, ierr)
   endif
 end subroutine get_tf_clm_dim
 
@@ -1848,10 +1849,11 @@ subroutine nc_check(status)
   include "mpif.h"
 
   integer, intent ( in) :: status
+  integer :: ierr
 
   if(status /= nf90_noerr) then
     print *, trim(nf90_strerror(status))
-    CALL MPI_ABORT(MPI_COMM_WORLD, 122)
+    CALL MPI_ABORT(MPI_COMM_WORLD, 122, ierr)
   end if
 end subroutine nc_check