Changeset 935 for codes/icosagcm/devel/src/kernels_unst/caldyn_fast.k90

Timestamp:

07/03/19 17:15:11 (5 years ago)

Author:

dubos

Message:

devel : interfaces for caldyn_fast and caldyn_slow_hydro

File:

• codes/icosagcm/devel/src/kernels_unst/caldyn_fast.k90 (modified) (2 diffs)

codes/icosagcm/devel/src/kernels_unst/caldyn_fast.k90

@@ -19 +19 @@
          !DIR$ SIMD
          DO l = 1, llm
-            berni(l,ij) = .5*(geopot(l,ij)+geopot(l+1,ij))
+            Phi_ik = .5*(geopot(l,ij)+geopot(l+1,ij))
+            berni(l,ij) = Phi_ik
          END DO
       END DO
@@ -28 +29 @@
          !DIR$ SIMD
          DO l = 1, llm
-            berni(l,ij) = .5*(geopot(l,ij)+geopot(l+1,ij))
-            berni(l,ij) = berni(l,ij) + pk(l,ij)*(cpp-theta(l,ij,1)) ! Gibbs = Cp.T-Ts = T(Cp-s)
+            Phi_ik = .5*(geopot(l,ij)+geopot(l+1,ij))
+            berni(l,ij) = Phi_ik + pk(l,ij)*(cpp-theta(l,ij,1)) ! Gibbs = Cp.T-Ts = T(Cp-s)
          END DO
       END DO
       !$OMP END DO
    CASE(thermo_variable_Cp)
-      ! thermodynamics with variable Cp
-      ! Cp(T) = Cp0 * (T/T0)^nu
-      ! => h = Cp(T).T/(nu+1)
       !$OMP DO SCHEDULE(STATIC)
       DO ij = 1, primal_num
          !DIR$ SIMD
          DO l = 1, llm
-            berni(l,ij) = .5*(geopot(l,ij)+geopot(l+1,ij))
-            cp_ik = cpp*(pk(l,ij)/Treff)**nu
-            berni(l,ij) = berni(l,ij) + pk(l,ij)*(cp_ik/(nu+1.)-theta(l,ij,1)) ! Gibbs = h-Ts = T(Cp/(nu+1)-s)
+            Phi_ik = .5*(geopot(l,ij)+geopot(l+1,ij))
+            ! thermodynamics with variable Cp
+            ! Cp(T) = Cp0 * (T/T0)^nu
+            ! => h = Cp(T).T/(nu+1)
+            cp_ik = cpp*(pk(ij,l)/Treff)**nu
+            berni(l,ij) = Phi_ik + pk(l,ij)*(cp_ik/(nu+1.)-theta(l,ij,1)) ! Gibbs = h-Ts = T(Cp/(nu+1)-s)
          END DO
       END DO