Changeset 12866 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR

Timestamp:

2020-05-05T08:18:05+02:00 (4 years ago)

Author:

smasson

Message:

Extra_Halo: using input files without halos, see #2366

Location:

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR

Files:

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

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR/usrdef_fmask.F90

@@ -68 +68 @@
             !
             IF(lwp) WRITE(numout,*) '      Gibraltar '
-            ij0 = 101   ;   ij1 = 101           ! Gibraltar strait  : partial slip (pfmsk=0.5)
+            ij0 = 101+1   ;   ij1 = 101+1           ! Gibraltar strait  : partial slip (pfmsk=0.5)
             ii0 = 139   ;   ii1 = 140   ;   pfmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  0.5_wp
-            ij0 = 102   ;   ij1 = 102
+            ij0 = 102+1   ;   ij1 = 102+1
             ii0 = 139   ;   ii1 = 140   ;   pfmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  0.5_wp
             !
             IF(lwp) WRITE(numout,*) '      Bab el Mandeb '
-            ij0 =  87   ;   ij1 =  88           ! Bab el Mandeb : partial slip (pfmsk=1)
+            ij0 =  87+1   ;   ij1 =  88+1           ! Bab el Mandeb : partial slip (pfmsk=1)
             ii0 = 160   ;   ii1 = 160   ;   pfmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  1._wp
-            ij0 =  88   ;   ij1 =  88
+            ij0 =  88+1   ;   ij1 =  88+1
             ii0 = 159   ;   ii1 = 159   ;   pfmsk( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  1._wp
             !
@@ -94 +94 @@
 !!gm    ! Currently these hard-wired indices relate to configuration with extend grid (jpjglo=332)
             !
-            isrow = 332 - jpjglo
+            isrow = 332 - Nj0glo - 2
             !
             IF(lwp) WRITE(numout,*)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR/usrdef_hgr.F90

@@ -13 +13 @@
    !!   usr_def_hgr   : initialize the horizontal mesh 
    !!----------------------------------------------------------------------
-   USE dom_oce  , ONLY: nimpp, njmpp       ! ocean space and time domain
+   USE dom_oce        ! ocean space and time domain
    USE par_oce        ! ocean space and time domain
    USE phycst         ! physical constants
@@ -90 +90 @@
       zcos_alpha =   SQRT( 2._wp ) * 0.5_wp
       ze1deg = ze1 / (ra * rad)
-      zlam0 = zlam1 + zcos_alpha * ze1deg * REAL( jpjglo-2 , wp )
-      zphi0 = zphi1 + zsin_alpha * ze1deg * REAL( jpjglo-2 , wp )
+      zlam0 = zlam1 + zcos_alpha * ze1deg * REAL( Ni0glo-1 , wp )   ! -1 to keep same results -> to be removed...
+      zphi0 = zphi1 + zsin_alpha * ze1deg * REAL( Nj0glo-1 , wp )
 
 #if defined key_agrif
@@ -115 +115 @@
       !   
       DO_2D_11_11
-         zim1 = REAL( ji + nimpp - 1 ) - 1.   ;   zim05 = REAL( ji + nimpp - 1 ) - 1.5 
-         zjm1 = REAL( jj + njmpp - 1 ) - 1.   ;   zjm05 = REAL( jj + njmpp - 1 ) - 1.5 
+         zim1 = REAL( mig(ji)-1, wp ) - 1.   ;   zim05 = REAL( mig(ji)-1, wp ) - 1.5   ! -1 to keep same results -> to be removed...
+         zjm1 = REAL( mjg(jj)-1, wp ) - 1.   ;   zjm05 = REAL( mjg(jj)-1, wp ) - 1.5   ! -1 to keep same results -> to be removed...
          !   
          !glamt(i,j) longitude at T-point

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR/usrdef_nam.F90

@@ -70 +70 @@
       kk_cfg = nn_GYRE
       !
-      kpi = 30 * nn_GYRE + 2        ! Global Domain size
-      kpj = 20 * nn_GYRE + 2
+      kpi = 30 * nn_GYRE + 1       ! Global Domain size
+      kpj = 20 * nn_GYRE + 1
 #if defined key_agrif
       IF( .NOT. Agrif_Root() ) THEN
-         kpi  = nbcellsx + 2 + 2*nbghostcells
-         kpj  = nbcellsy + 2 + 2*nbghostcells
+         kpi  = nbcellsx + 2*nbghostcells
+         kpj  = nbcellsy + 2*nbghostcells
       ENDIF
 #endif
@@ -93 +93 @@
          IF( Agrif_Root() ) THEN
 #endif
-         WRITE(numout,*) '         jpiglo = 30*nn_GYRE+2                            jpiglo = ', kpi
-         WRITE(numout,*) '         jpjglo = 20*nn_GYRE+2                            jpjglo = ', kpj
+         WRITE(numout,*) '      Ni0glo = 30*nn_GYRE                              Ni0glo = ', kpi
+         WRITE(numout,*) '      Nj0glo = 20*nn_GYRE                              Nj0glo = ', kpj
 #if defined key_agrif
          ENDIF
 #endif
-         WRITE(numout,*) '      number of model levels                              jpkglo = ', kpk
+         WRITE(numout,*) '      number of model levels                           jpkglo = ', kpk
          WRITE(numout,*) '   '
-         WRITE(numout,*) '   Lateral b.c. of the global domain set to closed        jperio = ', kperio
+         WRITE(numout,*) '   Lateral b.c. of the global domain set to closed     jperio = ', kperio
       ENDIF
       !

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR/usrdef_zgr.F90

@@ -198 +198 @@
       IF(lwp) WRITE(numout,*) '       GYRE case : closed flat box ocean without ocean cavities'
       !
-      z2d(:,:) = REAL( jpkm1 , wp )          ! flat bottom
+      z2d(:,:) = REAL( jpkm1 , wp )                              ! flat bottom
+      z2d(mi0(  1 ):mi1(jpiglo),mj0(Njs0):mj1( Njs0 )) = 0._wp   ! line   number Njs0 at 0
+      z2d(mi0(Nis0):mi1( Nis0 ),mj0(  1 ):mj1(jpjglo)) = 0._wp   ! column number Nis0 at 0
       !
       CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)