Changeset 657 for codes/icosagcm/devel/src/dynamics

Timestamp:

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

Author:

dubos

Message:

devel/hex : updated kernels

File:

• codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90 (modified) (3 diffs)

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

@@ -118 +118 @@
     REAL(rstd) :: D_il(iim*jjm,llm+1)    ! Thomas algorithm
     REAL(rstd) :: gamma, rho_ij, X_ij, Y_ij
-    REAL(rstd) :: wil, tau2_g, g2, gm2, ml_g2, c2_mik
+    REAL(rstd) :: wil, tau2_g, g2, gm2, ml_g2, c2_mik, vreff
 
     INTEGER    :: iter, ij, l, ij_omp_begin_ext, ij_omp_end_ext
@@ -282 +282 @@
     REAL(rstd) :: berni(iim*jjm,llm)         ! (W/m_il)^2
     REAL(rstd) :: berni1(iim*jjm)         ! (W/m_il)^2
-    REAL(rstd) :: gamma, rho_ij, T_ij, X_ij, Y_ij, vreff, Rd, Cvd
+    REAL(rstd) :: gamma, rho_ij, T_ij, X_ij, Y_ij, vreff, Rd, Cvd, Rd_preff
     INTEGER    :: ij, l
 
@@ -292 +292 @@
 
 !$OMP BARRIER
+
+#include "../kernels_hex/caldyn_mil.k90"
+  IF(tau>0) THEN ! solve implicit problem for geopotential
+    CALL compute_NH_geopot(tau,phis, rhodz, m_il, theta, W, geopot)
+  END IF
 #define PHI_BOT(ij) phis(ij)
-#define PHI_BOT_VAR phis
 #include "../kernels_hex/caldyn_solver.k90"
-#undef PHI_BOT_VAR
 #undef PHI_BOT
 !$OMP BARRIER