Changeset 216 for trunk/NEMO/OPA_SRC/TRA/traqsr.F90

Timestamp:

2005-03-17T15:02:38+01:00 (19 years ago)

Author:

opalod

Message:

CT : UPDATE151 : New trends organization

File:

• trunk/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) (12 diffs)

trunk/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -12 +12 @@
    USE oce             ! ocean dynamics and active tracers
    USE dom_oce         ! ocean space and time domain
-   USE trdtra_oce      ! ocean active tracer trends
+   USE trdmod          ! ocean active tracers trends 
+   USE trdmod_oce      ! ocean variables trends
    USE in_out_manager  ! I/O manager
 
@@ -84 +85 @@
       !!        !  96-01  (G. Madec)  s-coordinates
       !!   8.5  !  02-06  (G. Madec)  F90: Free form and module
-      !!----------------------------------------------------------------------
+      !!   9.0  !  04-08  (C. Talandier) New trends organization
+      !!----------------------------------------------------------------------
+      !! * Modules used     
+      USE oce, ONLY :    ztdta => ua,   & ! use ua as 3D workspace   
+                         ztdsa => va      ! use va as 3D workspace   
+
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt    ! ocean time-step
+      INTEGER, INTENT( in ) ::   kt       ! ocean time-step
 
       !! * Local declarations
-      INTEGER ::    ji, jj, jk         ! dummy loop indexes
-      REAL(wp) ::   zc0, zta           ! temporary scalars
-      REAL(wp) ::   zc1 , zc2 ,     &  ! temporary scalars
-                    zdp1, zdp2         !
+      INTEGER ::    ji, jj, jk            ! dummy loop indexes
+      REAL(wp) ::   zc0, zta              ! temporary scalars
+      REAL(wp) ::   zc1 , zc2 ,        &  ! temporary scalars
+                    zdp1, zdp2            !
       !!----------------------------------------------------------------------
 
@@ -101 +107 @@
       ENDIF
 
+      ! Save ta and sa trends
+      IF( l_trdtra )   THEN
+         ztdta(:,:,:) = ta(:,:,:) 
+         ztdsa(:,:,:) = 0.e0
+      ENDIF
+
       IF( lk_qsr_sms .AND. ln_qsr_sms ) THEN    !  Biological fluxes  !
-         !                                     ! =================== !
+         !                                      ! =================== !
          !
          !                                                ! ===============
@@ -116 +128 @@
                   ta(ji,jj,jk) = ta(ji,jj,jk) + zta       ! add qsr trend to the temperature trend
                   
-#      if defined key_trdtra || defined key_trdmld
-                  ttrd(ji,jj,jk,7) = zta                  ! save the qsr trend
-#      endif
                END DO
             END DO
@@ -124 +133 @@
          END DO                                           !   End of slab
          !                                                ! ===============
+         ! save the trends for diagnostic
+         ! qsr tracers trends
+         IF( l_trdtra )   THEN
+            ztdta(:,:,:) = ta(:,:,:) - ztdta(:,:,:)
+            CALL trd_mod(ztdta, ztdsa, jpttdqsr, 'TRA', kt)
+         ENDIF
+
       ELSE
-      !                                                ! =================== !
-         IF( lk_sco ) THEN                                !     s-coordinate    !
-         !                                             ! =================== !
+         !                                                ! =================== !
+         IF( lk_sco ) THEN                                !    s-coordinate     !
+         !                                                ! =================== !
          !
          !                                                   ! ===============
-            DO jk = 1, jpkm1                                    ! Horizontal slab
+            DO jk = 1, jpkm1                                 ! Horizontal slab
             !                                                ! ===============
                DO jj = 2, jpjm1
@@ -144 +160 @@
                      ta(ji,jj,jk) = ta(ji,jj,jk) + zta       ! add qsr trend to the temperature trend
                      
-#      if defined key_trdtra || defined key_trdmld
-                     ttrd(ji,jj,jk,7) = zta                  ! save the qsr trend
-#      endif
                   END DO
                END DO
@@ -152 +165 @@
             END DO                                              !   End of slab
             !                                                   ! ===============
+            ! save the trends for diagnostic
+            ! qsr tracers trends
+            IF( l_trdtra )   THEN
+               ztdta(:,:,:) = ta(:,:,:) - ztdta(:,:,:)
+               CALL trd_mod(ztdta, ztdsa, jpttdqsr, 'TRA', kt)
+            ENDIF
+            !
          ENDIF
          !                                                ! =================== !
@@ -168 +188 @@
                      ta(ji,jj,jk) = ta(ji,jj,jk) + zta       ! add qsr trend to the temperature trend
                      
-#      if defined key_trdtra || defined key_trdmld
-                     ttrd(ji,jj,jk,7) = zta                  ! save the qsr trend
-#      endif
                   END DO
                END DO
@@ -176 +193 @@
             END DO                                           !   End of slab
             !                                                ! ===============
+            ! save the trends for diagnostic
+            ! qsr tracers trends
+            IF( l_trdtra )   THEN
+               ztdta(:,:,:) = ta(:,:,:) - ztdta(:,:,:)
+               CALL trd_mod(ztdta, ztdsa, jpttdqsr, 'TRA', kt)
+            ENDIF
+            !
          ENDIF
          !                                                ! =================== !
@@ -192 +216 @@
                      ta(ji,jj,jk) = ta(ji,jj,jk) + zta       ! add qsr trend to the temperature trend
                      
-#      if defined key_trdtra || defined key_trdmld
-                     ttrd(ji,jj,jk,7) = zta                  ! save the qsr forcing trend
-#      endif
                   END DO
                END DO
@@ -200 +221 @@
             END DO                                           !   End of slab
             !                                                ! ===============
+            ! save the trends for diagnostic
+            ! qsr tracers trends
+            IF( l_trdtra )   THEN
+               ztdta(:,:,:) = ta(:,:,:) - ztdta(:,:,:)
+               CALL trd_mod(ztdta, ztdsa, jpttdqsr, 'TRA', kt)
+            ENDIF
+            !
          ENDIF
          !
@@ -205 +233 @@
 
 
-      IF( l_ctl .AND. lwp ) THEN         ! print mean trends (used for debugging)
-!         zta = SUM( ta(2:jpim1,2:jpjm1,1:jpkm1) * tmask(2:jpim1,2:jpjm1,1:jpkm1) )
-!         zta = SUM( ta * tmask ) 
-          zta = SUM( ta(2:nictl,2:njctl,1:jpkm1) * tmask(2:nictl,2:njctl,1:jpkm1) )
+      IF(l_ctl) THEN         ! print mean trends (used for debugging)
+         zta = SUM( ta(2:nictl,2:njctl,1:jpkm1) * tmask(2:nictl,2:njctl,1:jpkm1) )
          WRITE(numout,*) ' qsr  - Ta: ', zta-t_ctl
          t_ctl = zta