Changeset 4317 for branches/2013/dev_MERGE_2013

Timestamp:

2013-11-26T17:47:17+01:00 (10 years ago)

Author:

cbricaud

Message:

Deallocate some arrays. see ticket #1190

Location:

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY

Files:

• bdydyn.F90 (modified) (4 diffs)
• bdydyn3d.F90 (modified) (2 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90

@@ -97 +97 @@
       
       IF (lk_vvl) THEN
-         phur1(:,:) = 0.
-         phvr1(:,:) = 0.
+         phur(:,:) = 0.
+         phvr(:,:) = 0.
          DO jk = 1, jpkm1
-            phur1(:,:) = phur1(:,:) + fse3u_a(:,:,jk) * umask(:,:,jk)
-            phvr1(:,:) = phvr1(:,:) + fse3v_a(:,:,jk) * vmask(:,:,jk)
+            phur(:,:) = phur(:,:) + fse3u_a(:,:,jk) * umask(:,:,jk)
+            phvr(:,:) = phvr(:,:) + fse3v_a(:,:,jk) * vmask(:,:,jk)
             pua2d(:,:) = pua2d(:,:) + fse3u_a(:,:,jk) * umask(:,:,jk) * ua(:,:,jk)
             pva2d(:,:) = pva2d(:,:) + fse3v_a(:,:,jk) * vmask(:,:,jk) * va(:,:,jk)
          END DO
-         phur1(:,:) = umask(:,:,1) / ( phur1(:,:) + 1. - umask(:,:,1) )
-         phvr1(:,:) = vmask(:,:,1) / ( phvr1(:,:) + 1. - vmask(:,:,1) )
-         pua2d(:,:) = pua2d(:,:) * phur1(:,:)
-         pva2d(:,:) = pva2d(:,:) * phvr1(:,:)
+         phur(:,:) = umask(:,:,1) / ( phur(:,:) + 1. - umask(:,:,1) )
+         phvr(:,:) = vmask(:,:,1) / ( phvr(:,:) + 1. - vmask(:,:,1) )
+         pua2d(:,:) = pua2d(:,:) * phur(:,:)
+         pva2d(:,:) = pva2d(:,:) * phvr(:,:)
       ELSE
          DO jk = 1, jpkm1
@@ -119 +119 @@
 
       DO jk = 1 , jpkm1
-         ua(:,:,jk) = ua(:,:,jk) - pua2d(:,:)
-         va(:,:,jk) = va(:,:,jk) - pva2d(:,:)
+         ua(:,:,jk) = (ua(:,:,jk) - pua2d(:,:)) * umask(:,:,jk)
+         va(:,:,jk) = (va(:,:,jk) - pva2d(:,:)) * vmask(:,:,jk)
       END DO
 
@@ -152 +152 @@
 
          DO jk = 1 , jpkm1
-            ub(:,:,jk) = ub(:,:,jk) - pub2d(:,:)
-            vb(:,:,jk) = vb(:,:,jk) - pvb2d(:,:)
+            ub(:,:,jk) = (ub(:,:,jk) - pub2d(:,:)) * umask(:,:,jk)
+            vb(:,:,jk) = (vb(:,:,jk) - pvb2d(:,:)) * vmask(:,:,jk)
          END DO
       END IF
@@ -183 +183 @@
 
       CALL wrk_dealloc(jpi,jpj,pua2d,pva2d) 
-      IF ( ll_orlanski ) CALL wrk_dealloc(jpi,jpj,pub2d,pvb2d) 
+      IF ( ll_orlanski ) CALL wrk_dealloc(jpi,jpj,pub2d,pvb2d,phur1,phvr1) 
 
       IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn')

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90

@@ -288 +288 @@
          pvb2d(:,:) = pvb2d(:,:) + fse3v_b(:,:,jk)* vb(:,:,jk)   *vmask(:,:,jk)
 #else
-         pub2d(:,:) = pub2d(:,:) + fse3u_0(:,:,jk) * ub(:,:,jk)  * umask(:,:,jk)
-         pvb2d(:,:) = pvb2d(:,:) + fse3v_0(:,:,jk) * vb(:,:,jk)  * vmask(:,:,jk)
+         pub2d(:,:) = pub2d(:,:) + fse3u(:,:,jk) * ub(:,:,jk)  * umask(:,:,jk)
+         pvb2d(:,:) = pvb2d(:,:) + fse3v(:,:,jk) * vb(:,:,jk)  * vmask(:,:,jk)
 #endif
       END DO
@@ -329 +329 @@
       ENDDO
       !
-      CALL wrk_dealloc(jpi,jpj,pub2d,pvb2d) 
+      CALL wrk_dealloc(jpi,jpj,pub2d,pvb2d,phur1,phvr1) 
       !
       CALL lbc_lnk( ua, 'U', -1. )   ;   CALL lbc_lnk( va, 'V', -1. )   ! Boundary points should be updated