Bugfix 1618 develop pb2nc (#1623)

Co-authored-by: Howard Soh <[email protected]>
dtcenter · Jan 19, 2021 · 12b0de0 · 12b0de0
1 parent ca49ffc
commit 12b0de0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/met/src/tools/other/pb2nc/numpbmsg.f b/met/src/tools/other/pb2nc/numpbmsg.f
@@ -24,7 +24,29 @@ SUBROUTINE NUMPBMSG ( FID, NMSG )
 C*
         END
 
-
+
+        SUBROUTINE NUMPBMSG_NEW ( PBFILE, FID, NMSG )
+C*
+        INCLUDE    'readpb.prm'
+C*
+        CHARACTER  PBFILE*(FILEMXSTRL)
+        INTEGER    FID, FID2
+        INTEGER    NMSG
+        REAL*8     R8ARR(1, 1)
+C*
+C-----------------------------------------------------------------------
+C*
+C*      Call UFBTAB to figure out how many messages the PrepBufr file
+C*      attached to FID contains
+C*
+        OPEN  ( UNIT = FID, FILE = PBFILE, FORM = 'UNFORMATTED' )
+        FID2 = -FID
+        CALL UFBTAB  ( FID2, R8ARR, 1, 1, NMSG, ' ' )
+        CLOSE ( UNIT = FID )
+C*
+        END
+
+
         SUBROUTINE GET_TMIN ( FID, TMIN )
 C*
         INTEGER    FID, TMIN

diff --git a/met/src/tools/other/pb2nc/pb2nc.cc b/met/src/tools/other/pb2nc/pb2nc.cc
@@ -312,6 +312,7 @@ static NcFile *f_out      = (NcFile *) 0;
 
 extern "C" {
    void numpbmsg_(int *, int *);
+   void numpbmsg_new_(const char *, int *, int *);
    void openpb_(const char *, int *);
    void closepb_(int *);
    void readpb_(int *, int *, int *, double[mxr8pm],
@@ -2050,14 +2051,14 @@ void process_pbfile_metadata(int i_pb) {
            << "Invalid file ID [" << unit << "] between 1 and 99.\n\n";
    }
 
-   // Open the blocked temp PrepBufr file for reading
-   openpb_(blk_file.c_str(), &unit);
-
    // Compute the number of PrepBufr records in the current file.
-   numpbmsg_(&unit, &npbmsg);
+   numpbmsg_new_(blk_file.c_str(), &unit, &npbmsg);
    mlog << Debug(1) << method_name << " -> "
         << "the number of records: " << npbmsg << "\n";
 
+   // Open the blocked temp PrepBufr file for reading
+   openpb_(blk_file.c_str(), &unit);
+
    // Use the number of records requested by the user if there
    // are enough present.
    if(nmsg >= 0 && nmsg <= npbmsg) {