/[MITgcm]/MITgcm/model/src/calc_gs.F
ViewVC logotype

Diff of /MITgcm/model/src/calc_gs.F

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

revision 1.40 by jmc, Fri Apr 15 14:18:50 2005 UTC revision 1.41 by jmc, Sun Nov 6 22:19:08 2005 UTC
# Line 48  C     == GLobal variables == Line 48  C     == GLobal variables ==
48  #include "DYNVARS.h"  #include "DYNVARS.h"
49  #include "EEPARAMS.h"  #include "EEPARAMS.h"
50  #include "PARAMS.h"  #include "PARAMS.h"
 #include "PACKAGES_CONFIG.h"  
51  #ifdef ALLOW_GENERIC_ADVDIFF  #ifdef ALLOW_GENERIC_ADVDIFF
52  #include "GAD.h"  #include "GAD.h"
53  #endif  #endif
# Line 88  CEOP Line 87  CEOP
87  C     === Local variables ===  C     === Local variables ===
88        LOGICAL calcAdvection        LOGICAL calcAdvection
89        INTEGER iterNb        INTEGER iterNb
90    #ifdef ALLOW_ADAMSBASHFORTH_3
91          INTEGER m1, m2
92    #endif
93    
94  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
95  C--   only the kUp part of fverS is set in this subroutine  C--   only the kUp part of fverS is set in this subroutine
# Line 95  C--   the kDown is still required Line 97  C--   the kDown is still required
97        fVerS(1,1,kDown) = fVerS(1,1,kDown)        fVerS(1,1,kDown) = fVerS(1,1,kDown)
98  #endif  #endif
99    
100    C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
101    
102        calcAdvection = saltAdvection .AND. .NOT.saltMultiDimAdvec        calcAdvection = saltAdvection .AND. .NOT.saltMultiDimAdvec
103        CALL GAD_CALC_RHS(        iterNb = myIter
104          IF (staggerTimeStep) iterNb = myIter - 1
105    
106    #ifdef ALLOW_ADAMSBASHFORTH_3
107          IF ( AdamsBashforth_S ) THEN
108            m1 = 1 + MOD(iterNb+1,2)
109            m2 = 1 + MOD( iterNb ,2)
110            CALL GAD_CALC_RHS(
111         I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,
112         I           xA,yA,uTrans,vTrans,rTrans,rTransKp1,maskUp,
113         I           uVel, vVel, wVel,
114         I           diffKhS, diffK4S, KappaRS,
115         I           gsNm(1-Olx,1-Oly,1,1,1,m2), salt,
116         I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,
117         I           calcAdvection, saltImplVertAdv,
118         U           fVerS, gS,
119         I           myTime, myIter, myThid )
120          ELSE
121    #endif /* ALLOW_ADAMSBASHFORTH_3 */
122            CALL GAD_CALC_RHS(
123       I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,       I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,
124       I           xA,yA,uTrans,vTrans,rTrans,rTransKp1,maskUp,       I           xA,yA,uTrans,vTrans,rTrans,rTransKp1,maskUp,
125       I           uVel, vVel, wVel,       I           uVel, vVel, wVel,
126       I           diffKhS, diffK4S, KappaRS, Salt,       I           diffKhS, diffK4S, KappaRS, salt, salt,
127       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,
128       I           calcAdvection, saltImplVertAdv,       I           calcAdvection, saltImplVertAdv,
129       U           fVerS, gS,       U           fVerS, gS,
130       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
131    #ifdef ALLOW_ADAMSBASHFORTH_3
132          ENDIF
133    #endif
134    
135  C--   External salinity forcing term(s) inside Adams-Bashforth:  C--   External salinity forcing term(s) inside Adams-Bashforth:
136        IF ( saltForcing .AND. forcing_In_AB )        IF ( saltForcing .AND. forcing_In_AB )
# Line 112  C--   External salinity forcing term(s) Line 138  C--   External salinity forcing term(s)
138       I     iMin,iMax,jMin,jMax,bi,bj,k,       I     iMin,iMax,jMin,jMax,bi,bj,k,
139       I     myTime,myThid)       I     myTime,myThid)
140    
141        IF ( saltAdamsBashforth ) THEN        IF ( AdamsBashforthGs ) THEN
         iterNb = myIter  
         IF (staggerTimeStep) iterNb = myIter - 1  
142  #ifdef ALLOW_ADAMSBASHFORTH_3  #ifdef ALLOW_ADAMSBASHFORTH_3
143          CALL ADAMS_BASHFORTH3(          CALL ADAMS_BASHFORTH3(
144       I                        bi, bj, k,       I                        bi, bj, k,
145       U                        gS, gsNm,       U                        gS, gsNm,
146       I                        iterNb, myThid )       I                        saltStartAB, iterNb, myThid )
147  #else  #else
148          CALL ADAMS_BASHFORTH2(          CALL ADAMS_BASHFORTH2(
149       I                        bi, bj, k,       I                        bi, bj, k,
# Line 140  C--   External salinity forcing term(s) Line 164  C--   External salinity forcing term(s)
164       I                          bi, bj, k,       I                          bi, bj, k,
165       U                          gS,       U                          gS,
166       I                          myThid )       I                          myThid )
167          IF ( saltAdamsBashforth ) THEN          IF ( AdamsBashforthGs ) THEN
168  #ifdef ALLOW_ADAMSBASHFORTH_3  #ifdef ALLOW_ADAMSBASHFORTH_3
169          CALL FREESURF_RESCALE_G(          CALL FREESURF_RESCALE_G(
170       I                          bi, bj, k,       I                          bi, bj, k,
Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41
  ViewVC Help
Powered by ViewVC 1.1.22