Changeset 831

Timestamp:

05/02/19 12:19:02 (5 years ago)

Author:

dubos

Message:

devel : separate module for compute_theta

Location:

codes/icosagcm/devel/src/dynamics

Files:

• caldyn_hevi.f90 (modified) (1 diff)
• caldyn_kernels_hevi.F90 (modified) (1 diff)
• compute_theta.F90 (added)

codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90

@@ -5 +5 @@
   USE caldyn_kernels_hevi_mod
   USE caldyn_kernels_base_mod
+  USE compute_theta_mod, ONLY : compute_theta
   IMPLICIT NONE
   PRIVATE

codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90

@@ -13 +13 @@
   LOGICAL, SAVE :: debug_hevi_solver = .FALSE.
 
-  PUBLIC :: compute_theta, compute_caldyn_Kv, compute_caldyn_Coriolis, &
+  PUBLIC :: compute_caldyn_Kv, compute_caldyn_Coriolis, &
        compute_caldyn_slow_hydro, compute_caldyn_slow_NH, &
        compute_caldyn_solver, compute_caldyn_fast
 
 CONTAINS
-
-  SUBROUTINE compute_theta(ps,theta_rhodz, rhodz,theta)
-    REAL(rstd),INTENT(IN)    :: ps(iim*jjm)
-    REAL(rstd),INTENT(IN)    :: theta_rhodz(iim*jjm,llm,nqdyn)
-    REAL(rstd),INTENT(INOUT) :: rhodz(iim*jjm,llm)
-    REAL(rstd),INTENT(OUT)   :: theta(iim*jjm,llm,nqdyn)
-    INTEGER :: ij,l,iq
-    REAL(rstd) :: m
-    CALL trace_start("compute_theta")
-
-    IF(caldyn_eta==eta_mass) THEN ! Compute mass
-       DO l = ll_begin,ll_end
-          !DIR$ SIMD
-          DO ij=ij_begin_ext,ij_end_ext
-             m = mass_dak(l)+(ps(ij)*g+ptop)*mass_dbk(l) ! ps is actually Ms
-             rhodz(ij,l) = m/g
-          END DO
-       END DO
-    END IF
-
-    DO l = ll_begin,ll_end
-       DO iq=1,nqdyn
-          !DIR$ SIMD
-          DO ij=ij_begin_ext,ij_end_ext
-             theta(ij,l,iq) = theta_rhodz(ij,l,iq)/rhodz(ij,l)
-          END DO
-       END DO
-    END DO
-
-    CALL trace_end("compute_theta")
-  END SUBROUTINE compute_theta
 
   SUBROUTINE compute_caldyn_kv(ue, Kv)