/[MITgcm]/MITgcm/pkg/ptracers/ptracers_calc_diff.F
ViewVC logotype

Diff of /MITgcm/pkg/ptracers/ptracers_calc_diff.F

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

revision 1.6 by dfer, Tue Feb 12 23:02:47 2008 UTC revision 1.7 by jahn, Fri Jun 26 23:10:10 2009 UTC
# Line 30  C     == GLobal variables == Line 30  C     == GLobal variables ==
30  #include "PARAMS.h"  #include "PARAMS.h"
31  #include "GRID.h"  #include "GRID.h"
32  #include "DYNVARS.h"  #include "DYNVARS.h"
33    #ifdef ALLOW_LONGSTEP
34    #include "LONGSTEP.h"
35    #endif
36  #include "PTRACERS_SIZE.h"  #include "PTRACERS_SIZE.h"
37  #include "PTRACERS_PARAMS.h"  #include "PTRACERS_PARAMS.h"
38  c #include "PTRACERS_FIELDS.h"  c #include "PTRACERS_FIELDS.h"
# Line 75  C Loop over tracers Line 78  C Loop over tracers
78          DO j = 1-Oly, sNy+Oly          DO j = 1-Oly, sNy+Oly
79           DO i = 1-Olx, sNx+Olx           DO i = 1-Olx, sNx+Olx
80            KappaRtr(i,j,iTr) =            KappaRtr(i,j,iTr) =
81    #ifdef ALLOW_LONGSTEP
82         &         LS_IVDConvCount(i,j,k,bi,bj)*ivdc_kappa
83    #else
84       &         IVDConvCount(i,j,k,bi,bj)*ivdc_kappa       &         IVDConvCount(i,j,k,bi,bj)*ivdc_kappa
85    #endif
86  #if (defined ALLOW_3D_DIFFKR || \  #if (defined ALLOW_3D_DIFFKR || \
87       (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL)))       (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL)))
88       &       + diffKr(i,j,k,bi,bj)       &       + diffKr(i,j,k,bi,bj)
# Line 93  C Loop over tracers Line 100  C Loop over tracers
100  #ifdef ALLOW_KPP  #ifdef ALLOW_KPP
101          IF ( PTRACERS_useKPP(iTr) ) THEN          IF ( PTRACERS_useKPP(iTr) ) THEN
102  C--   Set vertical diffusivity contribution from KPP  C--   Set vertical diffusivity contribution from KPP
103           CALL KPP_CALC_DIFF_S(           CALL KPP_CALC_DIFF_PTR(
104       I        bi,bj,iMin+1,iMax,jMin+1,jMax,k,1,       I        bi,bj,iMin+1,iMax,jMin+1,jMax,k,1,
105       O        KappaRtr(1-Olx,1-Oly,iTr),       O        KappaRtr(1-Olx,1-Oly,iTr),
106       I        myThid)       I        myThid)
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7
  ViewVC Help
Powered by ViewVC 1.1.22