Changeset 5032
- Timestamp:
- 2015-01-15T11:48:39+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r4770 r5032 97 97 ALLOCATE( wgtbtp1(3*nn_baro), wgtbtp2(3*nn_baro), zwz(jpi,jpj), STAT= ierr(2) ) 98 98 99 IF( ln_dynvor_een ) ALLOCATE( ftnw(jpi,jpj) , ftne(jpi,jpj) , &100 & ftsw(jpi,jpj) , ftse(jpi,jpj) , STAT=ierr(3) )99 IF( ln_dynvor_een .or. ln_dynvor_een_old ) ALLOCATE( ftnw(jpi,jpj) , ftne(jpi,jpj) , & 100 & ftsw(jpi,jpj) , ftse(jpi,jpj) , STAT=ierr(3) ) 101 101 102 102 dyn_spg_ts_alloc = MAXVAL(ierr(:)) … … 218 218 ! 219 219 IF ( kt == nit000 .OR. lk_vvl ) THEN 220 IF ( ln_dynvor_een ) THEN 220 IF ( ln_dynvor_een_old ) THEN 221 DO jj = 1, jpjm1 222 DO ji = 1, jpim1 223 zwz(ji,jj) = ( ht(ji ,jj+1) + ht(ji+1,jj+1) + & 224 & ht(ji ,jj ) + ht(ji+1,jj ) ) / 4._wp 225 IF( zwz(ji,jj) /= 0._wp ) zwz(ji,jj) = 1._wp / zwz(ji,jj) 226 END DO 227 END DO 228 CALL lbc_lnk( zwz, 'F', 1._wp ) 229 zwz(:,:) = ff(:,:) * zwz(:,:) 230 231 ftne(1,:) = 0._wp ; ftnw(1,:) = 0._wp ; ftse(1,:) = 0._wp ; ftsw(1,:) = 0._wp 232 DO jj = 2, jpj 233 DO ji = fs_2, jpi ! vector opt. 234 ftne(ji,jj) = zwz(ji-1,jj ) + zwz(ji ,jj ) + zwz(ji ,jj-1) 235 ftnw(ji,jj) = zwz(ji-1,jj-1) + zwz(ji-1,jj ) + zwz(ji ,jj ) 236 ftse(ji,jj) = zwz(ji ,jj ) + zwz(ji ,jj-1) + zwz(ji-1,jj-1) 237 ftsw(ji,jj) = zwz(ji ,jj-1) + zwz(ji-1,jj-1) + zwz(ji-1,jj ) 238 END DO 239 END DO 240 ELSE IF ( ln_dynvor_een ) THEN 221 241 DO jj = 1, jpjm1 222 242 DO ji = 1, jpim1 … … 339 359 END DO 340 360 ! 341 ELSEIF ( ln_dynvor_een ) THEN! enstrophy and energy conserving scheme361 ELSEIF ( ln_dynvor_een .or. ln_dynvor_een_old ) THEN ! enstrophy and energy conserving scheme 342 362 DO jj = 2, jpjm1 343 363 DO ji = fs_2, fs_jpim1 ! vector opt. … … 687 707 END DO 688 708 ! 689 ELSEIF ( ln_dynvor_een ) THEN!== energy and enstrophy conserving scheme ==!709 ELSEIF ( ln_dynvor_een .or. ln_dynvor_een_old ) THEN !== energy and enstrophy conserving scheme ==! 690 710 DO jj = 2, jpjm1 691 711 DO ji = fs_2, fs_jpim1 ! vector opt.
Note: See TracChangeset
for help on using the changeset viewer.