Fix bug in four shr_sys_abort calls

Author: slevis-lmwg

streams/dshr_methods_mod.F90

@@ -14,6 +14,7 @@ module dshr_methods_mod
   use ESMF         , only : ESMF_TraceRegionEnter, ESMF_TraceRegionExit
   use shr_kind_mod , only : r8=>shr_kind_r8, cs=>shr_kind_cs, cl=>shr_kind_cl
   use shr_sys_mod  , only : shr_sys_abort
+  use shr_log_mod  , only : errMsg => shr_log_errMsg
 
   implicit none
   public
@@ -184,16 +185,14 @@ subroutine dshr_fldbun_GetFldPtr(FB, fldname, fldptr1, fldptr2, rank, field, rc)
     if (chkerr(rc,__LINE__,u_FILE_u)) return
     if (ungriddedUBound(1) > 0) then
        if (.not.present(fldptr2)) then
-          call shr_sys_abort(trim(subname)//": ERROR missing rank=2 array ", &
-               line=__LINE__, file=u_FILE_u)
+          call shr_sys_abort(trim(subname)//": ERROR missing rank=2 array "//errMsg(u_FILE_u, __LINE__))
        endif
        call ESMF_FieldGet(lfield, farrayptr=fldptr2, rc=rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
        lrank = 2
     else
        if (.not.present(fldptr1)) then
-          call shr_sys_abort(trim(subname)//": ERROR missing rank=1 array ", &
-               line=__LINE__, file=u_FILE_u)
+          call shr_sys_abort(trim(subname)//": ERROR missing rank=1 array "//errMsg(u_FILE_u, __LINE__))
        endif
        call ESMF_FieldGet(lfield, farrayptr=fldptr1, rc=rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
@@ -551,8 +550,7 @@ subroutine dshr_field_getfldptr(field, fldptr1, fldptr2, rank, abort, rc)
         if (chkerr(rc,__LINE__,u_FILE_u)) return
         if (ungriddedUBound(1) > 0) then
            if (.not.present(fldptr2)) then
-              call shr_sys_abort(trim(subname)//": ERROR missing rank=2 array for "//trim(name), &
-                   line=__LINE__, file=u_FILE_u)
+              call shr_sys_abort(trim(subname)//": ERROR missing rank=2 array for "//trim(name)//errMsg(u_FILE_u, __LINE__))
               rc = ESMF_FAILURE
               return
            endif
@@ -561,8 +559,7 @@ subroutine dshr_field_getfldptr(field, fldptr1, fldptr2, rank, abort, rc)
            lrank = 2
         else
            if (.not.present(fldptr1)) then
-              call shr_sys_abort(trim(subname)//": ERROR missing rank=1 array for "//trim(name), &
-                   line=__LINE__, file=u_FILE_u)
+              call shr_sys_abort(trim(subname)//": ERROR missing rank=1 array for "//trim(name)//errMsg(u_FILE_u, __LINE__))
               rc = ESMF_FAILURE
               return
            endif