Changeset 3692


Ignore:
Timestamp:
2012-11-28T08:54:04+01:00 (8 years ago)
Author:
rblod
Message:

correct pb with agrif and obc (potentially bdy) see ticket #1029

Location:
trunk/NEMOGCM/NEMO/OPA_SRC/DYN
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

    r3562 r3692  
    156156# if defined key_obc 
    157157      !                                !* OBC open boundaries 
    158       CALL obc_dyn( kt ) 
     158      IF( lk_obc ) CALL obc_dyn( kt ) 
    159159      ! 
    160160      IF( .NOT. lk_dynspg_flt ) THEN 
     
    163163         !                                       sshn_b (= after ssha_b) for time-splitting case (lk_dynspg_ts=T) 
    164164         !                              - Correct the barotropic velocities 
    165          CALL obc_dyn_bt( kt ) 
     165         IF( lk_obc ) CALL obc_dyn_bt( kt ) 
    166166         ! 
    167167!!gm ERROR - potential BUG: sshn should not be modified at this stage !!   ssh_nxt not alrady called 
    168168         CALL lbc_lnk( sshn, 'T', 1. )         ! Boundary conditions on sshn 
    169169         ! 
    170          IF( ln_vol_cst )   CALL obc_vol( kt ) 
     170         IF( lk_obc .AND. ln_vol_cst )   CALL obc_vol( kt ) 
    171171         ! 
    172172         IF(ln_ctl)   CALL prt_ctl( tab2d_1=sshn, clinfo1=' ssh      : ', mask1=tmask ) 
     
    175175# elif defined key_bdy 
    176176      !                                !* BDY open boundaries 
    177       IF( lk_dynspg_exp ) CALL bdy_dyn( kt ) 
    178       IF( lk_dynspg_ts ) CALL bdy_dyn( kt, dyn3d_only=.true. ) 
     177      IF( lk_bdy .AND. lk_dynspg_exp ) CALL bdy_dyn( kt ) 
     178      IF( lk_bdy .AND. lk_dynspg_ts  ) CALL bdy_dyn( kt, dyn3d_only=.true. ) 
    179179 
    180180!!$   Do we need a call to bdy_vol here?? 
  • trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

    r3294 r3692  
    188188 
    189189#if defined key_obc 
    190       CALL obc_dyn( kt )      ! Update velocities on each open boundary with the radiation algorithm 
    191       CALL obc_vol( kt )      ! Correction of the barotropic componant velocity to control the volume of the system 
     190      IF( lk_obc ) CALL obc_dyn( kt )   ! Update velocities on each open boundary with the radiation algorithm 
     191      IF( lk_obc)  CALL obc_vol( kt )   ! Correction of the barotropic componant velocity to control the volume of the system 
    192192#endif 
    193193#if defined key_bdy 
    194       CALL bdy_dyn( kt )      ! Update velocities on each open boundary 
    195       CALL bdy_vol( kt )      ! Correction of the barotropic component velocity to control the volume of the system 
     194      IF( lk_bdy ) CALL bdy_dyn( kt )   ! Update velocities on each open boundary 
     195      IF( lk_bdy ) CALL bdy_vol( kt )   ! Correction of the barotropic component velocity to control the volume of the system 
    196196#endif 
    197197#if defined key_agrif 
Note: See TracChangeset for help on using the changeset viewer.