/[MITgcm]/MITgcm/pkg/generic_advdiff/gad_advection.F
ViewVC logotype

Diff of /MITgcm/pkg/generic_advdiff/gad_advection.F

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

revision 1.56 by jmc, Fri Feb 8 15:04:28 2008 UTC revision 1.57 by jmc, Fri Feb 8 20:03:36 2008 UTC
# Line 147  c     _RS maskUp  (1-OLx:sNx+OLx,1-OLy:s Line 147  c     _RS maskUp  (1-OLx:sNx+OLx,1-OLy:s
147  #endif  #endif
148  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
149        CHARACTER*8 diagName        CHARACTER*8 diagName
150        CHARACTER*4 GAD_DIAG_SUFX, diagSufx        CHARACTER*4 diagSufx
151          LOGICAL     doDiagAdvX, doDiagAdvY, doDiagAdvR
152    C-    Functions:
153          CHARACTER*4 GAD_DIAG_SUFX
154        EXTERNAL    GAD_DIAG_SUFX        EXTERNAL    GAD_DIAG_SUFX
155          LOGICAL  DIAGNOSTICS_IS_ON
156          EXTERNAL DIAGNOSTICS_IS_ON
157  #endif  #endif
158  CEOP  CEOP
159    
# Line 167  CEOP Line 172  CEOP
172       &                      + act2*max0*max1       &                      + act2*max0*max1
173       &                      + act3*max0*max1*max2       &                      + act3*max0*max1*max2
174       &                      + act4*max0*max1*max2*max3       &                      + act4*max0*max1*max2*max3
175            if (tracerIdentity.GT.maxpass) then            IF (tracerIdentity.GT.maxpass) THEN
176               print *, 'ph-pass gad_advection ', maxpass, tracerIdentity               print *, 'ph-pass gad_advection ', maxpass, tracerIdentity
177               STOP 'maxpass seems smaller than tracerIdentity'               STOP 'maxpass seems smaller than tracerIdentity'
178            endif            ENDIF
179  #endif /* ALLOW_AUTODIFF_TAMC */  #endif /* ALLOW_AUTODIFF_TAMC */
180    
181  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
182  C--   Set diagnostic suffix for the current tracer  C--   Set diagnostics flags and suffix for the current tracer
183          doDiagAdvX = .FALSE.
184          doDiagAdvY = .FALSE.
185          doDiagAdvR = .FALSE.
186        IF ( useDiagnostics ) THEN        IF ( useDiagnostics ) THEN
187          diagSufx = GAD_DIAG_SUFX( tracerIdentity, myThid )          diagSufx = GAD_DIAG_SUFX( tracerIdentity, myThid )
188            diagName = 'ADVx'//diagSufx
189            doDiagAdvX = DIAGNOSTICS_IS_ON( diagName, myThid )
190            diagName = 'ADVy'//diagSufx
191            doDiagAdvY = DIAGNOSTICS_IS_ON( diagName, myThid )
192            diagName = 'ADVr'//diagSufx
193            doDiagAdvR = DIAGNOSTICS_IS_ON( diagName, myThid )
194        ENDIF        ENDIF
195  #endif  #endif
196    
# Line 670  C-    horizontal advection done; store i Line 684  C-    horizontal advection done; store i
684        ENDIF        ENDIF
685    
686  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
687          IF ( useDiagnostics ) THEN          IF ( doDiagAdvX ) THEN
688            diagName = 'ADVx'//diagSufx            diagName = 'ADVx'//diagSufx
689            CALL DIAGNOSTICS_FILL(afx,diagName, k,1, 2,bi,bj, myThid)            CALL DIAGNOSTICS_FILL(afx,diagName, k,1, 2,bi,bj, myThid)
690            ENDIF
691            IF ( doDiagAdvY ) THEN
692            diagName = 'ADVy'//diagSufx            diagName = 'ADVy'//diagSufx
693            CALL DIAGNOSTICS_FILL(afy,diagName, k,1, 2,bi,bj, myThid)            CALL DIAGNOSTICS_FILL(afy,diagName, k,1, 2,bi,bj, myThid)
694          ENDIF          ENDIF
# Line 834  C--   Divergence of vertical fluxes Line 850  C--   Divergence of vertical fluxes
850          ENDDO          ENDDO
851    
852  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
853          IF ( useDiagnostics ) THEN          IF ( doDiagAdvR ) THEN
854            diagName = 'ADVr'//diagSufx            diagName = 'ADVr'//diagSufx
855            CALL DIAGNOSTICS_FILL( fVerT(1-Olx,1-Oly,kUp),            CALL DIAGNOSTICS_FILL( fVerT(1-Olx,1-Oly,kUp),
856       &                           diagName, k,1, 2,bi,bj, myThid)       &                           diagName, k,1, 2,bi,bj, myThid)
Legend:
Removed from v.1.56  
changed lines
  Added in v.1.57
  ViewVC Help
Powered by ViewVC 1.1.22