Skip to content

Commit

Permalink
Merge branch 'develop' into feature/cycle_frac2
Browse files Browse the repository at this point in the history
Fixes #549.
  • Loading branch information
GeorgeGayno-NOAA committed Jan 19, 2024
2 parents 2948941 + 93b4884 commit 599cf2a
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions sorc/global_cycle.fd/cycle.f90
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
!! file.
!! - $NST_FILE Gaussian GSI file which contains NSST
!! TREF increments
!! - $LND_SOI_FILE Gaussian GSI file which contains soil state
!! - $LND_SOI_FILE.$NNN Gaussian GSI file which contains soil state
!! increments
!! - xainc.$NNN The cubed-sphere increment file (contains
!! increments calculated by JEDI on the native
Expand Down Expand Up @@ -377,6 +377,7 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LENSFC,LSOIL,DELTSFC, &
INTEGER, DIMENSION(LENSFC) :: STC_UPDATED, SLC_UPDATED

LOGICAL :: FILE_EXISTS, DO_SOI_INC, DO_SNO_INC
CHARACTER(LEN=3) :: RANKCH

!--------------------------------------------------------------------------------
! NST_FILE is the path/name of the gaussian GSI file which contains NSST
Expand Down Expand Up @@ -457,7 +458,7 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LENSFC,LSOIL,DELTSFC, &
print *, 'FATAL ERROR: land increment update does not work with fractional grids.'
call MPI_ABORT(MPI_COMM_WORLD, 17, IERR)
ENDIF
! identify variables to be updates, and allocate arrays.
! identify variables to be updated, and allocate arrays.
IF (TRIM(LND_SOI_FILE) .NE. "NULL") THEN
DO_SOI_INC = .TRUE.
PRINT*
Expand Down Expand Up @@ -724,6 +725,10 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LENSFC,LSOIL,DELTSFC, &
! read increments in
!--------------------------------------------------------------------------------

WRITE(RANKCH, '(I3.3)') (MYRANK+1)

LND_SOI_FILE = trim(LND_SOI_FILE) // "." // RANKCH

INQUIRE(FILE=trim(LND_SOI_FILE), EXIST=file_exists)
IF (.not. file_exists) then
print *, 'FATAL ERROR: land increment update requested, but file does not exist: ', &
Expand Down

0 comments on commit 599cf2a

Please sign in to comment.