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 2214 – NEMO

Changeset 2214


Ignore:
Timestamp:
2010-10-12T12:40:26+02:00 (14 years ago)
Author:
rblod
Message:

Correct a mistake in divcur merge

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/divcur.F90

    r2208 r2214  
    340340         ENDIF 
    341341#endif          
    342 <<<<<<< .working 
    343342         IF( .NOT. AGRIF_Root() ) THEN 
    344 ======= 
    345 #if defined key_bdy 
    346          ! unstructured open boundaries (div must be zero behind the open boundary) 
    347          DO jj = 1, jpj 
    348            DO ji = 1, jpi 
    349              hdivn(ji,jj,jk)=hdivn(ji,jj,jk)*bdytmask(ji,jj) 
    350            END DO 
    351          END DO 
    352 #endif         
    353          IF( .NOT. AGRIF_Root() ) THEN 
    354 >>>>>>> .merge-right.r2207 
    355343            IF ((nbondi ==  1).OR.(nbondi == 2)) hdivn(nlci-1 , :     ,jk) = 0.e0      ! east 
    356344            IF ((nbondi == -1).OR.(nbondi == 2)) hdivn(2      , :     ,jk) = 0.e0      ! west 
Note: See TracChangeset for help on using the changeset viewer.