Changeset 1158


Ignore:
Timestamp:
2008-06-27T10:24:52+02:00 (12 years ago)
Author:
rblod
Message:

OBC corrections, see ticket #224

Location:
trunk/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90

    r1151 r1158  
    433433         zssha(:,:) = sshb(:,:) + z2dt * ( wn(:,:,1) - emp(:,:) * zraur ) * tmask(:,:,1) 
    434434      ENDIF 
    435  
    436 #if defined key_agrif 
    437       IF (lk_obc .AND. Agrif_Root() ) THEN 
    438 #else 
    439       IF (lk_obc) THEN 
    440 #endif 
     435#if defined key_obc 
     436# if defined key_agrif 
     437      IF ( Agrif_Root() ) THEN 
     438# endif 
    441439         zssha(:,:)=zssha(:,:)*obctmsk(:,:) 
    442440         CALL lbc_lnk(zssha,'T',1.)  ! absolutly compulsory !! (jmm) 
    443       ENDIF 
     441# if defined key_agrif 
     442      ENDIF 
     443# endif 
     444#endif 
    444445 
    445446      IF( neuler == 0 .AND. kt == nit000 ) THEN      ! Euler (forward) time stepping, no time filter 
  • trunk/NEMO/OPA_SRC/OBC/obc_oce.F90

    r1152 r1158  
    88   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)  
    99   !!---------------------------------------------------------------------- 
    10 #if defined key_obc 
    1110   !!---------------------------------------------------------------------- 
    1211   !!   'key_obc' :                                 Open Boundary Condition 
     
    2120   USE par_oce         ! ocean parameters 
    2221   USE obc_par         ! open boundary condition parameters 
     22 
     23#if defined key_obc 
    2324 
    2425   IMPLICIT NONE 
Note: See TracChangeset for help on using the changeset viewer.