more updates

python/test/test_checkpoint.py

@@ -27,7 +27,9 @@
     if nmsg == 15: break
     nmsg += 1
 bufr.restore()
-bufr.load_subset()
+# As of PR 599, a bug has been fixed in library subroutine rewnbf(), so the following
+# statement is no longer needed.
+#bufr.load_subset()
 hdr = bufr.read_subset(hdstr).squeeze()
 station_id = hdr[0].tostring()
 obs = bufr.read_subset(obstr)

python/test/test_misc.py

@@ -172,7 +172,9 @@
     if nmsg == 15: break
     nmsg += 1
 bufr.restore()
-bufr.load_subset()
+# As of PR 599, a bug has been fixed in library subroutine rewnbf(), so the following
+# statement is no longer needed.
+#bufr.load_subset()
 hdr = bufr.read_subset(hdstr).squeeze()
 station_id = hdr[0].tobytes()
 obs2 = bufr.read_subset(obstr)

src/CMakeLists.txt

@@ -7,11 +7,11 @@ list(APPEND fortran_src
   modules_vars.F90 modules_arrs.F90 bitmaps.F90 blocks.F90 borts.F90
   compress.F90 conwin.f copydata.F90 dumpdata.F90 dxtable.F90
   errwrt.F90 getwin.f fxy.F90 invcon.f invmrg.f invtag.f invwin.f
-  jumplink.F90 mastertable.F90 missing.F90 mesgbc.f mesgbf.f mrginv.f
+  jumplink.F90 mastertable.F90 missing.F90 mrginv.f
   nevn.f newwin.f nvnwin.f nwords.f nxtwin.f openbt.F90 cftbvs.F90
-  readwritemg.F90 readwritesb.F90 readwriteval.F90 rewnbf.f rsvfvm.f s013vals.F90 tankrcpt.F90
-  standard.F90 strings.F90 trybump.f ufbcup.f ufbevn.f ufbget.f ufbin3.f ufbinx.f
-  memmsgs.F90 ufbovr.f ufbtab.f ciencode.F90 cidecode.F90 arallocf.F90 openclosebf.F90
+  readwritemg.F90 readwritesb.F90 readwriteval.F90 s013vals.F90 tankrcpt.F90
+  standard.F90 strings.F90 ufbget.f ufbinx.f
+  memmsgs.F90 ciencode.F90 cidecode.F90 arallocf.F90 openclosebf.F90
   bufr_interface.F90 bufr_c2f_interface.F90 x4884.F90 bufrlib.F90)
 
 list(APPEND c_src
@@ -20,10 +20,9 @@ list(APPEND c_src
 list(APPEND c_hdr
   cread.h mstabs.h bufr_interface.h bufrlib.h)
 
-# Create the misc.F90 file and bfrini.F90 files
+# Create the misc.F90 file
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/misc.F90.in ${CMAKE_CURRENT_BINARY_DIR}/misc.F90 @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bfrini.F90.in ${CMAKE_CURRENT_BINARY_DIR}/bfrini.F90 @ONLY)
-list(APPEND fortran_src ${CMAKE_CURRENT_BINARY_DIR}/misc.F90 ${CMAKE_CURRENT_BINARY_DIR}/bfrini.F90)
+list(APPEND fortran_src ${CMAKE_CURRENT_BINARY_DIR}/misc.F90)
 
 include(TestBigEndian)
 test_big_endian(IS_BIG_ENDIAN)

src/arallocf.F90

@@ -905,10 +905,7 @@ subroutine exitbufr
 
   use moda_stbfr
   use moda_s01cm
-
-  common /tablef/ cdmf
-
-  character*1 cdmf
+  use moda_tablef
 
   ! Close any logical units that are open to the library.
 

src/cftbvs.F90

@@ -223,6 +223,7 @@ recursive subroutine getcfmng ( lunit, nemoi, ivali, nemod, ivald, cmeang, lnmng
   use modv_vars, only: im8b
 
   use moda_tababd
+  use moda_tablef
 
   implicit none
 
@@ -234,9 +235,7 @@ recursive subroutine getcfmng ( lunit, nemoi, ivali, nemod, ivald, cmeang, lnmng
   character*(*), intent(out) :: cmeang
   character*128 bort_str
   character*8 nemo, my_nemoi, my_nemod
-  character cdmf, tab
-
-  common /tablef/ cdmf
+  character tab
 
   ! Check for I8 integers
 

src/compress.F90

@@ -6,15 +6,13 @@
 !> Specify whether BUFR messages output by future calls to [message-writing subroutines](@ref hierarchy) and
 !> [subset-writing subroutines](@ref hierarchy) are to be compressed.
 !>
-!> This subroutine can be called at any time after the first call
-!> to subroutine openbf(), and the specified value for cf will remain
-!> in effect for all future calls to
+!> The specified value for cf will remain in effect for all future calls to
 !> [message-writing subroutines](@ref hierarchy) and
 !> [subset-writing subroutines](@ref hierarchy) for all Fortran logical
 !> units that are open for output within the application program, unless
 !> a subsequent call is made to this subroutine to reset the value of
 !> cf again.  If this subroutine is never called, a default value of
-!> 'N' is used for cf, as set within subroutine bfrini().
+!> 'N' is used for cf.
 !>
 !> When compression is activated, it is implemented using the
 !> algorithm for data subset compression prescribed within the
@@ -26,21 +24,20 @@
 !> compression may provide little to no benefit, and which is why
 !> it is not activated by default.
 !>
-!> @param cf - Flag indicating whether future BUFR output messages are to be compressed
+!> @param cf - Flag indicating whether future BUFR output messages are to be compressed:
 !>  - 'N' = No (the default)
 !>  - 'Y' = Yes
 !>
 !> @author J. Ator @date 2005-03-09
 subroutine cmpmsg(cf)
 
+  use moda_msgcmp
+
   implicit none
 
   character, intent(in) :: cf
-  character ccmf
   character*128 bort_str
 
-  common /msgcmp/ ccmf
-
   call capit(cf)
   if(cf.ne.'Y'.and. cf.ne.'N') then
     write(bort_str,'("BUFRLIB: CMPMSG - INPUT ARGUMENT IS ",A1,", IT MUST BE EITHER Y OR N")') cf