Changeset 3821
- Timestamp:
- 2013-02-25T15:13:39+01:00 (11 years ago)
- Location:
- branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ICB
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90
r3614 r3821 57 57 ! this assumes that input is given as equivalent water flux so that pure water density is appropriate 58 58 59 zfact = ( (1000._wp)**3 / ( NINT(rday) * nyear_len(1) ) ) * 1000._wp59 zfact = ( (1000._wp)**3 / ( NINT(rday) * nyear_len(1) ) ) * 850._wp 60 60 berg_grid%calving(:,:) = src_calving(:,:) * tmask_i(:,:) * zfact 61 61 -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
r3785 r3821 196 196 ! since we're looking for four T points containing quadrant we're in of 197 197 ! current T cell 198 ii = INT( pi)199 ij = INT( pj) ! T-point198 ii = MAX(1, INT( pi )) 199 ij = MAX(1, INT( pj )) ! T-point 200 200 zi = pi - REAL(ii,wp) 201 201 zj = pj - REAL(ij,wp) 202 202 CASE ( 'U' ) 203 ii = INT( pi-0.5)204 ij = INT( pj) ! U-point203 ii = MAX(1, INT( pi-0.5 )) 204 ij = MAX(1, INT( pj )) ! U-point 205 205 zi = pi - 0.5 - REAL(ii,wp) 206 206 zj = pj - REAL(ij,wp) 207 207 CASE ( 'V' ) 208 ii = INT( pi)209 ij = INT( pj -0.5) ! V-point208 ii = MAX(1, INT( pi )) 209 ij = MAX(1, INT( pj-0.5 )) ! V-point 210 210 zi = pi - REAL(ii,wp) 211 211 zj = pj - 0.5 - REAL(ij,wp) 212 212 CASE ( 'F' ) 213 ii = INT( pi-0.5)214 ij = INT( pj -0.5) ! F-point213 ii = MAX(1, INT( pi-0.5 )) 214 ij = MAX(1, INT( pj-0.5 )) ! F-point 215 215 zi = pi - 0.5 - REAL(ii,wp) 216 216 zj = pj - 0.5 - REAL(ij,wp) … … 250 250 ! since we're looking for four T points containing quadrant we're in of 251 251 ! current T cell 252 ii = INT( pi)253 ij = INT( pj) ! T-point252 ii = MAX(1, INT( pi )) 253 ij = MAX(1, INT( pj )) ! T-point 254 254 zi = pi - REAL(ii,wp) 255 255 zj = pj - REAL(ij,wp) 256 256 CASE ( 'U' ) 257 ii = INT( pi-0.5)258 ij = INT( pj) ! U-point257 ii = MAX(1, INT( pi-0.5 )) 258 ij = MAX(1, INT( pj )) ! U-point 259 259 zi = pi - 0.5 - REAL(ii,wp) 260 260 zj = pj - REAL(ij,wp) 261 261 CASE ( 'V' ) 262 ii = INT( pi)263 ij = INT( pj -0.5) ! V-point262 ii = MAX(1, INT( pi )) 263 ij = MAX(1, INT( pj-0.5 )) ! V-point 264 264 zi = pi - REAL(ii,wp) 265 265 zj = pj - 0.5 - REAL(ij,wp) 266 266 CASE ( 'F' ) 267 ii = INT( pi-0.5)268 ij = INT( pj -0.5) ! F-point267 ii = MAX(1, INT( pi-0.5 )) 268 ij = MAX(1, INT( pj-0.5 )) ! F-point 269 269 zi = pi - 0.5 - REAL(ii,wp) 270 270 zj = pj - 0.5 - REAL(ij,wp) … … 304 304 ! since we're looking for four T points containing quadrant we're in of 305 305 ! current T cell 306 ii = INT( pi)307 ij = INT( pj) ! T-point306 ii = MAX(1, INT( pi )) 307 ij = MAX(1, INT( pj )) ! T-point 308 308 zi = pi - REAL(ii,wp) 309 309 zj = pj - REAL(ij,wp) … … 348 348 !!---------------------------------------------------------------------- 349 349 ! 350 ii = INT( pi ) ; ij = INT( pj )! left bottom T-point (i,j) indices350 ii = MAX(1, INT( pi )) ; ij = MAX(1, INT( pj )) ! left bottom T-point (i,j) indices 351 351 352 352 ! fractional box spacing
Note: See TracChangeset
for help on using the changeset viewer.