- Timestamp:
- 2012-01-27T13:41:30+01:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
r3259 r3278 66 66 !!---------------------------------------------------------------------- 67 67 68 REAL(wp), POINTER, DIMENSION(:,:,:) :: zwi, zwd, zws 68 REAL(wp), POINTER, DIMENSION(:,:,:) :: zwi, zwd, zws, zavmu, zavmv 69 69 !!---------------------------------------------------------------------- 70 70 ! 71 71 IF( nn_timing == 1 ) CALL timing_start('dyn_zdf_imp') 72 72 ! 73 CALL wrk_alloc( jpi,jpj,jpk, zwi, zwd, zws )73 CALL wrk_alloc( jpi,jpj,jpk, zwi, zwd, zws, zavmu, zavmv ) 74 74 ! 75 75 IF( kt == nit000 ) THEN … … 90 90 ! 91 91 IF( ln_bfrimp ) THEN 92 DO jk = 1, jpk 93 DO jj = 1, jpj 94 DO ji =1, jpi 95 zavmu(ji,jj,jk) = avmu(ji,jj,jk) 96 zavmv(ji,jj,jk) = avmv(ji,jj,jk) 97 END DO 98 END DO 99 END DO 100 92 101 # if defined key_vectopt_loop 93 102 DO jj = 1, 1 … … 99 108 ikbu = mbku(ji,jj) ! ocean bottom level at u- and v-points 100 109 ikbv = mbkv(ji,jj) ! (deepest ocean u- and v-points) 101 avmu(ji,jj,ikbu+1) = -bfrua(ji,jj) * fse3uw(ji,jj,ikbu+1)102 avmv(ji,jj,ikbv+1) = -bfrva(ji,jj) * fse3vw(ji,jj,ikbv+1)110 zavmu(ji,jj,ikbu+1) = -bfrua(ji,jj) * fse3uw(ji,jj,ikbu+1) 111 zavmv(ji,jj,ikbv+1) = -bfrva(ji,jj) * fse3vw(ji,jj,ikbv+1) 103 112 END DO 104 113 END DO … … 115 124 DO ji = fs_2, fs_jpim1 ! vector opt. 116 125 zcoef = - p2dt / fse3u(ji,jj,jk) 117 zzwi = zcoef * avmu (ji,jj,jk ) / fse3uw(ji,jj,jk )126 zzwi = zcoef * zavmu (ji,jj,jk ) / fse3uw(ji,jj,jk ) 118 127 zwi(ji,jj,jk) = zzwi * umask(ji,jj,jk) 119 zzws = zcoef * avmu (ji,jj,jk+1) / fse3uw(ji,jj,jk+1)128 zzws = zcoef * zavmu (ji,jj,jk+1) / fse3uw(ji,jj,jk+1) 120 129 zws(ji,jj,jk) = zzws * umask(ji,jj,jk+1) 121 130 zwd(ji,jj,jk) = 1._wp - zwi(ji,jj,jk) - zzws … … 201 210 DO ji = fs_2, fs_jpim1 ! vector opt. 202 211 zcoef = -p2dt / fse3v(ji,jj,jk) 203 zzwi = zcoef * avmv (ji,jj,jk ) / fse3vw(ji,jj,jk )212 zzwi = zcoef * zavmv (ji,jj,jk ) / fse3vw(ji,jj,jk ) 204 213 zwi(ji,jj,jk) = zzwi * vmask(ji,jj,jk) 205 zzws = zcoef * avmv (ji,jj,jk+1) / fse3vw(ji,jj,jk+1)214 zzws = zcoef * zavmv (ji,jj,jk+1) / fse3vw(ji,jj,jk+1) 206 215 zws(ji,jj,jk) = zzws * vmask(ji,jj,jk+1) 207 216 zwd(ji,jj,jk) = 1._wp - zwi(ji,jj,jk) - zzws
Note: See TracChangeset
for help on using the changeset viewer.