Changeset 536 for codes/icosagcm/devel/src

Timestamp:

05/30/17 16:17:01 (7 years ago)

Author:

dubos

Message:

devel : macro-generated kernels for pvort_only and caldyn_fast

File:

• codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90 (moved) (moved from codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.f90) (7 diffs)

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

@@ -61 +61 @@
     CALL trace_start("compute_pvort_only")  
 !!! Compute shallow-water potential vorticity
+#ifdef CPP_DYSL
+#include "../kernels/pvort_only.k90"
+#else
     radius_m2=radius**(-2)
     DO l = ll_begin,ll_end
@@ -90 +93 @@
 
     ENDDO
-
+#endif
     CALL trace_end("compute_pvort_only")
 
@@ -366 +369 @@
 
     INTEGER :: i,j,ij,l
-    REAL(rstd) :: Rd, qv, temp, chi, nu, due_right, due_lup, due_ldown
+    REAL(rstd) :: Rd, qv, temp, chi, nu, due, due_right, due_lup, due_ldown
 
     CALL trace_start("compute_caldyn_fast")
@@ -372 +375 @@
     Rd=cpp*kappa
 
+#ifdef CPP_DYSL
+#include "../kernels/caldyn_fast.k90"
+#else
     ! Compute Bernoulli term
     IF(boussinesq) THEN
@@ -469 +475 @@
        END IF
     END DO
-       
+#endif       
     CALL trace_end("compute_caldyn_fast")
 
@@ -638 +644 @@
     CALL trace_start("compute_caldyn_slow_hydro")
 
-    le_de(:) = le(:)/de(:) ! FIXME - make sure le_de is what we expect
-
     DO l = ll_begin, ll_end
        !  Compute mass fluxes
@@ -686 +690 @@
        END IF
     END DO
-
     CALL trace_end("compute_caldyn_slow_hydro")    
   END SUBROUTINE compute_caldyn_slow_hydro