Changeset 5150 for branches/2012

Timestamp:

2015-03-18T11:04:44+01:00 (9 years ago)

Author:

pabouttier

Message:

Adding missing bits in DYN/dynzdf_imp_tam.F90; See Ticket #1362

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/DYN/dynzdf_imp_tam.F90 (modified) (3 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/DYN/dynzdf_imp_tam.F90

@@ -71 +71 @@
 
       !! * Local declarations
-      INTEGER ::   ji, jj, jk                          ! dummy loop indices
-      REAL(wp) ::   z1_p2dt, z2dtf, zcoef, zzws, zrhstl ! temporary scalars
+      INTEGER ::   ji, jj, jk, ikbu, ikbv                          ! dummy loop indices
+      REAL(wp) ::  z1_p2dt, z2dtf, zcoef, zzws, zrhstl ! temporary scalars
       REAL(wp), POINTER, DIMENSION(:,:,:):: zwi, zws, zwd ! temporary workspace arrays
+      REAL(wp), POINTER, DIMENSION(:,:):: zavmu, zavmv      ! temporary workspace arrays
       !!----------------------------------------------------------------------
       !
@@ -97 +98 @@
 
       IF( ln_bfrimp ) THEN
-         !!!!!!!!!!!!!!!!!!!!!!!!!!!
+         !!!!!!!!!!!!!!!!!!!!!!!!!!
          ! avm* are unactivated for the current TAM
-         !!!!!!!!!!!!!!!!!!!!!!!!!!!
-!# if defined key_vectopt_loop
-      !DO jj = 1, 1
-         !DO ji = jpi+2, jpij-jpi-1   ! vector opt. (forced unrolling)
-!# else
-      !DO jj = 2, jpjm1
-         !DO ji = 2, jpim1
-!# endif
-            !ikbu = mbku(ji,jj)         ! ocean bottom level at u- and v-points
-            !ikbv = mbkv(ji,jj)         ! (deepest ocean u- and v-points)
-            !zavmu(ji,jj) = avmu(ji,jj,ikbu+1)
-            !zavmv(ji,jj) = avmv(ji,jj,ikbv+1)
-            !avmu(ji,jj,ikbu+1) = -bfrua(ji,jj) * fse3uw(ji,jj,ikbu+1)
-            !avmv(ji,jj,ikbv+1) = -bfrva(ji,jj) * fse3vw(ji,jj,ikbv+1)
-         !END DO
-      !END DO
+         !!!!!!!!!!!!!!!!!!!!!!!!!!
+# if defined key_vectopt_loop
+      DO jj = 1, 1
+         DO ji = jpi+2, jpij-jpi-1   ! vector opt. (forced unrolling)
+# else
+      DO jj = 2, jpjm1
+         DO ji = 2, jpim1
+# endif
+            ikbu = mbku(ji,jj)         ! ocean bottom level at u- and v-points
+            ikbv = mbkv(ji,jj)         ! (deepest ocean u- and v-points)
+            zavmu(ji,jj) = avmu(ji,jj,ikbu+1)
+            zavmv(ji,jj) = avmv(ji,jj,ikbv+1)
+            avmu(ji,jj,ikbu+1) = -bfrua(ji,jj) * fse3uw(ji,jj,ikbu+1)
+            avmv(ji,jj,ikbv+1) = -bfrva(ji,jj) * fse3vw(ji,jj,ikbv+1)
+         END DO
+      END DO
 
       ENDIF
@@ -304 +305 @@
          ! avm* are unactivated in the current TAM
          !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!# if defined key_vectopt_loop
-      !DO jj = 1, 1
-         !DO ji = jpi+2, jpij-jpi-1   ! vector opt. (forced unrolling)
-!# else
-      !DO jj = 2, jpjm1
-         !DO ji = 2, jpim1
-!# endif
-            !ikbu = mbku(ji,jj)         ! ocean bottom level at u- and v-points
-            !ikbv = mbkv(ji,jj)         ! (deepest ocean u- and v-points)
-            !avmu(ji,jj,ikbu+1) = zavmu(ji,jj)
-            !avmv(ji,jj,ikbv+1) = zavmv(ji,jj)
-         !END DO
-      !END DO
+# if defined key_vectopt_loop
+      DO jj = 1, 1
+         DO ji = jpi+2, jpij-jpi-1   ! vector opt. (forced unrolling)
+# else
+      DO jj = 2, jpjm1
+         DO ji = 2, jpim1
+# endif
+            ikbu = mbku(ji,jj)         ! ocean bottom level at u- and v-points
+            ikbv = mbkv(ji,jj)         ! (deepest ocean u- and v-points)
+            avmu(ji,jj,ikbu+1) = zavmu(ji,jj)
+            avmv(ji,jj,ikbv+1) = zavmv(ji,jj)
+         END DO
+      END DO
       ENDIF
       !