Merge remote-tracking branch 'origin/ufs/dev' into no_arg_mismatch

physics/aerinterp.F90

@@ -438,7 +438,8 @@ subroutine read_netfaer(nf, iflip,nt, errmsg,errflg)
       use aerclm_def
       use netcdf
       integer, intent(in) :: iflip, nf, nt
-      integer      :: ncerr
+      integer, intent(inout) :: errflg
+      character(*), intent(inout) :: errmsg
       integer      :: ncid, varid, i,j,k,ii,klev
       character    :: fname*50, mn*2, vname*10
       real(kind=kind_io4),allocatable,dimension(:,:,:) :: buff
@@ -458,11 +459,22 @@ subroutine read_netfaer(nf, iflip,nt, errmsg,errflg)
 
       write(mn,'(i2.2)') nf 
       fname=trim("aeroclim.m"//mn//".nc")
-      ncerr = nf90_open(fname , NF90_NOWRITE, ncid)
+      ncid = -1
+      if(.not.netcdf_check(nf90_open(fname , nf90_NOWRITE, ncid), &
+           errmsg, errflg, 'open '//trim(fname))) then
+        return
+      endif
 
 ! ====> construct 3-d pressure array (Pa)
-      ncerr = nf90_inq_varid(ncid, "DELP", varid)
-      ncerr = nf90_get_var(ncid, varid, buff)
+      varid = -1
+      if(.not.netcdf_check(nf90_inq_varid(ncid, "DELP", varid), &
+           errmsg, errflg, 'find id of DELP var')) then
+        return
+      endif
+      if(.not.netcdf_check(nf90_get_var(ncid, varid, buff), &
+           errmsg, errflg, 'read DELP var')) then
+        return
+      endif
 
       do j = jamin, jamax
         do i = iamin, iamax
@@ -491,8 +503,15 @@ subroutine read_netfaer(nf, iflip,nt, errmsg,errflg)
 ! for GFS, iflip 0: toa to sfc; 1: sfc to toa
       DO ii = 1, ntrcaerm
         vname=trim(specname(ii))
-        ncerr = nf90_inq_varid(ncid, vname, varid)
-        ncerr = nf90_get_var(ncid, varid, buffx)
+        varid = -1
+        if(.not.netcdf_check(nf90_inq_varid(ncid, vname, varid), &
+             errmsg, errflg, 'get id of '//trim(vname)//' var')) then
+          return
+        endif
+        if(.not.netcdf_check(nf90_get_var(ncid, varid, buffx), &
+             errmsg, errflg, 'read '//trim(vname)//' var')) then
+          return
+        endif
 
         do j = jamin, jamax
           do k = 1, levsaer
@@ -514,7 +533,9 @@ subroutine read_netfaer(nf, iflip,nt, errmsg,errflg)
       ENDDO         ! ii-loop (ntracaerm)
 
 ! close the file
-      ncerr = nf90_close(ncid)
+      if(.not.netcdf_check(nf90_close(ncid), errmsg, errflg, 'close '//trim(fname))) then
+        return
+      endif
       deallocate (buff, pres_tmp)
       deallocate (buffx)
       END SUBROUTINE read_netfaer