/[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.48 by jmc, Wed Apr 4 01:39:06 2007 UTC revision 1.49 by heimbach, Fri Jul 27 22:18:57 2007 UTC
# Line 270  C--   Make local copy of tracer array an Line 270  C--   Make local copy of tracer array an
270         ENDDO         ENDDO
271        ENDDO        ENDDO
272    
273  #ifndef ALLOW_AUTODIFF_TAMC  cph-exch2#ifndef ALLOW_AUTODIFF_TAMC
274        IF (useCubedSphereExchange) THEN        IF (useCubedSphereExchange) THEN
275          withSigns = .FALSE.          withSigns = .FALSE.
276          CALL FILL_CS_CORNER_UV_RS(          CALL FILL_CS_CORNER_UV_RS(
277       &            withSigns, maskLocW,maskLocS, bi,bj, myThid )       &            withSigns, maskLocW,maskLocS, bi,bj, myThid )
278        ENDIF        ENDIF
279  #endif  cph-exch2#endif
280    
281  C--   Multiple passes for different directions on different tiles  C--   Multiple passes for different directions on different tiles
282  C--   For cube need one pass for each of red, green and blue axes.  C--   For cube need one pass for each of red, green and blue axes.
# Line 347  C       a) needed in overlap only Line 347  C       a) needed in overlap only
347  C   and b) the overlap of myTile are not cube-face Edges  C   and b) the overlap of myTile are not cube-face Edges
348         IF ( .NOT.overlapOnly .OR. N_edge .OR. S_edge ) THEN         IF ( .NOT.overlapOnly .OR. N_edge .OR. S_edge ) THEN
349    
350  #ifndef ALLOW_AUTODIFF_TAMC  cph-exch2#ifndef ALLOW_AUTODIFF_TAMC
351  C-     Internal exchange for calculations in X  C-     Internal exchange for calculations in X
352  #ifdef MULTIDIM_OLD_VERSION  #ifdef MULTIDIM_OLD_VERSION
353          IF ( useCubedSphereExchange ) THEN          IF ( useCubedSphereExchange ) THEN
# Line 357  C-     Internal exchange for calculation Line 357  C-     Internal exchange for calculation
357  #endif  #endif
358           CALL FILL_CS_CORNER_TR_RL( .TRUE., localTij, bi,bj, myThid )           CALL FILL_CS_CORNER_TR_RL( .TRUE., localTij, bi,bj, myThid )
359          ENDIF          ENDIF
360  #endif  cph-exch2#endif
361    
362  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
363  # ifndef DISABLE_MULTIDIM_ADVECTION  # ifndef DISABLE_MULTIDIM_ADVECTION
# Line 396  CADJ &     comlev1_bibj_k_gad_pass, key= Line 396  CADJ &     comlev1_bibj_k_gad_pass, key=
396  C-     Advective flux in X : done  C-     Advective flux in X : done
397         ENDIF         ENDIF
398    
399  #ifndef ALLOW_AUTODIFF_TAMC  cph-exch2#ifndef ALLOW_AUTODIFF_TAMC
400  C-     Internal exchange for next calculations in Y  C-     Internal exchange for next calculations in Y
401         IF ( overlapOnly .AND. ipass.EQ.1 ) THEN         IF ( overlapOnly .AND. ipass.EQ.1 ) THEN
402           CALL FILL_CS_CORNER_TR_RL(.FALSE., localTij, bi,bj, myThid )           CALL FILL_CS_CORNER_TR_RL(.FALSE., localTij, bi,bj, myThid )
403         ENDIF         ENDIF
404  #endif  cph-exch2#endif
405    
406  C-     Update the local tracer field where needed:  C-     Update the local tracer field where needed:
407    
# Line 513  C       a) needed in overlap only Line 513  C       a) needed in overlap only
513  C   and b) the overlap of myTile are not cube-face edges  C   and b) the overlap of myTile are not cube-face edges
514         IF ( .NOT.overlapOnly .OR. E_edge .OR. W_edge ) THEN         IF ( .NOT.overlapOnly .OR. E_edge .OR. W_edge ) THEN
515    
516  #ifndef ALLOW_AUTODIFF_TAMC  cph-exch2#ifndef ALLOW_AUTODIFF_TAMC
517  C-     Internal exchange for calculations in Y  C-     Internal exchange for calculations in Y
518  #ifdef MULTIDIM_OLD_VERSION  #ifdef MULTIDIM_OLD_VERSION
519          IF ( useCubedSphereExchange ) THEN          IF ( useCubedSphereExchange ) THEN
# Line 523  C-     Internal exchange for calculation Line 523  C-     Internal exchange for calculation
523  #endif  #endif
524           CALL FILL_CS_CORNER_TR_RL(.FALSE., localTij, bi,bj, myThid )           CALL FILL_CS_CORNER_TR_RL(.FALSE., localTij, bi,bj, myThid )
525          ENDIF          ENDIF
526  #endif  cph-exch2#endif
527    
528  C-     Advective flux in Y  C-     Advective flux in Y
529          DO j=1-Oly,sNy+Oly          DO j=1-Oly,sNy+Oly
# Line 569  CADJ &     comlev1_bibj_k_gad_pass, key= Line 569  CADJ &     comlev1_bibj_k_gad_pass, key=
569  C-     Advective flux in Y : done  C-     Advective flux in Y : done
570         ENDIF         ENDIF
571    
572  #ifndef ALLOW_AUTODIFF_TAMC  cph-exch2#ifndef ALLOW_AUTODIFF_TAMC
573  C-     Internal exchange for next calculations in X  C-     Internal exchange for next calculations in X
574         IF ( overlapOnly .AND. ipass.EQ.1 ) THEN         IF ( overlapOnly .AND. ipass.EQ.1 ) THEN
575           CALL FILL_CS_CORNER_TR_RL( .TRUE., localTij, bi,bj, myThid )           CALL FILL_CS_CORNER_TR_RL( .TRUE., localTij, bi,bj, myThid )
576         ENDIF         ENDIF
577  #endif  cph-exch2#endif
578    
579  C-     Update the local tracer field where needed:  C-     Update the local tracer field where needed:
580    
Legend:
Removed from v.1.48  
changed lines
  Added in v.1.49
  ViewVC Help
Powered by ViewVC 1.1.22