New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 1487 for trunk/NEMO – NEMO

Changeset 1487 for trunk/NEMO


Ignore:
Timestamp:
2009-07-07T16:21:58+02:00 (15 years ago)
Author:
smasson
Message:

suppress useless iom_init_chkcpp, see ticket:469

Location:
trunk/NEMO
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMO/OFF_SRC/IOM/iom.F90

    r1457 r1487  
    4545   PRIVATE iom_p2d, iom_p3d 
    4646#if defined key_iomput 
    47    PRIVATE iom_init_chkcpp 
    4847   PRIVATE set_grid 
    4948# endif 
    … …  
    9998      CALL event__set_vert_axis( "depthv", gdept_0 ) 
    10099      CALL event__set_vert_axis( "depthw", gdepw_0 ) 
    101  
    102       ! consistency regarding CPP keys... 
    103       CALL iom_init_chkcpp 
    104100 
    105101      ! end file definition 
    … …  
    938934   END SUBROUTINE set_grid 
    939935 
    940  
    941    SUBROUTINE iom_init_chkcpp 
    942       !!--------------------------------------------------------------------- 
    943       !!                   ***  SUBROUTINE    *** 
    944       !! 
    945       !! ** Purpose :   
    946       !!--------------------------------------------------------------------- 
    947       USE zdfddm, ONLY :   lk_zdfddm      ! vertical  physics: double diffusion 
    948  
    949 #if ! defined key_off_tra       
    950 #if defined key_dynspg_rl 
    951       CALL event__disable_field( "sossheig" ) 
    952 #else 
    953       CALL event__disable_field( "sobarstf" ) 
    954 #endif 
    955  
    956       !!#if ! ( ! defined key_dynspg_rl && defined key_ice_lim) 
    957       !!        CALL disable_field( "iowaflup" ) 
    958       !!         CALL disable_field( "sowaflep" ) 
    959       !!#endif 
    960  
    961 #if ! defined key_coupled 
    962       CALL event__enable_field( "sohefldp" ) 
    963       CALL event__enable_field( "sowafldp" ) 
    964       CALL event__enable_field( "sosafldp" ) 
    965 #endif 
    966  
    967 #if ( defined key_coupled && ! defined key_lim3 && ! defined key_lim2 )  
    968       CALL event__enable_field( "sohefldp" ) 
    969       CALL event__enable_field( "sowafldp" ) 
    970       CALL event__enable_field( "sosafldp" ) 
    971 #endif 
    972  
    973 #if ! defined key_diaspr 
    974       CALL event__disable_field( "sosurfps" ) 
    975 #endif 
    976  
    977 #if ! defined key_diahth 
    978       CALL event__disable_field( "sothedep" ) 
    979       CALL event__disable_field( "so20chgt" ) 
    980       CALL event__disable_field( "so28chgt" ) 
    981       CALL event__disable_field( "sohtc300" ) 
    982 #endif 
    983  
    984 #if defined key_coupled  
    985 # if defined key_lim3 
    986       Must be adapted to LIM3 
    987 # else 
    988       CALL event__enable_field( "soicetem" ) 
    989       CALL event__enable_field( "soicealb" ) 
    990 # endif  
    991 #endif  
    992  
    993 #if ! defined key_diaeiv 
    994       CALL event__disable_field( "vozoeivu" ) 
    995       CALL event__disable_field( "vomeeivv" ) 
    996       CALL event__disable_field( "voveeivw" ) 
    997 #endif 
    998  
    999 #if ! defined key_dynspg_rl 
    1000       CALL event__disable_field( "sozospgx" ) 
    1001       CALL event__disable_field( "somespgy" ) 
    1002 #endif 
    1003  
    1004       IF( lk_zdfddm ) CALL event__enable_field( "voddmavs" ) 
    1005  
    1006 #if ! defined key_traldf_c2d 
    1007       CALL event__disable_field( "soleahtw" ) 
    1008 #endif 
    1009  
    1010 #if ! defined key_traldf_eiv  
    1011       CALL event__disable_field( "soleaeiw" ) 
    1012 #endif 
    1013 #endif 
    1014  
    1015    END SUBROUTINE iom_init_chkcpp 
    1016  
    1017936#else 
    1018937 

  • trunk/NEMO/OPA_SRC/IOM/iom.F90

    r1482 r1487  
    4444   PRIVATE iom_p2d, iom_p3d 
    4545#if defined key_iomput 
    46    PRIVATE iom_init_chkcpp 
    4746   PRIVATE set_grid 
    4847# endif 
    … …  
    9897      CALL event__set_vert_axis( "depthv", gdept_0 ) 
    9998      CALL event__set_vert_axis( "depthw", gdepw_0 ) 
    100  
    101       ! consistency regarding CPP keys... 
    102 !!$      CALL iom_init_chkcpp 
    10399 
    104100      ! end file definition 
    … …  
    937933   END SUBROUTINE set_grid 
    938934 
    939  
    940    SUBROUTINE iom_init_chkcpp 
    941       !!--------------------------------------------------------------------- 
    942       !!                   ***  SUBROUTINE    *** 
    943       !! 
    944       !! ** Purpose :   
    945       !!--------------------------------------------------------------------- 
    946       USE zdfddm, ONLY :   lk_zdfddm      ! vertical  physics: double diffusion 
    947        
    948 #if defined key_dynspg_rl 
    949       CALL event__disable_field( "sossheig" ) 
    950 #else 
    951       CALL event__disable_field( "sobarstf" ) 
    952 #endif 
    953  
    954       !!#if ! ( ! defined key_dynspg_rl && defined key_ice_lim) 
    955       !!        CALL disable_field( "iowaflup" ) 
    956       !!         CALL disable_field( "sowaflep" ) 
    957       !!#endif 
    958  
    959 #if ! defined key_coupled 
    960       CALL event__enable_field( "sohefldp" ) 
    961       CALL event__enable_field( "sowafldp" ) 
    962       CALL event__enable_field( "sosafldp" ) 
    963 #endif 
    964  
    965 #if ( defined key_coupled && ! defined key_lim3 && ! defined key_lim2 )  
    966       CALL event__enable_field( "sohefldp" ) 
    967       CALL event__enable_field( "sowafldp" ) 
    968       CALL event__enable_field( "sosafldp" ) 
    969 #endif 
    970  
    971 #if ! defined key_diaspr 
    972       CALL event__disable_field( "sosurfps" ) 
    973 #endif 
    974  
    975 #if ! defined key_diahth 
    976       CALL event__disable_field( "sothedep" ) 
    977       CALL event__disable_field( "so20chgt" ) 
    978       CALL event__disable_field( "so28chgt" ) 
    979       CALL event__disable_field( "sohtc300" ) 
    980 #endif 
    981  
    982 #if defined key_coupled  
    983 # if defined key_lim3 
    984       Must be adapted to LIM3 
    985 # else 
    986       CALL event__enable_field( "soicetem" ) 
    987       CALL event__enable_field( "soicealb" ) 
    988 # endif  
    989 #endif  
    990  
    991 #if ! defined key_diaeiv 
    992       CALL event__disable_field( "vozoeivu" ) 
    993       CALL event__disable_field( "vomeeivv" ) 
    994       CALL event__disable_field( "voveeivw" ) 
    995 #endif 
    996  
    997 #if ! defined key_dynspg_rl 
    998       CALL event__disable_field( "sozospgx" ) 
    999       CALL event__disable_field( "somespgy" ) 
    1000 #endif 
    1001  
    1002       IF( lk_zdfddm ) CALL event__enable_field( "voddmavs" ) 
    1003  
    1004 #if ! defined key_traldf_c2d 
    1005       CALL event__disable_field( "soleahtw" ) 
    1006 #endif 
    1007  
    1008 #if ! defined key_traldf_eiv  
    1009       CALL event__disable_field( "soleaeiw" ) 
    1010 #endif 
    1011  
    1012    END SUBROUTINE iom_init_chkcpp 
    1013  
    1014935#else 
    1015936 
Note: See TracChangeset for help on using the changeset viewer.