Skip to content

Commit

Permalink
Merge pull request #68 from awnawab/merge-develop-1.3.2-to-develop-1.3
Browse files Browse the repository at this point in the history 
Merge develop-1.3.2 to develop-1.3
  • Loading branch information
@wdeconinck
wdeconinck authored Feb 12, 2025
2 parents 4415aa8 + c89419c commit bd552cb
Showing 1 changed file with 58 additions and 67 deletions.
125 changes: 58 additions & 67 deletions src/ecwam/getspec.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,52 +285,43 @@ SUBROUTINE GETSPEC(FL1, BLK2GLO, BLK2LOC, WVENVI, NBLKS, NBLKE, IREAD)
GOTO 1021
ELSEIF (LLRESIZING .AND. IRET == JPGRIB_END_OF_FILE) THEN
! WE SHOULD HAVE THE MAXIMUM SIZE NECESSARY, START ALL OVER.
WRITE(IU06,*) ''
WRITE(IU06,*) '* GETSPEC: WE SHOULD HAVE THE MAXIMUM SIZE NECESSARY, START ALL OVER.'
WRITE(IU06,*) ''
CALL FLUSH(IU06)
DEALLOCATE(INGRIB)
LLRESIZING=.FALSE.
CALL IGRIB_CLOSE_FILE(KFILE_HANDLE)
CALL IGRIB_OPEN_FILE(KFILE_HANDLE,FILENAME(1:LFILE),'r')
ISIZE=NBIT
IF (.NOT.ALLOCATED(INGRIB)) ALLOCATE(INGRIB(ISIZE))
! READ AGAIN UNTIL THE FIRST TIME WE ENCOUNTERED JPGRIB_BUFFER_TOO_SMALL
DO IBREAD=1,NBREAD_AGAIN
KBYTES=ISIZE*NPRECI
CALL IGRIB_READ_FROM_FILE(KFILE_HANDLE,INGRIB,KBYTES,IRET)
IF (IRET == JPGRIB_BUFFER_TOO_SMALL) THEN
WRITE(IU06,*) '****************************************************'
WRITE(IU06,*) '* GETSPEC: JPGRIB_BUFFER_TOO_SMALL SHOULD NOT HAPPEN'
WRITE(NULERR,*) '* GETSPEC: JPGRIB_BUFFER_TOO_SMALL SHOULD NOT HAPPEN'
WRITE(IU06,*) '****************************************************'
CALL ABORT1
ELSEIF (IRET == JPGRIB_END_OF_FILE) THEN
WRITE(IU06,*) '**********************************'
WRITE(IU06,*) '* GETSPEC: END OF FILE ENCOUNTED'
WRITE(NULERR,*) '* GETSPEC: END OF FILE ENCOUNTED'
WRITE(IU06,*) '**********************************'
CALL ABORT1
ELSEIF (IRET /= JPGRIB_SUCCESS) THEN
WRITE(IU06,*) '**********************************'
WRITE(IU06,*) '* GETSPEC: FILE HANDLING ERROR'
WRITE(NULERR,*) '* GETSPEC: FILE HANDLING ERROR'
WRITE(IU06,*) '**********************************'
CALL ABORT1
ENDIF
ENDDO
NBREAD=IBREAD-1
NBREAD_AGAIN=0

NBREAD=NBREAD+1

CALL IGRIB_READ_FROM_FILE(KFILE_HANDLE,INGRIB,KBYTES,IRET)
IF (IRET == JPGRIB_BUFFER_TOO_SMALL) THEN
IF (.NOT.LLRESIZING) NBREAD_AGAIN=NBREAD
CALL KGRIBSIZE(IU06, KBYTES, NBIT, 'GETSPEC')
DEALLOCATE(INGRIB)
LLRESIZING=.TRUE.
GOTO 1021
ELSEIF (LLRESIZING .AND. IRET /= JPGRIB_END_OF_FILE) THEN
! LOOP UNTIL YOU HAVE EXPLORE THE SIZE FOR THE WHOLE FILE.
DEALLOCATE(INGRIB)
GOTO 1021
ELSEIF (LLRESIZING .AND. IRET == JPGRIB_END_OF_FILE) THEN
! WE SHOULD HAVE THE MAXIMUM SIZE NECESSARY, START ALL OVER.
DEALLOCATE(INGRIB)
LLRESIZING=.FALSE.
CALL IGRIB_CLOSE_FILE(KFILE_HANDLE)
CALL IGRIB_OPEN_FILE(KFILE_HANDLE,FILENAME(1:LFILE),'r')
ISIZE=NBIT
IF (.NOT.ALLOCATED(INGRIB)) ALLOCATE(INGRIB(ISIZE))
DO IBREAD=1,NBREAD_AGAIN
KBYTES=ISIZE*NPRECI
CALL IGRIB_READ_FROM_FILE(KFILE_HANDLE,INGRIB,KBYTES,IRET)
ENDDO
NBREAD=IBREAD-1
NBREAD_AGAIN=0

ELSEIF (IRET == JPGRIB_END_OF_FILE) THEN
WRITE(IU06,*) '**********************************'
WRITE(IU06,*) '* GETSPEC: END OF FILE ENCOUNTED'
WRITE(IU06,*) '**********************************'
CALL ABORT1
ELSEIF (IRET /= JPGRIB_SUCCESS) THEN
WRITE(IU06,*) '**********************************'
WRITE(IU06,*) '* GETSPEC: FILE HANDLING ERROR'
WRITE(IU06,*) '**********************************'
CALL ABORT1
ENDIF
ENDIF

ENDIF
Expand Down Expand Up @@ -407,40 +398,40 @@ SUBROUTINE GETSPEC(FL1, BLK2GLO, BLK2LOC, WVENVI, NBLKS, NBLKE, IREAD)
CALL IGRIB_RELEASE(KGRIB_HANDLE)

IF (CDATE /= CDTPRO) THEN
WRITE(IU06,*)'**********************************'
WRITE(IU06,*)'* *'
WRITE(IU06,*)'* FATAL ERROR IN SUB GETSPEC *'
WRITE(IU06,*)'* =========================== *'
WRITE(IU06,*)'* *'
WRITE(IU06,*)'* REQUESTED DATE IS NOT EQUAL TO *'
WRITE(IU06,*)'* RETRIEVED DATE. *'
WRITE(IU06,*)'* IN FILE: ',FILENAME
WRITE(IU06,*)'* CDATE = ',CDATE
WRITE(IU06,*)'* CDTPRO = ',CDTPRO
WRITE(IU06,*)'* *'
WRITE(IU06,*)'**********************************'
WRITE(NULERR,*)'**********************************'
WRITE(NULERR,*)'* *'
WRITE(NULERR,*)'* FATAL ERROR IN SUB GETSPEC *'
WRITE(NULERR,*)'* =========================== *'
WRITE(NULERR,*)'* *'
WRITE(NULERR,*)'* REQUESTED DATE IS NOT EQUAL TO *'
WRITE(NULERR,*)'* RETRIEVED DATE. *'
WRITE(NULERR,*)'* IN FILE: ',FILENAME
WRITE(NULERR,*)'* CDATE = ',CDATE
WRITE(NULERR,*)'* CDTPRO = ',CDTPRO
WRITE(NULERR,*)'* *'
WRITE(NULERR,*)'**********************************'
CALL ABORT1
ENDIF
IF (K /= KK) THEN
WRITE(IU06,*) '************************************'
WRITE(IU06,*) '* FATAL ERROR IN SUB. GETSPEC *'
WRITE(IU06,*) '* REQUESTED AND DECODED DIRECTIONAL*'
WRITE(IU06,*) '* INDEX ARE DIFFERENT : *'
WRITE(IU06,*) '* REQUESTED : ',K
WRITE(IU06,*) '* DECODED : ',KK
WRITE(IU06,*) '* *'
WRITE(IU06,*) '************************************'
WRITE(NULERR,*) '************************************'
WRITE(NULERR,*) '* FATAL ERROR IN SUB. GETSPEC *'
WRITE(NULERR,*) '* REQUESTED AND DECODED DIRECTIONAL*'
WRITE(NULERR,*) '* INDEX ARE DIFFERENT : *'
WRITE(NULERR,*) '* REQUESTED : ',K
WRITE(NULERR,*) '* DECODED : ',KK
WRITE(NULERR,*) '* *'
WRITE(NULERR,*) '************************************'
CALL ABORT1
ENDIF
IF (M /= MM) THEN
WRITE(IU06,*) '************************************'
WRITE(IU06,*) '* FATAL ERROR IN SUB. GETSPEC *'
WRITE(IU06,*) '* REQUESTED AND DECODED FREQUENCY *'
WRITE(IU06,*) '* INDEX ARE DIFFERENT : *'
WRITE(IU06,*) '* REQUESTED : ',M
WRITE(IU06,*) '* DECODED : ',MM
WRITE(IU06,*) '* *'
WRITE(IU06,*) '************************************'
WRITE(NULERR,*) '************************************'
WRITE(NULERR,*) '* FATAL ERROR IN SUB. GETSPEC *'
WRITE(NULERR,*) '* REQUESTED AND DECODED FREQUENCY *'
WRITE(NULERR,*) '* INDEX ARE DIFFERENT : *'
WRITE(NULERR,*) '* REQUESTED : ',M
WRITE(NULERR,*) '* DECODED : ',MM
WRITE(NULERR,*) '* *'
WRITE(NULERR,*) '************************************'
CALL ABORT1
ENDIF

Expand Down

0 comments on commit bd552cb

Please sign in to comment.