Changeset 3374 for branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90

Timestamp:

2012-04-30T13:24:25+02:00 (12 years ago)

Author:

sga

Message:

NEMO branch dev_r3337_NOCS10_ICB: adopt mig, mjg, mi1 and mj1 for improved obscurity

File:

• branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90 (modified) (8 diffs)

branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90

@@ -93 +93 @@
             pt => this%current_point
             iine = INT( pt%xi + 0.5 )
-            IF( iine > nimpp+nicbei-1 ) THEN
+            IF( iine > mig(nicbei) ) THEN
                pt%xi = ricb_right + MOD(pt%xi, 1._wp ) - 1._wp
-            ELSE IF( iine < nimpp+nicbdi-1 ) THEN
+            ELSE IF( iine < mig(nicbdi) ) THEN
                pt%xi = ricb_left + MOD(pt%xi, 1._wp )
             ENDIF
@@ -129 +129 @@
          pt => this%current_point
          ijne = INT( pt%yj + 0.5 )
-         IF( ijne .GT. njmpp+nicbej-1 ) THEN
+         IF( ijne .GT. mjg(nicbej) ) THEN
             !
             iine = INT( pt%xi + 0.5 )
-            ipts  = nicbfldpts (iine-nimpp+1)
+            ipts  = nicbfldpts (mi1(iine))
             !
             ! moving across the cut line means both position and
@@ -236 +236 @@
             pt => this%current_point
             iine = INT( pt%xi + 0.5 )
-            IF( ipe_E >= 0 .AND. iine > nimpp+nicbei-1 ) THEN
+            IF( ipe_E >= 0 .AND. iine > mig(nicbei) ) THEN
                tmpberg => this
                this => this%next
@@ -249 +249 @@
                CALL icb_pack_into_buffer( tmpberg, obuffer_e, ibergs_to_send_e)
                CALL icb_utl_delete(first_berg, tmpberg)
-            ELSE IF( ipe_W >= 0 .AND. iine < nimpp+nicbdi-1 ) THEN
+            ELSE IF( ipe_W >= 0 .AND. iine < mig(nicbdi) ) THEN
                tmpberg => this
                this => this%next
@@ -374 +374 @@
             pt => this%current_point
             ijne = INT( pt%yj + 0.5 )
-            IF( ipe_N >= 0 .AND. ijne .GT. njmpp+nicbej-1 ) THEN
+            IF( ipe_N >= 0 .AND. ijne .GT. mjg(nicbej) ) THEN
                tmpberg => this
                this => this%next
@@ -384 +384 @@
                CALL icb_pack_into_buffer( tmpberg, obuffer_n, ibergs_to_send_n)
                CALL icb_utl_delete(first_berg, tmpberg)
-            ELSE IF( ipe_S >= 0 .AND. ijne .LT. njmpp+nicbdj-1 ) THEN
+            ELSE IF( ipe_S >= 0 .AND. ijne .LT. mjg(nicbdj) ) THEN
                tmpberg => this
                this => this%next
@@ -542 +542 @@
             iine = INT( pt%xi + 0.5 )
             ijne = INT( pt%yj + 0.5 )
-!           CALL check_position(grd, this, 'exchange (bot)')
-            IF( iine .LT. nimpp+nicbdi-1 .OR. &
-                iine .GT. nimpp+nicbei-1 .OR. &
-                ijne .LT. njmpp+nicbdj-1 .OR. &
-                ijne .GT. njmpp+nicbej-1) THEN
+            IF( iine .LT. mig(nicbdi) .OR. &
+                iine .GT. mig(nicbei) .OR. &
+                ijne .LT. mjg(nicbdj) .OR. &
+                ijne .GT. mjg(nicbej)) THEN
                i = i + 1
                WRITE(numicb,*) 'berg lost in halo: ', this%number(:),iine,ijne
@@ -607 +606 @@
                iine = INT( pt%xi + 0.5 )
                ijne = INT( pt%yj + 0.5 )
-               ipts  = nicbfldpts (iine-nimpp+1)
-               iproc = nicbflddest(iine-nimpp+1)
-               IF( ijne .GT. njmpp+nicbej-1 ) THEN
+               ipts  = nicbfldpts (mi1(iine))
+               iproc = nicbflddest(mi1(iine))
+               IF( ijne .GT. mjg(nicbej) ) THEN
                   IF( iproc == ifldproc ) THEN
                      !