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/ICE_AGRIF/MY_SRC – 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:
4 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/ICE_AGRIF/MY_SRC/usrdef_hgr.F90

    r13295 r14822  
    7979      IF( Agrif_Root() ) THEN 
    8080#endif 
    81          ! Compatibility WITH old version:  
    82          ! jperio = 7 =>  Ni0glo = jpigo_old_version - 2 
    83          !            =>  jpiglo-1 replaced by Ni0glo+1 
    84          zlam0 = -REAL( (Ni0glo+1)/2, wp) * 1.e-3 * rn_dx 
    85          zphi0 = -REAL( (Nj0glo+1)/2, wp) * 1.e-3 * rn_dy   ! +1 for compatibility with old version --> to be replaced by -1 as before 
     81         zlam0 = -REAL(Ni0glo, wp) * 0.5 * 1.e-3 * rn_dx 
     82         zphi0 = -REAL(Nj0glo, wp) * 0.5 * 1.e-3 * rn_dy 
    8683#if defined key_agrif  
    8784      ELSE 
    … …  
    8986!clem         zlam0  = Agrif_Parent(zlam0) + (Agrif_ix())*Agrif_Parent(rn_dx) * 1.e-5 
    9087!clem         zphi0  = Agrif_Parent(zphi0) + (Agrif_iy())*Agrif_Parent(rn_dy) * 1.e-5 
    91          ! Compatibility WITH old version:  
    92          ! jperio = 0 =>  Ni0glo = jpigo_old_version 
    93          !            =>  Agrif_parent(jpiglo)-1 replaced by  Agrif_parent(Ni0glo)-1 
    94          zlam0 = ( 0.5_wp - REAL( ( Agrif_parent(Ni0glo)-1 ) / 2, wp) ) * 1.e-3 * Agrif_irhox() * rn_dx  & 
     88         zlam0 = ( 0.5_wp - REAL(Ni0glo, wp) * 0.5 ) * 1.e-3 * Agrif_irhox() * rn_dx  & 
    9589            &  + ( Agrif_Ix() + nbghostcells - 1 ) * Agrif_irhox() * rn_dx * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dx * 1.e-3 
    96          zphi0 = ( 0.5_wp - REAL( ( Agrif_parent(Nj0glo)-1 ) / 2, wp) ) * 1.e-3 * Agrif_irhoy() * rn_dy  & 
     90         zphi0 = ( 0.5_wp - REAL(Nj0glo, wp) * 0.5 ) * 1.e-3 * Agrif_irhoy() * rn_dy  & 
    9791            &  + ( Agrif_Iy() + nbghostcells - 1 ) * Agrif_irhoy() * rn_dy * 1.e-3 - ( 0.5_wp + nbghostcells ) * rn_dy * 1.e-3 
    9892      ENDIF 
    9993#endif          
    10094 
    101       DO_2D( 1, 1, 1, 1 ) 
    102          zti = REAL( mig0_oldcmp(ji) - 1, wp )   ! start at i=0 in the global grid without halos 
    103          ztj = REAL( mjg0_oldcmp(jj) - 1, wp )   ! start at j=0 in the global grid without halos 
    104           
     95      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
     96         zti = REAL( mig0(ji), wp ) - 0.5_wp  ! start at i=0.5 in the global grid without halos 
     97         ztj = REAL( mjg0(jj), wp ) - 0.5_wp  ! start at j=0.5 in the global grid without halos 
     98           
    10599         plamt(ji,jj) = zlam0 + rn_dx * 1.e-3 *   zti 
    106100         plamu(ji,jj) = zlam0 + rn_dx * 1.e-3 * ( zti + 0.5_wp ) 

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

    r13286 r14822  
    4040CONTAINS 
    4141 
    42    SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, kperio ) 
     42   SUBROUTINE usr_def_nam( cd_cfg, kk_cfg, kpi, kpj, kpk, ldIperio, ldJperio, ldNFold, cdNFtype ) 
    4343      !!---------------------------------------------------------------------- 
    4444      !!                     ***  ROUTINE dom_nam  *** 
    … …  
    5252      !! ** input   : - namusr_def namelist found in namelist_cfg 
    5353      !!---------------------------------------------------------------------- 
    54       CHARACTER(len=*)              , INTENT(out) ::   cd_cfg          ! configuration name 
    55       INTEGER                       , INTENT(out) ::   kk_cfg          ! configuration resolution 
    56       INTEGER                       , INTENT(out) ::   kpi, kpj, kpk   ! global domain sizes  
    57       INTEGER                       , INTENT(out) ::   kperio          ! lateral global domain b.c.  
     54      CHARACTER(len=*), INTENT(out) ::   cd_cfg               ! configuration name 
     55      INTEGER         , INTENT(out) ::   kk_cfg               ! configuration resolution 
     56      INTEGER         , INTENT(out) ::   kpi, kpj, kpk        ! global domain sizes  
     57      LOGICAL         , INTENT(out) ::   ldIperio, ldJperio   ! i- and j- periodicity 
     58      LOGICAL         , INTENT(out) ::   ldNFold              ! North pole folding 
     59      CHARACTER(len=1), INTENT(out) ::   cdNFtype             ! Folding type: T or F 
    5860      ! 
    5961      INTEGER ::   ios       ! Local integer 
    … …  
    8385      ! 
    8486      IF( Agrif_Root() ) THEN        ! Global Domain size:  ICE_AGRIF domain is  300 km x 300 Km x 10 m 
    85          kpi = NINT( 300.e3 / rn_dx ) - 1 
    86          kpj = NINT( 300.e3 / rn_dy ) - 1 
    87          kpi = kpi - 2   ! for compatibility with old version (because kerio=7) --> to be removed 
    88          kpj = kpj - 2   ! for compatibility with old version (because kerio=7) --> to be removed 
     87         kpi = NINT( 300.e3 / rn_dx ) - 3  
     88         kpj = NINT( 300.e3 / rn_dy ) - 3 
    8989      ELSE                           ! Global Domain size: add nbghostcells + 1 "land" point on each side 
    9090         kpi  = nbcellsx + 2 * ( nbghostcells + 1 ) 
    … …  
    100100      zly = kpj*rn_dy*1.e-3 
    101101      ! 
    102       IF( Agrif_Root() ) THEN   ;   kperio = 7     ! ICE_AGRIF configuration : bi-periodic basin 
    103       ELSE                      ;   kperio = 0     ! closed periodicity for the zoom 
     102      IF( Agrif_Root() ) THEN   ;   ldIperio =  .TRUE.   ;   ldJperio =  .TRUE.     ! ICE_AGRIF configuration : bi-periodic basin 
     103      ELSE                      ;   ldIperio = .FALSE.   ;   ldJperio = .FALSE.     ! closed periodicity for the zoom 
    104104      ENDIF 
     105      ldNFold  = .FALSE.   ;   cdNFtype = '-' 
     106      ! 
    105107      !                             ! control print 
    106108      IF(lwp) THEN 
    … …  
    119121         WRITE(numout,*) '         Coriolis:', ln_corio 
    120122         WRITE(numout,*) '   ' 
    121          WRITE(numout,*) '   Lateral boundary condition of the global domain' 
    122          WRITE(numout,*) '      ICE_AGRIF : bi-periodic basin            jperio = ', kperio 
    123123      ENDIF 
    124124      ! 

  • NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90

    r14072 r14822  
    119119      emp_oce (:,:)   = 0._wp   ! uniform value for freshwater budget (E-P) 
    120120      qsr_oce (:,:)   = 0._wp   ! uniform value for     solar radiation 
    121       qns_oce (:,:)   = 0._wp   ! uniform value for non-solar radiation 
     121      qns_oce (:,:)   = 0._wp   ! uniform value for non-solar heat flux 
    122122 
    123123      ! ice variables 
    124124      alb_ice (:,:,:) = 0.7_wp  ! useless 
    125125      qsr_ice (:,:,:) = 0._wp   ! uniform value for     solar radiation 
    126       qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar radiation 
     126      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar heat flux 
     127      dqns_ice(:,:,:) = 0._wp   ! uniform value for non solar heat flux sensitivity for ice 
    127128      sprecip (:,:)   = 0._wp   ! uniform value for snow precip 
    128129      evap_ice(:,:,:) = 0._wp   ! uniform value for sublimation 
Note: See TracChangeset for help on using the changeset viewer.