Changeset 461 for trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90
- Timestamp:
- 2006-05-10T19:15:54+02:00 (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90
r450 r461 10 10 !!---------------------------------------------------------------------- 11 11 !! ldf_eiv : compute the eddy induced velocity coefficients 12 !! Same results but not same routine if 'key_ autotasking'12 !! Same results but not same routine if 'key_mpp_omp' 13 13 !! is defined or not 14 14 !!---------------------------------------------------------------------- … … 41 41 CONTAINS 42 42 43 # if defined key_ autotasking44 !!---------------------------------------------------------------------- 45 !! 'key_ autotasking' :autotasking (j-slab)43 # if defined key_mpp_omp 44 !!---------------------------------------------------------------------- 45 !! 'key_mpp_omp' : OpenMP / NEC autotasking (j-slab) 46 46 !!---------------------------------------------------------------------- 47 47 … … 79 79 IF(lwp) WRITE(numout,*) 80 80 IF(lwp) WRITE(numout,*) 'ldf_eiv : eddy induced velocity coefficients' 81 IF(lwp) WRITE(numout,*) '~~~~~~~ key_autotasking'81 IF(lwp) WRITE(numout,*) '~~~~~~~ NEC autotasking / OpenMP : j-slab' 82 82 ENDIF 83 83 … … 176 176 zaht = ( 1. - MIN( 1., ABS( ff(ji,jj) / zf20 ) ) ) * ( aht0 - zaht_min ) & 177 177 & + aht0 * upsrnfh(ji,jj) ! enhanced near river mouths 178 ahtu(ji,jj) = MAX( MAX( zaht_min, aeiu(ji,jj) ) + zaht, aht0 )179 ahtv(ji,jj) = MAX( MAX( zaht_min, aeiv(ji,jj) ) + zaht, aht0 )180 ahtw(ji,jj) = MAX( MAX( zaht_min, aeiw(ji,jj) ) + zaht, aht0 )178 ahtu(ji,jj) = MAX( zaht_min, aeiu(ji,jj) ) + zaht 179 ahtv(ji,jj) = MAX( zaht_min, aeiv(ji,jj) ) + zaht 180 ahtw(ji,jj) = MAX( zaht_min, aeiw(ji,jj) ) + zaht 181 181 END DO 182 182 END DO … … 249 249 250 250 DO jk = 1, jpk 251 # if defined key_vectopt_loop && ! defined key_ autotasking251 # if defined key_vectopt_loop && ! defined key_mpp_omp 252 252 !CDIR NOVERRCHK 253 253 DO ji = 1, jpij ! vector opt. … … 360 360 ENDIF 361 361 ENDIF 362 362 363 363 IF( aeiv0 == 0.e0 ) THEN 364 364 aeiu(:,:) = 0.e0
Note: See TracChangeset
for help on using the changeset viewer.