Changeset 9564 for branches

Timestamp:

2018-05-09T11:24:02+02:00 (6 years ago)

Author:

smasson

Message:

dev_merge_2017: minor style modifications

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

@@ -146 +146 @@
       INTEGER ::   iino, ijno, iiso, ijso     !   -       -
       INTEGER ::   iiea, ijea, iiwe, ijwe     !   -       -
-      INTEGER ::   iresti, irestj, iproc      !   -       -
+      INTEGER ::   iresti, irestj, iarea0     !   -       -
       INTEGER ::   ierr                       ! local logical unit
       REAL(wp)::   zidom, zjdom               ! local scalars
@@ -279 +279 @@
       icont = -1
       DO jarea = 1, jpni*jpnj
-         ii = 1 + MOD(jarea-1,jpni)
-         ij = 1 +    (jarea-1)/jpni
+         iarea0 = jarea - 1
+         ii = 1 + MOD(iarea0,jpni)
+         ij = 1 +     iarea0/jpni
          ili = ilci(ii,ij)
          ilj = ilcj(ii,ij)
@@ -293 +294 @@
 
          ! Subdomain neighbors (get their zone number): default definition
-         iproc = jarea - 1
-         ioso(ii,ij) = iproc - jpni
-         iowe(ii,ij) = iproc - 1
-         ioea(ii,ij) = iproc + 1
-         iono(ii,ij) = iproc + jpni
+         ioso(ii,ij) = iarea0 - jpni
+         iowe(ii,ij) = iarea0 - 1
+         ioea(ii,ij) = iarea0 + 1
+         iono(ii,ij) = iarea0 + jpni
          ildi(ii,ij) =  1  + nn_hls
          ilei(ii,ij) = ili - nn_hls
@@ -312 +312 @@
             ENDIF
             IF( MOD(jarea,jpni) == 0 ) THEN
-               ioea(ii,ij) = iproc - (jpni-1)
+               ioea(ii,ij) = iarea0 - (jpni-1)
             ENDIF
             IF( MOD(jarea,jpni) == 1 ) THEN
-               iowe(ii,ij) = iproc + jpni - 1
+               iowe(ii,ij) = iarea0 + jpni - 1
             ENDIF
          ENDIF
@@ -391 +391 @@
       ! ----------------------
       DO jarea = 1, jpni*jpnj
-         iproc = jarea-1
          ii = 1 + MOD( jarea-1  , jpni )
          ij = 1 +     (jarea-1) / jpni
@@ -428 +427 @@
       ! Update il[de][ij] according to modified ibond[ij]
       ! ----------------------
-      DO jarea = 1, jpnij
-         ii = iin(jarea)
-         ij = ijn(jarea)
+      DO jproc = 1, jpnij
+         ii = iin(jproc)
+         ij = ijn(jproc)
          IF( ibondi(ii,ij) == -1 .OR. ibondi(ii,ij) == 2 ) ildi(ii,ij) =  1
          IF( ibondi(ii,ij) ==  1 .OR. ibondi(ii,ij) == 2 ) ilei(ii,ij) = ilci(ii,ij)