New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 3278 for branches/2011/dev_NEMO_MERGE_2011 – NEMO

Ignore:
Timestamp:
2012-01-27T13:41:30+01:00 (12 years ago)
Author:
hliu
Message:

keep avmu(v) intact in dynzdf_imp.F90, ref: ticket #918

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

    r3259 r3278  
    6666      !!---------------------------------------------------------------------- 
    6767 
    68       REAL(wp), POINTER, DIMENSION(:,:,:) ::  zwi, zwd, zws 
     68      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zwi, zwd, zws, zavmu, zavmv 
    6969      !!---------------------------------------------------------------------- 
    7070      ! 
    7171      IF( nn_timing == 1 )  CALL timing_start('dyn_zdf_imp') 
    7272      ! 
    73       CALL wrk_alloc( jpi,jpj,jpk, zwi, zwd, zws )  
     73      CALL wrk_alloc( jpi,jpj,jpk, zwi, zwd, zws, zavmu, zavmv )  
    7474      ! 
    7575      IF( kt == nit000 ) THEN 
     
    9090      ! 
    9191      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 
    92101# if defined key_vectopt_loop 
    93102      DO jj = 1, 1 
     
    99108            ikbu = mbku(ji,jj)         ! ocean bottom level at u- and v-points  
    100109            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) 
    103112         END DO 
    104113      END DO 
     
    115124            DO ji = fs_2, fs_jpim1   ! vector opt. 
    116125               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  ) 
    118127               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) 
    120129               zws(ji,jj,jk) = zzws  * umask(ji,jj,jk+1) 
    121130               zwd(ji,jj,jk) = 1._wp - zwi(ji,jj,jk) - zzws 
     
    201210            DO ji = fs_2, fs_jpim1   ! vector opt. 
    202211               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  ) 
    204213               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) 
    206215               zws(ji,jj,jk) =  zzws * vmask(ji,jj,jk+1) 
    207216               zwd(ji,jj,jk) = 1._wp - zwi(ji,jj,jk) - zzws 
Note: See TracChangeset for help on using the changeset viewer.