- Timestamp:
- 2014-04-02T14:17:19+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90
r3988 r4612 1137 1137 REAL(wp):: zet1, zet2 ! weight for interpolation 1138 1138 REAL(wp):: zdep1,zdep2 ! differences of depth 1139 REAL(wp):: zmsk ! mask value 1139 1140 !!---------------------------------------------------------------------- 1140 1141 … … 1145 1146 zet1=e1t(ii1,ij1) 1146 1147 zet2=e1t(ii2,ij2) 1148 zmsk=umask(ii1,ij1,kk) 1147 1149 1148 1150 ELSE ! cd_point=='V' … … 1152 1154 zet1=e2t(ii1,ij1) 1153 1155 zet2=e2t(ii2,ij2) 1156 zmsk=vmask(ii1,ij1,kk) 1154 1157 1155 1158 ENDIF … … 1166 1169 1167 1170 ! result 1168 interp = umask(ii1,ij1,kk)* ( zwgt2 * ptab(ii1,ij1,kk) + zwgt1 * ptab(ii1,ij1,kk) ) / ( zwgt2 + zwgt1 )1171 interp = zmsk * ( zwgt2 * ptab(ii1,ij1,kk) + zwgt1 * ptab(ii1,ij1,kk) ) / ( zwgt2 + zwgt1 ) 1169 1172 1170 1173 … … 1191 1194 zbis = ptab(ii2,ij2,kk) + zwgt1 * ( ptab(ii2,ij2,kk-1) - ptab(ii2,ij2,kk) ) 1192 1195 ! result 1193 interp = umask(ii1,ij1,kk)* ( zet2 * ptab(ii1,ij1,kk) + zet1 * zbis )/( zet1 + zet2 )1196 interp = zmsk * ( zet2 * ptab(ii1,ij1,kk) + zet1 * zbis )/( zet1 + zet2 ) 1194 1197 ELSE 1195 1198 !zbis 1196 1199 zbis = ptab(ii1,ij1,kk) + zwgt2 * ( ptab(ii1,ij1,kk-1) - ptab(ii1,ij2,kk) ) 1197 1200 ! result 1198 interp = umask(ii1,ij1,kk)* ( zet2 * zbis + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 )1201 interp = zmsk * ( zet2 * zbis + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 ) 1199 1202 ENDIF 1200 1203 1201 1204 ELSE 1202 interp = umask(ii1,ij1,kk)* ( zet2 * ptab(ii1,ij1,kk) + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 )1205 interp = zmsk * ( zet2 * ptab(ii1,ij1,kk) + zet1 * ptab(ii2,ij2,kk) )/( zet1 + zet2 ) 1203 1206 ENDIF 1204 1207
Note: See TracChangeset
for help on using the changeset viewer.