Changeset 3680 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90

Timestamp:

2012-11-27T15:42:24+01:00 (11 years ago)

Author:

rblod

Message:

First commit of the final branch for 2012 (future nemo_3_5), see ticket #1028

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90 (modified) (3 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_update.F90

@@ -38 +38 @@
 
 #if defined TWO_WAY
-      CALL wrk_alloc( jpi, jpj, jpk, jpts, ztra )
+      CALL wrk_alloc( jpi, jpj, jpk, jptra, ztra )
 
       Agrif_UseSpecialValueInUpdate = .TRUE.
@@ -52 +52 @@
       nbcline_trc = nbcline_trc + 1
 
-      CALL wrk_dealloc( jpi, jpj, jpk, jpts, ztra )
+      CALL wrk_dealloc( jpi, jpj, jpk, jptra, ztra )
 #endif
 
    END SUBROUTINE Agrif_Update_Trc
 
-   SUBROUTINE updateTRC(tabres,i1,i2,j1,j2,k1,k2,l1,l2,before)
+   SUBROUTINE updateTRC(tabres,i1,i2,j1,j2,k1,k2,n1,n2,before)
       !!---------------------------------------------
       !!   *** ROUTINE UpdateTrc ***
       !!---------------------------------------------
-#  include "domzgr_substitute.h90"
-
-      INTEGER, INTENT(in) :: i1,i2,j1,j2,k1,k2,l1,l2
-      REAL, DIMENSION(i1:i2,j1:j2,k1:k2,l1:l2), INTENT(inout) :: tabres
+      INTEGER, INTENT(in) :: i1,i2,j1,j2,k1,k2,n1,n2
+      REAL, DIMENSION(i1:i2,j1:j2,k1:k2,n1:n2), INTENT(inout) :: tabres
       LOGICAL, INTENT(in) :: before
    
-      INTEGER :: ji,jj,jk,jl
+      INTEGER :: ji,jj,jk,jn
 
-         IF (before) THEN
-            DO jl=l1,l2
-               DO jk=k1,k2
-                  DO jj=j1,j2
-                     DO ji=i1,i2
-                        tabres(ji,jj,jk,jl) = trn(ji,jj,jk,jl)
+         IF( before ) THEN
+            DO jn = n1, n2
+               DO jk = k1, k2
+                  DO jj = j1, j2
+                     DO ji = i1, i2
+                        tabres(ji,jj,jk,jn) = trn(ji,jj,jk,jn)
                      ENDDO
                   ENDDO
@@ -80 +78 @@
             ENDDO
          ELSE
-            DO jl=l1,l2
-               DO jk=k1,k2
-                  DO jj=j1,j2
-                     DO ji=i1,i2
-                        IF (tabres(ji,jj,jk,jl).NE.0.) THEN
-                           trn(ji,jj,jk,jl) = tabres(ji,jj,jk,jl) * tmask(ji,jj,jk)
+            DO jn = n1, n2
+               DO jk = k1, k2
+                  DO jj = j1, j2
+                     DO ji = i1, i2
+                        IF( tabres(ji,jj,jk,jn) .NE. 0. ) THEN
+                           trn(ji,jj,jk,jn) = tabres(ji,jj,jk,jn) * tmask(ji,jj,jk)
                         ENDIF
                      ENDDO