Changeset 2052 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA

Timestamp:

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

Author:

cetlod

Message:

Improve the merge TRA-TRC, see ticket:701

Location:

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA

Files:

• traadv_cen2.F90 (modified) (2 diffs)
• trasbc.F90 (modified) (1 diff)
• trazdf_imp.F90 (modified) (3 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

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

@@ -200 +200 @@
                 ENDIF  
   
-              ELSE IF( rnf(ji,jj) > 0.) THEN   ! for use in baltic when flow is out of domain, want no change in temp and sal  
+              ELSE IF( rnf(ji,jj) < 0.) THEN   ! for use in baltic when flow is out of domain, want no change in temp and sal  
   
                 IF( lk_vvl ) THEN  

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

@@ -180 +180 @@
                END DO
             END DO
+            ! first recurrence:   Tk = Dk - Ik Sk-1 / Tk-1   (increasing k)
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1
+                  zwt(ji,jj,1) = zwd(ji,jj,1)
+               END DO
+            END DO
+            DO jk = 2, jpkm1
+               DO jj = 2, jpjm1
+                  DO ji = fs_2, fs_jpim1
+                    zwt(ji,jj,jk) = zwd(ji,jj,jk) - zwi(ji,jj,jk) * zws(ji,jj,jk-1)  /zwt(ji,jj,jk-1)
+                  END DO
+               END DO
+            END DO
             !
          ELSE IF( ( cdtype == 'TRA' .AND. jn == jp_sal ) .OR. ( cdtype == 'TRC' .AND. jn == 1 ) ) THEN
@@ -191 +204 @@
                            & * (  wslpi(ji,jj,jk) * wslpi(ji,jj,jk)   &
                            &    + wslpj(ji,jj,jk) * wslpj(ji,jj,jk)  )
-                        zwt(ji,jj,jk) = fsavs(ji,jj,jk) + zavi              ! zwt=avt+zavi (total vertical mixing coef. on temperature)
+                        zwt(ji,jj,jk) = fsavs(ji,jj,jk) + zavi              ! zwt=avt+zavi (total vertical mixing coef. on salinity)
                      END DO
                   END DO
@@ -223 +236 @@
             END DO
             !
-         END IF
+            ! first recurrence:   Tk = Dk - Ik Sk-1 / Tk-1   (increasing k)
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1
+                  zwt(ji,jj,1) = zwd(ji,jj,1)
+               END DO
+            END DO
+            DO jk = 2, jpkm1
+               DO jj = 2, jpjm1
+                  DO ji = fs_2, fs_jpim1
+                    zwt(ji,jj,jk) = zwd(ji,jj,jk) - zwi(ji,jj,jk) * zws(ji,jj,jk-1)  /zwt(ji,jj,jk-1)
+                  END DO
+               END DO
+            END DO
+            !
+         END IF 
 
          ! II.1. Vertical diffusion on tracer
          ! ---------------------------
-
-         !! Matrix inversion from the first level
-         !!----------------------------------------------------------------------
-         !   solve m.x = y  where m is a tri diagonal matrix ( jpk*jpk )
-         !
-         !        ( zwd1 zws1   0    0    0  )( zwx1 ) ( zwy1 )
-         !        ( zwi2 zwd2 zws2   0    0  )( zwx2 ) ( zwy2 )
-         !        (  0   zwi3 zwd3 zws3   0  )( zwx3 )=( zwy3 )
-         !        (        ...               )( ...  ) ( ...  )
-         !        (  0    0    0   zwik zwdk )( zwxk ) ( zwyk )
-         !
-         !   m is decomposed in the product of an upper and lower triangular matrix
-         !   The 3 diagonal terms are in 2d arrays: zwd, zws, zwi
-         !   The second member is in 2d array zwy
-         !   The solution is in 2d array zwx
-         !   The 3d arry zwt is a work space array
-         !   zwy is used and then used as a work space array : its value is modified!
-         
-         ! first recurrence:   Tk = Dk - Ik Sk-1 / Tk-1   (increasing k)
-         DO jj = 2, jpjm1
-            DO ji = fs_2, fs_jpim1
-               zwt(ji,jj,1) = zwd(ji,jj,1)
-            END DO
-         END DO
-         DO jk = 2, jpkm1
-            DO jj = 2, jpjm1
-               DO ji = fs_2, fs_jpim1
-                  zwt(ji,jj,jk) = zwd(ji,jj,jk) - zwi(ji,jj,jk) * zws(ji,jj,jk-1)  /zwt(ji,jj,jk-1)
-               END DO
-            END DO
-         END DO
          
          ! second recurrence:    Zk = Yk - Ik / Tk-1  Zk-1