Changeset 8860 for branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_nfd_ext_generic.h90

Timestamp:

2017-11-30T16:11:05+01:00 (6 years ago)

Author:

acc

Message:

Branch 2017/dev_r8126_ROBUST08_no_ghost. Revamp of extended halo north-fold icb routines which makes the logic cleaner and more understandable. Sucessfully SETTE tested and continuity of trajectories across the north-fold have been verified

File:

• branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_nfd_ext_generic.h90 (modified) (11 diffs)

branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/NEMO/OPA_SRC/LBC/lbc_nfd_ext_generic.h90

@@ -10 +10 @@
 #define ARRAY_TYPE(i,j,k,l,f)    REAL(wp),INTENT(inout)::ARRAY_IN(i,j,k,l,f)
 
-   SUBROUTINE ROUTINE_NFD( ptab, cd_nat, psgn, ipr2dj )
+   SUBROUTINE ROUTINE_NFD( ptab, cd_nat, psgn, kextj )
       ARRAY_TYPE(:,:,:,:,:)                             ! array or pointer of arrays on which the boundary condition is applied
       CHARACTER(len=1) , INTENT(in   ) ::   NAT_IN(:)   ! nature of array grid-points
       REAL(wp)         , INTENT(in   ) ::   SGN_IN(:)   ! sign used across the north fold boundary
-      INTEGER          , INTENT(in   ) ::   ipr2dj      ! extra halo width to exchange
+      INTEGER          , INTENT(in   ) ::   kextj       ! extra halo width at north fold
       !
       INTEGER  ::    ji,  jj,  jk,  jl, jh,  jf   ! dummy loop indices
@@ -31 +31 @@
       END SELECT
       !
-      IF (jpni > 1 ) ipj = ipj + ipr2dj
-      !
       ipjm1 = ipj-1
 
@@ -44 +42 @@
             SELECT CASE ( NAT_IN(jf)  )
             CASE ( 'T' , 'W' )                         ! T-, W-point
-               DO jh = 0, ipr2dj
+               DO jh = 0, kextj
                   DO ji = 2, jpiglo
                      ijt = jpiglo-ji+2
@@ -56 +54 @@
                END DO
             CASE ( 'U' )                               ! U-point
-               DO jh = 0, ipr2dj
+               DO jh = 0, kextj
                   DO ji = 1, jpiglo-1
                      iju = jpiglo-ji+1
@@ -69 +67 @@
                END DO
             CASE ( 'V' )                               ! V-point
-               DO jh = 0, ipr2dj
+               DO jh = 0, kextj
                   DO ji = 2, jpiglo
                      ijt = jpiglo-ji+2
@@ -78 +76 @@
                END DO
             CASE ( 'F' )                               ! F-point
-               DO jh = 0, ipr2dj
+               DO jh = 0, kextj
                   DO ji = 1, jpiglo-1
                      iju = jpiglo-ji+1
@@ -93 +91 @@
             SELECT CASE ( NAT_IN(jf)  )
             CASE ( 'T' , 'W' )                         ! T-, W-point
-               DO jh = 0, ipr2dj
+               DO jh = 0, kextj
                   DO ji = 1, jpiglo
                      ijt = jpiglo-ji+1
@@ -100 +98 @@
                END DO
             CASE ( 'U' )                               ! U-point
-               DO jh = 0, ipr2dj
+               DO jh = 0, kextj
                   DO ji = 1, jpiglo-1
                      iju = jpiglo-ji
@@ -108 +106 @@
                END DO
             CASE ( 'V' )                               ! V-point
-               DO jh = 0, ipr2dj
+               DO jh = 0, kextj
                   DO ji = 1, jpiglo
                      ijt = jpiglo-ji+1
@@ -119 +117 @@
                END DO
             CASE ( 'F' )                               ! F-point
-               DO jh = 0, ipr2dj
+               DO jh = 0, kextj
                   DO ji = 1, jpiglo-1
                      iju = jpiglo-ji
@@ -136 +134 @@
             SELECT CASE ( NAT_IN(jf) )
             CASE ( 'T' , 'U' , 'V' , 'W' )             ! T-, U-, V-, W-points
-               ARRAY_IN(:,  1:1-ipr2dj  ,:,:,jf) = 0._wp
-               ARRAY_IN(:,ipj:ipj+ipr2dj,:,:,jf) = 0._wp
+               ARRAY_IN(:,  1:1-kextj  ,:,:,jf) = 0._wp
+               ARRAY_IN(:,ipj:ipj+kextj,:,:,jf) = 0._wp
             CASE ( 'F' )                               ! F-point
-               ARRAY_IN(:,ipj:ipj+ipr2dj,:,:,jf) = 0._wp
+               ARRAY_IN(:,ipj:ipj+kextj,:,:,jf) = 0._wp
             END SELECT
             !