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 14511 for NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/tests/LOCK_EXCHANGE/MY_SRC – NEMO

Ignore:
Timestamp:
2021-02-19T17:06:46+01:00 (3 years ago)
Author:
francesca
Message:

align branch with trunk@14509

Location:
NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/tests/LOCK_EXCHANGE/MY_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90

    r13286 r14511  
    3737CONTAINS 
    3838 
    39    SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, kperio ) 
     39   SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, ldIperio, ldJperio, ldNFold, cdNFtype ) 
    4040      !!---------------------------------------------------------------------- 
    4141      !!                     ***  ROUTINE dom_nam  *** 
    … …  
    4949      !! ** input   : - namusr_def namelist found in namelist_cfg 
    5050      !!---------------------------------------------------------------------- 
    51       CHARACTER(len=*)              , INTENT(out) ::   cd_cfg          ! configuration name 
    52       INTEGER                       , INTENT(out) ::   kk_cfg          ! configuration resolution 
    53       INTEGER                       , INTENT(out) ::   kpi, kpj, kpk   ! global domain sizes  
    54       INTEGER                       , INTENT(out) ::   kperio          ! lateral global domain b.c.  
     51      CHARACTER(len=*), INTENT(out) ::   cd_cfg               ! configuration name 
     52      INTEGER         , INTENT(out) ::   kk_cfg               ! configuration resolution 
     53      INTEGER         , INTENT(out) ::   kpi, kpj, kpk        ! global domain sizes 
     54      LOGICAL         , INTENT(out) ::   ldIperio, ldJperio   ! i- and j- periodicity 
     55      LOGICAL         , INTENT(out) ::   ldNFold              ! North pole folding 
     56      CHARACTER(len=1), INTENT(out) ::   cdNFtype             ! Folding type: T or F 
    5557      ! 
    5658      INTEGER ::   ios   ! Local integer 
    … …  
    7375      kpk = INT(  20.  / rn_dz ) + 1 
    7476      !                             ! Set the lateral boundary condition of the global domain 
    75       kperio = 0                    ! LOCK_EXCHANGE configuration : closed domain 
     77      ldIperio = .FALSE.   ;   ldJperio = .FALSE.   ! LOCK_EXCHANGE configuration : closed domain 
     78      ldNFold  = .FALSE.   ;   cdNFtype = '-' 
    7679      ! 
    7780      !                             ! control print 
    … …  
    8891         WRITE(numout,*) '                                               jpkglo = ', kpk 
    8992         WRITE(numout,*) '   ' 
    90          WRITE(numout,*) '   Lateral boundary condition of the global domain' 
    91          WRITE(numout,*) '      closed                                   jperio = ', kperio 
    9293      ENDIF 
    9394      ! 

  • NEMO/branches/2021/dev_r14393_HPC-03_Mele_Comm_Cleanup/tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90

    r12377 r14511  
    8484      ! 
    8585      ! no ocean cavities : top ocean level is ONE, except over land 
    86       ! the ocean basin surrounded by land (1 grid-point) set through lbc_lnk call as jperio=0  
     86      ! the ocean basin surrounded by land (1+nn_hls grid-points) set through lbc_lnk call 
    8787      z2d(:,:) = 1._wp                    ! surface ocean is the 1st level 
    88       CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin since jperio = 0 (see userdef_nam.F90) 
     88      CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin, see userdef_nam.F90 
    8989      k_top(:,:) = NINT( z2d(:,:) ) 
    9090      ! 
Note: See TracChangeset for help on using the changeset viewer.