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

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

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

revision 1.5 by dimitri, Thu Apr 5 00:02:49 2007 UTC revision 1.6 by dimitri, Thu Apr 5 22:51:48 2007 UTC
# Line 78  CEOP Line 78  CEOP
78           DO i = 1-Olx,sNx+Olx           DO i = 1-Olx,sNx+Olx
79            KappaRTr(i,j,k) =            KappaRTr(i,j,k) =
80       &         IVDConvCount(i,j,k,bi,bj)*ivdc_kappa       &         IVDConvCount(i,j,k,bi,bj)*ivdc_kappa
81  #if (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL))  #if (defined ALLOW_3D_DIFFKR || \
82         (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL)))
83       &       + diffKr(i,j,k,bi,bj)       &       + diffKr(i,j,k,bi,bj)
84  #else  #else
85       &       + diffKr3dT(i,j,k,bi,bj)       &       + diffKrNrT(k)
86  #endif  #endif
87       &       + KbryanLewis79       &       + KbryanLewis79
88           ENDDO           ENDDO
# Line 97  CEOP Line 98  CEOP
98           DO i = 1-Olx, sNx+Olx           DO i = 1-Olx, sNx+Olx
99            KappaRTr(i,j,k) =            KappaRTr(i,j,k) =
100       &         IVDConvCount(i,j,k,bi,bj)*ivdc_kappa       &         IVDConvCount(i,j,k,bi,bj)*ivdc_kappa
101  #if (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL))  #if (defined ALLOW_3D_DIFFKR || \
102         (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL)))
103       &       + diffKr(i,j,k,bi,bj)       &       + diffKr(i,j,k,bi,bj)
104  #else  #else
105       &       + diffKr3dS(i,j,k,bi,bj)       &       + diffKrNrS(k)
106  #endif  #endif
107       &       + KbryanLewis79       &       + KbryanLewis79
108           ENDDO           ENDDO
# Line 119  CEOP Line 121  CEOP
121           DO i = 1-Olx, sNx+Olx           DO i = 1-Olx, sNx+Olx
122            KappaRTr(i,j,k) =            KappaRTr(i,j,k) =
123       &         IVDConvCount(i,j,k,bi,bj)*ivdc_kappa       &         IVDConvCount(i,j,k,bi,bj)*ivdc_kappa
124  #if (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL))  #if (defined ALLOW_3D_DIFFKR || \
125         (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL)))
126       &       + diffKr(i,j,k,bi,bj)       &       + diffKr(i,j,k,bi,bj)
127  #else  #else
128       &       + PTRACERS_diffKrNr(k,iTr)       &       + PTRACERS_diffKrNr(k,iTr)
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6
  ViewVC Help
Powered by ViewVC 1.1.22