Changeset 537 for codes/icosagcm/devel

Timestamp:

05/30/17 21:33:09 (7 years ago)

Author:

dubos

Message:

devel : macro-generated kernels for compute_geopot and caldyn_slow_hydro

Location:

codes/icosagcm/devel/src/dynamics

Files:

• caldyn_kernels_base.F90 (moved) (moved from codes/icosagcm/devel/src/dynamics/caldyn_kernels_base.f90) (3 diffs)
• caldyn_kernels_hevi.F90 (modified) (4 diffs)

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

@@ -35 +35 @@
 
     INTEGER :: i,j,ij,l
-    REAL(rstd) :: Rd, p_ik, exner_ik, temp_ik, qv, chi, Rmix
+    REAL(rstd) :: Rd, p_ik, exner_ik, temp_ik, qv, chi, Rmix, gv
     INTEGER    :: ij_omp_begin_ext, ij_omp_end_ext
 
@@ -47 +47 @@
 
     Rd = kappa*cpp
+
+#ifdef CPP_DYSL
+#include "../kernels/compute_geopot.k90"
+#else
 
     ! Pressure is computed first top-down (temporarily stored in pk)
@@ -158 +162 @@
     END IF
 
+#endif
+
     !ym flush geopot
     !$OMP BARRIER

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

@@ -638 +638 @@
     REAL(rstd),INTENT(INOUT) :: du(3*iim*jjm,llm)
     
-    REAL(rstd) :: berni(iim*jjm)  ! Bernoulli function
-    REAL(rstd) :: uu_right, uu_lup, uu_ldown
+    REAL(rstd) :: berni(iim*jjm,llm)  ! Bernoulli function
+    REAL(rstd) :: uu_right, uu_lup, uu_ldown, ke, uu
     INTEGER :: ij,l
 
     CALL trace_start("compute_caldyn_slow_hydro")
+
+#ifdef CPP_DYSL
+#define BERNI(ij,l) berni(ij,l)
+#include "../kernels/caldyn_slow_hydro.k90"
+#else
+#define BERNI(ij) berni(ij,1)
 
     DO l = ll_begin, ll_end
@@ -662 +668 @@
        !DIR$ SIMD
        DO ij=ij_begin,ij_end         
-          berni(ij) = &
+          BERNI(ij) = &
                1/(4*Ai(ij))*(le_de(ij+u_right)*u(ij+u_right,l)**2 +    &
                le_de(ij+u_rup)*u(ij+u_rup,l)**2 +          &
@@ -674 +680 @@
           !DIR$ SIMD
           DO ij=ij_begin,ij_end
-             du(ij+u_right,l) = ne_right*(berni(ij)-berni(ij+t_right))
-             du(ij+u_lup,l)   = ne_lup*(berni(ij)-berni(ij+t_lup))
-             du(ij+u_ldown,l) = ne_ldown*(berni(ij)-berni(ij+t_ldown))
+             du(ij+u_right,l) = ne_right*(BERNI(ij)-BERNI(ij+t_right))
+             du(ij+u_lup,l)   = ne_lup*(BERNI(ij)-BERNI(ij+t_lup))
+             du(ij+u_ldown,l) = ne_ldown*(BERNI(ij)-BERNI(ij+t_ldown))
           END DO
        ELSE
@@ -682 +688 @@
           DO ij=ij_begin,ij_end
              du(ij+u_right,l) = du(ij+u_right,l) + &
-                  ne_right*(berni(ij)-berni(ij+t_right))
+                  ne_right*(BERNI(ij)-BERNI(ij+t_right))
              du(ij+u_lup,l)   = du(ij+u_lup,l) + &
-                  ne_lup*(berni(ij)-berni(ij+t_lup))
+                  ne_lup*(BERNI(ij)-BERNI(ij+t_lup))
              du(ij+u_ldown,l) = du(ij+u_ldown,l) + &
-                  ne_ldown*(berni(ij)-berni(ij+t_ldown))
+                  ne_ldown*(BERNI(ij)-BERNI(ij+t_ldown))
           END DO
        END IF
     END DO
+#endif
+#undef BERNI
     CALL trace_end("compute_caldyn_slow_hydro")    
   END SUBROUTINE compute_caldyn_slow_hydro