xP: manually re-add Px to other calculations for bwd compatibility

Author: knutaros

src/turbulence/cmue_a.F90

@@ -85,7 +85,7 @@ subroutine cmue_a(nlev)
 !
 ! !USES:
    use turbulence, only: eps
-   use turbulence, only: P,B,Pb,epsb
+   use turbulence, only: P,B,Px,Pb,epsb
    use turbulence, only: an,as,at,r
    use turbulence, only: cmue1,cmue2,gam
    use turbulence, only: cm0
@@ -158,7 +158,7 @@ subroutine cmue_a(nlev)
 
      do i=1,nlev-1
 
-        Pe   =   ( P(i) + B(i) )/eps(i)
+        Pe   =   ( P(i) + Px(i) + B(i) )/eps(i)
         Pbeb =   Pb(i)/epsb(i)
         r_i  =   1./r(i)
 

src/turbulence/dissipationeq.F90

@@ -122,7 +122,7 @@ subroutine dissipationeq(nlev,dt,u_taus,u_taub,z0s,z0b,h,NN,SS)
    if (sig_peps) then          ! With wave breaking
       sig_eff(nlev)=sig_e0
       do i=1,nlev-1
-         peps=(P(i)+B(i))/eps(i)
+         peps=(P(i)+Px(i)+B(i))/eps(i)
          if (peps .gt. 1.) peps=_ONE_
          sig_eff(i)=peps*sig_e+(_ONE_-peps)*sig_e0
       end do

src/turbulence/variances.F90

@@ -45,7 +45,7 @@ subroutine variances(nlev,SSU,SSV)
 !
 ! !USES:
   use turbulence,  only:     uu,vv,ww
-  use turbulence,  only:     tke,eps,P,B,num
+  use turbulence,  only:     tke,eps,P,B,Px,num
   use turbulence,  only:     cc1,ct1,a2,a3,a5
   IMPLICIT NONE
 !
@@ -90,7 +90,7 @@ subroutine variances(nlev,SSU,SSV)
       vv(i) = tke(i)*( fac1 + fac2*( fac3*num(i)*SSV(i)                &
                           - fac5*num(i)*SSU(i) - 4./3.*a5*B(i) ) )
 
-      ww(i) = tke(i)*( fac1 + fac2*( fac4*P(i) + 8./3.*a5*B(i) ) )
+      ww(i) = tke(i)*( fac1 + fac2*( fac4*(P(i)+Px(i)) + 8./3.*a5*B(i) ) )
 
    enddo