Changeset 11465


Ignore:
Timestamp:
2019-08-20T18:03:53+02:00 (13 months ago)
Author:
acc
Message:

Branch dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap. Update VORTEX/MY_SRC/domvvl.F90 to be compatible with time swapping changes; now passes SETTE tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/tests/VORTEX/MY_SRC/domvvl.F90

    r11426 r11465  
    619619         tilde_e3t_n(:,:,:) = tilde_e3t_a(:,:,:) 
    620620      ENDIF 
    621       gdept(:,:,:,Kbb) = gdept(:,:,:,Kmm) 
    622       gdepw(:,:,:,Kbb) = gdepw(:,:,:,Kmm) 
    623  
    624       e3t(:,:,:,Kmm) = e3t(:,:,:,Kaa) 
    625       e3u(:,:,:,Kmm) = e3u(:,:,:,Kaa) 
    626       e3v(:,:,:,Kmm) = e3v(:,:,:,Kaa) 
    627621 
    628622      ! Compute all missing vertical scale factor and depths 
     
    631625      ! -------------------------------------- 
    632626      ! - ML - e3u(:,:,:,Kbb) and e3v(:,:,:,Kbb) are allready computed in dynnxt 
    633       ! - JC - hu(:,:,Kbb), hv(:,:,Kbb), hur_b, hvr_b also 
     627      ! - JC - hu(:,:,:,Kbb), hv(:,:,:,:,Kbb), hur_b, hvr_b also 
    634628       
    635629      CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3f(:,:,:), 'F'  ) 
     
    663657      ! Local depth and Inverse of the local depth of the water 
    664658      ! ------------------------------------------------------- 
    665       hu(:,:,Kmm) = hu(:,:,Kaa)   ;   r1_hu(:,:,Kmm) = r1_hu(:,:,Kaa) 
    666       hv(:,:,Kmm) = hv(:,:,Kaa)   ;   r1_hv(:,:,Kmm) = r1_hv(:,:,Kaa) 
    667659      ! 
    668660      ht(:,:) = e3t(:,:,1,Kmm) * tmask(:,:,1) 
     
    906898                     DO ji = 1, jpi 
    907899                        IF( ht_0(ji,jj)-ssh_ref <  rn_wdmin1 ) THEN ! if total depth is less than min depth 
    908  
    909900                           ssh(ji,jj,Kbb) = rn_wdmin1 - (ht_0(ji,jj) ) 
    910901                           ssh(ji,jj,Kmm) = rn_wdmin1 - (ht_0(ji,jj) ) 
     
    932923            ELSE 
    933924               ! 
    934                ! usr_def_istate called here only to get ssh(:,:,Kbb), that is needed to initialize e3t(:,:,:,Kbb) and e3t(:,:,:,Kmm) 
     925               ! usr_def_istate called here only to get ssh(Kbb) needed to initialize e3t(Kbb) and e3t(Kmm) 
     926               ! 
    935927               CALL usr_def_istate( gdept_0, tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb)  )   
    936                ! usr_def_istate will be called again in istate_init to initialize ts(bn), ssh(bn), u(bn) and v(bn) 
     928               ! 
     929               ! usr_def_istate will be called again in istate_init to initialize ts, ssh, u and v 
    937930               ! 
    938931               DO jk=1,jpk 
     
    942935               END DO 
    943936               e3t(:,:,:,Kmm) = e3t(:,:,:,Kbb) 
    944                ssh(:,:,Kmm) = ssh(:,:,Kbb)   ! needed later for gde3w 
    945 !!$                e3t(:,:,:,Kmm)=e3t_0(:,:,:) 
    946 !!$                e3t(:,:,:,Kbb)=e3t_0(:,:,:) 
     937               ssh(:,:,Kmm) = ssh(:,:,Kbb)                                     ! needed later for gde3w 
    947938               ! 
    948939            END IF           ! end of ll_wd edits 
Note: See TracChangeset for help on using the changeset viewer.