no more large ftp testing for memcheck workflow, adding interface sta…

…tements (#688)

* no more large ftp testing for memcheck workflow

* interface work

* more interface work

* more interface work

.github/workflows/developer.yml

@@ -13,11 +13,6 @@ on:
     branches:
     - develop
 
-# Cancel in-progress workflows when pushing to a branch
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   developer:
     runs-on: ubuntu-latest

.github/workflows/memcheck.yml

@@ -97,14 +97,14 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/data
-        key: data-developer-4
+        key: data-memcheck-1
 
     - name: memcheck
       run: |
         cd g2
         mkdir build
         cd build
-        cmake -DFTP_LARGE_TEST_FILES=ON -DJasper_ROOT=~/Jasper -DCMAKE_PREFIX_PATH="~/bacio;~/w3emc" -DCMAKE_Fortran_FLAGS="-g -O0" -DCMAKE_C_FLAGS="-g -O0" -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug ..
+        cmake -DJasper_ROOT=~/Jasper -DCMAKE_PREFIX_PATH="~/bacio;~/w3emc" -DCMAKE_Fortran_FLAGS="-g -O0" -DCMAKE_C_FLAGS="-g -O0" -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug ..
         make -j2 VERBOSE=1
 
     - name: test_memcheck

CMakeLists.txt

@@ -53,7 +53,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$")
   set(CMAKE_C_FLAGS "-g ${CMAKE_C_FLAGS}")
   set(CMAKE_C_FLAGS_DEBUG "-ggdb -Wall")
   set(CMAKE_Fortran_FLAGS "-g -funroll-loops ${CMAKE_Fortran_FLAGS}")
-  set(CMAKE_Fortran_FLAGS_DEBUG "-ggdb -Wall")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-ggdb -Wall -Wimplicit-interface")
   set(fortran_d_flags "-fdefault-real-8")
 endif()
 

src/g2bytes.F90

@@ -23,6 +23,15 @@ subroutine g2_gbytec(in, iout, iskip, nbits)
   character*1, intent(in) :: in(*)
   integer, intent(inout) :: iout(*)
   integer, intent(in) :: iskip, nbits
+
+  interface
+     subroutine g2_gbytesc(in, iout, iskip, nbits, nskip, n)
+       character*1, intent(in) :: in(*)
+       integer, intent(out) :: iout(*)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_gbytesc
+  end interface
+
   call g2_gbytesc(in, iout, iskip, nbits, 0, 1)
 end subroutine g2_gbytec
 
@@ -46,6 +55,14 @@ subroutine g2_gbytec1(in, siout, iskip, nbits)
   integer, intent(inout) :: siout
   integer, intent(in) :: iskip, nbits
   integer (kind = 4) :: iout(1)
+
+  interface
+     subroutine g2_gbytesc(in, iout, iskip, nbits, nskip, n)
+       character*1, intent(in) :: in(*)
+       integer, intent(out) :: iout(*)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_gbytesc
+  end interface
 
   call g2_gbytesc(in, iout, iskip, nbits, 0, 1)
   siout = iout(1)
@@ -71,6 +88,14 @@ subroutine g2_gbytescr(in, rout, iskip, nbits, nskip, n)
   integer, intent(in) :: iskip, nbits, nskip, n
   integer (kind = 4) :: iout(n)
 
+  interface
+     subroutine g2_gbytesc(in, iout, iskip, nbits, nskip, n)
+       character*1, intent(in) :: in(*)
+       integer, intent(out) :: iout(*)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_gbytesc
+  end interface
+
   ! Unpack into integer array.
   call g2_gbytesc(in, iout, iskip, nbits, nskip, n)
 
@@ -154,6 +179,15 @@ subroutine g2_gbytec8(in, iout, iskip, nbits)
   character*1, intent(in) :: in(*)
   integer (kind = 8), intent(inout) :: iout(*)
   integer, intent(in) :: iskip, nbits
+
+  interface
+     subroutine g2_gbytesc8(in, iout, iskip, nbits, nskip, n)
+       character*1, intent(in) :: in(*)
+       integer (kind = 8), intent(out) :: iout(*)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_gbytesc8
+  end interface
+
   call g2_gbytesc8(in, iout, iskip, nbits, 0, 1)
 end subroutine g2_gbytec8
 
@@ -177,6 +211,14 @@ subroutine g2_gbytec81(in, siout, iskip, nbits)
   integer (kind = 8), intent(inout) :: siout
   integer, intent(in) :: iskip, nbits
   integer (kind = 8) :: iout(1)
+
+  interface
+     subroutine g2_gbytesc8(in, iout, iskip, nbits, nskip, n)
+       character*1, intent(in) :: in(*)
+       integer (kind = 8), intent(out) :: iout(*)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_gbytesc8
+  end interface
 
   call g2_gbytesc8(in, iout, iskip, nbits, 0, 1)
   siout = iout(1)
@@ -200,6 +242,7 @@ subroutine g2_gbytesc8(in, iout, iskip, nbits, nskip, n)
   character*1, intent(in) :: in(*)
   integer (kind = 8), intent(out) :: iout(*)
   integer, intent(in) :: iskip, nbits, nskip, n
+
   integer :: tbit, bitcnt
   integer, parameter :: ones(8) = (/ 1, 3, 7, 15, 31, 63, 127, 255 /)
 
@@ -264,6 +307,15 @@ subroutine g2_sbytec(out, in, iskip, nbits)
   character*1, intent(inout) :: out(*)
   integer, intent(in) :: in(*)
   integer, intent(in) :: iskip, nbits
+
+  interface
+     subroutine g2_sbytesc(out, in, iskip, nbits, nskip, n)
+       character*1, intent(out) :: out(*)
+       integer, intent(in) :: in(n)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_sbytesc
+  end interface
+
   call g2_sbytesc(out, in, iskip, nbits, 0, 1)
 end subroutine g2_sbytec
 
@@ -287,6 +339,15 @@ subroutine g2_sbytec1(out, in, iskip, nbits)
   integer, intent(in) :: in
   integer, intent(in) :: iskip, nbits
   integer :: ain(1)
+
+  interface
+     subroutine g2_sbytesc(out, in, iskip, nbits, nskip, n)
+       character*1, intent(out) :: out(*)
+       integer, intent(in) :: in(n)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_sbytesc
+  end interface
+
   ain(1) = in
   call g2_sbytesc(out, ain, iskip, nbits, 0, 1)
 end subroutine g2_sbytec1
@@ -309,6 +370,14 @@ subroutine g2_sbytescr(out, rin, iskip, nbits, nskip, n)
   integer, intent(in) :: iskip, nbits, nskip, n
   integer :: in(n)
 
+  interface
+     subroutine g2_sbytesc(out, in, iskip, nbits, nskip, n)
+       character*1, intent(out) :: out(*)
+       integer, intent(in) :: in(n)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_sbytesc
+  end interface
+
   ! Transfer real array to integer array.
   in(1:n) = transfer(rin, in(1:n), n)
 
@@ -405,6 +474,15 @@ subroutine g2_sbytec8(out, in, iskip, nbits)
   character*1, intent(inout) :: out(*)
   integer (kind = 8), intent(in) :: in(*)
   integer, intent(in) :: iskip, nbits
+
+  interface
+     subroutine g2_sbytesc8(out, in, iskip, nbits, nskip, n)
+       character*1, intent(out) :: out(*)
+       integer (kind = 8), intent(in) :: in(n)
+       integer, intent(in) :: iskip, nbits, nskip, n
+     end subroutine g2_sbytesc8
+  end interface
+
   call g2_sbytesc8(out, in, iskip, nbits, 0, 1)
 end subroutine g2_sbytec8
 
@@ -497,6 +575,14 @@ subroutine rdieeec(cieee, a, num)
   integer, intent(in) :: num
   real (kind = 4) :: rieee(num)
 
+  interface
+     subroutine rdieee(rieee, a, num)
+       real(4), intent(in) :: rieee(num)
+       real, intent(out) :: a(num)
+       integer, intent(in) :: num
+     end subroutine rdieee
+  end interface
+
   rieee(1:num) = transfer(cieee(1:num * 4), rieee, num)
   call rdieee(rieee, a, num)
 end subroutine rdieeec

src/g2get.F90

@@ -1514,6 +1514,14 @@ subroutine gettemplates(cgrib, lcgrib, ifldnum, igds, igdstmpl, &
   logical have3, have4
   integer :: igdslen, ipdslen, ipos, isecnum, j, jerr, lengrib, lensec, lensec0, numfld
 
+  interface
+     subroutine g2_gbytec1(in, siout, iskip, nbits)
+       character*1, intent(in) :: in(*)
+       integer, intent(inout) :: siout
+       integer, intent(in) :: iskip, nbits
+     end subroutine g2_gbytec1
+  end interface
+
   have3 = .false.
   have4 = .false.
   ierr = 0
@@ -1543,12 +1551,12 @@ subroutine gettemplates(cgrib, lcgrib, ifldnum, igds, igdstmpl, &
 
   ! Unpack Section 0 - Indicator Section.
   iofst = 8 * (istart + 5)
-  call g2_gbytec(cgrib, listsec0(1), iofst, 8)     ! Discipline
+  call g2_gbytec1(cgrib, listsec0(1), iofst, 8)     ! Discipline
   iofst = iofst + 8
-  call g2_gbytec(cgrib, listsec0(2), iofst, 8)     ! GRIB edition number
+  call g2_gbytec1(cgrib, listsec0(2), iofst, 8)     ! GRIB edition number
   iofst = iofst + 8
   iofst = iofst + 32
-  call g2_gbytec(cgrib, lengrib, iofst, 32)        ! Length of GRIB message
+  call g2_gbytec1(cgrib, lengrib, iofst, 32)        ! Length of GRIB message
   iofst = iofst + 32
   lensec0 = 16
   ipos = istart + lensec0
@@ -1578,9 +1586,9 @@ subroutine gettemplates(cgrib, lcgrib, ifldnum, igds, igdstmpl, &
      endif
      ! Get length of Section and Section number.
      iofst = (ipos - 1) * 8
-     call g2_gbytec(cgrib, lensec, iofst, 32)        ! Get Length of Section
+     call g2_gbytec1(cgrib, lensec, iofst, 32)        ! Get Length of Section
      iofst = iofst + 32
-     call g2_gbytec(cgrib, isecnum, iofst, 8)         ! Get Section number
+     call g2_gbytec1(cgrib, isecnum, iofst, 8)         ! Get Section number
      iofst = iofst + 8
      !print *, ' lensec =  ', lensec, '    secnum =  ', isecnum
 

src/g2getgb2.F90

@@ -374,6 +374,17 @@ subroutine getgb2l2(lugb, idxver, cindex, gfld, iret)
   integer :: mypos
 
   interface
+     subroutine g2_gbytec1(in, siout, iskip, nbits)
+       character*1, intent(in) :: in(*)
+       integer, intent(inout) :: siout
+       integer, intent(in) :: iskip, nbits
+     end subroutine g2_gbytec1
+     subroutine g2_gbytec81(in, siout, iskip, nbits)
+       character*1, intent(in) :: in(*)
+       integer (kind = 8), intent(inout) :: siout
+       integer, intent(in) :: iskip, nbits
+       integer (kind = 8) :: iout(1)
+     end subroutine g2_gbytec81
      subroutine gf_unpack2(cgrib, lcgrib, iofst, lencsec2, csec2, ierr)
        character(len = 1), intent(in) :: cgrib(lcgrib)
        integer, intent(in) :: lcgrib
@@ -384,6 +395,7 @@ subroutine gf_unpack2(cgrib, lcgrib, iofst, lencsec2, csec2, ierr)
      end subroutine gf_unpack2
   end interface
 
+
 #ifdef LOGGING
   write(g2_log_msg, '(a, i2, a, i1)') 'getgb2l2: lugb ', lugb, ' idxver ', idxver
   call g2_log(1)
@@ -398,18 +410,18 @@ end subroutine gf_unpack2
   ! index version 2.
   if (idxver .eq. 1) then
      ! Read bytes to skip in file before message.
-     call g2_gbytec(cindex, lskip, mypos, INT4_BITS)
+     call g2_gbytec1(cindex, lskip, mypos, INT4_BITS)
      mypos = mypos + INT4_BITS
      lskip8 = lskip
      ! Read bytes to skip in msg before local use.
-     call g2_gbytec(cindex, skip2, mypos, INT4_BITS)
+     call g2_gbytec1(cindex, skip2, mypos, INT4_BITS)
      skip28 = skip2
   else
      ! Read bytes to skip in file before message.
-     call g2_gbytec8(cindex, lskip8, mypos, INT8_BITS)
+     call g2_gbytec81(cindex, lskip8, mypos, INT8_BITS)
      mypos = mypos + INT8_BITS
      ! Read bytes to skip in msg before local use.
-     call g2_gbytec8(cindex, skip28, mypos, INT8_BITS)
+     call g2_gbytec81(cindex, skip28, mypos, INT8_BITS)
      mypos = mypos + INT8_BITS
   endif
 
@@ -419,7 +431,7 @@ end subroutine gf_unpack2
 
      ! Get length of section.
      call bareadl(lugb, iskip8, 4_8, lread8, csize)    
-     call g2_gbytec(csize, ilen, 0, 32)
+     call g2_gbytec1(csize, ilen, 0, 32)
      allocate(ctemp(ilen))
      ilen8 = ilen