/[MITgcm]/MITgcm/pkg/ptracers/ptracers_integrate.F
ViewVC logotype

Diff of /MITgcm/pkg/ptracers/ptracers_integrate.F

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

revision 1.23 by jmc, Fri Apr 15 14:23:03 2005 UTC revision 1.25 by mlosch, Mon Oct 10 05:53:48 2005 UTC
# Line 121  C External forcing term(s) Line 121  C External forcing term(s)
121       I                      myIter,myTime,myThid)       I                      myIter,myTime,myThid)
122    
123  C If using Adams-Bashforth II, then extrapolate tendancies  C If using Adams-Bashforth II, then extrapolate tendancies
124    C gPtr is now the tracer tendency for explicit advection/diffusion
125        IF ( PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_2ND        IF ( PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_2ND
126       & .OR.PTRACERS_advScheme(iTracer).EQ.ENUM_UPWIND_3RD       & .OR.PTRACERS_advScheme(iTracer).EQ.ENUM_UPWIND_3RD
127       & .OR.PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_4TH ) THEN       & .OR.PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_4TH ) THEN
128    #ifdef ALLOW_MATRIX
129    C  If matrix is being computed, block call to S/R ADAMS_BASHFORTH2 to
130    C  prevent gPtr from being replaced by the average of gPtr and gPtrNm1.    
131            IF (.NOT.useMATRIX) THEN
132    #endif          
133          iterNb = myIter          iterNb = myIter
134          IF (staggerTimeStep) iterNb = myIter - 1          IF (staggerTimeStep) iterNb = myIter - 1
135          CALL ADAMS_BASHFORTH2(          CALL ADAMS_BASHFORTH2(
# Line 131  C If using Adams-Bashforth II, then extr Line 137  C If using Adams-Bashforth II, then extr
137       U                        gPtr(1-Olx,1-Oly,1,1,1,iTracer),       U                        gPtr(1-Olx,1-Oly,1,1,1,iTracer),
138       U                        gPtrNm1(1-Olx,1-Oly,1,1,1,iTracer),       U                        gPtrNm1(1-Olx,1-Oly,1,1,1,iTracer),
139       I                        iterNb, myThid )       I                        iterNb, myThid )
140    #ifdef ALLOW_MATRIX
141            ENDIF
142    #endif    
143        ENDIF        ENDIF
144    
145  C External forcing term(s)  C External forcing term(s)
# Line 166  C Integrate forward in time, storing in Line 175  C Integrate forward in time, storing in
175       I                        gPtr(1-Olx,1-Oly,1,1,1,iTracer),       I                        gPtr(1-Olx,1-Oly,1,1,1,iTracer),
176       I                        myIter,myThid )       I                        myIter,myThid )
177    
178    #ifdef   ALLOW_OBCS
179    C Apply open boundary conditions
180             IF (useOBCS) THEN
181              CALL OBCS_APPLY_PTRACER(
182         I         bi, bj, k, iTracer,
183         U         gPtr(1-Olx,1-Oly,k,bi,bj,iTracer),
184         I         myThid )
185             END IF
186    #endif   /* ALLOW_OBCS */
187  C end of tracer loop  C end of tracer loop
188        ENDDO        ENDDO
189    
Legend:
Removed from v.1.23  
changed lines
  Added in v.1.25
  ViewVC Help
Powered by ViewVC 1.1.22