/[MITgcm]/MITgcm/model/src/do_oceanic_phys.F
ViewVC logotype

Diff of /MITgcm/model/src/do_oceanic_phys.F

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

revision 1.115 by heimbach, Sat Apr 28 19:04:57 2012 UTC revision 1.116 by jmc, Wed Jun 27 22:36:15 2012 UTC
# Line 563  c#endif /* ALLOW_AUTODIFF_TAMC */ Line 563  c#endif /* ALLOW_AUTODIFF_TAMC */
563  C--       Calculate gradients of potential density for isoneutral  C--       Calculate gradients of potential density for isoneutral
564  C         slope terms (e.g. GM/Redi tensor or IVDC diffusivity)  C         slope terms (e.g. GM/Redi tensor or IVDC diffusivity)
565            IF ( useGMRedi .OR. (k.GT.1 .AND. ivdc_kappa.NE.0.)            IF ( useGMRedi .OR. (k.GT.1 .AND. ivdc_kappa.NE.0.)
566         &         .OR. usePP81 .OR. useMY82 .OR. useGGL90
567       &         .OR. useSALT_PLUME .OR. doDiagsRho.GE.1 ) THEN       &         .OR. useSALT_PLUME .OR. doDiagsRho.GE.1 ) THEN
568              IF (k.GT.1) THEN              IF (k.GT.1) THEN
569  #ifdef ALLOW_AUTODIFF_TAMC  #ifdef ALLOW_AUTODIFF_TAMC
# Line 742  C--     Compute PP81 mixing coefficients Line 743  C--     Compute PP81 mixing coefficients
743            IF (debugMode) CALL DEBUG_CALL('PP81_CALC',myThid)            IF (debugMode) CALL DEBUG_CALL('PP81_CALC',myThid)
744  #endif  #endif
745            CALL PP81_CALC(            CALL PP81_CALC(
746       I                  bi, bj, myTime, myThid )       I                     bi, bj, sigmaR, myTime, myIter, myThid )
747          ENDIF          ENDIF
748  #endif /* ALLOW_PP81 */  #endif /* ALLOW_PP81 */
749    
# Line 753  C--     Compute MY82 mixing coefficients Line 754  C--     Compute MY82 mixing coefficients
754            IF (debugMode) CALL DEBUG_CALL('MY82_CALC',myThid)            IF (debugMode) CALL DEBUG_CALL('MY82_CALC',myThid)
755  #endif  #endif
756            CALL MY82_CALC(            CALL MY82_CALC(
757       I                  bi, bj, myTime, myThid )       I                     bi, bj, sigmaR, myTime, myIter, myThid )
758          ENDIF          ENDIF
759  #endif /* ALLOW_MY82 */  #endif /* ALLOW_MY82 */
760    
# Line 769  C--     Compute GGL90 mixing coefficient Line 770  C--     Compute GGL90 mixing coefficient
770  #endif  #endif
771            CALL TIMER_START('GGL90_CALC [DO_OCEANIC_PHYS]', myThid)            CALL TIMER_START('GGL90_CALC [DO_OCEANIC_PHYS]', myThid)
772            CALL GGL90_CALC(            CALL GGL90_CALC(
773       I                  bi, bj, myTime, myIter, myThid )       I                     bi, bj, sigmaR, myTime, myIter, myThid )
774            CALL TIMER_STOP ('GGL90_CALC [DO_OCEANIC_PHYS]', myThid)            CALL TIMER_STOP ('GGL90_CALC [DO_OCEANIC_PHYS]', myThid)
775          ENDIF          ENDIF
776  #endif /* ALLOW_GGL90 */  #endif /* ALLOW_GGL90 */
Legend:
Removed from v.1.115  
changed lines
  Added in v.1.116
  ViewVC Help
Powered by ViewVC 1.1.22