Changeset 426 for trunk/NEMO

Timestamp:

2006-03-21T16:54:15+01:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_035 : CT : take into account the case with no split along the i/j-direction (nbondi/nbondj = 2)

Location:

trunk/NEMO

Files:

• OPA_SRC/prtctl.F90 (modified) (2 diffs)
• TOP_SRC/prtctl_trc.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/prtctl.F90

@@ -145 +145 @@
                njctle = nlejtl(jn) + overlap * MIN( 1, nlcjtl(jn) - nlejtl(jn))
                ! Do not take into account the bound of the domain
-               IF( ibonitl(jn) == -1 ) nictls = MAX(2, nictls)
-               IF( ibonitl(jn) ==  1 ) nictle = MIN(nictle, nleitl(jn) - 1)
-               IF( ibonjtl(jn) == -1 ) njctls = MAX(2, njctls)
-               IF( ibonjtl(jn) ==  1 ) njctle = MIN(njctle, nlejtl(jn) - 1)
+               IF( ibonitl(jn) == -1 .OR. ibonitl(jn) == 2 ) nictls = MAX(2, nictls)
+               IF( ibonjtl(jn) == -1 .OR. ibonjtl(jn) == 2 ) njctls = MAX(2, njctls)
+               IF( ibonitl(jn) ==  1 .OR. ibonitl(jn) == 2 ) nictle = MIN(nictle, nleitl(jn) - 1)
+               IF( ibonjtl(jn) ==  1 .OR. ibonjtl(jn) == 2 ) njctle = MIN(njctle, nlejtl(jn) - 1)
             ELSE
                nictls = MAX( 1, nimpptl(jn) + nlditl(jn) - 1 - overlap )
@@ -155 +155 @@
                njctle = njmpptl(jn) + nlejtl(jn) - 1 + overlap * MIN( 1, nlcjtl(jn) - nlejtl(jn) ) 
                ! Do not take into account the bound of the domain
-               IF( ibonitl(jn) == -1 ) nictls = MAX(2, nictls)
-               IF( ibonjtl(jn) == -1 ) njctls = MAX(2, njctls)
-               IF( ibonitl(jn) ==  1 ) nictle = MIN(nictle, nimpptl(jn) + nleitl(jn) - 2)
-               IF( ibonjtl(jn) ==  1 ) njctle = MIN(njctle, njmpptl(jn) + nlejtl(jn) - 2)
+               IF( ibonitl(jn) == -1 .OR. ibonitl(jn) == 2 ) nictls = MAX(2, nictls)
+               IF( ibonjtl(jn) == -1 .OR. ibonjtl(jn) == 2 ) njctls = MAX(2, njctls)
+               IF( ibonitl(jn) ==  1 .OR. ibonitl(jn) == 2 ) nictle = MIN(nictle, nimpptl(jn) + nleitl(jn) - 2)
+               IF( ibonjtl(jn) ==  1 .OR. ibonjtl(jn) == 2 ) njctle = MIN(njctle, njmpptl(jn) + nlejtl(jn) - 2)
             ENDIF
          ENDIF

trunk/NEMO/TOP_SRC/prtctl_trc.F90

@@ -129 +129 @@
                njctle = nlejtl(js) + overlap * MIN( 1, nlcjtl(js) - nlejtl(js))
                ! Do not take into account the bound of the domain
-               IF( ibonitl(js) == -1 ) nictls = MAX(2, nictls)
-               IF( ibonitl(js) ==  1 ) nictle = MIN(nictle, nleitl(js) - 1)
-               IF( ibonjtl(js) == -1 ) njctls = MAX(2, njctls)
-               IF( ibonjtl(js) ==  1 ) njctle = MIN(njctle, nlejtl(js) - 1)
+               IF( ibonitl(js) == -1 .OR. ibonitl(js) == 2 ) nictls = MAX(2, nictls)
+               IF( ibonitl(js) ==  1 .OR. ibonitl(js) == 2 ) nictle = MIN(nictle, nleitl(js) - 1)
+               IF( ibonjtl(js) == -1 .OR. ibonjtl(js) == 2 ) njctls = MAX(2, njctls)
+               IF( ibonjtl(js) ==  1 .OR. ibonjtl(js) == 2 ) njctle = MIN(njctle, nlejtl(js) - 1)
             ELSE
                nictls = MAX( 1, nimpptl(js) + nlditl(js) - 1 - overlap )
@@ -139 +139 @@
                njctle = njmpptl(js) + nlejtl(js) - 1 + overlap * MIN( 1, nlcjtl(js) - nlejtl(js) ) 
                ! Do not take into account the bound of the domain
-               IF( ibonitl(js) == -1 ) nictls = MAX(2, nictls)
-               IF( ibonjtl(js) == -1 ) njctls = MAX(2, njctls)
-               IF( ibonitl(js) ==  1 ) nictle = MIN(nictle, nimpptl(js) + nleitl(js) - 2)
-               IF( ibonjtl(js) ==  1 ) njctle = MIN(njctle, njmpptl(js) + nlejtl(js) - 2)
+               IF( ibonitl(js) == -1 .OR. ibonitl(js) == 2 ) nictls = MAX(2, nictls)
+               IF( ibonjtl(js) == -1 .OR. ibonjtl(js) == 2 ) njctls = MAX(2, njctls)
+               IF( ibonitl(js) ==  1 .OR. ibonitl(js) == 2 ) nictle = MIN(nictle, nimpptl(js) + nleitl(js) - 2)
+               IF( ibonjtl(js) ==  1 .OR. ibonjtl(js) == 2 ) njctle = MIN(njctle, njmpptl(js) + nlejtl(js) - 2)
             ENDIF
          ENDIF