Changeset 4370 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90

Timestamp:

2014-01-23T18:13:16+01:00 (10 years ago)

Author:

jchanut

Message:

Time split cleaning / AMM12 restart / BDY and Agrif. See tickets #1228, #1227, #1225 and #1133

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) (5 diffs)

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

@@ -61 +61 @@
       !!
       REAL(wp), POINTER, DIMENSION(:,:) :: pua2d, pva2d     ! after barotropic velocities
-      REAL(wp), POINTER, DIMENSION(:,:) :: phura, phvra     ! after inverse depth at u and v points
 
       IF( nn_timing == 1 ) CALL timing_start('bdy_dyn')
@@ -82 +81 @@
       !-------------------------------------------------------
 
-      CALL wrk_alloc(jpi,jpj,pua2d,pva2d,phura,phvra) 
+      CALL wrk_alloc(jpi,jpj,pua2d,pva2d) 
 
       !-------------------------------------------------------
@@ -91 +90 @@
 
       pua2d(:,:) = 0.e0
-      pva2d(:,:) = 0.e0
-      
-      IF (lk_vvl) THEN
-         phura(:,:) = 0.
-         phvra(:,:) = 0.
-         DO jk = 1, jpkm1
-            phura(:,:) = phura(:,:) + fse3u_a(:,:,jk) * umask(:,:,jk)
-            phvra(:,:) = phvra(:,:) + 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
-         phura(:,:) = umask(:,:,1) / ( phura(:,:) + 1. - umask(:,:,1) )
-         phvra(:,:) = vmask(:,:,1) / ( phvra(:,:) + 1. - vmask(:,:,1) )
-      ELSE
-         phura(:,:) = hur(:,:)
-         phvra(:,:) = hvr(:,:)
-         DO jk = 1, jpkm1
-            pua2d(:,:) = pua2d(:,:) + fse3u(:,:,jk) * umask(:,:,jk) * ua(:,:,jk)
-            pva2d(:,:) = pva2d(:,:) + fse3v(:,:,jk) * vmask(:,:,jk) * va(:,:,jk)
-         END DO
-      ENDIF
-      pua2d(:,:) = pua2d(:,:) * phura(:,:)
-      pva2d(:,:) = pva2d(:,:) * phvra(:,:)
+      pva2d(:,:) = 0.e0      
+      DO jk = 1, jpkm1
+         pua2d(:,:) = pua2d(:,:) + fse3u_a(:,:,jk) * umask(:,:,jk) * ua(:,:,jk)
+         pva2d(:,:) = pva2d(:,:) + fse3v_a(:,:,jk) * vmask(:,:,jk) * va(:,:,jk)
+      END DO
+
+      pua2d(:,:) = pua2d(:,:) * hur_a(:,:)
+      pva2d(:,:) = pva2d(:,:) * hvr_a(:,:)
 
       DO jk = 1 , jpkm1
@@ -134 +118 @@
       !-------------------------------------------------------
 
-      IF( ll_dyn2d ) CALL bdy_dyn2d( kt, pua2d, pva2d, ub_b, vb_b, phura, phvra, ssha )
+      IF( ll_dyn2d ) CALL bdy_dyn2d( kt, pua2d, pva2d, ub_b, vb_b, hur_a(:,:), hvr_a(:,:), ssha )
 
       IF( ll_dyn3d ) CALL bdy_dyn3d( kt )
@@ -154 +138 @@
       END IF
 
-      CALL wrk_dealloc(jpi,jpj,pua2d,pva2d,phura,phvra) 
+      CALL wrk_dealloc(jpi,jpj,pua2d,pva2d) 
 
       IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn')