/[MITgcm]/MITgcm/pkg/kpp/kpp_transport_s.F
ViewVC logotype

Diff of /MITgcm/pkg/kpp/kpp_transport_s.F

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

revision 1.12 by jmc, Thu May 3 21:33:42 2007 UTC revision 1.15 by atn, Fri Dec 21 02:54:34 2007 UTC
# Line 34  C     == GLobal variables == Line 34  C     == GLobal variables ==
34  #include "KPP.h"  #include "KPP.h"
35  #include "KPP_PARAMS.h"  #include "KPP_PARAMS.h"
36  #ifdef ALLOW_GMREDI  #ifdef ALLOW_GMREDI
37  #include "GMREDI.h"  # include "GMREDI.h"
38    #endif
39    #ifdef ALLOW_SALT_PLUME
40    # include "SALT_PLUME.h"
41  #endif  #endif
42    
43  C     == Routine arguments ==  C     == Routine arguments ==
# Line 55  C     myThid :: My Thread Id. number Line 58  C     myThid :: My Thread Id. number
58  C     == Local variables ==  C     == Local variables ==
59  C     I, J - Loop counters  C     I, J - Loop counters
60        INTEGER I, J        INTEGER I, J
61        _RL tmpFac        _RL tmpFac, tmpFac1
62    
63    
64    #ifdef ALLOW_SALT_PLUME
65          IF ( useSALT_PLUME ) THEN
66             tmpFac1 = 1. _d 0
67          ELSE
68             tmpFac1 = 0. _d 0
69          ENDIF
70    #endif /* ALLOW_SALT_PLUME */
71    
72  #ifdef ALLOW_GMREDI  #ifdef ALLOW_GMREDI
73    
# Line 69  C     I, J - Loop counters Line 81  C     I, J - Loop counters
81          df(i,j) = - _rA(i,j,bi,bj)          df(i,j) = - _rA(i,j,bi,bj)
82       &        *( KPPdiffKzS(i,j,k,bi,bj) + tmpFac*Kwz(i,j,k,bi,bj) )       &        *( KPPdiffKzS(i,j,k,bi,bj) + tmpFac*Kwz(i,j,k,bi,bj) )
83       &        *KPPghat(i,j,km1,bi,bj)       &        *KPPghat(i,j,km1,bi,bj)
84       &        *surfaceForcingS(i,j,bi,bj)       &        *( surfaceForcingS(i,j,bi,bj)
85    #ifdef ALLOW_SALT_PLUME
86         &          + tmpFac1*saltPlumeFlux(i,j,bi,bj)*recip_rhoConst
87         &          *(1.-KPPplumefrac(i,j,bi,bj))
88    #endif /* ALLOW_SALT_PLUME */
89         &         )
90         ENDDO         ENDDO
91        ENDDO        ENDDO
92    
# Line 80  C     I, J - Loop counters Line 97  C     I, J - Loop counters
97          df(i,j) = - _rA(i,j,bi,bj)          df(i,j) = - _rA(i,j,bi,bj)
98       &        *KPPdiffKzS(i,j,k,bi,bj)       &        *KPPdiffKzS(i,j,k,bi,bj)
99       &        *KPPghat(i,j,km1,bi,bj)       &        *KPPghat(i,j,km1,bi,bj)
100       &        *surfaceForcingS(i,j,bi,bj)       &        *( surfaceForcingS(i,j,bi,bj)
101    #ifdef ALLOW_SALT_PLUME
102         &          + tmpFac1*saltPlumeFlux(i,j,bi,bj)*recip_rhoConst
103         &          *(1.-KPPplumefrac(i,j,bi,bj))
104    #endif /* ALLOW_SALT_PLUME */
105         &         )
106         ENDDO         ENDDO
107        ENDDO        ENDDO
108    

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.15

  ViewVC Help
Powered by ViewVC 1.1.22