Changeset 14644 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/NST/agrif_user.F90

Timestamp:

2021-03-26T15:33:49+01:00 (3 years ago)

Author:

sparonuz

Message:

Merge trunk -r14642:HEAD

Location:

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

Files:

• . (modified) (1 prop)
• src/NST/agrif_user.F90 (modified) (7 diffs)

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/NST/agrif_user.F90

@@ -63 +63 @@
 ! In case of East-West periodicity, prevent AGRIF interpolation at east and west boundaries
 ! The procnames will not be called at these boundaries
-      IF (jperio == 1) THEN
+      IF (l_Iperio) THEN
          CALL Agrif_Set_NearCommonBorderX(.TRUE.)
          CALL Agrif_Set_DistantCommonBorderX(.TRUE.)
@@ -209 +209 @@
       ENDIF
       !
-      CALL lbc_lnk_multi( 'Agrif_Init_Domain', hu0_parent, 'U', 1.0_wp, hv0_parent, 'V', 1.0_wp )
+      CALL lbc_lnk( 'Agrif_Init_Domain', hu0_parent, 'U', 1.0_wp, hv0_parent, 'V', 1.0_wp )
       DO_2D( 0, 0, 0, 0 )
          zk(ji,jj) = REAL( mbku_parent(ji,jj), wp )
@@ -251 +251 @@
          ENDIF
 
-         CALL lbc_lnk_multi( 'Agrif_Init_Domain', e3u0_parent, 'U', 1.0_wp, e3v0_parent, 'V', 1.0_wp )
+         CALL lbc_lnk( 'Agrif_Init_Domain', e3u0_parent, 'U', 1.0_wp, e3v0_parent, 'V', 1.0_wp )
       ENDIF
 
@@ -272 +272 @@
                   
             CALL Agrif_check_bat( kindic_agr )           
-
-            CALL mpp_sum( 'agrif_InitValues_Domain', kindic_agr )
-            IF( kindic_agr /= 0 ) THEN
-               CALL ctl_stop('==> Child Bathymetry is NOT correct near boundaries.')
-            ELSE
-               IF(lwp) WRITE(numout,*) '==> Child Bathymetry is ok near boundaries.'
-               IF(lwp) WRITE(numout,*) ' '
-            ENDIF  
          ENDIF
+         !
+         CALL mpp_sum( 'agrif_InitValues_Domain', kindic_agr )
+         IF( kindic_agr /= 0 ) THEN
+            CALL ctl_stop('==> Child Bathymetry is NOT correct near boundaries.')
+         ELSE
+            IF(lwp) WRITE(numout,*) '==> Child Bathymetry is ok near boundaries.'
+            IF(lwp) WRITE(numout,*) ' '
+         ENDIF  
       ENDIF
       !
@@ -532 +532 @@
       CALL Agrif_Set_bc(   ub2b_cor_id, (/-imaxrho*nn_shift_bar,ind1/) )
       CALL Agrif_Set_bc(   vb2b_cor_id, (/-imaxrho*nn_shift_bar,ind1/) )
-      IF( ln_zdftke.OR.ln_zdfgls ) CALL Agrif_Set_bc( avm_id, (/0,ind1/) )
+      IF( ln_zdftke.OR.ln_zdfgls ) CALL Agrif_Set_bc( avm_id, (/0,ind1-1/) )
 !!$      CALL Agrif_Set_bc(glamt_id, (/0,ind1-1/) )  
 !!$      CALL Agrif_Set_bc(gphit_id, (/0,ind1-1/) )  
@@ -872 +872 @@
       nbghostcells_y_n = nbghostcells
       !
-      IF(   jperio == 1  )   nbghostcells_x   = 0
+      IF(    l_Iperio    )   nbghostcells_x   = 0
       IF( .NOT. lk_south )   nbghostcells_y_s = 0
       IF( .NOT. lk_north )   nbghostcells_y_n = 0
@@ -889 +889 @@
 
    
-# if defined key_mpp_mpi
+# if ! defined key_mpi_off
    SUBROUTINE Agrif_InvLoc( indloc, nprocloc, i, indglob )
       !!----------------------------------------------------------------------

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette