Changeset 2399 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90

Timestamp:

2010-11-17T10:09:35+01:00 (13 years ago)

Author:

gm

Message:

v3.3beta: diaptr (poleward heat & salt transports) #759 : rewriting including dynamical allocation + DOCTOR names

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) (8 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90

@@ -41 +41 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
-   SUBROUTINE tra_adv_qck ( kt, cdtype, p2dt, pun, pvn, pwn, &
-      &                                       ptb, ptn, pta, kjpt   )
+   SUBROUTINE tra_adv_qck ( kt, cdtype, p2dt, pun, pvn, pwn,      &
+      &                                       ptb, ptn, pta, kjpt )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_adv_qck  ***
@@ -82 +81 @@
       !! ** Reference : Leonard (1979, 1991)
       !!----------------------------------------------------------------------
-      !!
       INTEGER                              , INTENT(in   ) ::   kt              ! ocean time-step index
       CHARACTER(len=3)                     , INTENT(in   ) ::   cdtype          ! =TRA or TRC (tracer indicator)
@@ -112 +110 @@
 
 
-   SUBROUTINE tra_adv_qck_i( kt, cdtype, p2dt, pun,    &
+   SUBROUTINE tra_adv_qck_i( kt, cdtype, p2dt, pun,                  &
       &                                        ptb, ptn, pta, kjpt   )
       !!----------------------------------------------------------------------
@@ -152 +150 @@
          END DO
          CALL lbc_lnk( zfc(:,:,:), 'T', 1. )   ;   CALL lbc_lnk( zfd(:,:,:), 'T', 1. )   ! Lateral boundary conditions 
-
          
          !
@@ -231 +228 @@
 
 
-   SUBROUTINE tra_adv_qck_j( kt, cdtype, p2dt, pvn,   &
-      &                                        ptb, ptn, pta, kjpt   )
-      !!----------------------------------------------------------------------
-      !!
-      !!----------------------------------------------------------------------
-      !!
+   SUBROUTINE tra_adv_qck_j( kt, cdtype, p2dt, pvn,                &
+      &                                        ptb, ptn, pta, kjpt )
+      !!----------------------------------------------------------------------
+      !!
+      !!----------------------------------------------------------------------
       USE oce         , zwy => ua   ! use ua as workspace
       !!
@@ -312 +308 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.               
                   zfu(ji,jj,jk) = tmask(ji,jj-1,jk) + tmask(ji,jj,jk) + tmask(ji,jj+1,jk) - 2.
-               ENDDO
+               END DO
             END DO
          END DO
@@ -347 +343 @@
          IF( l_trd )  CALL trd_tra( kt, cdtype, jn, jptra_trd_yad, zwy, pvn, ptn(:,:,:,jn) )
          !                                 ! "Poleward" heat and salt transports (contribution of upstream fluxes)
-         IF( cdtype == 'TRA' .AND. ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN  
-           IF( jn == jp_tem )  pht_adv(:) = ptr_vj( zwy(:,:,:) )
-           IF( jn == jp_sal )  pst_adv(:) = ptr_vj( zwy(:,:,:) )
+         IF( cdtype == 'TRA' .AND. ln_diaptr .AND. ( MOD( kt, nn_fptr ) == 0 ) ) THEN  
+           IF( jn == jp_tem )  htr_adv(:) = ptr_vj( zwy(:,:,:) )
+           IF( jn == jp_sal )  str_adv(:) = ptr_vj( zwy(:,:,:) )
          ENDIF
          !
@@ -357 +353 @@
 
 
-   SUBROUTINE tra_adv_cen2_k( kt, cdtype, pwn,   &
+   SUBROUTINE tra_adv_cen2_k( kt, cdtype, pwn,           &
      &                                    ptn, pta, kjpt )
       !!----------------------------------------------------------------------