Changeset 6759

Timestamp:

2016-06-29T18:34:37+02:00 (8 years ago)

Author:

jchanut

Message:

AGRIF and LIM2 bug, ticket #1754

File:

• trunk/NEMOGCM/NEMO/NST_SRC/agrif_lim2_interp.F90 (modified) (8 diffs)

trunk/NEMOGCM/NEMO/NST_SRC/agrif_lim2_interp.F90

@@ -392 +392 @@
       INTEGER :: ji,jj,jn
       REAL(wp) :: zalpha
-      REAL(wp), DIMENSION(jpi,jpj,7) :: tabice_agr 
       !!-----------------------------------------------------------------------      
       !
@@ -529 +528 @@
             END DO
          END DO
+      ELSE
+         DO jj=MAX(j1,2),j2
+            DO ji=MAX(i1,2),i2
+               uice_agr(ji,jj) = tabres(ji,jj)
+            END DO
+         END DO
       ENDIF
 #else
@@ -541 +546 @@
             END DO
          END DO
+      ELSE
+         DO jj= j1, j2
+            DO ji= i1, i2
+               uice_agr(ji,jj) = tabres(ji,jj)
+            END DO
+         END DO
       ENDIF
 #endif
@@ -566 +577 @@
                   tabres(ji,jj) = e1f(ji-1,jj-1) * v_ice(ji,jj)
                ENDIF
+            END DO
+         END DO
+      ELSE
+         DO jj=MAX(j1,2),j2
+            DO ji=MAX(i1,2),i2
+               vice_agr(ji,jj) = tabres(ji,jj)
             END DO
          END DO
@@ -580 +597 @@
             END DO
          END DO
+      ELSE
+         DO jj= j1 ,j2
+            DO ji = i1, i2
+               vice_agr(ji,jj) = tabres(ji,jj)
+            END DO
+         END DO
       ENDIF
 #endif
@@ -585 +608 @@
 
 
-   SUBROUTINE interp_adv_ice( tabres, i1, i2, j1, j2, before )
+   SUBROUTINE interp_adv_ice( tabres, i1, i2, j1, j2, k1, k2, before )
       !!-----------------------------------------------------------------------
       !!                    *** ROUTINE interp_adv_ice ***                           
@@ -593 +616 @@
       !!              put -9999 where no ice for correct extrapolation             
       !!-----------------------------------------------------------------------
-      INTEGER, INTENT(in) :: i1, i2, j1, j2
-      REAL(wp), DIMENSION(i1:i2,j1:j2,7), INTENT(inout) :: tabres
+      INTEGER, INTENT(in) :: i1, i2, j1, j2, k1, k2
+      REAL(wp), DIMENSION(i1:i2,j1:j2,k1:k2), INTENT(inout) :: tabres
       LOGICAL, INTENT(in) :: before
       !!
@@ -601 +624 @@
       !
       IF( before ) THEN
-         DO jj=j1,j2
-            DO ji=i1,i2
-               IF( tms(ji,jj) == 0. ) THEN
-                  tabres(ji,jj,:) = -9999. 
-               ELSE
-                  tabres(ji,jj, 1) = frld  (ji,jj)
-                  tabres(ji,jj, 2) = hicif (ji,jj)
-                  tabres(ji,jj, 3) = hsnif (ji,jj)
-                  tabres(ji,jj, 4) = tbif  (ji,jj,1)
-                  tabres(ji,jj, 5) = tbif  (ji,jj,2)
-                  tabres(ji,jj, 6) = tbif  (ji,jj,3)
-                  tabres(ji,jj, 7) = qstoif(ji,jj)
-               ENDIF
-            END DO
-         END DO
+         DO jj=j1,j2
+       DO ji=i1,i2
+          IF( tms(ji,jj) == 0. ) THEN
+             tabres(ji,jj,:) = -9999 
+          ELSE
+             tabres(ji,jj, 1) = frld  (ji,jj)
+             tabres(ji,jj, 2) = hicif (ji,jj)
+             tabres(ji,jj, 3) = hsnif (ji,jj)
+             tabres(ji,jj, 4) = tbif  (ji,jj,1)
+             tabres(ji,jj, 5) = tbif  (ji,jj,2)
+             tabres(ji,jj, 6) = tbif  (ji,jj,3)
+             tabres(ji,jj, 7) = qstoif(ji,jj)
+          ENDIF
+       END DO
+         END DO
+      ELSE
+    DO jj=j1,j2
+       DO ji=i1,i2
+               DO jk=k1, k2
+             tabice_agr(ji,jj,jk) = tabres(ji,jj,jk)
+               END DO
+       END DO
+    END DO
       ENDIF
       !