Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for 1000 mb HGT corrupted at RRFS 3KM parallel run. #396

Merged
merged 5 commits into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.0.9
10.0.10
2 changes: 2 additions & 0 deletions sorc/ncep_post.fd/MDL2P.f
Original file line number Diff line number Diff line change
Expand Up @@ -3866,6 +3866,8 @@ SUBROUTINE MDL2P(iostatusD3D)
ENDIF
Z1000(I,J) = GRID1(I,J)*GI
GRID1(I,J) = Z1000(I,J)
ELSE
GRID1(I,J) = SPVAL
END IF
ENDDO
ENDDO
Expand Down
15 changes: 5 additions & 10 deletions sorc/ncep_post.fd/SLP_new.f
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
! ARE COMMENTED OUT FOR NOW
! 19-10-30 Bo CUI - REMOVE "GOTO" STATEMENT
! 21-07-26 W Meng - Restrict computation from undefined grids
! 21-09-25 W Meng - Further modification for restricting computation
! from undefined grids.
!
! USAGE: CALL SLPSIG FROM SUBROUITNE ETA2P
!
Expand Down Expand Up @@ -109,7 +111,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
TNEW(I,J) = spval


LMHO(I,J) = 0
LMHO(I,J) = LSM
DONE(I,J) = .FALSE.
ENDDO
ENDDO
Expand All @@ -127,7 +129,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
DO J=JSTA,JEND
DO I=1,IM

HTMO(I,J,L)=spval
HTMO(I,J,L)=1.
if(PSLP(I,J)<spval) then

PSFC = PSLP(I,J)
Expand Down Expand Up @@ -259,12 +261,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
DO J=JSTA_M,JEND_M
DO I=2,IM-1

!if(PSLP(I,J)<spval) then
if(HTM2D(I-1,J)<spval.and.HTM2D(I+1,J)<spval.and. &
HTM2D(I,J-1)<spval.and.HTM2D(I,J+1)<spval.and. &
HTM2D(I-1,J-1)<spval.and.HTM2D(I+1,J-1)<spval.and. &
HTM2D(I-1,J+1)<spval.and.HTM2D(I+1,J+1)<spval.and. &
TPRES(I,J,L)<spval.and.QPRES(I,J,L)<spval)then
if(PSLP(I,J)<spval) then

!HC IF(HTM2D(I,J,L)>0.5.AND.
!HC 1 HTM2D(I+IHW(J),J-1,L)*HTM2D(I+IHE(J),J-1,L)
Expand All @@ -278,8 +275,6 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
IF(HTM2D(I,J) > 0.5 .AND. tem < 0.5) then
TTV(I,J) = TPRES(I,J,L)*(1.+0.608*QPRES(I,J,L))
ENDIF
else
TTV(I,J) = spval
! if(i==ii.and.j==jj)print*,'Debug:L,TTV B SMOO= ',l,TTV(I,J)
end if ! spval
ENDDO
Expand Down