Changeset 163 for trunk/NEMO

Timestamp:

2004-11-03T15:47:34+01:00 (20 years ago)

Author:

opalod

Message:

CT + CL : BUGFIX106 : Remove the T-point/coast distance computation problem in cofdis subroutine in the tradmp.F90 module

File:

• trunk/NEMO/OPA_SRC/TRA/tradmp.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/TRA/tradmp.F90

@@ -550 +550 @@
             ii0 =  81   ;   ii1 =  91   ;   zmrs( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 1.e0
             ij0 =  50   ;   ij1 =  55
-            ii0 =  70   ;   ii1 =  80   ;   zmrs( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 1.e0
+            ii0 =  75   ;   ii1 =  80   ;   zmrs( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 1.e0
             ij0 =  52   ;   ij1 =  53
             ii0 =  70   ;   ii1 =  74   ;   zmrs( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 1.e0
@@ -722 +722 @@
       REAL(wp) ::   zdate0
       REAL(wp), DIMENSION(jpi,jpj) ::   &
-         zxt, zyt, zzt            ! cartesian coordinates for T-points
+         zxt, zyt, zzt,                 &  ! cartesian coordinates for T-points
+         zmask                             
       REAL(wp), DIMENSION(3*jpi*jpj) ::   &
          zxc, zyc, zzc, zdis      ! temporary workspace
@@ -755 +756 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
-               llcotu(ji,jj) = ( umask(ji,jj,jk) == 0. ) .AND. ( tmask(ji,jj  ,jk)+tmask(ji+1,jj  ,jk) == 1. ) 
-               llcotv(ji,jj) = ( vmask(ji,jj,jk) == 0. ) .AND. ( tmask(ji,jj  ,jk)+tmask(ji  ,jj+1,jk) == 1. ) 
-               llcotf(ji,jj) = ( fmask(ji,jj,jk) == 0. ) .AND. ( tmask(ji,jj+1,jk)+tmask(ji+1,jj+1,jk)   &
-                                                               + tmask(ji,jj  ,jk)+tmask(ji+1,jj  ,jk) <  4. )
+               zmask(ji,jj) =  ( tmask(ji,jj+1,jk) + tmask(ji+1,jj+1,jk) &
+                   &           + tmask(ji,jj  ,jk) + tmask(ji+1,jj  ,jk) )
+               llcotu(ji,jj) = ( tmask(ji,jj,  jk) + tmask(ji+1,jj  ,jk) == 1. ) 
+               llcotv(ji,jj) = ( tmask(ji,jj  ,jk) + tmask(ji  ,jj+1,jk) == 1. ) 
+               llcotf(ji,jj) = ( zmask(ji,jj) > 0. ) .AND. ( zmask(ji,jj) < 4. )
             END DO
          END DO