Changeset 2082 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/dtadyn.F90

Timestamp:

2010-09-10T12:32:58+02:00 (14 years ago)

Author:

cetlod

Message:

Improve the merge of TRA-TRC, see ticket #717

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/dtadyn.F90 (modified) (7 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/dtadyn.F90

@@ -184 +184 @@
          
          IF( lk_ldfslp ) THEN
-            ! Computes slopes
-            ! Caution : here tn, sn and avt are used as workspace
-            tn (:,:,:) = tdta  (:,:,:,2)
-            sn (:,:,:) = sdta  (:,:,:,2)
-            avt(:,:,:) = avtdta(:,:,:,2)
-         
-            CALL eos( tn, sn, rhd, rhop )   ! Time-filtered in situ density 
-            CALL bn2( tn, sn, rn2 )         ! before Brunt-Vaisala frequency
+            ! Computes slopes. Caution : here tsn and avt are used as workspace
+            tsn (:,:,:,jp_tem) = tdta  (:,:,:,2)
+            tsn (:,:,:,jp_sal) = sdta  (:,:,:,2)
+            avt(:,:,:)         = avtdta(:,:,:,2)
+         
+            CALL eos( tsn, rhd, rhop )   ! Time-filtered in situ density 
+            CALL bn2( tsn, rn2 )         ! before Brunt-Vaisala frequency
             IF( ln_zps )   &
-               &   CALL zps_hde( kt, tn , sn , rhd,  &  ! Partial steps: before Horizontal DErivative
-               &                 gtu, gsu, gru,  &  ! of t, s, rd at the bottom ocean level
-               &                 gtv, gsv, grv )
+               &   CALL zps_hde( kt, jpts, tsn, gtsu, gtsv,  &  ! Partial steps: before Horizontal DErivative
+               &                           rhd, gru , grv   )    ! of t, s, rd at the bottom ocean level
                    CALL zdf_mxl( kt )              ! mixed layer depth
                    CALL ldf_slp( kt, rhd, rn2 )
@@ -213 +211 @@
          
          IF( lk_ldfslp ) THEN
-            ! Computes slopes
-            ! Caution : here tn, sn and avt are used as workspace
-            tn (:,:,:) = tdta  (:,:,:,2)
-            sn (:,:,:) = sdta  (:,:,:,2)
-            avt(:,:,:) = avtdta(:,:,:,2)
-
-            CALL eos( tn, sn, rhd, rhop )   ! Time-filtered in situ density 
-            CALL bn2( tn, sn, rn2 )         ! before Brunt-Vaisala frequency
+            ! Computes slopes. Caution : here tsn and avt are used as workspace
+            tsn (:,:,:,jp_tem) = tdta  (:,:,:,2)
+            tsn (:,:,:,jp_sal) = sdta  (:,:,:,2)
+            avt(:,:,:)         = avtdta(:,:,:,2)
+         
+            CALL eos( tsn, rhd, rhop )   ! Time-filtered in situ density 
+            CALL bn2( tsn, rn2 )         ! before Brunt-Vaisala frequency
             IF( ln_zps )   &
-               &   CALL zps_hde( kt, tn , sn , rhd,  &  ! Partial steps: before Horizontal DErivative
-               &                 gtu, gsu, gru,  &  ! of t, s, rd at the bottom ocean level
-               &                 gtv, gsv, grv )
+               &   CALL zps_hde( kt, jpts, tsn, gtsu, gtsv,  &  ! Partial steps: before Horizontal DErivative
+               &                           rhd, gru , grv   )    ! of t, s, rd at the bottom ocean level
                    CALL zdf_mxl( kt )              ! mixed layer depth
                    CALL ldf_slp( kt, rhd, rn2 )
@@ -261 +257 @@
 
          IF( lk_ldfslp ) THEN
-            ! Computes slopes
-            ! Caution : here tn, sn and avt are used as workspace
-            tn (:,:,:) = tdta  (:,:,:,2)
-            sn (:,:,:) = sdta  (:,:,:,2)
-            avt(:,:,:) = avtdta(:,:,:,2)
-
-            CALL eos( tn, sn, rhd, rhop )   ! Time-filtered in situ density 
-            CALL bn2( tn, sn, rn2 )         ! before Brunt-Vaisala frequency
+            ! Computes slopes. Caution : here tsn and avt are used as workspace
+            tsn (:,:,:,jp_tem) = tdta  (:,:,:,2)
+            tsn (:,:,:,jp_sal) = sdta  (:,:,:,2)
+            avt(:,:,:)         = avtdta(:,:,:,2)
+         
+            CALL eos( tsn, rhd, rhop )   ! Time-filtered in situ density 
+            CALL bn2( tsn, rn2 )         ! before Brunt-Vaisala frequency
             IF( ln_zps )   &
-               &   CALL zps_hde( kt, tn , sn , rhd,  &  ! Partial steps: before Horizontal DErivative
-               &                 gtu, gsu, gru,  &  ! of t, s, rd at the bottom ocean level
-               &                 gtv, gsv, grv )
+               &   CALL zps_hde( kt, jpts, tsn, gtsu, gtsv,  &  ! Partial steps: before Horizontal DErivative
+               &                           rhd, gru , grv   )    ! of t, s, rd at the bottom ocean level
                    CALL zdf_mxl( kt )              ! mixed layer depth
                    CALL ldf_slp( kt, rhd, rn2 )
@@ -311 +305 @@
       
       ! In any case, we need rhop
-      CALL eos( tn, sn, rhd, rhop ) 
+      CALL eos( tsn, rhd, rhop ) 
       
 #if ! defined key_degrad && defined key_traldf_c2d
@@ -320 +314 @@
       ! Compute bbl coefficients if needed
       IF( lk_trabbl ) THEN
-         tb(:,:,:) = tn(:,:,:)
-         sb(:,:,:) = sn(:,:,:)
+         tsb(:,:,:,:) = tsn(:,:,:,:)
          CALL bbl( kt, 'TRC')
       END IF
@@ -735 +728 @@
       !!----------------------------------------------------------------------
       
-      tn (:,:,:) = tdta  (:,:,:,2)
-      sn (:,:,:) = sdta  (:,:,:,2)
-      avt(:,:,:) = avtdta(:,:,:,2)
+      tsn(:,:,:,jp_tem) = tdta  (:,:,:,2)
+      tsn(:,:,:,jp_sal) = sdta  (:,:,:,2)
+      avt(:,:,:)        = avtdta(:,:,:,2)
       
       un (:,:,:) = udta  (:,:,:,2) 
@@ -796 +789 @@
       zweighm1 = 1. - pweigh
       
-      tn (:,:,:) = zweighm1 * tdta  (:,:,:,1) + pweigh * tdta  (:,:,:,2)
-      sn (:,:,:) = zweighm1 * sdta  (:,:,:,1) + pweigh * sdta  (:,:,:,2)
-      avt(:,:,:) = zweighm1 * avtdta(:,:,:,1) + pweigh * avtdta(:,:,:,2)
+      tsn(:,:,:,jp_tem) = zweighm1 * tdta  (:,:,:,1) + pweigh * tdta  (:,:,:,2)
+      tsn(:,:,:,jp_sal) = zweighm1 * sdta  (:,:,:,1) + pweigh * sdta  (:,:,:,2)
+      avt(:,:,:)        = zweighm1 * avtdta(:,:,:,1) + pweigh * avtdta(:,:,:,2)
       
       un (:,:,:) = zweighm1 * udta  (:,:,:,1) + pweigh * udta  (:,:,:,2)