Changeset 580 for codes/icosagcm/trunk/src/dynamics/caldyn_kernels_base.F90

Timestamp:

10/13/17 15:55:07 (7 years ago)

Author:

dubos

Message:

trunk : upgrading to devel

File:

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

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

@@ -49 +49 @@
     Rd = kappa*cpp
 
-#ifdef CPP_DYSL
-!#if 0
+    IF(dysl_geopot) THEN
 #include "../kernels/compute_geopot.k90"
-#else
-
+    ELSE
     ! Pressure is computed first top-down (temporarily stored in pk)
     ! Then Exner pressure and geopotential are computed bottom-up
@@ -164 +162 @@
     END IF
 
-#endif
+    END IF ! dysl
 
     !ym flush geopot
@@ -314 +312 @@
     CALL trace_start("compute_caldyn_vert_nh")
 
-#ifdef CPP_DYSL
+    IF(dysl) THEN
 !$OMP BARRIER
 #include "../kernels/caldyn_vert_NH.k90"
 !$OMP BARRIER
-#else
+    ELSE
 #define ETA_DOT(ij) eta_dot(ij,1)
 #define WCOV(ij) wcov(ij,1)
@@ -365 +363 @@
 #undef ETA_DOT
 #undef WCOV
-#endif
-
+
+    END IF ! dysl
     CALL trace_end("compute_caldyn_vert_nh")