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

Timestamp:

10/12/17 19:10:20 (7 years ago)

Author:

dubos

Message:

devel : get rid of CPP_DYSL

File:

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

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

@@ -50 +50 @@
 
     IF(dysl_geopot) THEN
-#ifdef CPP_DYSL
 #include "../kernels/compute_geopot.k90"
-#else
-    STOP 'dysl_geopot=.TRUE. but DYNAMICO has been compiled without the -dysl option'
-#endif
     ELSE
     ! Pressure is computed first top-down (temporarily stored in pk)
@@ -316 +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)
@@ -367 +363 @@
 #undef ETA_DOT
 #undef WCOV
-#endif
-
+
+    END IF ! dysl
     CALL trace_end("compute_caldyn_vert_nh")