Changeset 1487 for trunk/NEMO/OFF_SRC

Timestamp:

2009-07-07T16:21:58+02:00 (15 years ago)

Author:

smasson

Message:

suppress useless iom_init_chkcpp, see ticket:469

File:

• trunk/NEMO/OFF_SRC/IOM/iom.F90 (modified) (3 diffs)

trunk/NEMO/OFF_SRC/IOM/iom.F90

@@ -45 +45 @@
    PRIVATE iom_p2d, iom_p3d
 #if defined key_iomput
-   PRIVATE iom_init_chkcpp
    PRIVATE set_grid
 # endif
@@ -99 +98 @@
       CALL event__set_vert_axis( "depthv", gdept_0 )
       CALL event__set_vert_axis( "depthw", gdepw_0 )
-
-      ! consistency regarding CPP keys...
-      CALL iom_init_chkcpp
 
       ! end file definition
@@ -938 +934 @@
    END SUBROUTINE set_grid
 
-
-   SUBROUTINE iom_init_chkcpp
-      !!---------------------------------------------------------------------
-      !!                   ***  SUBROUTINE    ***
-      !!
-      !! ** Purpose :  
-      !!---------------------------------------------------------------------
-      USE zdfddm, ONLY :   lk_zdfddm      ! vertical  physics: double diffusion
-
-#if ! defined key_off_tra      
-#if defined key_dynspg_rl
-      CALL event__disable_field( "sossheig" )
-#else
-      CALL event__disable_field( "sobarstf" )
-#endif
-
-      !!#if ! ( ! defined key_dynspg_rl && defined key_ice_lim)
-      !!        CALL disable_field( "iowaflup" )
-      !!         CALL disable_field( "sowaflep" )
-      !!#endif
-
-#if ! defined key_coupled
-      CALL event__enable_field( "sohefldp" )
-      CALL event__enable_field( "sowafldp" )
-      CALL event__enable_field( "sosafldp" )
-#endif
-
-#if ( defined key_coupled && ! defined key_lim3 && ! defined key_lim2 ) 
-      CALL event__enable_field( "sohefldp" )
-      CALL event__enable_field( "sowafldp" )
-      CALL event__enable_field( "sosafldp" )
-#endif
-
-#if ! defined key_diaspr
-      CALL event__disable_field( "sosurfps" )
-#endif
-
-#if ! defined key_diahth
-      CALL event__disable_field( "sothedep" )
-      CALL event__disable_field( "so20chgt" )
-      CALL event__disable_field( "so28chgt" )
-      CALL event__disable_field( "sohtc300" )
-#endif
-
-#if defined key_coupled 
-# if defined key_lim3
-      Must be adapted to LIM3
-# else
-      CALL event__enable_field( "soicetem" )
-      CALL event__enable_field( "soicealb" )
-# endif 
-#endif 
-
-#if ! defined key_diaeiv
-      CALL event__disable_field( "vozoeivu" )
-      CALL event__disable_field( "vomeeivv" )
-      CALL event__disable_field( "voveeivw" )
-#endif
-
-#if ! defined key_dynspg_rl
-      CALL event__disable_field( "sozospgx" )
-      CALL event__disable_field( "somespgy" )
-#endif
-
-      IF( lk_zdfddm ) CALL event__enable_field( "voddmavs" )
-
-#if ! defined key_traldf_c2d
-      CALL event__disable_field( "soleahtw" )
-#endif
-
-#if ! defined key_traldf_eiv 
-      CALL event__disable_field( "soleaeiw" )
-#endif
-#endif
-
-   END SUBROUTINE iom_init_chkcpp
-
 #else