/[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.35 by jmc, Mon Nov 5 18:48:04 2007 UTC revision 1.36 by jmc, Mon Dec 17 22:03:15 2007 UTC
# Line 27  C !USES: =============================== Line 27  C !USES: ===============================
27  #include "DYNVARS.h"  #include "DYNVARS.h"
28  #include "PTRACERS_SIZE.h"  #include "PTRACERS_SIZE.h"
29  #include "PTRACERS_PARAMS.h"  #include "PTRACERS_PARAMS.h"
30    #include "PTRACERS_RESTART.h"
31  #include "PTRACERS_FIELDS.h"  #include "PTRACERS_FIELDS.h"
32  #include "GAD.h"  #include "GAD.h"
33  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
# Line 45  C  uTrans               :: zonal transpo Line 46  C  uTrans               :: zonal transpo
46  C  vTrans               :: meridional transport in level k  C  vTrans               :: meridional transport in level k
47  C  rTrans               :: vertical volume transport at interface k  C  rTrans               :: vertical volume transport at interface k
48  C  rTransKp1            :: vertical volume transport at interface k+1  C  rTransKp1            :: vertical volume transport at interface k+1
49  C  KappaRtr             :: vertical diffusion of passive tracers, interf k  C  KappaRtr             :: vertical diffusion of passive tracers, interf k
50  C  rFlx                 :: vertical flux  C  rFlx                 :: vertical flux
51  C  myTime               :: model time  C  myTime               :: model time
52  C  myIter               :: time-step number  C  myIter               :: time-step number
53  C  myThid               :: thread number  C  myThid               :: thread number
# Line 83  C  GAD_TR               :: passive trace Line 84  C  GAD_TR               :: passive trace
84        INTEGER kUp,kDown,km1        INTEGER kUp,kDown,km1
85        INTEGER GAD_TR        INTEGER GAD_TR
86        LOGICAL calcAdvection        LOGICAL calcAdvection
87        INTEGER iterNb, startAB        INTEGER iterNb
88  CEOP  CEOP
89    
90  C Loop ranges for daughter routines  C Loop ranges for daughter routines
# Line 128  CADJ &      = comlev1_bibj_k_ptracers, k Line 129  CADJ &      = comlev1_bibj_k_ptracers, k
129    
130  C Calculate active tracer tendencies (gPtr) due to internal processes  C Calculate active tracer tendencies (gPtr) due to internal processes
131  C (advection, [explicit] diffusion, parameterizations,...)  C (advection, [explicit] diffusion, parameterizations,...)
132         calcAdvection = .NOT.multiDimAdvection         calcAdvection = .NOT.PTRACERS_MultiDimAdv(iTracer)
      &      .OR. PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_2ND  
      &      .OR. PTRACERS_advScheme(iTracer).EQ.ENUM_UPWIND_3RD  
      &      .OR. PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_4TH  
133         GAD_TR = GAD_TR1 + iTracer - 1         GAD_TR = GAD_TR1 + iTracer - 1
134         CALL GAD_CALC_RHS(         CALL GAD_CALC_RHS(
135       I                   bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,       I                   bi,bj,iMin,iMax,jMin,jMax,k,km1,kUp,kDown,
136       I                   xA, yA, maskUp, uFld, vFld, wFld,       I                   xA, yA, maskUp, uFld, vFld, wFld,
137       I                   uTrans, vTrans, rTrans, rTransKp1,       I                   uTrans, vTrans, rTrans, rTransKp1,
138       I                   PTRACERS_diffKh(iTracer),       I                   PTRACERS_diffKh(iTracer),
# Line 163  C External forcing term(s) Line 161  C External forcing term(s)
161    
162  C If using Adams-Bashforth II, then extrapolate tendencies  C If using Adams-Bashforth II, then extrapolate tendencies
163  C gPtr is now the tracer tendency for explicit advection/diffusion  C gPtr is now the tracer tendency for explicit advection/diffusion
164        IF ( PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_2ND        IF ( PTRACERS_AdamsBashGtr(iTracer) ) THEN
      & .OR.PTRACERS_advScheme(iTracer).EQ.ENUM_UPWIND_3RD  
      & .OR.PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_4TH ) THEN  
165  #ifdef ALLOW_MATRIX  #ifdef ALLOW_MATRIX
166  C  If matrix is being computed, block call to S/R ADAMS_BASHFORTH2 to  C  If matrix is being computed, block call to S/R ADAMS_BASHFORTH2 to
167  C  prevent gPtr from being replaced by the average of gPtr and gpTrNm1.  C  prevent gPtr from being replaced by the average of gPtr and gpTrNm1.
# Line 173  C  prevent gPtr from being replaced by t Line 169  C  prevent gPtr from being replaced by t
169  #endif  #endif
170          iterNb = myIter          iterNb = myIter
171          IF (staggerTimeStep) iterNb = myIter - 1          IF (staggerTimeStep) iterNb = myIter - 1
         startAB = nIter0 - PTRACERS_Iter0  
172          CALL ADAMS_BASHFORTH2(          CALL ADAMS_BASHFORTH2(
173       I                        bi,bj,K,       I                      bi,bj,K,
174       U                        gPtr(1-Olx,1-Oly,1,1,1,iTracer),       U                      gPtr(1-Olx,1-Oly,1,1,1,iTracer),
175       U                        gpTrNm1(1-Olx,1-Oly,1,1,1,iTracer),       U                      gpTrNm1(1-Olx,1-Oly,1,1,1,iTracer),
176       I                        startAB, iterNb, myThid )       I                      PTRACERS_startAB(iTracer), iterNb, myThid )
177  #ifdef ALLOW_MATRIX  #ifdef ALLOW_MATRIX
178          ENDIF          ENDIF
179  #endif  #endif
# Line 199  C Account for change in level thickness Line 194  C Account for change in level thickness
194       I                          bi,bj,K,       I                          bi,bj,K,
195       U                          gPtr(1-Olx,1-Oly,1,1,1,iTracer),       U                          gPtr(1-Olx,1-Oly,1,1,1,iTracer),
196       I                          myThid )       I                          myThid )
197          IF ( PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_2ND          IF ( PTRACERS_AdamsBashGtr(iTracer) ) THEN
      &   .OR.PTRACERS_advScheme(iTracer).EQ.ENUM_UPWIND_3RD  
      &   .OR.PTRACERS_advScheme(iTracer).EQ.ENUM_CENTERED_4TH )  
198       &  CALL FREESURF_RESCALE_G(       &  CALL FREESURF_RESCALE_G(
199       I                          bi,bj,K,       I                          bi,bj,K,
200       U                          gpTrNm1(1-Olx,1-Oly,1,1,1,iTracer),       U                          gpTrNm1(1-Olx,1-Oly,1,1,1,iTracer),
# Line 224  C Apply open boundary conditions Line 217  C Apply open boundary conditions
217       I         bi, bj, k, iTracer,       I         bi, bj, k, iTracer,
218       U         gPtr(1-Olx,1-Oly,k,bi,bj,iTracer),       U         gPtr(1-Olx,1-Oly,k,bi,bj,iTracer),
219       I         myThid )       I         myThid )
220           END IF           ENDIF
221  #endif   /* ALLOW_OBCS */  #endif   /* ALLOW_OBCS */
222  C end of tracer loop  C end of tracer loop
223        ENDDO        ENDDO
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36
  ViewVC Help
Powered by ViewVC 1.1.22