Changeset 13065 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ISOMIP

Timestamp:

2020-06-08T18:11:57+02:00 (7 months ago)

Author:

smasson

Message:

Extra_Halo: toward AGRIF compatibility, see #2366

Location:

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ISOMIP/MY_SRC

Files:

• usrdef_nam.F90 (modified) (1 diff)
• usrdef_zgr.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ISOMIP/MY_SRC/usrdef_nam.F90

@@ -94 +94 @@
          WRITE(numout,*) '         vertical   resolution                 rn_e3    = ', rn_e3   , ' meters'
          WRITE(numout,*) '      ISOMIP domain = 15° x 10° x 900 m'
-         WRITE(numout,*) '         resulting global domain size :        jpiglo   = ', kpi
-         WRITE(numout,*) '                                               jpjglo   = ', kpj
+         WRITE(numout,*) '         resulting global domain size :        Ni0glo   = ', kpi
+         WRITE(numout,*) '                                               Nj0glo   = ', kpj
          WRITE(numout,*) '                                               jpkglo   = ', kpk
          WRITE(numout,*) '   '

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ISOMIP/MY_SRC/usrdef_zgr.F90

@@ -67 +67 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   zht  , zhu         ! bottom depth
       REAL(wp), DIMENSION(jpi,jpj) ::   zhisf, zhisfu      ! top depth
-      REAL(wp), DIMENSION(jpi,jpj) ::   zmsk 
-      REAL(wp), DIMENSION(jpi,jpj) ::   z2d                ! 2d workspace
       !!----------------------------------------------------------------------
       !
@@ -87 +85 @@
       !                       !==  isfdraft  ==!
       !
-      ! the ocean basin surrounded by land (1 grid-point) set through lbc_lnk call as jperio=0 
-      z2d(:,:) = 1._wp                    ! surface ocean is the 1st level
-      CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin since jperio = 0 (see userdef_nam.F90)
-      zmsk(:,:) = NINT( z2d(:,:) )
-      !
-      !
       zht  (:,:) = rbathy 
       zhisf(:,:) = 200._wp
-      ij0 = 1 ; ij1 = 40
+      ij0 = 1+1 ; ij1 = 40+1    ! + 1 for compatibility with old version. ==> to be removed
       DO jj = mj0(ij0), mj1(ij1)
          zhisf(:,jj)=700.0_wp-(gphit(:,jj)+80.0_wp)*125.0_wp
       END DO
-      zhisf(:,:) = zhisf(:,:) * zmsk(:,:)
       !
       CALL zgr_z1d( pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d )   ! Reference z-coordinate system