Changeset 481 for trunk/NEMO/OPA_SRC/TRA/trabbl.F90

Timestamp:

2006-06-19T15:29:54+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_047 : CT : correction in order to take into account the partial steps for advective bbl

File:

• trunk/NEMO/OPA_SRC/TRA/trabbl.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/TRA/trabbl.F90

@@ -20 +20 @@
    USE trdmod_oce           ! ocean variables trends
    USE in_out_manager       ! I/O manager
+   USE lbclnk               ! ocean lateral boundary conditions
    USE prtctl               ! Print control
 
@@ -115 +116 @@
       USE oce, ONLY :    ztdta => ua,     & ! use ua as 3D workspace   
                          ztdsa => va        ! use va as 3D workspace   
-      USE eosbn2 , ONLY : neos              ! type of equation of state
+      USE eosbn2                            ! equation of state
 
       !! * Arguments 
@@ -233 +234 @@
       SELECT CASE ( neos )
 
-      CASE ( 0   )               ! 0 :Jackett and McDougall (1994) formulation
+      CASE ( 0 )                 ! Jackett and McDougall (1994) formulation
 
 #  if defined key_vectopt_loop   &&   ! defined key_mpp_omp
@@ -321 +322 @@
       CASE ( 2 )               ! Linear formulation function of temperature and salinity
 
-         CALL ctl_stop( '          use of linear eos rho(T,S) = rau0 * ( rbeta * S - ralpha * T )', &
-              &         '          bbl not implented: easy to do it ' )
-
+#  if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+      jj = 1
+      DO ji = 1, jpij-jpi   ! vector opt. (forced unrolling)
+#  else
+      DO jj = 1, jpjm1
+         DO ji = 1, jpim1
+#  endif      
+            ! local density gradient along i-bathymetric slope
+            zgdrho = - ( rbeta*( zsnb(ji+1,jj) - zsnb(ji,jj) )   &
+                     -  ralpha*( ztnb(ji+1,jj) - ztnb(ji,jj) ) )
+            ! sign of local i-gradient of density multiplied by the i-slope
+            zsign = SIGN( 0.5, - zgdrho * ( zdep(ji+1,jj) - zdep(ji,jj) ) )
+            zki(ji,jj) = ( 0.5 - zsign ) * zahu(ji,jj)
+#  if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+         END DO
+#  endif
+      END DO
+
+#  if defined key_vectopt_loop   &&   ! defined key_mpp_omp
+      jj = 1
+      DO ji = 1, jpij-jpi   ! vector opt. (forced unrolling)
+#  else
+      DO jj = 1, jpjm1
+         DO ji = 1, jpim1
+#  endif     
+            ! local density gradient along j-bathymetric slope
+            zgdrho = - ( rbeta*( zsnb(ji,jj+1) - zsnb(ji,jj) )   &
+                     -  ralpha*( ztnb(ji,jj+1) - ztnb(ji,jj) ) )   
+            ! sign of local j-gradient of density multiplied by the j-slope
+            zsign = sign( 0.5, -zgdrho * ( zdep(ji,jj+1) - zdep(ji,jj) ) )
+            zkj(ji,jj) = ( 0.5 - zsign ) * zahv(ji,jj)
+#  if ! defined key_vectopt_loop   ||   defined key_mpp_omp
+         END DO
+#  endif
+      END DO
+      
       CASE DEFAULT
 
@@ -461 +495 @@
       !! * Local declarations
       INTEGER ::   ji, jj      ! dummy loop indices
+      REAL(wp),  DIMENSION(jpi,jpj) :: zmbk  
+
       NAMELIST/nambbl/ atrbbl
       !!----------------------------------------------------------------------
@@ -499 +535 @@
          END DO
       END DO
-!!bug ???
-!!bug Caution : define the vakue of mbku & mbkv everywhere!!! but lbc mpp lnk : pb when closed (0)
+
+      zmbk(:,:) = FLOAT( mbku (:,:) )   
+      CALL lbc_lnk(zmbk,'U',1.)
+      mbku(:,:) = MAX( INT( zmbk(:,:) ), 1 ) 
+
+      zmbk(:,:) = FLOAT( mbkv (:,:) )   
+      CALL lbc_lnk(zmbk,'V',1.)
+      mbkv(:,:) = MAX( INT( zmbk(:,:) ), 1 ) 
 
 # if defined key_trabbl_adv