Changeset 990 for branches/dev_003_CPL/NEMO/OPA_SRC/TRA

Timestamp:

2008-05-23T16:38:21+02:00 (16 years ago)

Author:

smasson

Message:

dev_003_CPL: to the trunk , see ticket #155

Location:

branches/dev_003_CPL/NEMO/OPA_SRC/TRA

Files:

• traadv_cen2.F90 (modified) (2 diffs)
• tradmp.F90 (modified) (5 diffs)
• traldf.F90 (modified) (3 diffs)
• tranxt.F90 (modified) (2 diffs)
• trazdf_imp.F90 (modified) (2 diffs)

branches/dev_003_CPL/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -27 +27 @@
    USE trabbl          ! advective term in the BBL
    USE ocfzpt          !
+   USE sbcmod          ! surface Boundary Condition
    USE sbcrnf          ! river runoffs
    USE in_out_manager  ! I/O manager
@@ -147 +148 @@
          !
          upsmsk(:,:) = 0.e0                              ! not upstream by default
+         IF( .NOT. ln_rnf ) THEN                         ! no runoff 
+            rnfmsk(:,:) = 0.e0 ; rnfmsk_z(:) = 0.e0
+         ENDIF
+         ! 
          IF( cp_cfg == "orca" )   CALL ups_orca_set      ! set mixed Upstream/centered scheme near some straits
          !                                               ! and in closed seas (orca2 and orca4 only)

branches/dev_003_CPL/NEMO/OPA_SRC/TRA/tradmp.F90

@@ -47 +47 @@
    LOGICAL, PUBLIC            ::   lk_tradmp = .TRUE.     !: internal damping flag
 #endif
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   strdmp   !: damping salinity trend (psu/s)
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   resto    !: restoring coeff. on T and S (s-1)
    
@@ -121 +120 @@
                   sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
                   ! save the salinity trend (used in flx to close the salt budget)
-                  strdmp(ji,jj,jk) = zsa
                END DO
             END DO
@@ -142 +140 @@
                   sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
                   ! save the salinity trend (used in flx to close the salt budget)
-                  strdmp(ji,jj,jk) = zsa
                END DO
             END DO
@@ -162 +159 @@
                   sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
                   ! save the salinity trend (used in flx to close the salt budget)
-                  strdmp(ji,jj,jk) = zsa
                END DO
             END DO
@@ -229 +225 @@
       IF( .NOT.lk_dtasal .OR. .NOT.lk_dtatem )   &
          &   CALL ctl_stop( 'no temperature and/or salinity data define key_dtatem and key_dtasal' )
-
-      strdmp(:,:,:) = 0.e0       ! internal damping salinity trend (used in ocesbc)
 
       !                          ! Damping coefficients initialization

branches/dev_003_CPL/NEMO/OPA_SRC/TRA/traldf.F90

@@ -33 +33 @@
    PUBLIC   tra_ldf    ! called by step.F90 
 
-   INTEGER ::   nldf = 0   ! type of lateral diffusion used defined from ln_traldf_... namlist logicals)
+   INTEGER, PUBLIC ::   nldf = 0   ! type of lateral diffusion used defined from ln_traldf_... namlist logicals)
+                                   ! (need to be public to be used in vertical diffusion routine)
 #if defined key_traldf_ano
    REAL, DIMENSION(jpi,jpj,jpk) ::   t0_ldf, s0_ldf   ! lateral diffusion trends of T & S
@@ -159 +160 @@
 
       ! defined the type of lateral diffusion from ln_traldf_... logicals
+      ! CAUTION : nldf = 1 is used in trazdf_imp, change it carefully
       ierr = 0
       IF( ln_traldf_lap ) THEN       ! laplacian operator
@@ -203 +205 @@
       IF( nldf == 1 .OR. nldf == 3 ) THEN      ! rotation
          IF( .NOT.lk_ldfslp )   CALL ctl_stop( '          the rotation of the diffusive tensor require key_ldfslp' )
+         l_traldf_rot = .TRUE.                 ! needed for trazdf_imp
       ENDIF
 

branches/dev_003_CPL/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -27 +27 @@
    USE domvvl          ! variable volume
    USE obctra          ! open boundary condition (obc_tra routine)
+   USE bdytra          ! Unstructured open boundary condition (bdy_tra routine)
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
@@ -159 +160 @@
       ! Update tracers on open boundaries.
       CALL obc_tra( kt )
+
+      !                                                ! ===============
+      DO jk = 1, jpkm1                                 ! Horizontal slab
+         !                                             ! ===============
+#elif defined key_bdy
+         !                                             ! ===============
+      END DO                                           !   End of slab
+      !                                                ! ===============
+
+      ! Update tracers on open boundaries.
+      CALL bdy_tra( kt )
+
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab

branches/dev_003_CPL/NEMO/OPA_SRC/TRA/trazdf_imp.F90

@@ -31 +31 @@
    USE prtctl          ! Print control
    USE domvvl          ! variable volume
+   USE ldftra          ! lateral mixing type
 
    IMPLICIT NONE
@@ -138 +139 @@
 #if defined key_ldfslp
       ! update and save of avt (and avs if double diffusive mixing)
-      DO jk = 2, jpkm1
-         DO jj = 2, jpjm1
-            DO ji = fs_2, fs_jpim1   ! vector opt.
-               zavi = fsahtw(ji,jj,jk)                       &   ! vertical mixing coef. due to lateral mixing
-                  & * (  wslpi(ji,jj,jk) * wslpi(ji,jj,jk)   &
-                  &    + wslpj(ji,jj,jk) * wslpj(ji,jj,jk)  )
-               zwt(ji,jj,jk) = avt(ji,jj,jk) + zavi              ! zwt=avt+zavi (total vertical mixing coef. on temperature)
+      IF( l_traldf_rot ) THEN
+         DO jk = 2, jpkm1
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  zavi = fsahtw(ji,jj,jk)                       &   ! vertical mixing coef. due to lateral mixing
+                     & * (  wslpi(ji,jj,jk) * wslpi(ji,jj,jk)   &
+                     &    + wslpj(ji,jj,jk) * wslpj(ji,jj,jk)  )
+                  zwt(ji,jj,jk) = avt(ji,jj,jk) + zavi              ! zwt=avt+zavi (total vertical mixing coef. on temperature)
 # if defined key_zdfddm
-               zavsi(ji,jj,jk) = fsavs(ji,jj,jk) + zavi          ! dd mixing: zavsi = total vertical mixing coef. on salinity
+                  zavsi(ji,jj,jk) = fsavs(ji,jj,jk) + zavi          ! dd mixing: zavsi = total vertical mixing coef. on salinity
 # endif
-            END DO
-         END DO
-      END DO
-
+               END DO
+            END DO
+         END DO
+      ENDIF   
 #else
       ! No isopycnal diffusion