Changeset 4613 for trunk

Timestamp:

2014-04-02T14:17:58+02:00 (10 years ago)

Author:

cbricaud

Message:

fixe bug in diadct, ticket 1292

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) (7 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

@@ -723 +723 @@
               END SELECT 
  
-              zfsdep= gdept(k%I,k%J,jk) 
+              zfsdep= fsdept(k%I,k%J,jk) 
   
               !compute velocity with the correct direction 
@@ -903 +903 @@
               END SELECT 
  
-              zfsdep= gdept(k%I,k%J,jk) 
+              zfsdep= fsdept(k%I,k%J,jk) 
   
               !------------------------------- 
@@ -1217 +1217 @@
   REAL(wp):: zet1, zet2                                        ! weight for interpolation 
   REAL(wp):: zdep1,zdep2                                       ! differences of depth
+  REAL(wp):: zmsk                                              ! mask value
   !!----------------------------------------------------------------------
 
@@ -1225 +1226 @@
      zet1=e1t(ii1,ij1)
      zet2=e1t(ii2,ij2)
+     zmsk=umask(ii1,ij1,kk)
+  
 
   ELSE ! cd_point=='V' 
@@ -1232 +1235 @@
      zet1=e2t(ii1,ij1)
      zet2=e2t(ii2,ij2)
+     zmsk=vmask(ii1,ij1,kk)
 
   ENDIF
@@ -1246 +1250 @@
   
      ! result
-     interp = umask(ii1,ij1,kk) * ( zwgt2 *  ptab(ii1,ij1,kk) + zwgt1 *  ptab(ii1,ij1,kk) ) / ( zwgt2 + zwgt1 )   
+     interp = zmsk * ( zwgt2 *  ptab(ii1,ij1,kk) + zwgt1 *  ptab(ii1,ij1,kk) ) / ( zwgt2 + zwgt1 )   
 
 
@@ -1271 +1275 @@
            zbis = ptab(ii2,ij2,kk) + zwgt1 * ( ptab(ii2,ij2,kk-1) - ptab(ii2,ij2,kk) ) 
            ! result
-            interp = umask(ii1,ij1,kk) * ( zet2 * ptab(ii1,ij1,kk) + zet1 * zbis )/( zet1 + zet2 )
+            interp = zmsk * ( zet2 * ptab(ii1,ij1,kk) + zet1 * zbis )/( zet1 + zet2 )
         ELSE
            ! zbis
            zbis = ptab(ii1,ij1,kk) + zwgt2 * ( ptab(ii1,ij1,kk-1) - ptab(ii1,ij2,kk) )
            ! result
-           interp = umask(ii1,ij1,kk) * ( zet2 * zbis + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 )
+           interp = zmsk * ( zet2 * zbis + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 )
         ENDIF    
 
      ELSE
-        interp = umask(ii1,ij1,kk) * (  zet2 * ptab(ii1,ij1,kk) + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 )
+        interp = zmsk * (  zet2 * ptab(ii1,ij1,kk) + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 )
      ENDIF