Changeset 14619

Timestamp:

2021-03-21T19:25:43+01:00 (3 years ago)

Author:

ldebreu

Message:

AGFdomcfg:uncomment the call to agrif_set_external_mapping, call agrif_nemo_init even on the root grid #2638

Location:

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/src

Files:

• NST/agrif_user.F90 (modified) (2 diffs)
• OCE/LBC/mppini.F90 (modified) (2 diffs)

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/src/NST/agrif_user.F90

@@ -142 +142 @@
 #endif      
 
-   !   CALL Agrif_Set_ExternalMapping(nemo_mapping)
+      CALL Agrif_Set_ExternalMapping(nemo_mapping)
       !
    END SUBROUTINE agrif_declare_var_ini
@@ -861 +861 @@
       ENDIF
 
-! JC => side effects of lines below to be checked:
-      lk_west  = .NOT. ( Agrif_Ix() == 1 )
-      lk_east  = .NOT. ( Agrif_Ix() + nbcellsx/AGRIF_Irhox() == Agrif_Parent(Ni0glo) -1 )
-      lk_south = .NOT. ( Agrif_Iy() == 1 )
-      lk_north = .NOT. ( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() == Agrif_Parent(Nj0glo) -1 )
-      !
       ! Set the number of ghost cells according to periodicity
       nbghostcells_x   = nbghostcells
       nbghostcells_y_s = nbghostcells
       nbghostcells_y_n = nbghostcells
-      !
-      IF(    l_Iperio    )   nbghostcells_x   = 0
+
+      !IF ((jperio == 1).OR.(jperio == 4) ) THEN   
+      IF ( l_Iperio ) nbghostcells_x = 0
+      lk_south = .NOT. ( Agrif_Iy() == 1 )
       IF( .NOT. lk_south )   nbghostcells_y_s = 0
-      IF( .NOT. lk_north )   nbghostcells_y_n = 0
+
+! JC => side effects of lines below to be checked:
+      IF (.not.agrif_root()) THEN
+        lk_west  = .NOT. ( Agrif_Ix() == 1 )
+        lk_east  = .NOT. ( Agrif_Ix() + nbcellsx/AGRIF_Irhox() == Agrif_Parent(Ni0glo) -1 )
+        lk_south = .NOT. ( Agrif_Iy() == 1 )
+        lk_north = .NOT. ( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() == Agrif_Parent(Nj0glo) -1 )
+      !
+
+      !
+        IF(    l_Iperio    )   nbghostcells_x   = 0
+        IF( .NOT. lk_south )   nbghostcells_y_s = 0
+        IF( .NOT. lk_north )   nbghostcells_y_n = 0
       !
       ! Some checks
-      IF( (.NOT.ln_vert_remap).AND.(jpkglo>Agrif_Parent(jpkglo)) )                    CALL ctl_stop( 'STOP',    &
-         &   'agrif_nemo_init: Agrif children must have less or equal number of vertical levels without ln_vert_remap defined' ) 
-      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. ' )
+        IF( (.NOT.ln_vert_remap).AND.(jpkglo>Agrif_Parent(jpkglo)) )                    CALL ctl_stop( 'STOP',    &
+           &   'agrif_nemo_init: Agrif children must have less or equal number of vertical levels without ln_vert_remap defined' ) 
+        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. ' )
+      ENDIF
+
       !
       !

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/src/OCE/LBC/mppini.F90

@@ -89 +89 @@
       !
 #if defined key_agrif
-    IF (.NOT.agrif_root()) THEN
       call agrif_nemo_init()
-    ENDIF
 #endif
    END SUBROUTINE mpp_init
@@ -307 +305 @@
 
 #if defined key_agrif
-      IF( .NOT. Agrif_Root() ) THEN       ! AGRIF children: specific setting (cf. agrif_user.F90)
          CALL agrif_nemo_init()
-      ENDIF
 #endif
       !