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 14822 for NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE – NEMO

Ignore:
Timestamp:
2021-05-10T13:32:16+02:00 (3 years ago)
Author:
smueller
Message:

Synchronizing with /NEMO/trunk@14820 (ticket #2353)

Location:
NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

    • Property svn:externals

      •  

        old new  
        1 ^/utils/build/arch@14122      arch 
        2 ^/utils/build/makenemo@14122  makenemo 
        3 ^/utils/build/mk@14122        mk 
        4 ^/utils/tools@14122           tools 
        5 ^/vendors/AGRIF/dev@14122     ext/AGRIF 
        6 ^/vendors/FCM@14122           ext/FCM 
        7 ^/vendors/IOIPSL@14122        ext/IOIPSL 
        8 ^/vendors/PPR@14122           ext/PPR 
         1^/utils/build/arch@HEAD       arch 
         2^/utils/build/makenemo@HEAD   makenemo 
         3^/utils/build/mk@HEAD         mk 
         4^/utils/tools@HEAD            tools 
         5^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         6^/vendors/FCM@HEAD            ext/FCM 
         7^/vendors/IOIPSL@HEAD         ext/IOIPSL 
         8^/vendors/PPR@HEAD            ext/PPR 
        99 
        1010# SETTE 
        11 ^/utils/CI/sette_wave@13990         sette 
         11^/utils/CI/sette@14244        sette 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_cen2_cfg

    r13476 r14822  
    190190/ 
    191191!----------------------------------------------------------------------- 
    192 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     192&nammpp        !   Massively Parallel Processing 
    193193!----------------------------------------------------------------------- 
    194194/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg

    r14053 r14822  
    289289!!                  ***  Miscellaneous namelists  ***                 !! 
    290290!!                                                                    !! 
    291 !!   nammpp            Massively Parallel Processing                    ("key_mpp_mpi") 
     291!!   nammpp            Massively Parallel Processing 
    292292!!   namctl            Control prints                                   (default: OFF) 
    293293!!   namsto            Stochastic parametrization of EOS                (default: OFF) 
    … …  
    295295! 
    296296!----------------------------------------------------------------------- 
    297 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     297&nammpp        !   Massively Parallel Processing 
    298298!----------------------------------------------------------------------- 
    299299/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg

    r13476 r14822  
    189189/ 
    190190!----------------------------------------------------------------------- 
    191 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     191&nammpp        !   Massively Parallel Processing 
    192192!----------------------------------------------------------------------- 
    193193/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg

    r13476 r14822  
    188188/ 
    189189!----------------------------------------------------------------------- 
    190 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     190&nammpp        !   Massively Parallel Processing 
    191191!----------------------------------------------------------------------- 
    192192/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg

    r13476 r14822  
    188188/ 
    189189!----------------------------------------------------------------------- 
    190 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     190&nammpp        !   Massively Parallel Processing 
    191191!----------------------------------------------------------------------- 
    192192/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg

    r14053 r14822  
    188188/ 
    189189!----------------------------------------------------------------------- 
    190 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     190&nammpp        !   Massively Parallel Processing 
    191191!----------------------------------------------------------------------- 
    192192/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg

    r13476 r14822  
    189189/ 
    190190!----------------------------------------------------------------------- 
    191 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     191&nammpp        !   Massively Parallel Processing 
    192192!----------------------------------------------------------------------- 
    193193/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg

    r13476 r14822  
    189189/ 
    190190!----------------------------------------------------------------------- 
    191 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     191&nammpp        !   Massively Parallel Processing 
    192192!----------------------------------------------------------------------- 
    193193/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg

    r13476 r14822  
    188188/ 
    189189!----------------------------------------------------------------------- 
    190 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     190&nammpp        !   Massively Parallel Processing 
    191191!----------------------------------------------------------------------- 
    192192/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg

    r13476 r14822  
    189189/ 
    190190!----------------------------------------------------------------------- 
    191 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     191&nammpp        !   Massively Parallel Processing 
    192192!----------------------------------------------------------------------- 
    193193/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg

    r13476 r14822  
    190190/ 
    191191!----------------------------------------------------------------------- 
    192 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     192&nammpp        !   Massively Parallel Processing 
    193193!----------------------------------------------------------------------- 
    194194/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg

    r13476 r14822  
    189189/ 
    190190!----------------------------------------------------------------------- 
    191 &nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
     191&nammpp        !   Massively Parallel Processing 
    192192!----------------------------------------------------------------------- 
    193193/ 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/MY_SRC/usrdef_hgr.F90

    r13295 r14822  
    7474      !                       !==  grid point position  ==!   (in kilometers) 
    7575      zfact = rn_dx * 1.e-3         ! conversion in km 
    76       DO_2D( 1, 1, 1, 1 ) 
    77          !                       ! longitude 
    78          plamt(ji,jj) = zfact * (  - 0.5 + REAL( mig0_oldcmp(ji)-1 , wp )  )   
    79          plamu(ji,jj) = zfact * (          REAL( mig0_oldcmp(ji)-1 , wp )  ) 
     76      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
     77         !                       ! longitude   (west coast at lon=0°) 
     78         plamt(ji,jj) = zfact * (  - 0.5 + REAL( mig0(ji)-1 , wp )  )   
     79         plamu(ji,jj) = zfact * (          REAL( mig0(ji)-1 , wp )  ) 
    8080         plamv(ji,jj) = plamt(ji,jj) 
    8181         plamf(ji,jj) = plamu(ji,jj) 
    82          !                       ! latitude 
    83          pphit(ji,jj) = zfact * (  - 0.5 + REAL( mjg0_oldcmp(jj)-1 , wp )  ) 
     82         !                       ! latitude   (south coast at lat= 0°) 
     83         pphit(ji,jj) = zfact * (  - 0.5 + REAL( mjg0(jj)-1 , wp )  ) 
    8484         pphiu(ji,jj) = pphit(ji,jj) 
    85          pphiv(ji,jj) = zfact * (          REAL( mjg0_oldcmp(jj)-1 , wp )  ) 
     85         pphiv(ji,jj) = zfact * (          REAL( mjg0(jj)-1 , wp )  ) 
    8686         pphif(ji,jj) = pphiv(ji,jj) 
    8787      END_2D 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/MY_SRC/usrdef_nam.F90

    r13286 r14822  
    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_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90

    r12377 r14822  
    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      ! 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/LOCK_EXCHANGE/cpp_LOCK_EXCHANGE.fcm

    r10425 r14822  
    1  bld::tool::fppkeys   key_iomput key_mpp_mpi  
     1 bld::tool::fppkeys   key_qco key_xios  
Note: See TracChangeset for help on using the changeset viewer.