Changeset 3318 for branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2012-02-25T16:50:01+01:00 (12 years ago)

Author:

gm

Message:

Ediag branche: #927 split TRA/DYN trd computation

File:

• branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (4 diffs)

branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -29 +29 @@
    USE zdf_oce         ! ???
    USE domvvl          ! variable volume
+   USE phycst          ! physical constant
    USE ldftra_oce      ! ocean active tracers lateral physics
    USE dynspg_oce      ! surface     pressure gradient variables
    USE dynhpg          ! hydrostatic pressure gradient 
-   USE trdmod_oce      ! ocean space and time domain variables 
-   USE trdtra          ! ocean active tracers trends 
-   USE phycst
-   USE obc_oce
+   USE traqsr          ! penetrative solar radiation (needed for nksr)
+   USE trd_oce         ! trends: ocean variables
+   USE trdtra          ! trends manager: tracers 
+   USE obc_oce         ! open boundary condition variable
    USE obctra          ! open boundary condition (obc_tra routine)
    USE bdy_oce
@@ -42 +43 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
-   USE traqsr          ! penetrative solar radiation (needed for nksr)
 #if defined key_agrif
    USE agrif_opa_update
@@ -134 +134 @@
          ztrds(:,:,:) = tsn(:,:,:,jp_sal)
          IF( ln_traldf_iso ) THEN              ! diagnose the "pure" Kz diffusive trend 
-            CALL trd_tra( kt, 'TRA', jp_tem, jptra_trd_zdfp, ztrdt )
-            CALL trd_tra( kt, 'TRA', jp_sal, jptra_trd_zdfp, ztrds )
+            CALL trd_tra( kt, 'TRA', jp_tem, jptra_zdfp, ztrdt )
+            CALL trd_tra( kt, 'TRA', jp_sal, jptra_zdfp, ztrds )
          ENDIF
       ENDIF
@@ -164 +164 @@
             ztrds(:,:,jk) = ( tsb(:,:,jk,jp_sal) - ztrds(:,:,jk) ) * zfact
          END DO
-         CALL trd_tra( kt, 'TRA', jp_tem, jptra_trd_atf, ztrdt )
-         CALL trd_tra( kt, 'TRA', jp_sal, jptra_trd_atf, ztrds )
+         CALL trd_tra( kt, 'TRA', jp_tem, jptra_atf, ztrdt )
+         CALL trd_tra( kt, 'TRA', jp_sal, jptra_atf, ztrds )
          CALL wrk_dealloc( jpi, jpj, jpk, ztrdt, ztrds )
       END IF