Skip to content

Commit

Permalink
Merge pull request NOAA-EMC#7 from NOAA-EMC/feature/prepobs.SATEM.fix
Browse files Browse the repository at this point in the history
feature/prepobs.SATEM.fix corrects JDATE and IDSAT types for WCOSS2 compiler
  • Loading branch information
ShelleyMelchior-NOAA authored Apr 15, 2022
2 parents 2b39440 + 4e238c5 commit cfc992f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
8 changes: 6 additions & 2 deletions sorc/prepobs_prepdata.fd/prepdata.f
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions sorc/prepobs_prepdata.fd/w3xtovseds.f
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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)'
Expand Down

0 comments on commit cfc992f

Please sign in to comment.