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 12724 for NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/tests/BENCH – NEMO

Ignore:
Timestamp:
2020-04-08T21:37:59+02:00 (4 years ago)
Author:
techene
Message:

branch KERNEL-06 : merge with trunk@12698 #2385 - in duplcated files : changes to comply to the new trunk variables and some loop bug fixes

Location:
NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3

    • Property svn:externals

      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
         8 
         9# SETTE 
         10^/utils/CI/sette@HEAD         sette 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/tests/BENCH/EXPREF/namelist_cfg_orca025_like

    r11536 r12724  
    3636&namdom        !   time and space domain 
    3737!----------------------------------------------------------------------- 
    38    rn_rdt      =    900.   !  time step for the dynamics (and tracer if nn_acc=0) 
     38   rn_Dt      =    900.   !  time step for the dynamics (and tracer if nn_acc=0) 
    3939   rn_atfp     =   0.05    !  asselin time filter parameter 
    4040/ 
    … …  
    5050!----------------------------------------------------------------------- 
    5151  ln_usr      = .true.    !  user defined formulation                  (T => check usrdef_sbc) 
     52  nn_ice      = 2         !  =0 no ice boundary condition 
     53     !                    !  =1 use observed ice-cover                 (  => fill namsbc_iif ) 
     54     !                    !  =2 or 3 for SI3 and CICE, respectively 
    5255  ln_traqsr   = .true.    !  Light penetration in the ocean            (T => fill namtra_qsr) 
    5356/ 
    … …  
    189192   ln_dynspg_ts   = .true.   ! split-explicit free surface 
    190193      ln_bt_auto    = .false.    ! Number of sub-step defined from: 
    191          nn_baro      =  30         ! =F : the number of sub-step in rn_rdt seconds 
     194         nn_e      =  30         ! =F : the number of sub-step in rn_Dt seconds 
    192195/ 
    193196!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/tests/BENCH/EXPREF/namelist_cfg_orca12_like

    r11536 r12724  
    3636&namdom        !   time and space domain 
    3737!----------------------------------------------------------------------- 
    38    rn_rdt      =    300.   !  time step for the dynamics (and tracer if nn_acc=0) 
     38   rn_Dt      =    300.   !  time step for the dynamics (and tracer if nn_acc=0) 
    3939   rn_atfp     =   0.05    !  asselin time filter parameter 
    4040/ 
    … …  
    5050!----------------------------------------------------------------------- 
    5151  ln_usr      = .true.    !  user defined formulation                  (T => check usrdef_sbc) 
     52  nn_ice      = 2         !  =0 no ice boundary condition 
     53     !                    !  =1 use observed ice-cover                 (  => fill namsbc_iif ) 
     54     !                    !  =2 or 3 for SI3 and CICE, respectively 
    5255  ln_traqsr   = .true.    !  Light penetration in the ocean            (T => fill namtra_qsr) 
    5356/ 
    … …  
    188191   ln_dynspg_ts   = .true.   ! split-explicit free surface 
    189192      ln_bt_auto    = .false.    ! Number of sub-step defined from: 
    190          nn_baro      =  30         ! =F : the number of sub-step in rn_rdt seconds 
     193         nn_e      =  30         ! =F : the number of sub-step in rn_Dt seconds 
    191194/ 
    192195!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/tests/BENCH/EXPREF/namelist_cfg_orca1_like

    r11536 r12724  
    3636&namdom        !   time and space domain 
    3737!----------------------------------------------------------------------- 
    38    rn_rdt      =   3600.   !  time step for the dynamics (and tracer if nn_acc=0) 
     38   rn_Dt      =   3600.   !  time step for the dynamics (and tracer if nn_acc=0) 
    3939   rn_atfp     =   0.05    !  asselin time filter parameter 
    4040/ 
    … …  
    5050!----------------------------------------------------------------------- 
    5151  ln_usr      = .true.    !  user defined formulation                  (T => check usrdef_sbc) 
     52  nn_ice      = 2         !  =0 no ice boundary condition 
     53     !                    !  =1 use observed ice-cover                 (  => fill namsbc_iif ) 
     54     !                    !  =2 or 3 for SI3 and CICE, respectively 
    5255  ln_traqsr   = .true.    !  Light penetration in the ocean            (T => fill namtra_qsr) 
    5356/ 
    … …  
    188191   ln_dynspg_ts   = .true.   ! split-explicit free surface 
    189192      ln_bt_auto    = .false.    ! Number of sub-step defined from: 
    190          nn_baro      =  30         ! =F : the number of sub-step in rn_rdt seconds 
     193         nn_e      =  30         ! =F : the number of sub-step in rn_Dt seconds 
    191194/ 
    192195!----------------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/tests/BENCH/EXPREF/namelist_pisces_cfg

    r10343 r12724  
    8181/ 
    8282!----------------------------------------------------------------------- 
    83 &nampissbc     !   parameters for inputs deposition 
     83&nampisbc      !   parameters for inputs deposition 
    8484!----------------------------------------------------------------------- 
    85    ln_dust     =  .false.   ! boolean for dust input from the atmosphere 
    86    ln_solub    =  .false.   ! boolean for variable solubility of atm. Iron 
    87    ln_river    =  .false.   ! boolean for river input of nutrients 
    88    ln_ndepo    =  .false.   ! boolean for atmospheric deposition of N 
    8985   ln_ironsed  =  .false.   ! boolean for Fe input from sediments 
    9086   ln_ironice  =  .false.   ! boolean for Fe input from sea ice 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/tests/BENCH/MY_SRC/usrdef_nam.F90

    r12377 r12724  
    5555      !                              !!* nammpp namelist *!! 
    5656      INTEGER          ::   jpni, jpnj 
    57       LOGICAL          ::   ln_nnogather 
     57      LOGICAL          ::   ln_nnogather, ln_listonly 
    5858      !! 
    5959      NAMELIST/namusr_def/ nn_isize, nn_jsize, nn_ksize, nn_perio 
    60       NAMELIST/nammpp/ jpni, jpnj, ln_nnogather 
     60      NAMELIST/nammpp/ jpni, jpnj, ln_nnogather, ln_listonly 
    6161      !!----------------------------------------------------------------------      
    6262      ! 
Note: See TracChangeset for help on using the changeset viewer.