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 15127 for NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/tests/OVERFLOW – NEMO

Ignore:
Timestamp:
2021-07-16T20:00:12+02:00 (3 years ago)
Author:
cetlod
Message:

dev_PISCO : merge with trunk@15119

Location:
NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO
Files:
2 deleted
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO

    • Property svn:externals

      •  

        old new  
        99 
        1010# SETTE 
        11 ^/utils/CI/sette@14244        sette 
         11^/utils/CI/sette@HEAD        sette 
         12 

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/tests/OVERFLOW/EXPREF/AGRIF/1_namelist_cfg

    r14229 r15127  
    1111   ln_sco      = .false.      ! s-coordinate    
    1212   rn_dx       =   1000.   !  horizontal resolution   [meters] 
    13    rn_dz       =     20.   !  vertical   resolution   [meters] 
     13   rn_dz       =     50.   !  vertical   resolution   [meters] 
    1414/ 
    1515! 
    … …  
    2626   cn_exp      =    "OVF"  !  experience name 
    2727   nn_it000    =       1   !  first time step 
    28    nn_itend    =    2040   ! here 16h of simulation  (=5760 time-step) abort after 5802 for zps: pb of physics conditions 
     28   nn_itend    =    1530   ! here 16h of simulation  (=5760 time-step) abort after 5802 for zps: pb of physics conditions 
    2929   nn_istate   =       0   !  output the initial state (1) or not (0) 
    3030   nn_stock    =    9999   !  frequency of creation of a restart file (modulo referenced to 1) 
    … …  
    4040/ 
    4141!----------------------------------------------------------------------- 
     42&namtile        !   parameters of the tiling 
     43!----------------------------------------------------------------------- 
     44/ 
     45!----------------------------------------------------------------------- 
    4246&namdom        !   space and time domain (bathymetry, mesh, timestep) 
    4347!----------------------------------------------------------------------- 
    44    rn_Dt      =   10.     !  time step for the dynamics (and tracer if nn_acc=0) 
     48   rn_Dt      =   40.     !  time step for the dynamics (and tracer if nn_acc=0) 
    4549   rn_atfp    =    0.1    !  asselin time filter parameter 
    4650   ln_meshmask = .false.  !  =T create a mesh file 
    … …  
    150154   ln_dynvor_mix = .false. !  mixed scheme 
    151155   ln_dynvor_een = .false. !  energy & enstrophy scheme 
    152       nn_een_e3f = 0             !  e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1) 
    153156/ 
    154157!----------------------------------------------------------------------- 

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/tests/OVERFLOW/EXPREF/AGRIF/AGRIF_FixedGrids.in

    r13936 r15127  
    111 
    2 10 41 1 4 4 1 4  
     210 41 1 4 1 1 1  
    330 

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/tests/OVERFLOW/EXPREF/AGRIF/namelist_cfg

    r14229 r15127  
    1111   ln_sco      = .false.      ! s-coordinate    
    1212   rn_dx       =   1000.   !  horizontal resolution   [meters] 
    13    rn_dz       =     20.   !  vertical   resolution   [meters] 
     13   rn_dz       =     50.   !  vertical   resolution   [meters] 
    1414/ 
    1515! 
    … …  
    2020   cn_exp      =    "OVF"  !  experience name 
    2121   nn_it000    =       1   !  first time step 
    22    nn_itend    =    2040   ! here 16h of simulation  (=5760 time-step) abort after 5802 for zps: pb of physics conditions 
     22   nn_itend    =    1530   ! here 16h of simulation  (=5760 time-step) abort after 5802 for zps: pb of physics conditions 
    2323   nn_istate   =       0   !  output the initial state (1) or not (0) 
    2424   nn_stock    =    9999   !  frequency of creation of a restart file (modulo referenced to 1) 
    … …  
    3232      cn_domcfg = "OVF_domcfg"  ! domain configuration filename 
    3333      ! 
     34/ 
     35!----------------------------------------------------------------------- 
     36&namtile        !   parameters of the tiling 
     37!----------------------------------------------------------------------- 
    3438/ 
    3539!----------------------------------------------------------------------- 
    … …  
    144148   ln_dynvor_mix = .false. !  mixed scheme 
    145149   ln_dynvor_een = .false. !  energy & enstrophy scheme 
    146       nn_een_e3f = 0             !  e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1) 
    147150/ 
    148151!----------------------------------------------------------------------- 

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg

    r14229 r15127  
    1212!!   namtsd       data: temperature & salinity                          (default: OFF) 
    1313!!   namcrs       coarsened grid (for outputs and/or TOP)               (ln_crs =T) 
    14 !!   namc1d       1D configuration options                              ("key_c1d") 
    15 !!   namc1d_dyndmp 1D newtonian damping applied on currents             ("key_c1d") 
    16 !!   namc1d_uvd   1D data (currents)                                    ("key_c1d") 
     14!!   namc1d       1D configuration options                              (ln_c1d =T) 
     15!!   namc1d_dyndmp 1D newtonian damping applied on currents             (ln_c1d =T) 
     16!!   namc1d_uvd   1D data (currents)                                    (ln_c1d =T) 
    1717!!====================================================================== 
    1818! 
    … …  
    4141!----------------------------------------------------------------------- 
    4242&namcfg        !   parameters of the configuration 
     43!----------------------------------------------------------------------- 
     44/ 
     45!----------------------------------------------------------------------- 
     46&namtile        !   parameters of the tiling 
    4347!----------------------------------------------------------------------- 
    4448/ 

  • NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/tests/OVERFLOW/MY_SRC/usrdef_zgr.F90

    r14448 r15127  
    9090      ! 
    9191      ! at u-point: averaging zht 
    92       DO ji = 1, jpim1 
    93          zhu(ji,:) = 0.5_wp * ( zht(ji,:) + zht(ji+1,:) ) 
    94       END DO 
     92      DO_2D( 0, 0, 0, 0 ) 
     93         zhu(ji,jj) = 0.5_wp * ( zht(ji,jj) + zht(ji+1,jj) ) 
     94      END_2D 
    9595      CALL lbc_lnk( 'usrdef_zgr', zhu, 'U', 1. )     ! boundary condition: this mask the surrouding grid-points 
    9696      !                                ! ==>>>  set by hand non-zero value on first/last columns & rows  
    … …  
    184184            pe3vw(:,:,jk) = pe3w_1d (jk) 
    185185         END DO 
    186          DO_2D( 1, 1, 1, 1 ) 
     186         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
    187187            ik = k_bot(ji,jj) 
    188188            pdepw(ji,jj,ik+1) = MIN( zht(ji,jj) , pdepw_1d(ik+1) ) 
Note: See TracChangeset for help on using the changeset viewer.