Changeset 12962 for NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/DOM/domain.F90

Timestamp:

2020-05-22T16:18:18+02:00 (4 years ago)

Author:

hadcv

Message:

Update with [12960] fixes

File:

• NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/DOM/domain.F90 (modified) (2 diffs)

NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/DOM/domain.F90

@@ -217 +217 @@
       !!              - mig0, mjg0: local  domain indices ==> global domain, excluding halos, indices
       !!              - mi0 , mi1 : global domain indices ==> local  domain indices
-      !!              - mj0,, mj1   (global point not in the local domain ==> mi0>mi1 and/or mj0>mj1)
+      !!              - mj0 , mj1   (if global point not in the local domain ==> mi0>mi1 and/or mj0>mj1)
       !!----------------------------------------------------------------------
       INTEGER ::   ji, jj   ! dummy loop argument
@@ -230 +230 @@
       !                              ! local domain indices ==> global domain, excluding halos, indices
       !
+      mig0(:) = mig(:) - nn_hls
+      mjg0(:) = mjg(:) - nn_hls  
       ! WARNING: to keep compatibility with the trunk that was including periodocity into the input data, 
       ! we must define mig0 and mjg0 as bellow.
       ! Once we decide to forget trunk compatibility, we must simply define mig0 and mjg0 as:
-!!$      mig0(:) = mig(:) - nn_hls
-!!$      mjg0(:) = mjg(:) - nn_hls  
-      mig0(:) = mig(:) - nn_hls + COUNT( (/ jperio == 1 .OR. jperio == 4 .OR. jperio == 6 .OR. jperio == 7 /) )
-      mjg0(:) = mjg(:) - nn_hls + COUNT( (/ jperio == 2 .OR. jperio == 7 /) )
+      mig0_oldcmp(:) = mig0(:) + COUNT( (/ jperio == 1 .OR. jperio == 4 .OR. jperio == 6 .OR. jperio == 7 /) )
+      mjg0_oldcmp(:) = mjg0(:) + COUNT( (/ jperio == 2 .OR. jperio == 7 /) )
       !
       !                              ! global domain, including halos, indices ==> local domain indices