Changeset 2399 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_bilapg.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/traldf_bilapg.F90 (modified) (7 diffs)

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

@@ -4 +4 @@
    !! Ocean  tracers:  horizontal component of the lateral tracer mixing trend
    !!==============================================================================
-   !! History : 8.0   !  1997-07  (G. Madec)  Original code
-   !!           NEMO  !  2002-08  (G. Madec)  F90: Free form and module
-   !!           3.3   !  2010-06  (C. Ethe, G. Madec) Merge TRA-TRC
+   !! History : 8.0   ! 1997-07  (G. Madec)  Original code
+   !!   NEMO    1.0   ! 2002-08  (G. Madec)  F90: Free form and module
+   !!           3.3   ! 2010-06  (C. Ethe, G. Madec) Merge TRA-TRC
    !!==============================================================================
 #if defined key_ldfslp   ||   defined key_esopa
@@ -37 +37 @@
    !! 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
 
@@ -66 +65 @@
       !!               biharmonic mixing trend.
       !!----------------------------------------------------------------------
-      INTEGER         , INTENT(in   )                                ::   kt             ! ocean time-step index
-      CHARACTER(len=3), INTENT(in   )                                ::   cdtype         ! =TRA or TRC (tracer indicator)
-      INTEGER         , INTENT(in   )                                ::   kjpt            ! number of tracers
-      REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(in   ) ::   ptb          ! before and now tracer fields
-      REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(inout) ::   pta          ! tracer trend 
+      INTEGER         , INTENT(in   )                      ::   kt       ! ocean time-step index
+      CHARACTER(len=3), INTENT(in   )                      ::   cdtype   ! =TRA or TRC (tracer indicator)
+      INTEGER         , INTENT(in   )                      ::   kjpt     ! number of tracers
+      REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(in   ) ::   ptb      ! before and now tracer fields
+      REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(inout) ::   pta      ! tracer trend 
       !!
       INTEGER ::   ji, jj, jk, jn                 ! dummy loop indices
@@ -81 +80 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~'
       ENDIF
-      !
-      !
 
       ! 1. Laplacian of ptb * aht
@@ -100 +97 @@
       ! 3. Update the tracer trends                    (j-slab :   2, jpj-1)
       ! ---------------------------
-      !
       DO jn = 1, kjpt
-         !                                                ! ===============
-         DO jj = 2, jpjm1                                 !  Vertical slab
-            !                                             ! ===============
+         DO jj = 2, jpjm1
             DO jk = 1, jpkm1
                DO ji = 2, jpim1
@@ -111 +105 @@
                END DO
             END DO
-            !                                             ! ===============
-         END DO                                           !   End of slab
-         !                                                ! ===============
+         END DO
       END DO
-
+      !
    END SUBROUTINE tra_ldf_bilapg
 
@@ -238 +230 @@
          !                                                ! ===============
          ! "Poleward" diffusive heat or salt transport
-         IF( cdtype == 'TRA' .AND. ln_diaptr .AND. ( kaht == 2 ) .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN
-            IF( jn == jp_tem)   pht_ldf(:) = ptr_vj( zftv(:,:,:) )
-            IF( jn == jp_sal)   pst_ldf(:) = ptr_vj( zftv(:,:,:) )
+         IF( cdtype == 'TRA' .AND. ln_diaptr .AND. ( kaht == 2 ) .AND. ( MOD( kt, nn_fptr ) == 0 ) ) THEN
+            IF( jn == jp_tem)   htr_ldf(:) = ptr_vj( zftv(:,:,:) )
+            IF( jn == jp_sal)   str_ldf(:) = ptr_vj( zftv(:,:,:) )
          ENDIF