Changeset 1718

Timestamp:

2009-11-06T13:19:48+01:00 (14 years ago)

Author:

smasson

Message:

fill extra-halo in mpp_lnk_2/3d with defined values, see ticket:591

File:

• trunk/NEMO/OPA_SRC/lib_mpp.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -307 +307 @@
       REAL(wp)        , OPTIONAL      , INTENT(in   ) ::   pval     ! background value (used at closed boundaries)
       !!
-      INTEGER  ::   ji, jj, jl   ! dummy loop indices
+      INTEGER  ::   ji, jj, jk, jl             ! dummy loop indices
       INTEGER  ::   imigr, iihom, ijhom        ! temporary integers
       INTEGER  ::   ml_req1, ml_req2, ml_err   ! for key_mpi_isend
@@ -320 +320 @@
       ! 1. standard boundary treatment
       ! ------------------------------
-      IF( PRESENT( cd_mpp ) ) THEN      ! only fill added line/raw with non zero values
-         !
-         DO jj = nlcj+1, jpj                 ! added line(s)   (inner only)
-            ptab(1:nlci, jj, :) = ptab(1:nlci, nlej, :)
-         END DO
-         DO ji = nlci+1, jpi                 ! added column(s) (full)
-            ptab(ji    , : , :) = ptab(nlei  , :   , :)
+      IF( PRESENT( cd_mpp ) ) THEN      ! only fill added line/raw with existing values
+         !
+         ! WARNING ptab is defined only between nld and nle
+         DO jk = 1, jpk
+            DO jj = nlcj+1, jpj                 ! added line(s)   (inner only)
+               ptab(nldi  :nlei  , jj          ,jk) = ptab(nldi:nlei,     nlej,jk)   
+               ptab(1     :nldi-1, jj          ,jk) = ptab(nldi     ,     nlej,jk)
+               ptab(nlei+1:nlci  , jj          ,jk) = ptab(     nlei,     nlej,jk)
+            END DO
+            DO ji = nlci+1, jpi                 ! added column(s) (full)
+               ptab(ji           ,nldj  :nlej  ,jk) = ptab(     nlei,nldj:nlej,jk)
+               ptab(ji           ,1     :nldj-1,jk) = ptab(     nlei,nldj     ,jk)
+               ptab(ji           ,nlej+1:jpj   ,jk) = ptab(     nlei,     nlej,jk)
+            END DO
          END DO
          !
@@ -509 +516 @@
       ! ------------------------------
       !
-      IF( PRESENT( cd_mpp ) ) THEN      ! only fill added line/raw with non zero values
-         !
-         DO jj = nlcj+1, jpj                 ! last line (inner)
-            pt2d(1:nlci, jj) = pt2d(1:nlci, nlej)
-         END DO
-         DO ji = nlci+1, jpi                 ! last column
-            pt2d(ji    , : ) = pt2d(nlei  , :   )
+      IF( PRESENT( cd_mpp ) ) THEN      ! only fill added line/raw with existing values
+         !
+         ! WARNING pt2d is defined only between nld and nle
+         DO jj = nlcj+1, jpj                 ! added line(s)   (inner only)
+            pt2d(nldi  :nlei  , jj          ) = pt2d(nldi:nlei,     nlej)   
+            pt2d(1     :nldi-1, jj          ) = pt2d(nldi     ,     nlej)
+            pt2d(nlei+1:nlci  , jj          ) = pt2d(     nlei,     nlej)
+         END DO
+         DO ji = nlci+1, jpi                 ! added column(s) (full)
+            pt2d(ji           ,nldj  :nlej  ) = pt2d(     nlei,nldj:nlej)
+            pt2d(ji           ,1     :nldj-1) = pt2d(     nlei,nldj     )
+            pt2d(ji           ,nlej+1:jpj   ) = pt2d(     nlei,     nlej)
          END DO
          !