Changeset 14687

Timestamp:

2021-04-09T17:48:50+02:00 (3 years ago)

Author:

jchanut

Message:

#Changes to accomodate AGRIF new grid positionning implemented at r14674 and r14675, #2638

Location:

utils/tools/DOMAINcfg

Files:

• AGRIF_FixedGrids.in (modified) (1 diff)
• make_namelist.py (modified) (1 diff)
• src/agrif_connect.F90 (modified) (8 diffs)
• src/par_oce.f90 (modified) (1 diff)

utils/tools/DOMAINcfg/AGRIF_FixedGrids.in

@@ -1 +1 @@
 2
-43 83 52 94 1 1 1
-123 154 113 146 4 4 4
+45 85 53 95 1 1 1
+125 156 114 147 4 4 4
 0
 1

utils/tools/DOMAINcfg/make_namelist.py

@@ -20 +20 @@
 Agrilefile="AGRIF_FixedGrids.in"
 grid=[]
-nbghostcells  = 3
+nbghostcells  = 4 
 nbghostcells_x = nbghostcells
 nbghostcells_y = nbghostcells

utils/tools/DOMAINcfg/src/agrif_connect.F90

@@ -180 +180 @@
       ! --- West --- !
       IF( ((nbondi == -1) .OR. (nbondi == 2) ).AND. .NOT. (jperio == 1 .OR. jperio == 4 .OR. jperio == 6)) THEN
-         ind1 = nn_hls + 1 + nbghostcells + istart
+         ind1 = nn_hls + nbghostcells + istart
          ind2 = ind1 + ispongearea 
          DO ji = mi0(ind1), mi1(ind2)   
@@ -189 +189 @@
             ! ghost cells:
             ind1 = 1
-            ind2 = nn_hls + 1 + nbghostcells + istart  ! halo + land + nbghostcells
+            ind2 = nn_hls + nbghostcells + istart  ! halo + land + nbghostcells
             DO ji = mi0(ind1), mi1(ind2)   
                DO jj = 1, jpj               
@@ -199 +199 @@
       ! --- East --- !
       IF( ((nbondi == 1) .OR. (nbondi == 2) ).AND. .NOT. (jperio == 1 .OR. jperio == 4 .OR. jperio == 6)) THEN
-         ind2 = jpiglo -  (nn_hls + nbghostcells ) - istart
+         ind2 = jpiglo -  (nn_hls + nbghostcells -1 ) - istart
          ind1 = ind2 -ispongearea       
          DO ji = mi0(ind1), mi1(ind2)
@@ -207 +207 @@
          ENDDO
             ! ghost cells:
-            ind1 = jpiglo -  (nn_hls + nbghostcells ) - istart   ! halo + land + nbghostcells - 1
+            ind1 = jpiglo -  (nn_hls + nbghostcells - 1 ) - istart   ! halo + land + nbghostcells - 1
             ind2 = jpiglo - 1
             DO ji = mi0(ind1), mi1(ind2)
@@ -218 +218 @@
       ! --- South --- !
       IF(( (nbondj == -1) .OR. (nbondj == 2) ).AND.(lk_south)) THEN
-         ind1 = nn_hls + 1 + nbghostcells + istart
+         ind1 = nn_hls + nbghostcells + istart
          ind2 = ind1 + ispongearea 
          DO jj = mj0(ind1), mj1(ind2) 
@@ -227 +227 @@
             ! ghost cells:
             ind1 = 1
-            ind2 = nn_hls + 1 + nbghostcells + istart                 ! halo + land + nbghostcells
+            ind2 = nn_hls + nbghostcells + istart                 ! halo + land + nbghostcells
             DO jj = mj0(ind1), mj1(ind2) 
                DO ji = 1, jpi
@@ -237 +237 @@
       ! --- North --- !
       IF( (nbondj == 1) .OR. (nbondj == 2) ) THEN
-         ind2 = jpjglo - (nn_hls + nbghostcells) - istart
+         ind2 = jpjglo - (nn_hls + nbghostcells - 1) - istart
          ind1 = ind2 -ispongearea
          DO jj = mj0(ind1), mj1(ind2)
@@ -245 +245 @@
          ENDDO
             ! ghost cells:
-            ind1 = jpjglo - (nn_hls + nbghostcells) - istart      ! halo + land + nbghostcells - 1
+            ind1 = jpjglo - (nn_hls + nbghostcells - 1) - istart      ! halo + land + nbghostcells - 1
             ind2 = jpjglo
             DO jj = mj0(ind1), mj1(ind2)

utils/tools/DOMAINcfg/src/par_oce.f90

@@ -55 +55 @@
    ! global domain size for AGRIF     !!! * total AGRIF computational domain *
    INTEGER, PUBLIC            ::   nbug_in_agrif_conv_do_not_remove_or_modify = 1 - 1
-   INTEGER, PUBLIC, PARAMETER ::   nbghostcells = 3 !: number of ghost cells: default value
+   INTEGER, PUBLIC, PARAMETER ::   nbghostcells = 4 !: number of ghost cells: default value
    INTEGER, PUBLIC            ::   nbghostcells_x   !: number of ghost cells in i-direction
    INTEGER, PUBLIC            ::   nbghostcells_y_s   !: number of ghost cells in j-direction at south