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 14433 for NEMO/trunk/tests/WAD/MY_SRC – NEMO

Ignore:
Timestamp:
2021-02-11T09:06:49+01:00 (3 years ago)
Author:
smasson
Message:

trunk: merge dev_r14312_MPI_Interface into the trunk, #2598

Location:
NEMO/trunk/tests/WAD/MY_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/tests/WAD/MY_SRC/usrdef_nam.F90

    r13286 r14433  
    3838CONTAINS 
    3939 
    40    SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, kperio ) 
     40   SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, ldIperio, ldJperio, ldNFold, cdNFtype ) 
    4141      !!---------------------------------------------------------------------- 
    4242      !!                     ***  ROUTINE dom_nam  *** 
     
    5050      !! ** input   : - namusr_def namelist found in namelist_cfg 
    5151      !!---------------------------------------------------------------------- 
    52       CHARACTER(len=*)              , INTENT(out) ::   cd_cfg          ! configuration name 
    53       INTEGER                       , INTENT(out) ::   kk_cfg          ! configuration resolution 
    54       INTEGER                       , INTENT(out) ::   kpi, kpj, kpk   ! global domain sizes  
    55       INTEGER                       , INTENT(out) ::   kperio          ! lateral global domain b.c.  
     52      CHARACTER(len=*), INTENT(out) ::   cd_cfg               ! configuration name 
     53      INTEGER         , INTENT(out) ::   kk_cfg               ! configuration resolution 
     54      INTEGER         , INTENT(out) ::   kpi, kpj, kpk        ! global domain sizes 
     55      LOGICAL         , INTENT(out) ::   ldIperio, ldJperio   ! i- and j- periodicity 
     56      LOGICAL         , INTENT(out) ::   ldNFold              ! North pole folding 
     57      CHARACTER(len=1), INTENT(out) ::   cdNFtype             ! Folding type: T or F 
    5658      ! 
    5759      INTEGER ::   ios   ! Local integer 
     
    7577      kpk = INT(  10.  / rn_dz ) + 1 
    7678      !                             ! Set the lateral boundary condition of the global domain 
    77       kperio = 0                    ! WAD_TEST_CASES configuration : closed domain 
     79      ldIperio = .FALSE.   ;   ldJperio = .FALSE.    ! WAD_TEST_CASES configuration : closed domain 
     80      ldNFold  = .FALSE.   ;   cdNFtype = '-' 
    7881      IF( nn_wad_test == 8 ) THEN 
    79          kperio = 7         ! North-South cyclic test 
     82         ldIperio = .TRUE.   ;   ldJperio = .TRUE.   ! WAD_TEST_CASES configuration : bi-periodic 
    8083         kpi = kpi - 2      ! no closed boundary 
    8184         kpj = kpj - 2      ! no closed boundary 
     
    9598         WRITE(numout,*) '                                               jpkglo = ', kpk 
    9699         WRITE(numout,*) '   ' 
    97          WRITE(numout,*) '   Lateral boundary condition of the global domain' 
    98          WRITE(numout,*) '      closed                                   jperio = ', kperio 
    99100      ENDIF 
    100101      ! 
  • NEMO/trunk/tests/WAD/MY_SRC/usrdef_zgr.F90

    r13295 r14433  
    260260      ! 
    261261      ! no ocean cavities : top ocean level is ONE, except over land 
    262       ! the ocean basin surrounnded by land (1 grid-point) set through lbc_lnk call as jperio=0  
     262      ! the ocean basin surrounnded by land (1+nn_hls grid-points) set through lbc_lnk call 
    263263      z2d(:,:) = 1._wp                    ! surface ocean is the 1st level 
    264264      z2d(mi0(1):mi1(1),:) = 0._wp 
     
    267267      z2d(:,mj0(jpjglo):mj1(jpjglo)) = 0._wp 
    268268 
    269  
    270  
    271  
    272  
    273       CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin since jperio = 0 (see userdef_nam.F90) 
     269      CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin, see userdef_nam.F90 
    274270      k_top(:,:) = NINT( z2d(:,:) ) 
    275271      ! 
Note: See TracChangeset for help on using the changeset viewer.