Skip to content

Various syntax fixes found by FPT tool (static Fortran analysis mode) #1253

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

Merged
davegill merged 4 commits into from
Jul 22, 2020
Merged

Various syntax fixes found by FPT tool (static Fortran analysis mode) #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e677b0f
Starting changes for WRF_fpt_regression
JCollinsSimCon Jul 13, 2020
ed7742d
Removed duplicate + sign
JCollinsSimCon Jul 13, 2020
6cf16be
Final changes to support WRF_fpt_regression
JCollinsSimCon Jul 13, 2020
ad51e7d
Eliminate the commented out "rm xx0.f90", etc
davegill Jul 15, 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
2 changes: 1 addition & 1 deletion dyn_em/module_first_rk_step_part1.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& ,iopt_tbot=config_flags%opt_tbot, iopt_stc=config_flags%opt_stc &
& ,iopt_gla=config_flags%opt_gla, iopt_rsf=config_flags%opt_rsf &
& ,iopt_soil=config_flags%opt_soil, iopt_pedo=config_flags%opt_pedo &
& ,iopt_crop=config_flags%opt_crop
& ,iopt_crop=config_flags%opt_crop &
& , isnowxy=grid%isnowxy , tvxy=grid%tvxy , tgxy=grid%tgxy &
& ,canicexy=grid%canicexy ,canliqxy=grid%canliqxy, eahxy=grid%eahxy &
& , tahxy=grid%tahxy , cmxy=grid%cmxy , chxy=grid%chxy &
Expand Down
26 changes: 13 additions & 13 deletions external/io_grib2/bacio-1.3/baciof.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ SUBROUTINE BAOPEN(LU,CFN,IRET)
USE BACIO_MODULE
CHARACTER CFN*(*)
CHARACTER(80) CMSG
INTEGER SIZE = 1
INTEGER :: SIZE = 1

C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(LU.LT.001.OR.LU.GT.999) THEN
Expand Down Expand Up @@ -132,7 +132,7 @@ SUBROUTINE BAOPENR(LU,CFN,IRET)
C$$$
USE BACIO_MODULE
CHARACTER CFN*(*)
INTEGER SIZE = 1
INTEGER :: SIZE = 1
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(LU.LT.001.OR.LU.GT.999) THEN
IRET=6
Expand Down Expand Up @@ -174,7 +174,7 @@ SUBROUTINE BAOPENW(LU,CFN,IRET)
C$$$
USE BACIO_MODULE
CHARACTER CFN*(*)
INTEGER SIZE = 1
INTEGER :: SIZE = 1
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(LU.LT.001.OR.LU.GT.999) THEN
IRET=6
Expand Down Expand Up @@ -216,7 +216,7 @@ SUBROUTINE BAOPENWT(LU,CFN,IRET)
C$$$
USE BACIO_MODULE
CHARACTER CFN*(*)
INTEGER SIZE = 1
INTEGER :: SIZE = 1
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(LU.LT.001.OR.LU.GT.999) THEN
IRET=6
Expand Down Expand Up @@ -258,7 +258,7 @@ SUBROUTINE BAOPENWA(LU,CFN,IRET)
C$$$
USE BACIO_MODULE
CHARACTER CFN*(*)
INTEGER SIZE = 1
INTEGER :: SIZE = 1
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(LU.LT.001.OR.LU.GT.999) THEN
IRET=6
Expand Down Expand Up @@ -299,7 +299,7 @@ SUBROUTINE BACLOSE(LU,IRET)
C
C$$$
USE BACIO_MODULE
INTEGER SIZE = 1
INTEGER :: SIZE = 1
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(LU.LT.001.OR.LU.GT.999) THEN
IRET=6
Expand Down Expand Up @@ -356,8 +356,8 @@ SUBROUTINE BAREAD(LU,IB,NB,KA,A)
CHARACTER Y(NY,MY)
DATA LUX/0/
SAVE JY,NS,NN,Y,LUX
INTEGER SIZE=1
INTEGER ZERO=0
INTEGER :: SIZE=1
INTEGER :: ZERO=0
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(FD(LU).LE.0) THEN
KA=0
Expand All @@ -375,7 +375,7 @@ SUBROUTINE BAREAD(LU,IB,NB,KA,A)
C UNBUFFERED I/O
IF(BAOPTS(1).NE.1) THEN
IF(IB.GE.0) THEN

IRET=BACIO(BACIO_READ,IB,JB,SIZE,NB,KA,FD(LU),CFN,A)
ELSE
IRET=BACIO(BACIO_READ+BACIO_NOSEEK,ZERO,JB,SIZE,NB,KA,
Expand Down Expand Up @@ -469,8 +469,8 @@ SUBROUTINE BAWRITE(LU,IB,NB,KA,A)
USE BACIO_MODULE
CHARACTER A(NB)
CHARACTER CFN
INTEGER SIZE=1
INTEGER ZERO=0
INTEGER :: SIZE=1
INTEGER :: ZERO=0
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(FD(LU).LE.0) THEN
KA=0
Expand Down Expand Up @@ -524,8 +524,8 @@ SUBROUTINE WRYTE(LU,NB,A)
USE BACIO_MODULE
CHARACTER A(NB)
CHARACTER CFN
INTEGER SIZE=1
INTEGER ZERO=0
INTEGER :: SIZE=1
INTEGER :: ZERO=0
C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IF(FD(LU).LE.0) THEN
RETURN
Expand Down
16 changes: 0 additions & 16 deletions frame/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,82 +89,66 @@ $(LIBTARGET) : $(MODULES) $(OBJS) $(SPECIAL) $(NLOBJS) $(ALOBJS)
nl_set_0_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=0 -I../inc -DNL_set_ROUTINES nl_access_routines.F > xx0.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) xx0.f90
$(RM) xx0.f90

nl_set_1_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=1 -I../inc -DNL_set_ROUTINES nl_access_routines.F > xx1.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) xx1.f90
$(RM) xx1.f90

nl_set_2_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=2 -I../inc -DNL_set_ROUTINES nl_access_routines.F > xx2.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) xx2.f90
$(RM) xx2.f90

nl_set_3_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=3 -I../inc -DNL_set_ROUTINES nl_access_routines.F > xx3.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) xx3.f90
$(RM) xx3.f90

nl_set_4_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=4 -I../inc -DNL_set_ROUTINES nl_access_routines.F > xx4.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) xx4.f90
$(RM) xx4.f90

nl_set_5_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=5 -I../inc -DNL_set_ROUTINES nl_access_routines.F > xx5.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) xx5.f90
$(RM) xx5.f90

nl_set_6_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=6 -I../inc -DNL_set_ROUTINES nl_access_routines.F > xx6.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) xx6.f90
$(RM) xx6.f90

nl_set_7_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=7 -I../inc -DNL_set_ROUTINES nl_access_routines.F > xx7.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) xx7.f90
$(RM) xx7.f90

nl_get_0_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=0 -I../inc -DNL_get_ROUTINES nl_access_routines.F > yy0.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) yy0.f90
$(RM) yy0.f90

nl_get_1_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=1 -I../inc -DNL_get_ROUTINES nl_access_routines.F > yy1.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) yy1.f90
$(RM) yy1.f90

nl_get_2_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=2 -I../inc -DNL_get_ROUTINES nl_access_routines.F > yy2.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) yy2.f90
$(RM) yy2.f90

nl_get_3_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=3 -I../inc -DNL_get_ROUTINES nl_access_routines.F > yy3.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) yy3.f90
$(RM) yy3.f90

nl_get_4_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=4 -I../inc -DNL_get_ROUTINES nl_access_routines.F > yy4.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) yy4.f90
$(RM) yy4.f90

nl_get_5_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=5 -I../inc -DNL_get_ROUTINES nl_access_routines.F > yy5.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) yy5.f90
$(RM) yy5.f90

nl_get_6_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=6 -I../inc -DNL_get_ROUTINES nl_access_routines.F > yy6.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) yy6.f90
$(RM) yy6.f90

nl_get_7_routines.o : nl_access_routines.F module_configure.o
$(CPP) -DNNN=7 -I../inc -DNL_get_ROUTINES nl_access_routines.F > yy7.f90
$(FC) -o $@ -c $(PROMOTION) $(FCNOOPT) $(FCBASEOPTS_NO_G) $(MODULE_DIRS) $(FCSUFFIX) yy7.f90
$(RM) yy7.f90

wrf_num_bytes_between.o :
$(CC) -c $(CFLAGS) wrf_num_bytes_between.c
Expand Down
2 changes: 1 addition & 1 deletion phys/module_bl_mynn.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3027,7 +3027,7 @@ SUBROUTINE mynn_tendencies(kts,kte, &
& 0.5*dtz(k)*(s_aw(k)-s_aw(k+1))
c(k)= -dtz(k)*khdz(k+1)/rho(k) - 0.5*dtz(k)*s_aw(k+1)
d(k)=thl(k) + tcd(k)*delt + dtz(k)*(s_awthl(k)-s_awthl(k+1)) + &
& + diss_heat(k)*delt*dheat_opt + &
& diss_heat(k)*delt*dheat_opt + &
& sub_thl(k)*delt + det_thl(k)*delt
ENDDO

Expand Down