Changeset 538 for codes/icosagcm/devel/src/dynamics/caldyn_kernels_base.F90

Timestamp:

06/09/17 16:13:47 (7 years ago)

Author:

dubos

Message:

devel : macro-generated kernels for caldyn_coriolis, compute_NH_geopot, caldyn_solver, caldyn_vert_NH

File:

• codes/icosagcm/devel/src/dynamics/caldyn_kernels_base.F90 (modified) (6 diffs)

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

@@ -49 +49 @@
 
 #ifdef CPP_DYSL
+!#if 0
 #include "../kernels/compute_geopot.k90"
 #else
@@ -303 +304 @@
     REAL(rstd),INTENT(INOUT) :: dW(iim*jjm,llm+1)
     ! local arrays
-    REAL(rstd) :: eta_dot(iim*jjm) ! eta_dot in full layers
-    REAL(rstd) :: wcov(iim*jjm) ! covariant vertical momentum in full layers
+    REAL(rstd) :: eta_dot(iim*jjm, llm) ! eta_dot in full layers
+    REAL(rstd) :: wcov(iim*jjm,llm) ! covariant vertical momentum in full layers
     REAL(rstd) :: W_etadot(iim*jjm,llm) ! vertical flux of vertical momentum
     ! indices and temporary values
@@ -312 +313 @@
     CALL trace_start("compute_caldyn_vert_nh")
 
+#ifdef CPP_DYSL
+!#if 0
+#include "../kernels/caldyn_vert_NH.k90"
+#else
+#define ETA_DOT(ij) eta_dot(ij,1)
+#define WCOV(ij) wcov(ij,1)
+
     DO l=ll_begin,ll_end
        ! compute the local arrays
@@ -319 +327 @@
           w_ij = .5*(W(ij,l)+W(ij,l+1))/mass(ij,l)
           W_etadot(ij,l) = wflux_ij*w_ij
-          eta_dot(ij) = wflux_ij / mass(ij,l)
-          wcov(ij) = w_ij*(geopot(ij,l+1)-geopot(ij,l))
+          ETA_DOT(ij) = wflux_ij / mass(ij,l)
+          WCOV(ij) = w_ij*(geopot(ij,l+1)-geopot(ij,l))
        ENDDO
        ! add NH term to du
@@ -326 +334 @@
       DO ij=ij_begin,ij_end
           du(ij+u_right,l) = du(ij+u_right,l) &
-               - .5*(wcov(ij+t_right)+wcov(ij)) &
-               *ne_right*(eta_dot(ij+t_right)-eta_dot(ij))
+               - .5*(WCOV(ij+t_right)+WCOV(ij)) &
+               *ne_right*(ETA_DOT(ij+t_right)-ETA_DOT(ij))
           du(ij+u_lup,l) = du(ij+u_lup,l) &
-               - .5*(wcov(ij+t_lup)+wcov(ij)) &
-               *ne_lup*(eta_dot(ij+t_lup)-eta_dot(ij))
+               - .5*(WCOV(ij+t_lup)+WCOV(ij)) &
+               *ne_lup*(ETA_DOT(ij+t_lup)-ETA_DOT(ij))
           du(ij+u_ldown,l) = du(ij+u_ldown,l) &
-               - .5*(wcov(ij+t_ldown)+wcov(ij)) &
-               *ne_ldown*(eta_dot(ij+t_ldown)-eta_dot(ij))
+               - .5*(WCOV(ij+t_ldown)+WCOV(ij)) &
+               *ne_ldown*(ETA_DOT(ij+t_ldown)-ETA_DOT(ij))
        END DO
     ENDDO
@@ -352 +360 @@
        END DO
     END DO
+
+#undef ETA_DOT
+#undef WCOV
+#endif
+
     CALL trace_end("compute_caldyn_vert_nh")