Changeset 572

Timestamp:

10/12/17 19:08:46 (7 years ago)

Author:

dubos

Message:

devel : Move some GETIN where they belong

Location:

codes/icosagcm/devel/src/dynamics

Files:

• caldyn.f90 (modified) (1 diff)
• caldyn_gcm.F90 (modified) (1 diff)

codes/icosagcm/devel/src/dynamics/caldyn.f90

@@ -29 +29 @@
     END SELECT
         
-    dysl=.FALSE.
-    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)
-
   END SUBROUTINE init_caldyn
 

codes/icosagcm/devel/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)