Skip to content

Commit

Permalink
fixes for failed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Mariana Vertenstein committed Apr 19, 2022
1 parent a07a078 commit 4bd6847
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions streams/dshr_strdata_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1386,6 +1386,17 @@ subroutine shr_strdata_readstrm(sdat, per_stream, stream, fldbun_data, &

rc = ESMF_SUCCESS

! nullify local pointers
nullify(dataptr)
nullify(dataptr1d)
nullify(dataptr2d)
nullify(dataptr2d_src)
nullify(dataptr2d_dst)
nullify(nv_coords)
nullify(nu_coords)
nullify(data_u_dst)
nullify(data_v_dst)

! Set up file to read from
if (sdat%mainproc) then
inquire(file=trim(fileName),exist=fileExists)
Expand Down Expand Up @@ -1815,7 +1826,6 @@ subroutine shr_strdata_set_stream_iodesc(sdat, per_stream, fldname, pioid, rc)
integer , intent(out) :: rc

! local variables

integer :: stream_nlev
integer :: gsize2d
integer :: pio_iovartype
Expand All @@ -1827,8 +1837,8 @@ subroutine shr_strdata_set_stream_iodesc(sdat, per_stream, fldname, pioid, rc)
integer, allocatable :: dimlens(:)
type(ESMF_DistGrid) :: distGrid
integer :: lsize
integer, pointer :: compdof(:) => null()
integer, pointer :: compdof3d(:) => null()
integer, pointer :: compdof(:)
integer, pointer :: compdof3d(:)
integer :: rCode ! pio return code (only used when pio error handling is PIO_BCAST_ERROR)
character(*), parameter :: subname = '(shr_strdata_set_stream_iodesc) '
character(*), parameter :: F00 = "('(shr_strdata_set_stream_iodesc) ',a,i8,2x,i8,2x,a)"
Expand All @@ -1838,6 +1848,10 @@ subroutine shr_strdata_set_stream_iodesc(sdat, per_stream, fldname, pioid, rc)

rc = ESMF_SUCCESS

! nullify local pointers
nullify(compdof)
nullify(compdof3d)

! set the number of vertical levels to a local variable
stream_nlev = per_stream%stream_nlev

Expand Down

0 comments on commit 4bd6847

Please sign in to comment.