Changeset 4916 for branches/2014/dev_CNRS_2014

Timestamp:

2014-11-28T12:43:24+01:00 (9 years ago)

Author:

cetlod

Message:

2014/dev_CNRS_2014 : add missing lbc_lnk

Location:

branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/TRA

Files:

• eosbn2.F90 (modified) (7 diffs)
• trabbl.F90 (modified) (1 diff)

branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -44 +44 @@
    USE prtctl          ! Print control
    USE wrk_nemo        ! Memory Allocation
+   USE lbclnk         ! ocean lateral boundary conditions
    USE timing          ! Timing
 
@@ -452 +453 @@
          END DO
          !
+         CALL lbc_lnk( prd, 'T', 1. )                    ! Lateral boundary conditions
+         !
       CASE( 1 )                !==  simplified EOS  ==!
          !
@@ -469 +472 @@
             END DO
          END DO
+         !
+         CALL lbc_lnk( prd, 'T', 1. )                    ! Lateral boundary conditions
          !
       END SELECT
@@ -585 +590 @@
       END SELECT
       !
+      IF(ln_ctl)   CALL prt_ctl( tab3d_1=pab(:,:,:,jp_tem), clinfo1=' rab_3d_t: ', &
+         &                       tab3d_2=pab(:,:,:,jp_sal), clinfo2=' rab_3d_s : ', ovlap=1, kdim=jpk )
+      !
       IF( nn_timing == 1 )   CALL timing_stop('rab_3d')
       !
@@ -668 +676 @@
          END DO
          !
+         CALL lbc_lnk( pab(:,:,jp_tem), 'T', 1. )                    ! Lateral boundary conditions
+         CALL lbc_lnk( pab(:,:,jp_sal), 'T', 1. )                    
+         !
       CASE( 1 )                  !==  simplified EOS  ==!
          !
@@ -685 +696 @@
             END DO
          END DO
+         !
+         CALL lbc_lnk( pab(:,:,jp_tem), 'T', 1. )                    ! Lateral boundary conditions
+         CALL lbc_lnk( pab(:,:,jp_sal), 'T', 1. )                    
          !
       CASE DEFAULT
@@ -692 +706 @@
          !
       END SELECT
+      !
+      IF(ln_ctl)   CALL prt_ctl( tab2d_1=pab(:,:,jp_tem), clinfo1=' rab_2d_t: ', &
+         &                       tab2d_2=pab(:,:,jp_sal), clinfo2=' rab_2d_s : ' )
       !
       IF( nn_timing == 1 )   CALL timing_stop('rab_2d')

branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90

@@ -198 +198 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zptb(ji,jj) = ptb(ji,jj,mbkt(ji,jj),jn)       ! bottom before T and S
+               ik = mbkt(ji,jj)                              ! bottom T-level index
+               zptb(ji,jj) = ptb(ji,jj,ik,jn)       ! bottom before T and S
             END DO
          END DO