36 |
INTEGER i,j |
INTEGER i,j |
37 |
_RL Rjm,Rj,Rjp,cfl,d0,d1,psiP,psiM,thetaP,thetaM |
_RL Rjm,Rj,Rjp,cfl,d0,d1,psiP,psiM,thetaP,thetaM |
38 |
_RL uFld |
_RL uFld |
39 |
|
_RL thetaMax |
40 |
|
PARAMETER( thetaMax = 1.D+20 ) |
41 |
|
|
42 |
|
C- jmc: an alternative would be to compute directly psiM*Rj & psiP*Rj |
43 |
|
C (if Rj*Rjm < 0 => psiP*Rj = 0 , elsef Rj > 0 ... , else ... ) |
44 |
|
C with no need to compute thetaM (might be easier to differentiate) |
45 |
|
|
46 |
DO j=1-Oly,sNy+Oly |
DO j=1-Oly,sNy+Oly |
47 |
uT(1-Olx,j)=0.D0 |
uT(1-Olx,j)=0. _d 0 |
48 |
uT(2-Olx,j)=0.D0 |
uT(2-Olx,j)=0. _d 0 |
49 |
uT(sNx+Olx,j)=0.D0 |
uT(sNx+Olx,j)=0. _d 0 |
50 |
DO i=1-Olx+2,sNx+Olx-1 |
DO i=1-Olx+2,sNx+Olx-1 |
51 |
Rjp=(tracer(i+1,j)-tracer( i ,j))*maskLocW(i+1,j) |
Rjp=(tracer(i+1,j)-tracer( i ,j))*maskLocW(i+1,j) |
52 |
Rj =(tracer( i ,j)-tracer(i-1,j))*maskLocW( i ,j) |
Rj =(tracer( i ,j)-tracer(i-1,j))*maskLocW( i ,j) |
56 |
uFld = uTrans(i,j)*recip_dyG(i,j,bi,bj) |
uFld = uTrans(i,j)*recip_dyG(i,j,bi,bj) |
57 |
& *recip_drF(k)*recip_hFacW(i,j,k,bi,bj) |
& *recip_drF(k)*recip_hFacW(i,j,k,bi,bj) |
58 |
cfl=abs(uFld*deltaTloc*recip_dxC(i,j,bi,bj)) |
cfl=abs(uFld*deltaTloc*recip_dxC(i,j,bi,bj)) |
59 |
d0=(2.D0-cfl)*(1.D0-cfl)*oneSixth |
d0=(2. _d 0 -cfl)*(1. _d 0 -cfl)*oneSixth |
60 |
d1=(1.D0-cfl*cfl)*oneSixth |
d1=(1. _d 0 -cfl*cfl)*oneSixth |
61 |
|
|
62 |
|
C- the old version: can produce overflow, division by zero, |
63 |
|
c and is wrong for tracer with low concentration: |
64 |
|
c thetaP=Rjm/(1.D-20+Rj) |
65 |
|
c thetaM=Rjp/(1.D-20+Rj) |
66 |
|
C- the right expression, but not bounded: |
67 |
c thetaP=0.D0 |
c thetaP=0.D0 |
|
c IF (Rj.NE.0.D0) thetaP=Rjm/Rj |
|
|
thetaP=Rjm/(1.D-20+Rj) |
|
|
psiP=d0+d1*thetaP |
|
|
psiP=max(0.D0, min(min(1.D0,psiP), |
|
|
& (1.D0-cfl)/(1.D-20+cfl)*thetaP)) |
|
|
thetaM=Rjp/(1.D-20+Rj) |
|
68 |
c thetaM=0.D0 |
c thetaM=0.D0 |
69 |
|
c IF (Rj.NE.0.D0) thetaP=Rjm/Rj |
70 |
c IF (Rj.NE.0.D0) thetaM=Rjp/Rj |
c IF (Rj.NE.0.D0) thetaM=Rjp/Rj |
71 |
|
C- prevent |thetaP,M| to reach too big value: |
72 |
|
IF ( ABS(Rj)*thetaMax .LE. ABS(Rjm) ) THEN |
73 |
|
thetaP=SIGN(thetaMax,Rjm*Rj) |
74 |
|
ELSE |
75 |
|
thetaP=Rjm/Rj |
76 |
|
ENDIF |
77 |
|
IF ( ABS(Rj)*thetaMax .LE. ABS(Rjp) ) THEN |
78 |
|
thetaM=SIGN(thetaMax,Rjp*Rj) |
79 |
|
ELSE |
80 |
|
thetaM=Rjp/Rj |
81 |
|
ENDIF |
82 |
|
|
83 |
|
psiP=d0+d1*thetaP |
84 |
|
psiP=MAX(0. _d 0, MIN(MIN(1. _d 0,psiP), |
85 |
|
& thetaP*(1. _d 0 -cfl)/(cfl+1. _d -20) )) |
86 |
psiM=d0+d1*thetaM |
psiM=d0+d1*thetaM |
87 |
psiM=max(0.D0, min(min(1.D0,psiM), |
psiM=MAX(0. _d 0, MIN(MIN(1. _d 0,psiM), |
88 |
& (1.D0-cfl)/(1.D-20+cfl)*thetaM)) |
& thetaM*(1. _d 0 -cfl)/(cfl+1. _d -20) )) |
89 |
|
|
90 |
uT(i,j)= |
uT(i,j)= |
91 |
& 0.5*(uTrans(i,j)+abs(uTrans(i,j))) |
& 0.5*(uTrans(i,j)+abs(uTrans(i,j))) |
92 |
& *( Tracer(i-1,j) + psiP*Rj ) |
& *( Tracer(i-1,j) + psiP*Rj ) |