Changeset 2123

Timestamp:

2010-09-24T17:39:58+02:00 (14 years ago)

Author:

cetlod

Message:

correction of minor bug in trabbl.F90

File:

• branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) (7 diffs)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/trabbl.F90

@@ -102 +102 @@
       ENDIF
 
-      IF( l_bbl )   CALL bbl( kt, 'TRA' )       !* bbl coef. and transport (only if not already done trcbbl)
+      IF( l_bbl )   CALL bbl( kt, 'TRA' )       !* bbl coef. and transport (only if not already done in trcbbl)
 
 
@@ -166 +166 @@
       INTEGER  ::   ji, jj, jn   ! dummy loop indices
       INTEGER  ::   ik           ! local integers
-      REAL(wp) ::   zbtr, ztra   ! local scalars
+      REAL(wp) ::   zbtr         ! local scalars
       !!----------------------------------------------------------------------
       !
@@ -216 +216 @@
       !!
       INTEGER  ::   ji, jj, jk, jn           ! dummy loop indices
-      INTEGER  ::   ik                       ! local integers
-      INTEGER  ::   iis , iid , ijs , ijd    !   -       -
+      INTEGER  ::   iis , iid , ijs , ijd    ! local integers
       INTEGER  ::   ikus, ikud, ikvs, ikvd   !   -       -
       REAL(wp) ::   zbtr, ztra               ! local scalars
@@ -228 +227 @@
 # if defined key_vectopt_loop
          DO jj = 1, 1
-            DO ji = jpi+1, jpij-jpi-1   ! vector opt. (forced unrolling)
+            DO ji = 1, jpij-jpi-1   ! vector opt. (forced unrolling)
 # else
-         DO jj = 2, jpjm1
+         DO jj = 1, jpjm1
             DO ji = 1, jpim1            ! CAUTION start from i=1 to update i=2 when cyclic east-west
 # endif
@@ -418 +417 @@
          !
          CASE( 1 )                                   != use of upper velocity
-            DO jj = 2, jpjm1                                 ! criteria: grad(rho).grad(h)<0  and grad(rho).grad(h)<0
+            DO jj = 1, jpjm1                                 ! criteria: grad(rho).grad(h)<0  and grad(rho).grad(h)<0
                DO ji = 1, fs_jpim1   ! vector opt.
                   !                                               ! i-direction
@@ -451 +450 @@
          CASE( 2 )                                 != bbl velocity = F( delta rho )
             zgbbl = grav * rn_gambbl
-            DO jj = 2, jpjm1                            ! criteria: rho_up > rho_down
+            DO jj = 1, jpjm1                            ! criteria: rho_up > rho_down
                DO ji = 1, fs_jpim1   ! vector opt.
                   !                                         ! i-direction
@@ -555 +554 @@
       zmbk(:,:) = FLOAT( mbkv_d(:,:) )   ;   CALL lbc_lnk(zmbk,'V',1.)   ;   mbkv_d(:,:) = MAX( INT( zmbk(:,:) ), 1 )
 
-      DO jj = 1, jpj                !* sign of grad(H) at u- and v-points
-         DO ji = 1, jpi
+                                        !* sign of grad(H) at u- and v-points
+      mgrhu(jpi,:) = 0.    ;    mgrhu(:,jpj) = 0.   ;    mgrhv(jpi,:) = 0.    ;    mgrhv(:,jpj) = 0.
+      DO jj = 1, jpjm1                
+         DO ji = 1, jpim1
             mgrhu(ji,jj) = INT(  SIGN( 1.e0, fsdept_0(ji+1,jj,mbkt(ji+1,jj)) - fsdept_0(ji,jj,mbkt(ji,jj)) )  )
             mgrhv(ji,jj) = INT(  SIGN( 1.e0, fsdept_0(ji,jj+1,mbkt(ji,jj+1)) - fsdept_0(ji,jj,mbkt(ji,jj)) )  )