Changeset 2082 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/istate.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/OPA_SRC/istate.F90 (modified) (2 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/istate.F90

@@ -42 +42 @@
    USE dynspg_exp      ! pressure gradient schemes
    USE dynspg_ts       ! pressure gradient schemes
+   USE traswp          ! Swap arrays                      (tra_swp routine)
    
    IMPLICIT NONE
@@ -122 +123 @@
          ENDIF
 
-         CALL eos( tb, sb, rhd, rhop )        ! before potential and in situ densities
+         ta(:,:,:) = 0.       ;     sa(:,:,:) = 0.
+         CALL tra_swap
+         CALL eos( tsb, rhd, rhop )        ! before potential and in situ densities
          
          IF( ln_zps .AND. .NOT. lk_c1d )   &
-            &             CALL zps_hde( nit000, tb, sb, rhd,  &  ! Partial steps: before Horizontal DErivative
-            &                                  gtu, gsu, gru, &  ! of t, s, rd at the bottom ocean level
-            &                                  gtv, gsv, grv )
+                          CALL zps_hde( nit000, 'TRA', tsb, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient
+            &                                          rhd, gru , grv , jpts )      ! of t, s, rd at the last ocean level
          
       ENDIF