Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90 (modified) (8 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90

@@ -11 +11 @@
 #if   defined key_bdy   &&   defined key_dynspg_flt
    !!----------------------------------------------------------------------
-   !!   'key_bdy'            and      unstructured open boundary conditions
+   !!   'key_bdy'            AND      unstructured open boundary conditions
    !!   'key_dynspg_flt'                              filtered free surface
    !!----------------------------------------------------------------------
@@ -30 +30 @@
 #  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -62 +61 @@
       !!            zero (z_cflxemp=0) to calculate the correction velocity. So
       !!            it will only balance the flux through open boundaries.
-      !!            (set volbdy to 0 in tne namelist for this option)
+      !!            (set nn_volctl to 0 in tne namelist for this option)
       !!         2/ The volume is constant even with E-P flux. In this case
       !!            the correction velocity must balance both the flux 
       !!            through open boundaries and the ones through the free
       !!            surface. 
-      !!            (set volbdy to 1 in tne namelist for this option)
+      !!            (set nn_volctl to 1 in tne namelist for this option)
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -73 +72 @@
       INTEGER  ::   ji, jj, jk, jb, jgrd
       INTEGER  ::   ii, ij
-      REAL(wp) ::   zubtpecor, z_cflxemp, ztranst, zraur
+      REAL(wp) ::   zubtpecor, z_cflxemp, ztranst
       !!-----------------------------------------------------------------------------
+
+      IF( ln_vol ) THEN
 
       IF( kt == nit000 ) THEN 
@@ -84 +85 @@
       ! Calculate the cumulate surface Flux z_cflxemp (m3/s) over all the domain
       ! -----------------------------------------------------------------------
-      z_cflxemp = 0.e0
-      zraur = 1.e0 / rau0
-      z_cflxemp = SUM ( emp(:,:) * bdytmask(:,:) * e1t(:,:) * e2t(:,:) * zraur )
-      IF( lk_mpp )   CALL mpp_sum( z_cflxemp )   ! sum over the global domain
+      z_cflxemp = SUM ( ( emp(:,:)-rnf(:,:) ) * bdytmask(:,:) * e1t(:,:) * e2t(:,:) ) / rau0
+      IF( lk_mpp )   CALL mpp_sum( z_cflxemp )     ! sum over the global domain
 
-      ! Barotropic velocity through the unstructured open boundary
-      ! ----------------------------------------------------------
+      ! Transport through the unstructured open boundary
+      ! ------------------------------------------------
       zubtpecor = 0.e0
       jgrd = 2                               ! cumulate u component contribution first 
@@ -112 +111 @@
       ! The normal velocity correction
       ! ------------------------------
-      IF (volbdy==1) THEN   ;   zubtpecor = ( zubtpecor - z_cflxemp) / bdysurftot 
-      ELSE                  ;   zubtpecor =   zubtpecor             / bdysurftot
+      IF( nn_volctl==1 ) THEN   ;   zubtpecor = ( zubtpecor - z_cflxemp) / bdysurftot 
+      ELSE                   ;   zubtpecor =   zubtpecor             / bdysurftot
       END IF
 
@@ -141 +140 @@
       ! Check the cumulated transport through unstructured OBC once barotropic velocities corrected
       ! ------------------------------------------------------
-
       IF( lwp .AND. MOD( kt, nwrite ) == 0) THEN
          IF(lwp) WRITE(numout,*)
@@ -152 +150 @@
       END IF 
       !
+      END IF ! ln_vol
+
    END SUBROUTINE bdy_vol