Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (8 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -26 +26 @@
    USE sbc_oce         ! surface boundary condition: ocean
    USE obc_oce         ! Lateral open boundary condition
+   USE bdy_oce         ! Lateral open boundary condition
    USE sol_oce         ! ocean elliptic solver
    USE phycst          ! physical constants
@@ -33 +34 @@
    USE solpcg          ! preconditionned conjugate gradient solver
    USE solsor          ! Successive Over-relaxation solver
-   USE obcdyn          ! ocean open boundary condition (obc_dyn routines)
-   USE obcvol          ! ocean open boundary condition (obc_vol routines)
-   USE bdy_oce         ! Unstructured open boundaries condition
-   USE bdydyn          ! Unstructured open boundaries condition (bdy_dyn routine) 
-   USE bdyvol          ! Unstructured open boundaries condition (bdy_vol routine)
+   USE obcdyn          ! ocean open boundary condition on dynamics
+   USE obcvol          ! ocean open boundary condition (obc_vol routine)
+   USE bdydyn          ! ocean open boundary condition on dynamics
+   USE bdyvol          ! ocean open boundary condition (bdy_vol routine)
    USE cla             ! cross land advection
    USE in_out_manager  ! I/O manager
    USE lib_mpp         ! distributed memory computing library
+   USE wrk_nemo        ! Memory Allocation
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
@@ -49 +50 @@
    USE agrif_opa_interp
 #endif
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -103 +105 @@
       !! References : Roullet and Madec 1999, JGR.
       !!---------------------------------------------------------------------
-      USE oce, ONLY:   zub   => ta , zvb   => sa   ! (ta,sa) used as workspace
-      !!
       INTEGER, INTENT(in   ) ::   kt       ! ocean time-step index
       INTEGER, INTENT(  out) ::   kindic   ! solver convergence flag (<0 if not converge)
@@ -110 +110 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   z2dt, z2dtg, zgcb, zbtd, ztdgu, ztdgv   ! local scalars
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zub, zvb
       !!----------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )  CALL timing_start('dyn_spg_flt')
+      !
+      CALL wrk_alloc( jpi,jpj,jpk, zub, zvb )
       !
       IF( kt == nit000 ) THEN
@@ -187 +192 @@
 #endif
 #if defined key_bdy
-      CALL bdy_dyn_frs( kt )       ! Update velocities on unstructured boundary using the Flow Relaxation Scheme
-      CALL bdy_vol( kt )           ! Correction of the barotropic component velocity to control the volume of the system
+      CALL bdy_dyn( kt )      ! Update velocities on each open boundary
+      CALL bdy_vol( kt )      ! Correction of the barotropic component velocity to control the volume of the system
 #endif
 #if defined key_agrif
@@ -304 +309 @@
 #if defined key_obc
             ! caution : grad D = 0 along open boundaries
+            ! Remark: The filtering force could be reduced here in the FRS zone
+            !         by multiplying spgu/spgv by (1-alpha) ??  
             spgu(ji,jj) = z2dt * ztdgu * obcumask(ji,jj)
             spgv(ji,jj) = z2dt * ztdgv * obcvmask(ji,jj)
 #elif defined key_bdy
             ! caution : grad D = 0 along open boundaries
-            ! Remark: The filtering force could be reduced here in the FRS zone
-            !         by multiplying spgu/spgv by (1-alpha) ??  
             spgu(ji,jj) = z2dt * ztdgu * bdyumask(ji,jj)
-            spgv(ji,jj) = z2dt * ztdgv * bdyvmask(ji,jj)           
+            spgv(ji,jj) = z2dt * ztdgv * bdyvmask(ji,jj)
 #else
             spgu(ji,jj) = z2dt * ztdgu
@@ -345 +350 @@
       ! --------------------------------------------------
       IF( lrst_oce ) CALL flt_rst( kt, 'WRITE' )
+      !
+      CALL wrk_dealloc( jpi,jpj,jpk, zub, zvb )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('dyn_spg_flt')
       !
    END SUBROUTINE dyn_spg_flt