Changeset 2052 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_cen2.F90

Timestamp:

2010-08-13T11:15:17+02:00 (14 years ago)

Author:

cetlod

Message:

Improve the merge TRA-TRC, see ticket:701

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) (2 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -20 +20 @@
    !!                  area (set for orca 2 and 4 only)
    !!----------------------------------------------------------------------
-   USE oce, ONLY: tsn  ! now ocean temperature and salinity
+   USE oce, ONLY: tn, sn  ! now ocean temperature and salinity
    USE dom_oce         ! ocean space and time domain
    USE eosbn2          ! equation of state
@@ -159 +159 @@
 !!gm  not strickly exact : the freezing point should be computed at each ocean levels...
 !!gm  not a big deal since cen2 is no more used in global ice-ocean simulations
-      ztfreez(:,:) = tfreez( tsn(:,:,1,jp_sal) )
+      ztfreez(:,:) = tfreez( sn(:,:,1) )
       DO jk = 1, jpk
          DO jj = 1, jpj
             DO ji = 1, jpi
                !                                        ! below ice covered area (if tn < "freezing"+0.1 )
-               IF( tsn(ji,jj,jk,jp_tem) <= ztfreez(ji,jj) + 0.1 ) THEN   ;   zice = 1.e0
+               IF( tn(ji,jj,jk) <= ztfreez(ji,jj) + 0.1 ) THEN   ;   zice = 1.e0
                ELSE                                              ;   zice = 0.e0
                ENDIF