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.

Sign up for GitHub

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

Post refactor p1 #196

Merged
merged 37 commits into from
Nov 5, 2020
Merged

Post refactor p1 #196

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
144a1ed
20200820 Jesse Meng refactor branch of remove goto remove grib1
Aug 20, 2020
2624f6a
Merge pull request #1 from JesseMeng-NOAA/refactor
JesseMeng-NOAA Aug 26, 2020
4561a9f
Merge remote-tracking branch 'upstream/develop' into develop
Aug 27, 2020
87ed987
20200901 Jesse Meng remove redundant LAI output in SURFCE.f
Sep 1, 2020
7b53831
20200901 Jesse Meng continue merging refactor to develop
Sep 1, 2020
1462143
20200911 Jesse Meng add precisions to selected variables
Sep 11, 2020
8f87f14
20200911 Jesse Meng revert the precision changes
Sep 11, 2020
753108b
20200924 Jesse Meng update with EMC_post/develop
Sep 24, 2020
c9449e3
20200924 Jesse Meng update with EMC_post/develop
Sep 24, 2020
861ede9
CALMICT.f: modified, keep using “go to”
BoCui-NOAA Oct 8, 2020
4938dbf
Improve removal of go to statements
BoCui-NOAA Oct 13, 2020
3117795
Improve removal of go to statements
BoCui-NOAA Oct 13, 2020
b2a6957
Improve removal of go to statements
BoCui-NOAA Oct 16, 2020
3b1ffb3
Sync with upstream/develop.
WenMeng-NOAA Oct 21, 2020
c2fb7ae
Improve removal of go to statements
BoCui-NOAA Oct 22, 2020
bd8dc0f
Merge branch 'post_refactor_p1' of github.com:WenMeng-NOAA/EMC_post i…
BoCui-NOAA Oct 22, 2020
65ed943
Improve removal of go to statements
BoCui-NOAA Oct 23, 2020
215f645
Improve removal of go to statements
BoCui-NOAA Oct 24, 2020
26588e9
Update code for removing goto in GSL ceiling calculations.
hu5970 Oct 26, 2020
0b2ce99
Merge branch 'post_refactor_p1' of https://github.com/WenMeng-NOAA/EM…
hu5970 Oct 26, 2020
d162bf6
Suggested code for removing goto.
hu5970 Oct 26, 2020
2c1f3a7
Improve removal of go to statements
BoCui-NOAA Oct 26, 2020
9b08379
20201027 Jesse Meng update remove grib1 based on reviewer's comments
Oct 27, 2020
ba5eb9c
20201028 Bo Cui:improve removal of go to and clean code
BoCui-NOAA Oct 28, 2020
b726281
20201028 Bo Cui: improve removal of go to
BoCui-NOAA Oct 28, 2020
f2a8cb9
Clean up the grib1 routine GRIBIT.
WenMeng-NOAA Oct 29, 2020
4f0f89e
Add the changes from Huiya in SLP_NMM.f.
WenMeng-NOAA Oct 29, 2020
e40c8de
Add the changes from Huiya in SLP_new.f.
WenMeng-NOAA Oct 30, 2020
6a15e1c
Remove "GO TO 222" in MDL2P.f
hu5970 Oct 30, 2020
1e57614
Add some tweakings in TRPAUS.f and TRPAUS_NAM.f.
WenMeng-NOAA Nov 2, 2020
24e9244
Tweaking for WETFRZLVL.f.
WenMeng-NOAA Nov 2, 2020
cc7394f
clean code MDLFLD.f SERVER.f SLP_NMM.f WETBULB.f
BoCui-NOAA Nov 2, 2020
cfcedfe
Add tweaking in MDLFLD.f.
WenMeng-NOAA Nov 2, 2020
6cb36a9
Merge remote-tracking branch 'upstream/develop' into post_refactor_p1
WenMeng-NOAA Nov 2, 2020
73e966a
20201102 code clean
BoCui-NOAA Nov 2, 2020
4895f57
Add tweaking from Ming's comments.
WenMeng-NOAA Nov 3, 2020
a31fdac
Merge remote-tracking branch 'upstream/develop' into post_refactor_p1
WenMeng-NOAA Nov 3, 2020
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
15 changes: 13 additions & 2 deletions sorc/ncep_post.fd/AVIATION.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ SUBROUTINE CALLLWS(U,V,H,LLWS)
! . . .
! SUBPROGRAM: CALLLWS COMPUTES Low Level Wind Shear (0-2000feet)
! PRGRMMR: Binbin Zhou /NCEP/EMC DATE: 2005-08-16
! 19-10-30 Bo CUI - REMOVE "GOTO" STATEMENT

!
! ABSTRACT:
! This program computes the low level wind shear(LLWS) over 0-2000 feet (0-609.5m)
Expand Down Expand Up @@ -90,6 +92,7 @@ SUBROUTINE CALLLWS(U,V,H,LLWS)
REAL :: Z1,Z2,HZ1,DH,U2,V2,W2,RT
INTEGER :: K1,K2
integer I,J,LP
logical :: jcontinue=.true.

!***************************************************************
!
Expand All @@ -114,6 +117,10 @@ SUBROUTINE CALLLWS(U,V,H,LLWS)

DH = 0.0

! Bo Cui 10/30/2019, remove "go to" statement

jcontinue=.true.
if(jcontinue) then
IF((HZ1+10).GT.609.6) THEN !Then, search 2000ft(609.6m) location
U2= U10(I,J) + (U(I,J,K1-1)-U10(I,J))*599.6/HZ1 !found it between K1-1 and K1, then linear
V2= V10(I,J) + (V(I,J,K1-1)-V10(I,J))*599.6/HZ1 !interpolate to get wind at 2000ft U2,V2
Expand All @@ -127,16 +134,19 @@ SUBROUTINE CALLLWS(U,V,H,LLWS)
U2=U(I,J,LP)+RT*(U(I,J,LP-1)-U(I,J,LP))
V2=V(I,J,LP)+RT*(V(I,J,LP-1)-V(I,J,LP))
K2=LP
GO TO 610
jcontinue=.false.
exit
! GO TO 610
END IF
END DO
END IF
endif ! for jcontinue

!computer vector difference
610 LLWS(I,J)=SQRT((U2-U10(I,J))**2+(V2-V10(I,J))**2)/ &
609.6 * 1.943*609.6 !unit: knot/2000ft
jcontinue=.true.


ENDDO

100 CONTINUE
Expand Down Expand Up @@ -237,6 +247,7 @@ SUBROUTINE CALCAT(U,V,H,U_OLD,V_OLD,H_OLD,CAT)
! PROGRAM HISTORY LOG:
!
! 05-09-19 H CHUANG - MODIFIED TO COMPUTE GRADIENTS FOR BOTH A AND E GRIDS
! 10-30-19 Bo CUI - REMOVE "GOTO" STATEMENT
!
!
! According to Ellrod, the CAT is classied into 3 levels (index)
Expand Down
16 changes: 13 additions & 3 deletions sorc/ncep_post.fd/CALHEL.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ SUBROUTINE CALHEL(DEPTH,UST,VST,HELI,USHR1,VSHR1,USHR6,VSHR6)
! NMM WRFPOST CODE
! 05=02-25 H CHUANG - ADD COMPUTATION FOR ARW A GRID
! 05-07-07 BINBIN ZHOU - ADD RSM FOR A GRID
! 19-10-30 Bo CUI - REMOVE "GOTO" STATEMENT
!
! USAGE: CALHEL(UST,VST,HELI)
! INPUT ARGUMENT LIST:
Expand Down Expand Up @@ -129,6 +130,8 @@ SUBROUTINE CALHEL(DEPTH,UST,VST,HELI,USHR1,VSHR1,USHR6,VSHR6)
integer ISTART,ISTOP,JSTART,JSTOP
real Z2,DZABV,UMEAN5,VMEAN5,UMEAN1,VMEAN1,UMEAN6,VMEAN6, &
DENOM,Z1,Z3,DZ,DZ1,DZ2,DU1,DU2,DV1,DV2

logical :: jcontinue=.true.
!
!****************************************************************
! START CALHEL HERE
Expand Down Expand Up @@ -285,10 +288,13 @@ SUBROUTINE CALHEL(DEPTH,UST,VST,HELI,USHR1,VSHR1,USHR6,VSHR6)
!
! CASE WHERE THERE IS NO LEVEL WITH HEIGHT BETWEEN 5500 AND 6000
!
! Bo Cui 10/30/2019, remove "go to" statement

DO J=JSTART,JSTOP
DO I=ISTART,ISTOP
if(jcontinue) then
WenMeng-NOAA marked this conversation as resolved.
Show resolved Hide resolved
IF (COUNT5(I,J) == 0) THEN
DO L=LM,1,-1
lloop: DO L=LM,1,-1
IE=I+IVE(J)
IW=I+IVW(J)
JN=J+JVN
Expand All @@ -304,11 +310,15 @@ SUBROUTINE CALHEL(DEPTH,UST,VST,HELI,USHR1,VSHR1,USHR6,VSHR6)
UST5(I,J) = UST5(I,J) + UH(I,J,L)
VST5(I,J) = VST5(I,J) + VH(I,J,L)
COUNT5(I,J) = 1
GOTO 30
jcontinue=.false.
exit lloop
! GOTO 30
ENDIF
ENDDO
ENDDO lloop
ENDIF
endif ! for jcontinue
30 CONTINUE
jcontinue=.true.
ENDDO
ENDDO

Expand Down
6 changes: 5 additions & 1 deletion sorc/ncep_post.fd/CALLCL.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ SUBROUTINE CALLCL(P1D,T1D,Q1D,PLCL,ZLCL)
! 98-06-16 T BLACK - CONVERSION FROM 1-D TO 2-D
! 00-01-04 JIM TUCCILLO - MPI VERSION
! 02-04-24 MIKE BALDWIN - WRF VERSION
! 19-10-30 Bo CUI - REMOVE "GOTO" STATEMENT
!
! USAGE: CALL CALLCL(P1D,T1D,Q1D,PLCL,ZLCL)
! INPUT ARGUMENT LIST:
Expand Down Expand Up @@ -82,6 +83,8 @@ SUBROUTINE CALLCL(P1D,T1D,Q1D,PLCL,ZLCL)
!
! COMPUTE PRESSURE, TEMPERATURE AND AGL HEIGHT AT LCL.
!
! Bo Cui 10/30/2019, remove "GOTO" statement

DO 30 J=JSTA_M,JEND_M
DO 30 I=2,IM-1
! DO 30 I=1,IM
Expand All @@ -101,7 +104,8 @@ SUBROUTINE CALLCL(P1D,T1D,Q1D,PLCL,ZLCL)
DALP = ALPINT(I,J,L) - ALPINT(I,J,L+1)
DZ = ZINT(I,J,L) - ZINT(I,J,L+1)
ZLCL(I,J) = max(D00, ZINT(I,J,L+1) + DZ*DLPLCL/DALP - ZSFC)
GOTO 30
! GOTO 30
exit
ENDIF
20 CONTINUE
30 CONTINUE
Expand Down
Loading