Changeset 916

Timestamp:

06/18/19 14:17:55 (5 years ago)

Author:

dubos

Message:

devel : added variable Cp to compute_temperature

Location:

codes/icosagcm/devel/src

Files:

• diagnostics/compute_temperature.F90 (modified) (4 diffs)
• kernels_hex/compute_temperature.k90 (modified) (1 diff)
• kernels_unst/compute_temperature.k90 (modified) (1 diff)

codes/icosagcm/devel/src/diagnostics/compute_temperature.F90

@@ -1 +1 @@
 MODULE compute_temperature_mod
-  USE earth_const, ONLY : cpp, cppv, kappa, Rd, Rv, preff, Treff, &
-       caldyn_thermo, physics_thermo, &
-       thermo_theta, thermo_entropy, thermo_moist, thermo_fake_moist
+  USE earth_const, ONLY : cpp, cppv, kappa, Rd, Rv, preff, Treff, nu, &
+       caldyn_thermo, physics_thermo, thermo_fake_moist, &
+       thermo_theta, thermo_entropy, thermo_variable_Cp, thermo_moist
   USE grid_param
   IMPLICIT NONE
@@ -79 +79 @@
         temp_ik = Treff*exp((theta_ik + Rd*log(p_ik/preff))/cpp)
      {% endcall %}
+  CASE(thermo_variable_Cp)
+     {% call loop_compute_temperature() %}
+       Cp_ik = nu*( theta_ik + Rd*log(p_ik/preff) )
+       temp_ik = Treff* (Cp_ik/cpp)**(1./nu)  
+     {% endcall %}
   CASE(thermo_moist)
      {% call loop_compute_temperature() %}
@@ -95 +100 @@
     REAL(rstd),INTENT(IN)    :: q(llm, primal_num, nqtot)
     REAL(rstd),INTENT(INOUT) :: temp(llm, primal_num)
-    REAL(rstd) :: p_ik, theta_ik, temp_ik, qv, chi, Rmix  
+    REAL(rstd) :: p_ik, theta_ik, temp_ik, qv, chi, Rmix, Cp_ik
     DECLARE_INDICES
 #include "../kernels_unst/compute_temperature.k90"
@@ -107 +112 @@
     REAL(rstd),INTENT(INOUT) :: temp(iim*jjm,llm)
 
-    REAL(rstd) :: p_ik, theta_ik, temp_ik, qv, chi, Rmix
+    REAL(rstd) :: p_ik, theta_ik, temp_ik, qv, chi, Rmix, Cp_ik
     INTEGER :: ij,l
 #include "../kernels_hex/compute_temperature.k90"

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

@@ -52 +52 @@
          END DO
       END IF
+   CASE(thermo_variable_Cp)
+      DO l = ll_begin, ll_end
+         !DIR$ SIMD
+         DO ij=ij_begin, ij_end
+            p_ik = pmid(ij,l)
+            theta_ik = temp(ij,l)
+            qv = q(ij,l,1) ! water vapor mixing ratio = mv/md
+            Cp_ik = nu*( theta_ik + Rd*log(p_ik/preff) )
+            temp_ik = Treff* (Cp_ik/cpp)**(1./nu)
+            temp(ij,l) = temp_ik
+         END DO
+      END DO
    CASE(thermo_moist)
       DO l = ll_begin, ll_end

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

@@ -60 +60 @@
          !$OMP END DO
       END IF
+   CASE(thermo_variable_Cp)
+      !$OMP DO SCHEDULE(STATIC)
+      DO ij = 1, primal_num
+         !DIR$ SIMD
+         DO l = 1, llm
+            p_ik = pmid(l,ij)
+            theta_ik = temp(l,ij)
+            qv = q(l,ij,1) ! water vapor mixing ratio = mv/md
+            Cp_ik = nu*( theta_ik + Rd*log(p_ik/preff) )
+            temp_ik = Treff* (Cp_ik/cpp)**(1./nu)
+            temp(l,ij) = temp_ik
+         END DO
+      END DO
+      !$OMP END DO
    CASE(thermo_moist)
       !$OMP DO SCHEDULE(STATIC)