--- MITgcm/pkg/kpp/kpp_transport_s.F 2007/12/21 02:54:34 1.15 +++ MITgcm/pkg/kpp/kpp_transport_s.F 2010/01/20 01:32:50 1.16 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/kpp/kpp_transport_s.F,v 1.15 2007/12/21 02:54:34 atn Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/kpp/kpp_transport_s.F,v 1.16 2010/01/20 01:32:50 jmc Exp $ C $Name: $ #include "KPP_OPTIONS.h" @@ -6,23 +6,23 @@ #include "GMREDI_OPTIONS.h" #endif - subroutine KPP_TRANSPORT_S ( + SUBROUTINE KPP_TRANSPORT_S ( I iMin,iMax,jMin,jMax,bi,bj,k,km1, O df, I myTime, myIter, myThid ) -C /==========================================================\ -C | o SUBROUTINE KPP_TRANSPORT_S | -C | Add non local KPP transport term (ghat) to diffusive | -C | salinity flux. | -C |==========================================================| -C | The nonlocal transport term is nonzero only for scalars | -C | in unstable (convective) forcing conditions. | -C | Note: KPPdiffKzS(-,k) is defined at the top of grid cell | -C | k while KPPghat(i,j,k,bi,bj) is defined at the | -C | bottom of grid cell k. | -C | For K=1, KPPdiffKzS(-,k) = 0 which insures no flux | -C | through the surface. | -C \==========================================================/ +C *==========================================================* +C | o SUBROUTINE KPP_TRANSPORT_S +C | Add non local KPP transport term (ghat) to diffusive +C | salinity flux. +C *==========================================================* +C | The nonlocal transport term is nonzero only for scalars +C | in unstable (convective) forcing conditions. +C | Note: KPPdiffKzS(-,k) is defined at the top of grid cell +C | k while KPPghat(i,j,k,bi,bj) is defined at the +C | bottom of grid cell k. +C | For K=1, KPPdiffKzS(-,k) = 0 which insures no flux +C | through the surface. +C *==========================================================* IMPLICIT NONE C == GLobal variables == @@ -58,8 +58,14 @@ C == Local variables == C I, J - Loop counters INTEGER I, J - _RL tmpFac, tmpFac1 +#ifdef ALLOW_GMREDI + _RL tmpFac +#endif +#ifdef ALLOW_SALT_PLUME + _RL tmpFac1 +#endif +C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----| #ifdef ALLOW_SALT_PLUME IF ( useSALT_PLUME ) THEN @@ -108,7 +114,6 @@ #endif /* ALLOW_GMREDI */ - #endif /* ALLOW_KPP and KPP_GHAT */ RETURN