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

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

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

revision 1.10 by jmc, Sat Jul 19 16:49:59 2014 UTC revision 1.11 by jmc, Tue Jul 22 12:04:09 2014 UTC
# Line 138  C   useVariableK :: T when vertical diff Line 138  C   useVariableK :: T when vertical diff
138        LOGICAL calcAdvection        LOGICAL calcAdvection
139        INTEGER iterNb        INTEGER iterNb
140  #ifdef ALLOW_ADAMSBASHFORTH_3  #ifdef ALLOW_ADAMSBASHFORTH_3
141        INTEGER m1, m2        INTEGER m2
142  #endif  #endif
143  #ifdef ALLOW_TIMEAVE  #ifdef ALLOW_TIMEAVE
144        LOGICAL useVariableK        LOGICAL useVariableK
# Line 306  C--   Collect forcing term in local arra Line 306  C--   Collect forcing term in local arra
306          ENDIF          ENDIF
307    
308  #ifdef ALLOW_ADAMSBASHFORTH_3  #ifdef ALLOW_ADAMSBASHFORTH_3
309          m1 = 1 + MOD(iterNb+1,2)  c       m1 = 1 + MOD(iterNb+1,2)
310          m2 = 1 + MOD( iterNb ,2)          m2 = 1 + MOD( iterNb ,2)
311          CALL GAD_CALC_RHS(          CALL GAD_CALC_RHS(
312       I           bi, bj, iMin,iMax,jMin,jMax, k, kM1, kUp, kDown,       I           bi, bj, iMin,iMax,jMin,jMax, k, kM1, kUp, kDown,
# Line 314  C--   Collect forcing term in local arra Line 314  C--   Collect forcing term in local arra
314       I           vFld(1-OLx,1-OLy,k), wFld(1-OLx,1-OLy,k),       I           vFld(1-OLx,1-OLy,k), wFld(1-OLx,1-OLy,k),
315       I           uTrans, vTrans, rTrans, rTransKp,       I           uTrans, vTrans, rTrans, rTransKp,
316       I           diffKhT, diffK4T, KappaRk(1-OLx,1-OLy,k), diffKr4T,       I           diffKhT, diffK4T, KappaRk(1-OLx,1-OLy,k), diffKr4T,
317       I           gtNm(1-OLx,1-OLy,1,1,1,m2), theta, dTtracerLev,       I           theta, gtNm(1-OLx,1-OLy,1,1,1,m2), dTtracerLev,
318       I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,       I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,
319       I           calcAdvection, tempImplVertAdv, AdamsBashforth_T,       I           calcAdvection, tempImplVertAdv, AdamsBashforth_T,
320       I           tempVertDiff4, useGMRedi, useKPP,       I           tempVertDiff4, useGMRedi, useKPP,
# Line 328  C--   Collect forcing term in local arra Line 328  C--   Collect forcing term in local arra
328       I           vFld(1-OLx,1-OLy,k), wFld(1-OLx,1-OLy,k),       I           vFld(1-OLx,1-OLy,k), wFld(1-OLx,1-OLy,k),
329       I           uTrans, vTrans, rTrans, rTransKp,       I           uTrans, vTrans, rTrans, rTransKp,
330       I           diffKhT, diffK4T, KappaRk(1-OLx,1-OLy,k), diffKr4T,       I           diffKhT, diffK4T, KappaRk(1-OLx,1-OLy,k), diffKr4T,
331       I           gtNm1, theta, dTtracerLev,       I           theta, gtNm1, dTtracerLev,
332       I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,       I           GAD_TEMPERATURE, tempAdvScheme, tempVertAdvScheme,
333       I           calcAdvection, tempImplVertAdv, AdamsBashforth_T,       I           calcAdvection, tempImplVertAdv, AdamsBashforth_T,
334       I           tempVertDiff4, useGMRedi, useKPP,       I           tempVertDiff4, useGMRedi, useKPP,
# Line 406  CADJ &     byte=isbyte,  kind = isbyte Line 406  CADJ &     byte=isbyte,  kind = isbyte
406          ENDIF          ENDIF
407  #endif /* NONLIN_FRSURF */  #endif /* NONLIN_FRSURF */
408    
409  #ifdef ALLOW_ADAMSBASHFORTH_3          CALL TIMESTEP_TRACER(
         IF ( AdamsBashforth_T ) THEN  
           CALL TIMESTEP_TRACER(  
      I           bi, bj, k, dTtracerLev(k),  
      I           gtNm(1-OLx,1-OLy,1,1,1,m2),  
      U           gT,  
      I           myIter, myThid )  
         ELSE  
 #endif  
           CALL TIMESTEP_TRACER(  
410       I           bi, bj, k, dTtracerLev(k),       I           bi, bj, k, dTtracerLev(k),
411       I           theta,       I           theta,
412       U           gT,       U           gT,
413       I           myIter, myThid )       I           myIter, myThid )
 #ifdef ALLOW_ADAMSBASHFORTH_3  
         ENDIF  
 #endif  
414    
415  C-    end of vertical index (k) loop (Nr:1)  C-    end of vertical index (k) loop (Nr:1)
416        ENDDO        ENDDO
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11
  ViewVC Help
Powered by ViewVC 1.1.22