Ignore:
Timestamp:
2017-12-13T18:08:50+01:00 (3 years ago)
Author:
timgraham
Message:

Merged METO_MERCATOR branch and resolved all conflicts in OPA_SRC

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

    r9019 r9023  
    275275               ENDIF 
    276276            END DO 
     277#if defined key_agrif  
     278       IF( .NOT. AGRIF_Root() ) THEN  
     279          IF ((nbondi ==  1).OR.(nbondi == 2)) fmask(nlci-1 , :     ,jk) = 0.e0      ! east  
     280          IF ((nbondi == -1).OR.(nbondi == 2)) fmask(1      , :     ,jk) = 0.e0      ! west  
     281          IF ((nbondj ==  1).OR.(nbondj == 2)) fmask(:      ,nlcj-1 ,jk) = 0.e0      ! north  
     282          IF ((nbondj == -1).OR.(nbondj == 2)) fmask(:      ,1      ,jk) = 0.e0      ! south  
     283       ENDIF  
     284#endif  
    277285         END DO 
    278286         ! 
Note: See TracChangeset for help on using the changeset viewer.