Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.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/bdytra.F90 (modified) (4 diffs, 1 prop)

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

@@ -11 +11 @@
    !!   'key_bdy'                     Unstructured Open Boundary Conditions
    !!----------------------------------------------------------------------
-   !!   bdy_tra        : Relaxation of tracers on unstructured open boundaries
+   !!   bdy_tra_frs        : Relaxation of tracers on unstructured open boundaries
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers variables
@@ -22 +22 @@
    PRIVATE
 
-   PUBLIC bdy_tra     ! routine called in tranxt.F90 
+   PUBLIC bdy_tra_frs     ! routine called in tranxt.F90 
 
    !!----------------------------------------------------------------------
-   !! 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
 
-   SUBROUTINE bdy_tra( kt )
+   SUBROUTINE bdy_tra_frs( kt )
       !!----------------------------------------------------------------------
-      !!                 ***  SUBROUTINE bdy_tra  ***
+      !!                 ***  SUBROUTINE bdy_tra_frs  ***
       !!                    
       !! ** Purpose : Apply the Flow Relaxation Scheme for tracers in the  
@@ -48 +47 @@
       !!----------------------------------------------------------------------
       !
-      IF(ln_bdy_tra_frs) THEN ! If this is false, then this routine does nothing. 
-
-      IF( kt == nit000 ) THEN
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'bdy_tra : Flow Relaxation Scheme for tracers'
-         IF(lwp) WRITE(numout,*) '~~~~~~~'
-      ENDIF
+      IF(ln_tra_frs) THEN       ! If this is false, then this routine does nothing. 
+         !
+         IF( kt == nit000 ) THEN
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) 'bdy_tra_frs : Flow Relaxation Scheme for tracers'
+            IF(lwp) WRITE(numout,*) '~~~~~~~'
+         ENDIF
+         !
+         igrd = 1                       ! Everything is at T-points here
+         DO ib = 1, nblen(igrd)
+            DO ik = 1, jpkm1
+               ii = nbi(ib,igrd)
+               ij = nbj(ib,igrd)
+               zwgt = nbw(ib,igrd)
+               ta(ii,ij,ik) = ( ta(ii,ij,ik) * (1.-zwgt) + tbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)         
+               sa(ii,ij,ik) = ( sa(ii,ij,ik) * (1.-zwgt) + sbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)
+            END DO
+         END DO 
+         !
+         CALL lbc_lnk( ta, 'T', 1. )   ; CALL lbc_lnk( sa, 'T', 1. )    ! Boundary points should be updated
+         !
+      ENDIF ! ln_tra_frs
       !
-      igrd = 1                       ! Everything is at T-points here
-      DO ib = 1, nblen(igrd)
-         DO ik = 1, jpkm1
-            ii = nbi(ib,igrd)
-            ij = nbj(ib,igrd)
-            zwgt = nbw(ib,igrd)
-            ta(ii,ij,ik) = ( ta(ii,ij,ik) * (1.-zwgt) + tbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)         
-            sa(ii,ij,ik) = ( sa(ii,ij,ik) * (1.-zwgt) + sbdy(ib,ik) * zwgt ) * tmask(ii,ij,ik)
-        END DO
-      END DO 
-      !
-      CALL lbc_lnk( ta, 'T', 1. )   ! Boundary points should be updated
-      CALL lbc_lnk( sa, 'T', 1. )   !
-      !
-      ENDIF ! ln_bdy_tra_frs
-
-   END SUBROUTINE bdy_tra
+   END SUBROUTINE bdy_tra_frs
    
 #else
@@ -79 +77 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE bdy_tra(kt)      ! Empty routine
-      WRITE(*,*) 'bdy_tra: You should not have seen this print! error?', kt
-   END SUBROUTINE bdy_tra
+   SUBROUTINE bdy_tra_frs(kt)      ! Empty routine
+      WRITE(*,*) 'bdy_tra_frs: You should not have seen this print! error?', kt
+   END SUBROUTINE bdy_tra_frs
 #endif