Changeset 786 for branches/dev_001_GM/NEMO/OPA_SRC/TRA/trasbc.F90

Timestamp:

2008-01-10T18:11:23+01:00 (16 years ago)

Author:

gm

Message:

dev_001_GM - merge TRC-TRA on OPA only, trabbl & zpshde not done and trdmld not OK - compilation OK

File:

• branches/dev_001_GM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (4 diffs)

branches/dev_001_GM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -1 +1 @@
 MODULE trasbc
-   !!==============================================================================
+   !!======================================================================
    !!                       ***  MODULE  trasbc  ***
    !! Ocean active tracers:  surface boundary condition
-   !!==============================================================================
-   !! History :  8.2  !  98-10  (G. Madec, G. Roullet, M. Imbard)  Original code
+   !!======================================================================
+   !! History :  OPA  !  98-10  (G. Madec, G. Roullet, M. Imbard)  Original code
    !!            8.2  !  01-02  (D. Ludicone)  sea ice and free surface
-   !!            8.5  !  02-06  (G. Madec)  F90: Free form and module
+   !!   NEMO     1.0  !  02-06  (G. Madec)  F90: Free form and module
+   !!            2.4  !  08-01  (G. Madec) Merge TRA-TRC
    !!----------------------------------------------------------------------
 
@@ -31 +32 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
+   !! NEMO/OPA 2.4 , LOCEAN-IPSL (2008) 
+   !! $Id:$ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -98 +99 @@
       !!              - save the trend it in ttrd ('key_trdtra')
       !!----------------------------------------------------------------------
-      USE oce, ONLY :   ztrdt => ua   ! use ua as 3D workspace   
-      USE oce, ONLY :   ztrds => va   ! use va as 3D workspace   
-      !!
       INTEGER, INTENT(in) ::   kt     ! ocean time-step index
       !!
       INTEGER  ::   ji, jj                   ! dummy loop indices
       REAL(wp) ::   zta, zsa, zsrau, zse3t   ! temporary scalars
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   ztrdt, ztrds   ! 3D workspace
       !!----------------------------------------------------------------------
 
@@ -144 +143 @@
       END DO
 
-      IF( l_trdtra ) THEN      ! save the sbc trends for diagnostic
+      IF( l_trdtra )   THEN                      ! save the horizontal diffusive trends for further diagnostics
          ztrdt(:,:,:) = ta(:,:,:) - ztrdt(:,:,:)
          ztrds(:,:,:) = sa(:,:,:) - ztrds(:,:,:)
-         CALL trd_mod(ztrdt, ztrds, jptra_trd_nsr, 'TRA', kt)
+         CALL trd_tra( kt, jp_tem, jpt_trd_qns, 'TRA', ptrd3d=ztrdt)
+         CALL trd_tra( kt, jp_sal, jpt_trd_qns, 'TRA', ptrd3d=ztrds)
       ENDIF
       !