Skip to content

Commit f80f9eb

Browse files
author
Joe Hamman
committed
fix uh_river convolution bug (missing diagonals), remove 32-bit underflow protection
1 parent f00e31b commit f80f9eb

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FFLAGS = -O -C -ffixed-line-length-none
2020
#for debugging
2121
#FFLAGS = -C -g -lm -ffixed-line-length-none
2222

23-
FC=g77
23+
FC=gfortran
2424

2525
HFILES= parameter.h
2626

src/unit_hyd_routines.f

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,11 @@ SUBROUTINE MAKE_UHM(UH,VELO,DIFF,XMASK,NCOL,NROW,LE,DT,
2121
DO K = 1,LE
2222
T = T + DT
2323
IF (VELO(I,J) .GT. 0.0) THEN
24-
POT = ((VELO(I,J)*T-XMASK(I,J))**2.0)/
25-
& (4.0*DIFF(I,J)*T)
26-
IF (POT .GT. 69.0) THEN
27-
H = 0.0
28-
ELSE
29-
H = 1.0/(2.0*SQRT(PI*DIFF(I,J))) *
24+
POT = ((VELO(I,J)*T-XMASK(I,J))**2.0)/(4.0*DIFF(I,J)*T)
25+
H = 1.0/(2.0*SQRT(PI*DIFF(I,J))) *
3026
& XMASK(I,J)/(T**1.5) * EXP(-POT)
31-
END IF
3227
ELSE
33-
H = 0.0
28+
H = 0.0
3429
END IF
3530
UH(I,J,K) = H
3631
END DO
@@ -115,8 +110,8 @@ SUBROUTINE MAKE_GRID_UH
115110
IF ((I .NE. PI) .OR. (J .NE. PJ)) THEN
116111
DO T = 1, TMAX
117112
DO L = 1, LE
118-
IF ((T-L) .GT. 0) THEN
119-
FR(T,2) = FR(T,2) + FR(T-L,1)*UHM(I,J,L)
113+
IF ((T-L) .GE. 0) THEN
114+
FR(T,2) = FR(T,2) + FR(T-L+1,1)*UHM(I,J,L)
120115
END IF
121116
END DO
122117
END DO

0 commit comments

Comments
 (0)