Changeset 9659


Ignore:
Timestamp:
2018-05-28T12:29:16+02:00 (2 years ago)
Author:
clem
Message:

complete last commit with the test cases

Location:
NEMO/trunk/tests
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/tests/CANAL/MY_SRC/usrdef_sbc.F90

    r9403 r9659  
    2727   PRIVATE 
    2828 
    29    PUBLIC   usrdef_sbc_oce    ! routine called in sbcmod module 
    30    PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics 
    31    PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo 
     29   PUBLIC   usrdef_sbc_oce      ! routine called in sbcmod module 
     30   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics 
     31   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3232 
    3333   !! * Substitutions 
  • NEMO/trunk/tests/ISOMIP/MY_SRC/usrdef_sbc.F90

    r9019 r9659  
    2828   PRIVATE 
    2929 
    30    PUBLIC   usrdef_sbc_oce    ! routine called in sbcmod module 
    31    PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics 
    32    PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo 
     30   PUBLIC   usrdef_sbc_oce      ! routine called in sbcmod module 
     31   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics 
     32   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3333 
    3434   !! * Substitutions 
  • NEMO/trunk/tests/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90

    r9019 r9659  
    2727   PRIVATE 
    2828 
    29    PUBLIC   usrdef_sbc_oce    ! routine called in sbcmod module 
    30    PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics 
    31    PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo 
     29   PUBLIC   usrdef_sbc_oce      ! routine called in sbcmod module 
     30   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics 
     31   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3232 
    3333   !! * Substitutions 
  • NEMO/trunk/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90

    r9019 r9659  
    2727   PRIVATE 
    2828 
    29    PUBLIC   usrdef_sbc_oce    ! routine called in sbcmod module 
    30    PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics 
    31    PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo 
     29   PUBLIC   usrdef_sbc_oce      ! routine called in sbcmod module 
     30   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics 
     31   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3232 
    3333   !! * Substitutions 
  • NEMO/trunk/tests/SAS_BIPER/MY_SRC/usrdef_sbc.F90

    r9517 r9659  
    3030 
    3131   PUBLIC   usrdef_sbc_oce      ! routine called by sbcmod.F90 for sbc ocean 
    32    PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics 
    33    PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo 
     32   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics 
     33   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3434 
    3535   !! * Substitutions 
  • NEMO/trunk/tests/VORTEX/MY_SRC/usrdef_sbc.F90

    r8703 r9659  
    2626   PRIVATE 
    2727 
    28    PUBLIC   usrdef_sbc_oce    ! routine called in sbcmod module 
    29    PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics 
    30    PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo 
     28   PUBLIC   usrdef_sbc_oce      ! routine called in sbcmod module 
     29   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics 
     30   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3131 
    3232   !! * Substitutions 
  • NEMO/trunk/tests/WAD/EXP00/namelist_cfg

    r9527 r9659  
    159159    nn_tra_dta    =  0                    !  = 0, bdy data are equal to the initial state 
    160160                                          !  = 1, bdy data are read in 'bdydata   .nc' files 
    161     cn_ice_lim      =  'none'             ! 
    162     nn_ice_lim_dta  =  0                  !  = 0, bdy data are equal to the initial state 
     161    cn_ice        =  'none'               ! 
     162    nn_ice_dta    =  0                    !  = 0, bdy data are equal to the initial state 
    163163                                          !  = 1, bdy data are read in 'bdydata   .nc' files 
    164     rn_ice_tem      = 270.                !  lim3 only: arbitrary temperature of incoming sea ice 
    165     rn_ice_sal      = 10.                 !  lim3 only:      --   salinity           -- 
    166     rn_ice_age      = 30.                 !  lim3 only:      --   age                -- 
     164    rn_ice_tem    = 270.                  !  si3 only: arbitrary temperature of incoming sea ice 
     165    rn_ice_sal    = 10.                   !  si3 only:      --   salinity           -- 
     166    rn_ice_age    = 30.                   !  si3 only:      --   age                -- 
    167167 
    168168    ln_tra_dmp    =.false.                !  open boudaries conditions for tracers 
  • NEMO/trunk/tests/WAD/MY_SRC/bdyini.F90

    r9576 r9659  
    6868         &             cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta,             & 
    6969         &             ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, & 
    70          &             cn_ice_lim, nn_ice_lim_dta,                             & 
     70         &             cn_ice, nn_ice_dta,                                     & 
    7171         &             rn_ice_tem, rn_ice_sal, rn_ice_age,                     & 
    7272         &             ln_vol, nn_volctl, nn_rimwidth, nb_jpk_bdy 
     
    346346#if defined key_si3 
    347347        IF(lwp) WRITE(numout,*) 'Boundary conditions for sea ice:  ' 
    348         SELECT CASE( cn_ice_lim(ib_bdy) )                   
     348        SELECT CASE( cn_ice(ib_bdy) )                   
    349349          CASE('none') 
    350350             IF(lwp) WRITE(numout,*) '      no open boundary condition'         
     
    357357             dta_bdy(ib_bdy)%ll_ht_i = .true. 
    358358             dta_bdy(ib_bdy)%ll_ht_s = .true. 
    359           CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for cn_ice_lim' ) 
     359          CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for cn_ice' ) 
    360360        END SELECT 
    361         IF( cn_ice_lim(ib_bdy) /= 'none' ) THEN  
    362            SELECT CASE( nn_ice_lim_dta(ib_bdy) )                   !  
     361        IF( cn_ice(ib_bdy) /= 'none' ) THEN  
     362           SELECT CASE( nn_ice_dta(ib_bdy) )                   !  
    363363              CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      initial state used for bdy data'         
    364364              CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      boundary data taken from file' 
    365               CASE DEFAULT   ;   CALL ctl_stop( 'nn_ice_lim_dta must be 0 or 1' ) 
     365              CASE DEFAULT   ;   CALL ctl_stop( 'nn_ice_dta must be 0 or 1' ) 
    366366           END SELECT 
    367367        ENDIF 
  • NEMO/trunk/tests/WAD/MY_SRC/usrdef_sbc.F90

    r9019 r9659  
    2727   PRIVATE 
    2828 
    29    PUBLIC   usrdef_sbc_oce    ! routine called in sbcmod module 
    30    PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics 
    31    PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo 
     29   PUBLIC   usrdef_sbc_oce      ! routine called in sbcmod module 
     30   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics 
     31   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3232 
    3333   !! * Substitutions 
Note: See TracChangeset for help on using the changeset viewer.