Changeset 13537 for NEMO/trunk

Timestamp:

2020-09-29T12:09:41+02:00 (4 years ago)

Author:

smasson

Message:

trunk: bugfix for BDY defined with segments, see #2519

File:

• NEMO/trunk/src/OCE/BDY/bdyini.F90 (modified) (5 diffs)

NEMO/trunk/src/OCE/BDY/bdyini.F90

@@ -1111 +1111 @@
       CASE( 'N' )
          IF( nbdyind == -1 ) THEN  ! Automatic boundary definition: if nbdysegX = -1
-            nbdyind  = jpjglo - 2  ! set boundary to whole side of model domain.
+            nbdyind  = Nj0glo - 2  ! set boundary to whole side of model domain.
             nbdybeg  = 2
-            nbdyend  = jpiglo - 1
+            nbdyend  = Ni0glo -1
          ENDIF
          nbdysegn = nbdysegn + 1
          npckgn(nbdysegn) = kb_bdy ! Save bdy package number
-         jpjnob(nbdysegn) = nbdyind
-         jpindt(nbdysegn) = nbdybeg
-         jpinft(nbdysegn) = nbdyend
+         jpjnob(nbdysegn) = nbdyind + nn_hls
+         jpindt(nbdysegn) = nbdybeg + nn_hls
+         jpinft(nbdysegn) = nbdyend + nn_hls
          !
       CASE( 'S' )
@@ -1125 +1125 @@
             nbdyind  = 2           ! set boundary to whole side of model domain.
             nbdybeg  = 2
-            nbdyend  = jpiglo - 1
+            nbdyend  = Ni0glo - 1
          ENDIF
          nbdysegs = nbdysegs + 1
          npckgs(nbdysegs) = kb_bdy ! Save bdy package number
-         jpjsob(nbdysegs) = nbdyind
-         jpisdt(nbdysegs) = nbdybeg
-         jpisft(nbdysegs) = nbdyend
+         jpjsob(nbdysegs) = nbdyind + nn_hls
+         jpisdt(nbdysegs) = nbdybeg + nn_hls
+         jpisft(nbdysegs) = nbdyend + nn_hls
          !
       CASE( 'E' )
          IF( nbdyind == -1 ) THEN  ! Automatic boundary definition: if nbdysegX = -1
-            nbdyind  = jpiglo - 2  ! set boundary to whole side of model domain.
+            nbdyind  = Ni0glo - 2  ! set boundary to whole side of model domain.
             nbdybeg  = 2
-            nbdyend  = jpjglo - 1
+            nbdyend  = Nj0glo - 1
          ENDIF
          nbdysege = nbdysege + 1 
          npckge(nbdysege) = kb_bdy ! Save bdy package number
-         jpieob(nbdysege) = nbdyind
-         jpjedt(nbdysege) = nbdybeg
-         jpjeft(nbdysege) = nbdyend
+         jpieob(nbdysege) = nbdyind + nn_hls
+         jpjedt(nbdysege) = nbdybeg + nn_hls
+         jpjeft(nbdysege) = nbdyend + nn_hls
          !
       CASE( 'W' )
@@ -1149 +1149 @@
             nbdyind  = 2           ! set boundary to whole side of model domain.
             nbdybeg  = 2
-            nbdyend  = jpjglo - 1
+            nbdyend  = Nj0glo - 1
          ENDIF
          nbdysegw = nbdysegw + 1
          npckgw(nbdysegw) = kb_bdy ! Save bdy package number
-         jpiwob(nbdysegw) = nbdyind
-         jpjwdt(nbdysegw) = nbdybeg
-         jpjwft(nbdysegw) = nbdyend
+         jpiwob(nbdysegw) = nbdyind + nn_hls
+         jpjwdt(nbdysegw) = nbdybeg + nn_hls
+         jpjwft(nbdysegw) = nbdyend + nn_hls
          !
       CASE DEFAULT   ;   CALL ctl_stop( 'ctypebdy must be N, S, E or W' )
@@ -1192 +1192 @@
       IF(lwp) WRITE(numout,*) 'Number of north segments     : ', nbdysegn
       IF(lwp) WRITE(numout,*) 'Number of south segments     : ', nbdysegs
+      !
       ! 1. Check bounds
       !----------------
@@ -1229 +1230 @@
          IF (jpjwft(ib).gt.jpjglo)     CALL ctl_stop( 'End index out of domain' )
       ENDDO
-      !
       !      
       ! 2. Look for segment crossings