Changeset 4613
- Timestamp:
- 2014-04-02T14:17:58+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90
r4153 r4613 723 723 END SELECT 724 724 725 zfsdep= gdept(k%I,k%J,jk)725 zfsdep= fsdept(k%I,k%J,jk) 726 726 727 727 !compute velocity with the correct direction … … 903 903 END SELECT 904 904 905 zfsdep= gdept(k%I,k%J,jk)905 zfsdep= fsdept(k%I,k%J,jk) 906 906 907 907 !------------------------------- … … 1217 1217 REAL(wp):: zet1, zet2 ! weight for interpolation 1218 1218 REAL(wp):: zdep1,zdep2 ! differences of depth 1219 REAL(wp):: zmsk ! mask value 1219 1220 !!---------------------------------------------------------------------- 1220 1221 … … 1225 1226 zet1=e1t(ii1,ij1) 1226 1227 zet2=e1t(ii2,ij2) 1228 zmsk=umask(ii1,ij1,kk) 1229 1227 1230 1228 1231 ELSE ! cd_point=='V' … … 1232 1235 zet1=e2t(ii1,ij1) 1233 1236 zet2=e2t(ii2,ij2) 1237 zmsk=vmask(ii1,ij1,kk) 1234 1238 1235 1239 ENDIF … … 1246 1250 1247 1251 ! result 1248 interp = umask(ii1,ij1,kk)* ( zwgt2 * ptab(ii1,ij1,kk) + zwgt1 * ptab(ii1,ij1,kk) ) / ( zwgt2 + zwgt1 )1252 interp = zmsk * ( zwgt2 * ptab(ii1,ij1,kk) + zwgt1 * ptab(ii1,ij1,kk) ) / ( zwgt2 + zwgt1 ) 1249 1253 1250 1254 … … 1271 1275 zbis = ptab(ii2,ij2,kk) + zwgt1 * ( ptab(ii2,ij2,kk-1) - ptab(ii2,ij2,kk) ) 1272 1276 ! result 1273 interp = umask(ii1,ij1,kk)* ( zet2 * ptab(ii1,ij1,kk) + zet1 * zbis )/( zet1 + zet2 )1277 interp = zmsk * ( zet2 * ptab(ii1,ij1,kk) + zet1 * zbis )/( zet1 + zet2 ) 1274 1278 ELSE 1275 1279 ! zbis 1276 1280 zbis = ptab(ii1,ij1,kk) + zwgt2 * ( ptab(ii1,ij1,kk-1) - ptab(ii1,ij2,kk) ) 1277 1281 ! result 1278 interp = umask(ii1,ij1,kk)* ( zet2 * zbis + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 )1282 interp = zmsk * ( zet2 * zbis + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 ) 1279 1283 ENDIF 1280 1284 1281 1285 ELSE 1282 interp = umask(ii1,ij1,kk)* ( zet2 * ptab(ii1,ij1,kk) + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 )1286 interp = zmsk * ( zet2 * ptab(ii1,ij1,kk) + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 ) 1283 1287 ENDIF 1284 1288
Note: See TracChangeset
for help on using the changeset viewer.