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

Timestamp:

12/08/17 15:08:49 (6 years ago)

Author:

dubos

Message:

devel : introduced kernels for caldyn_vert (optional)

File:

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

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

@@ -180 +180 @@
     REAL(rstd),INTENT(INOUT) :: dtheta_rhodz(iim*jjm,llm,nqdyn)
     REAL(rstd),INTENT(OUT) :: dps(iim*jjm)
+    INTEGER, PARAMETER :: caldyn_vert_cons=1, caldyn_vert_variant=caldyn_vert_cons
 
     ! temporary variable    
     INTEGER :: i,j,ij,l,iq
-    REAL(rstd) :: p_ik, exner_ik
+    REAL(rstd) :: p_ik, exner_ik, dF_deta, dFu_deta
     INTEGER    :: ij_omp_begin, ij_omp_end
 
@@ -190 +191 @@
     CALL distrib_level(ij_begin,ij_end, ij_omp_begin,ij_omp_end)
 
-    !    REAL(rstd) :: wwuu(iim*3*jjm,llm+1) ! tmp var, don't know why but gain 30% on the whole code in opemp
-    ! need to be understood
-
-    !    wwuu=wwuu_out
-    CALL trace_start("compute_caldyn_vert")
+    IF(dysl_caldyn_vert) THEN
+#define mass_bl(ij,l) bp(ij)
+#define dmass_col(ij) dps(ij)
+#include "../kernels_hex/caldyn_wflux.k90"
+#include "../kernels_hex/caldyn_vert.k90"
+#undef mass_bl
+#undef dmass_col
+    ELSE
 
     !$OMP BARRIER   
 !!! cumulate mass flux convergence from top to bottom
-    !  IF (is_omp_level_master) THEN
     DO  l = llm-1, 1, -1
-       !    IF (caldyn_conserv==energy) CALL test_message(req_qu) 
-
-!!$OMP DO SCHEDULE(STATIC) 
        !DIR$ SIMD
        DO ij=ij_omp_begin,ij_omp_end         
@@ -212 +212 @@
     !$OMP BARRIER
     ! FLUSH on convm
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-    ! compute dps
+    ! compute dmass_col
     IF (is_omp_first_level) THEN
        !DIR$ SIMD
@@ -277 +275 @@
     ENDDO
 
-    !  DO l=ll_beginp1,ll_end
-    !!DIR$ SIMD
-    !      DO ij=ij_begin,ij_end         
-    !        wwuu_out(ij+u_right,l) = wwuu(ij+u_right,l)
-    !        wwuu_out(ij+u_lup,l)   = wwuu(ij+u_lup,l)
-    !        wwuu_out(ij+u_ldown,l) = wwuu(ij+u_ldown,l)
-    !     ENDDO
-    !   ENDDO
+    END IF ! dysl
 
     CALL trace_end("compute_caldyn_vert")