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

Timestamp:

2020-07-05T16:59:00+02:00 (4 years ago)

Author:

smasson

Message:

Extra_Halo: bugfix following merge with trunk@13218, see #2366

Location:

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

Files:

• DYN/sshwzv.F90 (modified) (4 diffs)
• LBC/mppini.F90 (modified) (2 diffs)
• USR/usrdef_nam.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/DYN/sshwzv.F90

@@ -222 +222 @@
          ! inside computational domain (cosmetic) 
          DO jk = 1, jpkm1
-            ! --- West --- !
-            IF( lk_west) THEN
+            IF( lk_west ) THEN                             ! --- West --- !
                DO ji = mi0(2+nn_hls), mi1(2+nn_hls)
                   DO jj = 1, jpj
@@ -230 +229 @@
                END DO
             ENDIF
-            !
-            ! --- East --- !
-            IF( lk_east) THEN
+            IF( lk_east ) THEN                             ! --- East --- !
                DO ji = mi0(jpiglo-1-nn_hls), mi1(jpiglo-1-nn_hls)
                   DO jj = 1, jpj
@@ -239 +236 @@
                END DO
             ENDIF
-            !
-            ! --- South --- !
-            IF( lk_south) THEN
+            IF( lk_south ) THEN                            ! --- South --- !
                DO jj = mj0(2+nn_hls), mj1(2+nn_hls)
                   DO ji = 1, jpi
@@ -248 +243 @@
                END DO
             ENDIF
-            !
-            ! --- North --- !
-            IF( lk_north) THEN
+            IF( lk_north ) THEN                            ! --- North --- !
                DO jj = mj0(jpjglo-1-nn_hls), mj1(jpjglo-1-nn_hls)
                   DO ji = 1, jpi

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/LBC/mppini.F90

@@ -339 +339 @@
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'mpp_init: unable to allocate standard ocean arrays' )
       
+#if defined key_agrif
+      IF( .NOT. Agrif_Root() ) THEN       ! AGRIF children: specific setting (cf. agrif_user.F90)
+         CALL agrif_nemo_init()
+      ENDIF
+#endif
       !
       !  2. Index arrays for subdomains
@@ -550 +555 @@
       njmpp = ijmppt(ii,ij)
       jpk = jpkglo                              ! third dim
-#if defined key_agrif
-      ! simple trick to use same vertical grid as parent but different number of levels: 
-      ! Save maximum number of levels in jpkglo, then define all vertical grids with this number.
-      ! Suppress once vertical online interpolation is ok
-!!$      IF(.NOT.Agrif_Root())   jpkglo = Agrif_Parent( jpkglo )
-#endif
       !
       CALL init_doloop                          ! set start/end indices of do-loop, depending on the halo width value (nn_hls) 

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

@@ -14 +14 @@
    !!   usr_def_hgr   : initialize the horizontal mesh 
    !!----------------------------------------------------------------------
+   USE dom_oce
    USE par_oce        ! ocean space and time domain
    USE phycst         ! physical constants
@@ -73 +74 @@
 #if defined key_agrif
       IF( .NOT.Agrif_Root() ) THEN         ! Global Domain size: add 1 land point on each side
-         kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2
-         kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2
+         kpi  = nbcellsx + 2 * ( nbghostcells + 1 )
+         kpj  = nbcellsy + 2 * ( nbghostcells + 1 )
+!!$         kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2
+!!$         kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2
       ENDIF
 #endif