Changeset 13236 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/NST/agrif_user.F90

Timestamp:

2020-07-03T10:54:32+02:00 (4 years ago)

Author:

smasson

Message:

dev_r12558_HPC-08_epico_Extra_Halo: fix merge with trunk@13218, see #2366

File:

• NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/NST/agrif_user.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/NST/agrif_user.F90

@@ -551 +551 @@
 
       IF( ln_zdftke.OR.ln_zdfgls ) CALL Agrif_Set_bc( avm_id, (/0,ind1/) )
-      CALL Agrif_Set_bc(glamt_id, (/0,ind1-1/) )  
-      CALL Agrif_Set_bc(gphit_id, (/0,ind1-1/) )  
+!!$      CALL Agrif_Set_bc(glamt_id, (/0,ind1-1/) )  
+!!$      CALL Agrif_Set_bc(gphit_id, (/0,ind1-1/) )  
 
       ! 4. Update type
@@ -884 +884 @@
       !
       ! Set the number of ghost cells according to periodicity
-      nbghostcells_x = nbghostcells
+      nbghostcells_x   = nbghostcells
       nbghostcells_y_s = nbghostcells
       nbghostcells_y_n = nbghostcells
       !
-      IF ( jperio == 1 ) nbghostcells_x = 0
+      IF (   jperio == 1  ) nbghostcells_x   = 0
       IF ( .NOT. lk_south ) nbghostcells_y_s = 0
-
+PRINT*, 'seb ', narea, jpiglo, nbcellsx, nn_hls, nbghostcells_x
       ! Some checks
-      IF( jpiglo /= nbcellsx + 2 + 2*nbghostcells_x )   &
-          CALL ctl_stop( 'STOP', 'agrif_nemo_init: Agrif children requires jpiglo == nbcellsx + 2 + 2*nbghostcells_x' )
-      IF( jpjglo /= nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n )   &
-          CALL ctl_stop( 'STOP', 'agrif_nemo_init: Agrif children requires jpjglo == nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n' )
+      IF( jpiglo /= nbcellsx + 2 + 2*nn_hls + nbghostcells_x   + nbghostcells_x   )   CALL ctl_stop( 'STOP',    &
+         &   'agrif_nemo_init: Agrif children requires jpiglo == nbcellsx + 2 + 2*nn_hls + 2*nbghostcells_x' )
+      IF( jpjglo /= nbcellsy + 2 + 2*nn_hls + nbghostcells_y_s + nbghostcells_y_n )   CALL ctl_stop( 'STOP',    &
+         &   'agrif_nemo_init: Agrif children requires jpjglo == nbcellsy + 2 + 2*nn_hls + nbghostcells_y_s + nbghostcells_y_n' )
       IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'agrif_nemo_init:Agrif children requires ln_use_jattr = .false. ' )
       !