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

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

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

revision 1.47 by jmc, Sun Feb 26 01:57:24 2006 UTC revision 1.48 by jmc, Wed Mar 1 03:08:50 2006 UTC
# Line 124  C---+----1----+----2----+----3----+----4 Line 124  C---+----1----+----2----+----3----+----4
124        IF (staggerTimeStep) iterNb = myIter -1        IF (staggerTimeStep) iterNb = myIter -1
125    
126  #ifdef ALLOW_ADAMSBASHFORTH_3  #ifdef ALLOW_ADAMSBASHFORTH_3
       IF ( AdamsBashforth_T ) THEN  
127          m1 = 1 + MOD(iterNb+1,2)          m1 = 1 + MOD(iterNb+1,2)
128          m2 = 1 + MOD( iterNb ,2)          m2 = 1 + MOD( iterNb ,2)
129          CALL GAD_CALC_RHS(          CALL GAD_CALC_RHS(
# Line 134  C---+----1----+----2----+----3----+----4 Line 133  C---+----1----+----2----+----3----+----4
133       I           diffKhT, diffK4T, KappaRT,       I           diffKhT, diffK4T, KappaRT,
134       I           gtNm(1-Olx,1-Oly,1,1,1,m2), theta,       I           gtNm(1-Olx,1-Oly,1,1,1,m2), theta,
135       I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,       I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,
136       I           calcAdvection, tempImplVertAdv,       I           calcAdvection, tempImplVertAdv, AdamsBashforth_T,
137       U           fVerT, gT,       U           fVerT, gT,
138       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
       ELSE  
         CALL GAD_CALC_RHS(  
      I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,  
      I           xA,yA,uTrans,vTrans,rTrans,rTransKp1,maskUp,  
      I           uVel, vVel, wVel,  
      I           diffKhT, diffK4T, KappaRT, theta, theta,  
      I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,  
      I           calcAdvection, tempImplVertAdv,  
      U           fVerT, gT,  
      I           myTime, myIter, myThid )  
       ENDIF  
139  #else /* ALLOW_ADAMSBASHFORTH_3 */  #else /* ALLOW_ADAMSBASHFORTH_3 */
140          CALL GAD_CALC_RHS(          CALL GAD_CALC_RHS(
141       I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,       I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,
# Line 155  C---+----1----+----2----+----3----+----4 Line 143  C---+----1----+----2----+----3----+----4
143       I           uVel, vVel, wVel,       I           uVel, vVel, wVel,
144       I           diffKhT, diffK4T, KappaRT, gtNm1, theta,       I           diffKhT, diffK4T, KappaRT, gtNm1, theta,
145       I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,       I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,
146       I           calcAdvection, tempImplVertAdv,       I           calcAdvection, tempImplVertAdv, AdamsBashforth_T,
147       U           fVerT, gT,       U           fVerT, gT,
148       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
149  #endif  #endif
Legend:
Removed from v.1.47  
changed lines
  Added in v.1.48
  ViewVC Help
Powered by ViewVC 1.1.22