/[MITgcm]/MITgcm/pkg/generic_advdiff/gad_dst3fl_adv_x.F
ViewVC logotype

Diff of /MITgcm/pkg/generic_advdiff/gad_dst3fl_adv_x.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.3.2.1 by adcroft, Tue Feb 26 16:04:48 2002 UTC revision 1.16 by jmc, Fri Apr 4 20:29:08 2014 UTC
# Line 3  C $Name$ Line 3  C $Name$
3    
4  #include "GAD_OPTIONS.h"  #include "GAD_OPTIONS.h"
5    
6        SUBROUTINE GAD_DST3FL_ADV_X(        SUBROUTINE GAD_DST3FL_ADV_X(
7       I           bi,bj,k,deltaT,       I           bi,bj,k, calcCFL, deltaTloc,
8       I           uTrans, uVel,       I           uTrans, uFld,
9       I           tracer,       I           maskLocW, tracer,
10       O           uT,       O           uT,
11       I           myThid )       I           myThid )
12  C     /==========================================================\  C     /==========================================================\
# Line 23  C     == GLobal variables == Line 23  C     == GLobal variables ==
23    
24  C     == Routine arguments ==  C     == Routine arguments ==
25        INTEGER bi,bj,k        INTEGER bi,bj,k
26        _RL deltaT        LOGICAL calcCFL
27          _RL deltaTloc
28        _RL uTrans(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL uTrans(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
29        _RL uVel(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy)        _RL uFld  (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
30          _RS maskLocW(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
31        _RL tracer(1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL tracer(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
32        _RL uT    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)        _RL uT    (1-OLx:sNx+OLx,1-OLy:sNy+OLy)
33        INTEGER myThid        INTEGER myThid
34    
35  C     == Local variables ==  C     == Local variables ==
36        INTEGER i,j        INTEGER i,j
37        _RL Rjm,Rj,Rjp,cfl,d0,d1,psiP,psiM,thetaP,thetaM        _RL Rjm,Rj,Rjp,uCFL,d0,d1,psiP,psiM,thetaP,thetaM
38          _RL thetaMax
39        DO j=1-Oly,sNy+Oly        PARAMETER( thetaMax = 1.D+20 )
40         uT(1-Olx,j)=0.D0  
41         uT(2-Olx,j)=0.D0  C- jmc: an alternative would be to compute directly psiM*Rj & psiP*Rj
42         uT(sNx+Olx,j)=0.D0  C       (if Rj*Rjm < 0 => psiP*Rj = 0 , elsef Rj > 0 ... , else  ... )
43         DO i=1-Olx+2,sNx+Olx-1  C       with no need to compute thetaM (might be easier to differentiate)
44          Rjp=(tracer(i+1,j)-tracer(i,j))*maskW(i+1,j,k,bi,bj)  
45          Rj =(tracer(i,j)-tracer(i-1,j))*maskW(i,j,k,bi,bj)        DO j=1-OLy,sNy+OLy
46          Rjm=(tracer(i-1,j)-tracer(i-2,j))*maskW(i-1,j,k,bi,bj)         uT(1-OLx,j)=0. _d 0
47           uT(2-OLx,j)=0. _d 0
48          cfl=abs(uVel(i,j,k,bi,bj)*deltaT*recip_dxc(i,j,bi,bj))         uT(sNx+OLx,j)=0. _d 0
49          d0=(2.D0-cfl)*(1.D0-cfl)*oneSixth        ENDDO
50          d1=(1.D0-cfl*cfl)*oneSixth        DO j=1-OLy,sNy+OLy
51           DO i=1-OLx+2,sNx+OLx-1
52    #if (defined ALLOW_AUTODIFF && defined TARGET_NEC_SX)
53    C     These lines make TAF create vectorizable code
54            thetaP = 0. _d 0
55            thetaM = 0. _d 0
56    #endif
57            Rjp=(tracer(i+1,j)-tracer( i ,j))*maskLocW(i+1,j)
58            Rj =(tracer( i ,j)-tracer(i-1,j))*maskLocW( i ,j)
59            Rjm=(tracer(i-1,j)-tracer(i-2,j))*maskLocW(i-1,j)
60    
61            uCFL = uFld(i,j)
62            IF ( calcCFL ) uCFL = ABS( uFld(i,j)*deltaTloc
63         &                  *recip_dxC(i,j,bi,bj)*recip_deepFacC(k) )
64            d0=(2. _d 0 -uCFL)*(1. _d 0 -uCFL)*oneSixth
65            d1=(1. _d 0 -uCFL*uCFL)*oneSixth
66    
67    C-      the old version: can produce overflow, division by zero,
68    c       and is wrong for tracer with low concentration:
69    c       thetaP=Rjm/(1.D-20+Rj)
70    c       thetaM=Rjp/(1.D-20+Rj)
71    C-      the right expression, but not bounded:
72  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)  
73  c       thetaM=0.D0  c       thetaM=0.D0
74    c       IF (Rj.NE.0.D0) thetaP=Rjm/Rj
75  c       IF (Rj.NE.0.D0) thetaM=Rjp/Rj  c       IF (Rj.NE.0.D0) thetaM=Rjp/Rj
76    C-      prevent |thetaP,M| to reach too big value:
77            IF ( ABS(Rj)*thetaMax .LE. ABS(Rjm) ) THEN
78              thetaP=SIGN(thetaMax,Rjm*Rj)
79            ELSE
80              thetaP=Rjm/Rj
81            ENDIF
82            IF ( ABS(Rj)*thetaMax .LE. ABS(Rjp) ) THEN
83              thetaM=SIGN(thetaMax,Rjp*Rj)
84            ELSE
85              thetaM=Rjp/Rj
86            ENDIF
87    
88            psiP=d0+d1*thetaP
89            psiP=MAX(0. _d 0,MIN(MIN(1. _d 0,psiP),
90         &                       thetaP*(1. _d 0 -uCFL)/(uCFL+1. _d -20) ))
91          psiM=d0+d1*thetaM          psiM=d0+d1*thetaM
92          psiM=max(0.D0, min(min(1.D0,psiM),          psiM=MAX(0. _d 0,MIN(MIN(1. _d 0,psiM),
93       &       (1.D0-cfl)/(1.D-20+cfl)*thetaM))       &                       thetaM*(1. _d 0 -uCFL)/(uCFL+1. _d -20) ))
94    
95          uT(i,j)=          uT(i,j)=
96       &   0.5*(uTrans(i,j)+abs(uTrans(i,j)))       &   0.5*(uTrans(i,j)+ABS(uTrans(i,j)))
97       &      *( Tracer(i-1,j) + psiP*Rj )       &      *( Tracer(i-1,j) + psiP*Rj )
98       &  +0.5*(uTrans(i,j)-abs(uTrans(i,j)))       &  +0.5*(uTrans(i,j)-ABS(uTrans(i,j)))
99       &      *( Tracer( i ,j) - psiM*Rj )       &      *( Tracer( i ,j) - psiM*Rj )
100    
101         ENDDO         ENDDO
Legend:
Removed from v.1.3.2.1  
changed lines
  Added in v.1.16
  ViewVC Help
Powered by ViewVC 1.1.22