Changeset 657 for codes/icosagcm/devel/src/kernels_hex/compute_NH_geopot.k90

Timestamp:

12/30/17 01:56:49 (7 years ago)

Author:

dubos

Message:

devel/hex : updated kernels

File:

• codes/icosagcm/devel/src/kernels_hex/compute_NH_geopot.k90 (modified) (2 diffs)

codes/icosagcm/devel/src/kernels_hex/compute_NH_geopot.k90

@@ -4 +4 @@
    g2=g*g
    gm2 = 1./g2
+   vreff = Treff*cpp/preff*kappa
    gamma = 1./(1.-kappa)
    !$OMP BARRIER
@@ -30 +31 @@
             DO ij=ij_omp_begin_ext,ij_omp_end_ext
                rho_ij = (g*m_ik(ij,l))/(Phi_il(ij,l+1)-Phi_il(ij,l))
-               X_ij = Treff*exp(theta(ij,l)/cpp) ! theta = Tref.exp(s/Cp)
-               X_ij = (cpp/preff)*kappa*X_ij*rho_ij
-               p_ik(ij,l) = preff*(X_ij**gamma)
+               X_ij = log(vreff*rho_ij) + theta(ij,l)/cpp
+               p_ik(ij,l) = preff*exp(X_ij*gamma)
                c2_mik = gamma*p_ik(ij,l)/(rho_ij*m_ik(ij,l)) ! c^2 = gamma*R*T = gamma*p/rho
                A_ik(ij,l) = c2_mik*(tau/g*rho_ij)**2