/[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.42 by heimbach, Thu Dec 8 15:44:33 2005 UTC revision 1.44 by jmc, Wed Mar 1 03:08:50 2006 UTC
# Line 125  C---+----1----+----2----+----3----+----4 Line 125  C---+----1----+----2----+----3----+----4
125        IF (staggerTimeStep) iterNb = myIter - 1        IF (staggerTimeStep) iterNb = myIter - 1
126    
127  #ifdef ALLOW_ADAMSBASHFORTH_3  #ifdef ALLOW_ADAMSBASHFORTH_3
       IF ( AdamsBashforth_S ) THEN  
128          m1 = 1 + MOD(iterNb+1,2)          m1 = 1 + MOD(iterNb+1,2)
129          m2 = 1 + MOD( iterNb ,2)          m2 = 1 + MOD( iterNb ,2)
130          CALL GAD_CALC_RHS(          CALL GAD_CALC_RHS(
# Line 135  C---+----1----+----2----+----3----+----4 Line 134  C---+----1----+----2----+----3----+----4
134       I           diffKhS, diffK4S, KappaRS,       I           diffKhS, diffK4S, KappaRS,
135       I           gsNm(1-Olx,1-Oly,1,1,1,m2), salt,       I           gsNm(1-Olx,1-Oly,1,1,1,m2), salt,
136       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,
137       I           calcAdvection, saltImplVertAdv,       I           calcAdvection, saltImplVertAdv, AdamsBashforth_S,
138       U           fVerS, gS,       U           fVerS, gS,
139       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
140        ELSE  #else /* ALLOW_ADAMSBASHFORTH_3 */
 #endif /* ALLOW_ADAMSBASHFORTH_3 */  
141          CALL GAD_CALC_RHS(          CALL GAD_CALC_RHS(
142       I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,       I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,
143       I           xA,yA,uTrans,vTrans,rTrans,rTransKp1,maskUp,       I           xA,yA,uTrans,vTrans,rTrans,rTransKp1,maskUp,
144       I           uVel, vVel, wVel,       I           uVel, vVel, wVel,
145       I           diffKhS, diffK4S, KappaRS, salt, salt,       I           diffKhS, diffK4S, KappaRS, gsNm1, salt,
146       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,
147       I           calcAdvection, saltImplVertAdv,       I           calcAdvection, saltImplVertAdv, AdamsBashforth_S,
148       U           fVerS, gS,       U           fVerS, gS,
149       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
150  #ifdef ALLOW_ADAMSBASHFORTH_3  #endif /* ALLOW_ADAMSBASHFORTH_3 */
       ENDIF  
 #endif  
151    
152  C--   External salinity forcing term(s) inside Adams-Bashforth:  C--   External salinity forcing term(s) inside Adams-Bashforth:
153        IF ( saltForcing .AND. forcing_In_AB )        IF ( saltForcing .AND. forcing_In_AB )
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.44
  ViewVC Help
Powered by ViewVC 1.1.22