Changeset 580 for codes/icosagcm/trunk/src/dynamics/caldyn_gcm.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_gcm.F90 (modified) (1 diff)

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

@@ -22 +22 @@
     REAL(rstd),POINTER :: planetvel(:)
 
-#ifdef CPP_DYSL
-       IF(is_master) PRINT *,'CPP_DYSL : Using macro-generated compute kernels'
-#endif
-
     hydrostatic=.TRUE.
     CALL getin("hydrostatic",hydrostatic)
   
+    dysl=.NOT.hydrostatic ! dysl defaults to .FALSE. if hydrostatic, .TRUE. if NH                                              
+    CALL getin("dysl",dysl)
+    dysl_geopot=dysl
+    CALL getin("dysl_geopot",dysl_geopot)
+    dysl_caldyn_fast=dysl
+    CALL getin("dysl_caldyn_fast",dysl_caldyn_fast)
+    dysl_slow_hydro=dysl
+    CALL getin("dysl_slow_hydro",dysl_slow_hydro)
+    dysl_pvort_only=dysl
+    CALL getin("dysl_pvort_only",dysl_pvort_only)
+    dysl_caldyn_coriolis=dysl
+    CALL getin("dysl_caldyn_coriolis",dysl_caldyn_coriolis)
+
     def='energy'
     CALL getin('caldyn_conserv',def)