Changeset 539 for codes/icosagcm/devel

Timestamp:

06/09/17 17:19:59 (7 years ago)

Author:

dubos

Message:

devel : macro-generated kernel for caldyn_slow_NH

File:

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

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

@@ -748 +748 @@
     REAL(rstd) :: GradPhi2(3*iim*jjm,llm+1) ! grad_Phi**2
     REAL(rstd) :: DePhil(3*iim*jjm,llm+1) ! grad(Phi)
+    
+    INTEGER :: ij,l,kdown,kup
+    REAL(rstd) :: W_el, W2_el, uu_right, uu_lup, uu_ldown, gPhi2, dP, divG, u2, uu
+
+#ifdef CPP_DYSL
+    REAL(rstd) :: berni(iim*jjm,llm)  ! Bernoulli function
+    REAL(rstd) :: G_el(3*iim*jjm,llm+1) ! horizontal flux of W
+    REAL(rstd) :: v_el(3*iim*jjm,llm+1)
+#else
     REAL(rstd) :: berni(iim*jjm)  ! Bernoulli function
     REAL(rstd) :: G_el(3*iim*jjm) ! horizontal flux of W
     REAL(rstd) :: v_el(3*iim*jjm)
-    
-    INTEGER :: ij,l,kdown,kup
-    REAL(rstd) :: uu_right, uu_lup, uu_ldown, W_el, W2_el
+#endif
 
     CALL trace_start("compute_caldyn_slow_NH")
 
-    le_de(:) = le(:)/de(:) ! FIXME - make sure le_de is what we expect
-
+#ifdef CPP_DYSL
+#include "../kernels/caldyn_slow_NH.k90"
+#else
     DO l=ll_begin, ll_endp1 ! compute on l levels (interfaces)
        IF(l==1) THEN
@@ -832 +840 @@
        END DO
     END DO
-    ! FIXME !!
- !   F_el(:,:)=0. 
- !   dPhi(:,:)=0.
- !   dW(:,:)=0.
 
     DO l=ll_begin, ll_end ! compute on k levels (layers)
@@ -870 +874 @@
        END DO
     END DO
-    ! FIXME !!
-    ! du(:,:)=0.
-    ! hflux(:,:)=0.
+#endif
 
     CALL trace_end("compute_caldyn_slow_NH")