Merge pull request NOAA-EMC#9 from NOAA-EMC/release/prepobs.v1.0.0

Release/prepobs.v1.0.0
KateFriedman-NOAA · Jun 2, 2022 · ebbad4c · ebbad4c
2 parents d10b79e + 0db456e
commit ebbad4c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/sorc/prepobs_prepdata.fd/prepdata.f b/sorc/prepobs_prepdata.fd/prepdata.f
@@ -1335,6 +1335,8 @@
 C 2020-09-14  S. Melchior -- In subroutine PREP, added ability to
 C       process new WMO BUFR sequence Meteosat AMV data from subsets:
 C       005067, 005068, 005069. 
+C 2022-05-15  I. Genkova -- In subroutine SATEDS, updated IDSAT(4) to 
+C       IDSAT(8) to accomodate WCOSS2 compiler
 C
 C
 C USAGE:
@@ -3106,7 +3108,7 @@ PROGRAM PREPOBS_PREPDATA
      $ FLACMS,IACFTH,SUBSKP,JPGPSD,GWINDO,RASS,TWINDO,JPWDSD,IWWNDO,
      $ FLDMFR,WRMISS,SKGP45,JPASCD,IAWNDO,npkrpt,SKGNSS
       NAMELIST/PARM/IUNIT
-      CALL W3TAGB('PREPOBS_PREPDATA',2021,0175,0050,'EMC')
+      CALL W3TAGB('PREPOBS_PREPDATA',2022,0105,0050,'EMC')
 C DETERMINE MACHINE WORD LENGTH (BYTES) FOR BOTH INTEGERS AND REALS
       CALL WORDLENGTH(LWI,LWR)
       PRINT 2213, LWI,LWR
@@ -12629,6 +12631,8 @@ SUBROUTINE GETC06(NN,CYCLET,*,*)
 C     - Defined IDSDAT to eliminate Boundary Run-Time Check Failures.
 C     - Modified the code to handle invalid float errors during the
 C       run when the code was compiled with debug options enabled.
+C 2022-04-15 I. GENKOVA -- UPDATED IDSAT(4) TO IDSAT(8) TO ACCOMODATE 
+C     WCOSS2 COMPILER
 C
 C USAGE:    CALL SATEDS
 C   INPUT FILES:
@@ -12672,7 +12676,7 @@ SUBROUTINE SATEDS
       CHARACTER*8   STNPRT,STNID,DSNAME,SUBSET_d
       LOGICAL  SATMST,TR80KM,TOVEDS
       INTEGER  IBUF(140),JRTRV(3),NUMOB(5,4,2,4,4),KEPOB(5,4,2,4),
-     $ MSTOB(5,4,2,4),IDATA(MAXOBS),KSATOB(3),IDSAT(4),ISAMPLE(2)
+     $ MSTOB(5,4,2,4),IDATA(MAXOBS),KSATOB(3),IDSAT(8),ISAMPLE(2) 
       INTEGER(8) IDSDAT,IDSDMP_8
       REAL(8)  BMISS,obs8_8,alon_8,alat_8
       COMMON/ADP/ISATOB,PMAND(23),RDATA(MAXOBS),IPRINT

diff --git a/sorc/prepobs_prepdata.fd/w3xtovseds.f b/sorc/prepobs_prepdata.fd/w3xtovseds.f
@@ -68,6 +68,9 @@
 C 2020-01-09  J. Dong -- In subroutine W3XTOVSEDS, changed the windowing
 C      decade from 20 to 40 for cases when the year is represented by
 C      2 digits instead of 4.
+
+C 2022-05-15  I. GENKOVA --  DEFINED IDSAT AS INTEGER(8) TO ACCOMODATE
+C     COMPILER ON WCOSS2
 C
 C USAGE :   CALL W3XTOVSEDS(IUNIT,IBDATE,IBUFTN,ISATOB,PBOT,DSNAME,
 C                           IDSDAT,IDSDMP_8,IERR)
@@ -217,8 +220,7 @@ SUBROUTINE W3XTOVSEDS(IUNIT,IBDATE,IBUFTN,ISATOB,PBOT,DSNAME,
       REAL GEOOPR(18),TLAYER(15),PLAYER(16),RINC(5)
 
       INTEGER IBUFTN(140),ISATOB(3),JDATE(5),JDUMP(5),IBIT(2)
-
-      INTEGER(8) IDSDMP_8,JDUMP_8(5),KDATE(8),LDATE(8)
+      INTEGER(8) IDSDAT, IDSDMP_8,JDUMP_8(5),KDATE(8),LDATE(8) 
 
       CHARACTER*8 SUBSET,DSNAME
       DATA NUMLVL/0/,ISTLVL/0/
@@ -289,6 +291,7 @@ SUBROUTINE W3XTOVSEDS(IUNIT,IBDATE,IBUFTN,ISATOB,PBOT,DSNAME,
          JFIRST = 1
          IUNITL = IUNIT
          CALL DUMPBF(IUNIT,JDATE,JDUMP)
+         print'(" w3xtovseds output for jdate and jdump ")'
          print'(" CENTER DATE (JDATE) = ",5(I0,1X))', jdate
          print'(" DUMP DATE   (JDUMP) = ",5(I0,1X))', jdump
          print'(1X)'

diff --git a/ush/prepobs_makeprepbufr.sh b/ush/prepobs_makeprepbufr.sh
@@ -331,9 +331,12 @@
 #     DATA          String indicating the working directory path (usually a
 #                   temporary location)
 #     COMSP         String indicating the directory/filename path to input BUFR
-#                   observational data dumps, tropical cyclone location
-#                   (tcvitals) files, global atmos guess files, and status
-#                   files (e.g., "$COMROOT/gfs/prod/gfs.20060612/gfs.t12z.")
+#                   observational data dumps, global atmos guess files, and 
+#                   status files
+#                   (e.g. "$COMROOT/obsproc/v1.0/gfs.20220512/00/atmos/gfs.t12z.")
+#     COMSPtcvital  String indicating the directory/filename path to input BUFR
+#                   tropical cyclone location (tcvitals) files
+#                   (e.g. "$COMROOT/gfs/v16.2/gfs.20220512/00/atmos/gfs.t12z.")
 #     DBNROOT       String indicating directory path to bin/dbn_alert file
 #                   location
 #                   NOTE : This is required ONLY if the imported shell variable
@@ -583,7 +586,7 @@
 #                   programs (used by GBLEVENTS subroutine)
 #                   NOTE: Only read by gdas, gfs, cdas and nam networks
 #                   If imported "RUN=gdas" or "RUN=gfs", default is
-#                   "$HOMEgfs/fix/fix_gsi/prepobs_errtable.global";
+#                   "$HOMEgfs/fix/prepobs_errtable.global";
 #                   if imported "NET=cdas", default is
 #                   "$HOMEprepobs/fix/prepobs_errtable.cdas";
 #                   if imported "NET=nam", default is
@@ -1119,7 +1122,7 @@ PRPT=${PRPT:-$FIXPREP/prepobs_prep.bufrtable}
 cp $PRPT prep.bufrtable
 LANDC=${LANDC:-$FIXPREP/prepobs_landc}
 if [ "$RUN" = 'gdas' -o "$RUN" = 'gfs' ]; then
-   PRVT=${PRVT:-$HOMEgfs/fix/fix_gsi/prepobs_errtable.global}
+   PRVT=${PRVT:-$HOMEgfs/fix/prepobs_errtable.global}
 elif [ "$NET" = 'cdas' ]; then
    PRVT=${PRVT:-$HOMEprepobs/fix/prepobs_errtable.cdas}
 elif [ "$NET" = 'nam' ]; then
@@ -2512,7 +2515,7 @@ if [ "$SYNDATA"  = 'YES' ]; then
       if [ -f ${tstsp}syndata.tcvitals.$tmmark ]; then
          cp ${tstsp}syndata.tcvitals.$tmmark tcvitals_orig
       else
-         cp ${COMSP}syndata.tcvitals.$tmmark tcvitals_orig
+         cp ${COMSPtcvital}syndata.tcvitals.$tmmark tcvitals_orig
       fi
 
       if [ "$RELOCATION_HAS_RUN" != 'YES' -o "$NET" = 'nam' ]; then