Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@edwardhartnett
edwardhartnett committed May 21, 2024
1 parent d1b8ecc commit ddffbcc
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 46 deletions.
90 changes: 44 additions & 46 deletions src/g2get.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@ end subroutine g2_gbytec81
end interface

#ifdef LOGGING
! Log results for debugging.
write(g2_log_msg, '*') 'gb_info: lgrib ', lgrib, ' lugi ', lugi, &
' idxver ', idxver
write(g2_log_msg, *) 'gb_info: lcgrib ', lcgrib
call g2_log(1)
#endif

Expand Down Expand Up @@ -124,9 +122,8 @@ end subroutine g2_gbytec81

#ifdef LOGGING
! Log results for debugging.
write(g2_log_msg, '*') 'gb_info: lugb ', lugb, ' lugi ', lugi, &
' idxver ', idxver
call g2_log(1)
write(g2_log_msg, *) 'before getting len: iofst ', iofst
call g2_log(2)
#endif
call g2_gbytec1(cgrib, lengrib, iofst, 32) ! Length of GRIB message
iofst = iofst + 32
Expand Down Expand Up @@ -826,15 +823,15 @@ subroutine unpack3(cgrib, lcgrib, iofst, igds, igdstmpl, &
iofst = iofst + 32
iofst = iofst + 8 ! skip section number

call g2_gbytec(cgrib, igds(1), iofst, 8) ! Get source of Grid def.
call g2_gbytec1(cgrib, igds(1), iofst, 8) ! Get source of Grid def.
iofst = iofst + 8
call g2_gbytec(cgrib, igds(2), iofst, 32) ! Get number of grid pts.
call g2_gbytec1(cgrib, igds(2), iofst, 32) ! Get number of grid pts.
iofst = iofst + 32
call g2_gbytec(cgrib, igds(3), iofst, 8) ! Get num octets for opt. list
call g2_gbytec1(cgrib, igds(3), iofst, 8) ! Get num octets for opt. list
iofst = iofst + 8
call g2_gbytec(cgrib, igds(4), iofst, 8) ! Get interpret. for opt. list
call g2_gbytec1(cgrib, igds(4), iofst, 8) ! Get interpret. for opt. list
iofst = iofst + 8
call g2_gbytec(cgrib, igds(5), iofst, 16) ! Get Grid Def Template num.
call g2_gbytec1(cgrib, igds(5), iofst, 16) ! Get Grid Def Template num.
iofst = iofst + 16
if (igds(1) .eq. 0) then
! if (igds(1).eq.0.OR.igds(1).eq.255) then ! FOR ECMWF TEST ONLY
Expand All @@ -859,10 +856,10 @@ subroutine unpack3(cgrib, lcgrib, iofst, igds, igdstmpl, &
do i = 1, mapgridlen
nbits = iabs(mapgrid(i)) * 8
if (mapgrid(i) .ge. 0) then
call g2_gbytec(cgrib, igdstmpl(i), iofst, nbits)
call g2_gbytec1(cgrib, igdstmpl(i), iofst, nbits)
else
call g2_gbytec1(cgrib, isign, iofst, 1)
call g2_gbytec(cgrib, igdstmpl(i), iofst + 1, nbits-1)
call g2_gbytec1(cgrib, igdstmpl(i), iofst + 1, nbits-1)
if (isign .eq. 1) igdstmpl(i) = -igdstmpl(i)
endif
iofst = iofst + nbits
Expand All @@ -879,10 +876,10 @@ subroutine unpack3(cgrib, lcgrib, iofst, igds, igdstmpl, &
do i = mapgridlen + 1, newmapgridlen
nbits = iabs(mapgrid(i)) * 8
if (mapgrid(i) .ge. 0) then
call g2_gbytec(cgrib, igdstmpl(i), iofst, nbits)
call g2_gbytec1(cgrib, igdstmpl(i), iofst, nbits)
else
call g2_gbytec1(cgrib, isign, iofst, 1)
call g2_gbytec(cgrib, igdstmpl(i), iofst + 1, nbits - &
call g2_gbytec1(cgrib, igdstmpl(i), iofst + 1, nbits - &
1)
if (isign .eq. 1) igdstmpl(i) = -igdstmpl(i)
endif
Expand Down Expand Up @@ -963,51 +960,52 @@ subroutine unpack4(cgrib, lcgrib, iofst, ipdsnum, ipdstmpl, &
iofst = iofst + 16
call g2_gbytec1(cgrib, ipdsnum, iofst, 16) ! Get Prod. Def Template num.
iofst = iofst + 16
! Get Product Definition Template.

! Get Product Definition Template.
call getpdstemplate(ipdsnum, mappdslen, mappds, needext, iret)
if (iret.ne.0) then
ierr = 5
return
endif

! Unpack each value into array ipdstmpl from the the appropriate
! number of octets, which are specified in corresponding entries in
! array mappds.
! Unpack each value into array ipdstmpl from the the appropriate
! number of octets, which are specified in corresponding entries in
! array mappds.
do i = 1, mappdslen
nbits = iabs(mappds(i))*8
if (mappds(i).ge.0) then
call g2_gbytec(cgrib, ipdstmpl(i), iofst, nbits)
nbits = iabs(mappds(i)) * 8
if (mappds(i) .ge. 0) then
call g2_gbytec1(cgrib, ipdstmpl(i), iofst, nbits)
else
call g2_gbytec1(cgrib, isign, iofst, 1)
call g2_gbytec(cgrib, ipdstmpl(i), iofst + 1, nbits-1)
if (isign.eq.1) ipdstmpl(i) = -ipdstmpl(i)
call g2_gbytec1(cgrib, ipdstmpl(i), iofst + 1, nbits-1)
if (isign .eq. 1) ipdstmpl(i) = -ipdstmpl(i)
endif
iofst = iofst + nbits
enddo

! Check to see if the Product Definition Template needs to be
! extended. The number of values in a specific template may vary
! depending on data specified in the "static" part of the template.
! Check to see if the Product Definition Template needs to be
! extended. The number of values in a specific template may vary
! depending on data specified in the "static" part of the template.
if (needext) then
call extpdstemplate(ipdsnum, ipdstmpl, newmappdslen, mappds)

! Unpack the rest of the Product Definition Template
! Unpack the rest of the Product Definition Template.
do i = mappdslen + 1, newmappdslen
nbits = iabs(mappds(i))*8
if (mappds(i).ge.0) then
call g2_gbytec(cgrib, ipdstmpl(i), iofst, nbits)
nbits = iabs(mappds(i)) * 8
if (mappds(i) .ge. 0) then
call g2_gbytec1(cgrib, ipdstmpl(i), iofst, nbits)
else
call g2_gbytec1(cgrib, isign, iofst, 1)
call g2_gbytec(cgrib, ipdstmpl(i), iofst + 1, nbits-1)
if (isign.eq.1) ipdstmpl(i) = -ipdstmpl(i)
call g2_gbytec1(cgrib, ipdstmpl(i), iofst + 1, nbits-1)
if (isign .eq. 1) ipdstmpl(i) = -ipdstmpl(i)
endif
iofst = iofst + nbits
enddo
mappdslen = newmappdslen
endif

! Get Optional list of vertical coordinate values after the Product
! Definition Template, if necessary.
! Get Optional list of vertical coordinate values after the Product
! Definition Template, if necessary.
if (numcoord .ne. 0) then
allocate (coordieee(numcoord))
call g2_gbytescr(cgrib, coordieee, iofst, 32, 0, numcoord)
Expand Down Expand Up @@ -1084,29 +1082,29 @@ subroutine unpack5(cgrib, lcgrib, iofst, ndpts, idrsnum, &
do i = 1, mapdrslen
nbits = iabs(mapdrs(i))*8
if (mapdrs(i).ge.0) then
call g2_gbytec(cgrib, idrstmpl(i), iofst, nbits)
call g2_gbytec1(cgrib, idrstmpl(i), iofst, nbits)
else
call g2_gbytec1(cgrib, isign, iofst, 1)
call g2_gbytec(cgrib, idrstmpl(i), iofst + 1, nbits-1)
call g2_gbytec1(cgrib, idrstmpl(i), iofst + 1, nbits-1)
if (isign.eq.1) idrstmpl(i) = -idrstmpl(i)
endif
iofst = iofst + nbits
enddo

! Check to see if the Data Representation Template needs to be
! extended. The number of values in a specific template may vary
! depending on data specified in the "static" part of the template.
! Check to see if the Data Representation Template needs to be
! extended. The number of values in a specific template may vary
! depending on data specified in the "static" part of the template.
if (needext) then
call extdrstemplate(idrsnum, idrstmpl, newmapdrslen, mapdrs)
! Unpack the rest of the Data Representation Template
! Unpack the rest of the Data Representation Template.
do i = mapdrslen + 1, newmapdrslen
nbits = iabs(mapdrs(i))*8
if (mapdrs(i).ge.0) then
call g2_gbytec(cgrib, idrstmpl(i), iofst, nbits)
nbits = iabs(mapdrs(i)) * 8
if (mapdrs(i) .ge. 0) then
call g2_gbytec1(cgrib, idrstmpl(i), iofst, nbits)
else
call g2_gbytec1(cgrib, isign, iofst, 1)
call g2_gbytec(cgrib, idrstmpl(i), iofst + 1, nbits - 1)
if (isign.eq.1) idrstmpl(i) = -idrstmpl(i)
call g2_gbytec1(cgrib, idrstmpl(i), iofst + 1, nbits - 1)
if (isign .eq. 1) idrstmpl(i) = -idrstmpl(i)
endif
iofst = iofst + nbits
enddo
Expand Down
3 changes: 3 additions & 0 deletions tests/test_gb_info.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
!
! Ed Hartnett 7/17/23
program test_gb_info
use g2logging
implicit none

! Length of our message.
Expand Down Expand Up @@ -120,13 +121,15 @@ program test_gb_info
cgrib(42) = old_val

! This will work.
g2_log_level = 3
call gb_info(cgrib, lcgrib, listsec0, listsec1, numfields, numlocal, maxlocal, ierr)
if (ierr .ne. 0) stop 10
if (numfields .ne. 1 .or. numlocal .ne. 1 .or. maxlocal .ne. 3) stop 11
if (listsec0(1) .ne. 0 .or. listsec0(2) .ne. 2 .or. listsec0(3) .ne. 191) stop 12
do i = 1, sec1_len
if (listsec1(i) .ne. expected_listsec1(i)) stop 13
end do
g2_log_level = 0

! Test gribinfo() as well. This won't work because we change number of section 1.
old_val = cgrib(21)
Expand Down

0 comments on commit ddffbcc

Please sign in to comment.