/[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.20 by mlosch, Fri Nov 19 01:34:27 2004 UTC revision 1.21 by mlosch, Tue Nov 23 20:21:13 2004 UTC
# Line 2  C $Header$ Line 2  C $Header$
2  C $Name$  C $Name$
3    
4  #include "PTRACERS_OPTIONS.h"  #include "PTRACERS_OPTIONS.h"
 cswdptr -- add ---  
 #ifdef ALLOW_GCHEM  
 # include "GCHEM_OPTIONS.h"  
 #endif  
 cswdptr -- end add ---  
5    
6  CBOP  CBOP
7  C !ROUTINE: PTRACERS_INTEGRATE  C !ROUTINE: PTRACERS_INTEGRATE
# Line 117  C (advection, [explicit] diffusion, para Line 112  C (advection, [explicit] diffusion, para
112       I                   myTime, myIter, myThid )       I                   myTime, myIter, myThid )
113    
114  C External forcing term(s)  C External forcing term(s)
 cswdptr --add --  
 #ifdef ALLOW_GCHEM  
 #ifndef PTRACERS_SEPARATE_FORCING  
        IF ( forcing_In_AB .AND. useGCHEM )  
      &    CALL GCHEM_FORCING_INT(  
      I                        bi,bj,iMin,iMax,jMin,jMax,k,  
      I                        iTracer,  
      I                        myTime,myIter, myThid)  
 #endif  
 #else  
 cswdptr - end add ---  
115         IF ( forcing_In_AB )         IF ( forcing_In_AB )
116       &   CALL PTRACERS_FORCING(       &   CALL PTRACERS_FORCING(
117       I                      bi,bj,iMin,iMax,jMin,jMax,k,       I                      bi,bj,iMin,iMax,jMin,jMax,k,iTracer,
118       U                      gPtr(1-Olx,1-Oly,1,1,1,iTracer),       U                      gPtr(1-Olx,1-Oly,1,1,1,iTracer),
119       I                      surfaceForcingPtr(1-Olx,1-Oly,1,1,iTracer),       I                      surfaceForcingPtr(1-Olx,1-Oly,1,1,iTracer),
120       I                      myIter,myTime,myThid)       I                      myIter,myTime,myThid)
 cswdptr --add---  
 #endif  
 cswdptr -- end add ---  
121    
122  C If using Adams-Bashforth II, then extrapolate tendancies  C If using Adams-Bashforth II, then extrapolate tendancies
123        IF ( PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_2ND        IF ( PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_2ND
# Line 150  C If using Adams-Bashforth II, then extr Line 131  C If using Adams-Bashforth II, then extr
131        ENDIF        ENDIF
132    
133  C External forcing term(s)  C External forcing term(s)
 cswdptr - add--  
 #ifdef ALLOW_GCHEM  
 #ifndef PTRACERS_SEPARATE_FORCING  
        IF ( .NOT.forcing_In_AB .AND. useGCHEM )  
      &    CALL GCHEM_FORCING_INT(  
      I                        bi,bj,iMin,iMax,jMin,jMax,k,  
      I                        iTracer,  
      I                        myTime,myIter, myThid)  
 #endif  
 #else  
 cswdptr - end add ---  
134         IF ( .NOT.forcing_In_AB )         IF ( .NOT.forcing_In_AB )
135       &   CALL PTRACERS_FORCING(       &   CALL PTRACERS_FORCING(
136       I                      bi,bj,iMin,iMax,jMin,jMax,k,       I                      bi,bj,iMin,iMax,jMin,jMax,k,iTracer,
137       U                      gPtr(1-Olx,1-Oly,1,1,1,iTracer),       U                      gPtr(1-Olx,1-Oly,1,1,1,iTracer),
138       I                      surfaceForcingPtr(1-Olx,1-Oly,1,1,iTracer),       I                      surfaceForcingPtr(1-Olx,1-Oly,1,1,iTracer),
139       I                      myIter,myTime,myThid)       I                      myIter,myTime,myThid)
 cswdptr - add--  
 #endif  
 cswdptr -- end add ---  
140    
141  #ifdef NONLIN_FRSURF  #ifdef NONLIN_FRSURF
142  C Account for change in level thickness  C Account for change in level thickness
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21
  ViewVC Help
Powered by ViewVC 1.1.22